linwe
2024-07-16 938afd671ee3ba97ec827b59040d1543d915abc2
派出所搜索调整为选项
8 files modified
423 ■■■■■ changed files
src/views/backblask/BackblastPubRecord.vue 7 ●●●●● patch | view | raw | blame | history
src/views/backblask/BackblastWarnHanRec.vue 35 ●●●● patch | view | raw | blame | history
src/views/disputeRecord/disputeRecord.vue 165 ●●●● patch | view | raw | blame | history
src/views/grid/jwGrid.vue 89 ●●●●● patch | view | raw | blame | history
src/views/publicSecurity/ninePlaceManage/archivesManage.vue 32 ●●●● patch | view | raw | blame | history
src/views/publicSecurity/noExplosionManage.vue 32 ●●●● patch | view | raw | blame | history
src/views/publicSecurity/policeAlarmRecords.vue 30 ●●●● patch | view | raw | blame | history
src/views/publicSecurity/positionManage/fileManage.vue 33 ●●●● patch | view | raw | blame | history
src/views/backblask/BackblastPubRecord.vue
@@ -83,7 +83,7 @@
          height: "auto",
          calcHeight: 54,
          dialogWidth: 950,
          menuWidth: 100,
          menuWidth: 200,
          tip: false,
          searchShow: true,
          searchMenuSpan: 3,
@@ -91,7 +91,7 @@
          index: true,
          viewBtn: true,
          editBtn: false,
          delBtn: false,
          delBtn: true,
          addBtn: false,
          refreshBtn: false,
          searchShowBtn: false,
@@ -418,8 +418,7 @@
            type: "warning",
          })
          .then(() => {
            row.isDeleted = 1
            return removeTask(row)
            return remove(row.id)
          })
          .then(() => {
            this.onLoad(this.page)
src/views/backblask/BackblastWarnHanRec.vue
@@ -163,16 +163,37 @@
              labelWidth: 120,
              width: 156,
              searchPlaceholder: '请输入地区'
            }, {
            },
            // {
            //   label: "辖区派出所",
            //   prop: "pcsName",
            //   align: 'center',
            //   search: true,
            //   searchSpan: 4,
            //   labelWidth: 120,
            //   searchLabelWidth: 96,
            //   searchPlaceholder: '请输入辖区派出所'
            // },
            {
              searchLabelWidth: 90,
              label: "辖区派出所",
              prop: "pcsName",
              align: 'center',
              search: true,
              searchSpan: 4,
              labelWidth: 120,
              searchLabelWidth: 96,
              searchPlaceholder: '请输入辖区派出所'
            }, {
              // parent: false,
              prop: "pcsName",
              type: "tree",
              dicUrl: "/api/blade-system/dept/treeByDept?deptId=1727974759086493697",
              props: {
                label: "title",
                value: "title"
              },
              rules: [{
                required: true,
                message: "请选择辖区派出所",
                trigger: "blur",
              }, ],
            },
            {
              label: "宣防单位",
              prop: "deptName",
              align: 'center',
src/views/disputeRecord/disputeRecord.vue
@@ -1,10 +1,9 @@
<template>
    <basic-container>
        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
            v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
            :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
            @refresh-change="refreshChange" @on-load="onLoad">
      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
            <template slot-scope="{row, size}" slot="phoneOne">
                <el-button :size="size" type="text" @click="showStringDispose(row, 'phoneOneflag')"
                    v-text="textDispose(row, 'phoneOneflag', 'phoneOne')">
@@ -18,11 +17,11 @@
            <template slot="menuLeft">
                <el-button type="success" size="small" plain v-if="permission.dispute_record_import"
                    icon="el-icon-upload2" @click="handleImport">导入
        <el-button type="success" size="small" plain v-if="permission.dispute_record_import" icon="el-icon-upload2"
          @click="handleImport">导入
                </el-button>
                <el-button type="warning" size="small" plain v-if="permission.dispute_record_export"
                    icon="el-icon-download" @click="handleExport">导出
        <el-button type="warning" size="small" plain v-if="permission.dispute_record_export" icon="el-icon-download"
          @click="handleExport">导出
                </el-button>
            </template>
        </avue-crud>
@@ -202,8 +201,7 @@
                searchShowBtn: true,
                columnBtn: true,
                dialogClickModal: false,
                column: [
                    {
          column: [{
                        label: "事发地址",
                        prop: "address",
                        // align: 'center',
@@ -226,13 +224,11 @@
                        type: 'map',
                        dataType: "string",
                        value: [117.966460, 28.431002, ""],
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请选择巡查地址",
                                trigger: "blur",
                            },
                        ],
              }, ],
                    }, {
                        width: 150,
                        label: "事发时间",
@@ -241,13 +237,11 @@
                        labelWidth: 150,
                        format: "yyyy-MM-dd HH:mm:ss",
                        valueFormat: "yyyy-MM-dd HH:mm:ss",
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请选择事发时间",
                                trigger: "blur",
                            },
                        ],
              }, ],
                    }, {
                        label: "事发时间",
                        prop: "dateTime",
@@ -276,13 +270,11 @@
                        row: true,
                        span: 24,
                        overHidden: true,
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请输入纠纷内容",
                                trigger: "blur",
                            },
                        ],
              }, ],
                    },
                    {
                        label: "纠纷类型",
@@ -314,8 +306,7 @@
                        searchSpan: 3,
                        labelWidth: 150,
                        type: "select",
                        dicData: [
                            {
              dicData: [{
                                label: "是",
                                value: 1
                            },
@@ -324,13 +315,11 @@
                                value: 0
                            }
                        ],
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请选择是否受伤",
                                trigger: "blur",
                            },
                        ],
              }, ],
                    },
                    {
                        label: "受伤情况描述",
@@ -343,13 +332,11 @@
                        row: true,
                        span: 24,
                        overHidden: true,
                        rules: [
                            {
              rules: [{
                                required: false,
                                message: "请输入受伤情况描述",
                                trigger: "blur",
                            },
                        ],
              }, ],
                    },
                    {
                        label: "报警次数",
@@ -386,13 +373,11 @@
                        searchLabelWidth: 110,
                        searchSpan: 4,
                        width: 100,
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请输入当事人1姓名",
                                trigger: "blur",
                            },
                        ],
              }, ],
                    }, {
                        label: "当事人1性别",
                        prop: "genderOne",
@@ -403,23 +388,19 @@
                        searchLabelWidth: 110,
                        searchSpan: 4,
                        type: "select",
                        dicData: [
                            {
              dicData: [{
                                label: "男",
                                value: 1
                            }, {
                                label: "女",
                                value: 2
                            }
                        ],
              }],
                        width: 100,
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请选择当事人1性别",
                                trigger: "blur",
                            },
                        ],
              }, ],
                    }, {
                        label: "当事人1电话",
                        prop: "phoneOne",
@@ -430,8 +411,7 @@
                        searchLabelWidth: 110,
                        searchSpan: 4,
                        width: 100,
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请输入当事人1电话",
                                trigger: "blur",
@@ -453,16 +433,14 @@
                        searchSpan: 5,
                        width: 150,
                        // row: true,
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请输入当事人1身份证号",
                                trigger: "blur",
                            }, {
                                validator: isCardId,
                                trigger: 'blur'
                            }
                        ],
              }],
                    },
                    {
                        label: "当事人2姓名",
@@ -474,13 +452,11 @@
                        searchLabelWidth: 110,
                        searchSpan: 4,
                        width: 120,
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请输入当事人2姓名",
                                trigger: "blur",
                            },
                        ],
              }, ],
                    }, {
                        label: "当事人2性别",
                        prop: "genderOne",
@@ -491,23 +467,19 @@
                        searchLabelWidth: 110,
                        searchSpan: 4,
                        type: "select",
                        dicData: [
                            {
              dicData: [{
                                label: "男",
                                value: 1
                            }, {
                                label: "女",
                                value: 2
                            }
                        ],
              }],
                        width: 100,
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请选择当事人2性别",
                                trigger: "blur",
                            },
                        ],
              }, ],
                    }, {
                        label: "当事人2电话",
                        prop: "phoneTwo",
@@ -518,8 +490,7 @@
                        searchLabelWidth: 110,
                        searchSpan: 4,
                        width: 120,
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请输入当事人2电话",
                                trigger: "blur",
@@ -540,16 +511,14 @@
                        searchLabelWidth: 110,
                        searchSpan: 4,
                        width: 120,
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请输入当事人2身份证号",
                                trigger: "blur",
                            }, {
                                validator: isCardId,
                                trigger: 'blur'
                            }
                        ],
              }],
                    },
                    {
                        label: "地区",
@@ -563,19 +532,40 @@
                        labelWidth: 150,
                        width: 120,
                        searchPlaceholder: '请输入地区'
                    }, {
            },
            // {
            //     label: "辖区派出所",
            //     prop: "pcsName",
            //     align: 'center',
            //     search: true,
            //     addDisplay: false,
            //     editDisplay: false,
            //     searchSpan: 4,
            //     labelWidth: 150,
            //     width: 120,
            //     searchLabelWidth: 96,
            //     searchPlaceholder: '请输入辖区派出所'
            // },
            {
              searchLabelWidth: 90,
                        label: "辖区派出所",
                        prop: "pcsName",
                        align: 'center',
                        search: true,
                        addDisplay: false,
                        editDisplay: false,
                        searchSpan: 4,
                        labelWidth: 150,
                        width: 120,
                        searchLabelWidth: 96,
                        searchPlaceholder: '请输入辖区派出所'
                    }, {
              // parent: false,
              prop: "pcsName",
              type: "tree",
              dicUrl: "/api/blade-system/dept/treeByDept?deptId=1727974759086493697",
              props: {
                label: "title",
                value: "title"
              },
              rules: [{
                required: true,
                message: "请选择辖区派出所",
                trigger: "blur",
              }, ],
            },
            {
                        label: "处理结果",
                        prop: "handleResult",
                        align: 'center',
@@ -584,8 +574,7 @@
                        searchSpan: 4,
                        width: 110,
                        type: "select",
                        dicData: [
                            {
              dicData: [{
                                label: "已化解",
                                value: 1
                            },
@@ -598,14 +587,13 @@
                                value: 3
                            }
                        ],
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请选择处理结果",
                                trigger: "blur",
                            },
              }, ],
            }
                        ],
                    }],
            },
            data: []
        }
@@ -664,7 +652,8 @@
        'excelForm.isCovered'() {
            if (this.excelForm.isCovered !== '') {
                const column = this.findObject(this.excelOption.column, "excelFile")
                column.action = `/api/blade-disputeRecord/disputeRecord/import-disputeRecord?isCovered=${this.excelForm.isCovered}`
          column.action =
            `/api/blade-disputeRecord/disputeRecord/import-disputeRecord?isCovered=${this.excelForm.isCovered}`
            }
        }
    },
@@ -679,7 +668,8 @@
            }
        },
        handleTemplate() {
            exportBlob(`/api/blade-disputeRecord/disputeRecord/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
        exportBlob(`/api/blade-disputeRecord/disputeRecord/export-template?${this.website.tokenHeader}=${getToken()}`)
          .then(res => {
                downloadXls(res.data, "矛盾纠纷事件数据模板.xlsx")
            })
        },
@@ -709,7 +699,8 @@
                data.isNine = 1
                data = Qs.stringify(data)
                exportBlob(
                    `/api/blade-disputeRecord/disputeRecord/export-disputeRecord?${this.website.tokenHeader}=${getToken()}&` + data
            `/api/blade-disputeRecord/disputeRecord/export-disputeRecord?${this.website.tokenHeader}=${getToken()}&` +
            data
                ).then(res => {
                    console.log('exportBlob', res)
                    downloadXls(res.data, `矛盾纠纷事件${dateNow()}.xlsx`)
src/views/grid/jwGrid.vue
@@ -71,8 +71,7 @@
        viewBtn: true,
        selection: true,
        dialogClickModal: false,
        column: [
          {
          column: [{
          overHidden: true,
          label: "所属派出所",
          prop: "pcsCode",
@@ -93,38 +92,78 @@
            trigger: "blur",
          },],
        }, 
            // {
            //   overHidden: true,
            //   label: "所属派出所",
            //   prop: "pcsName",
            //   addDisplay: false,
            //   editDisplay: false,
            //   viewDisplay: false,
            //   searchSpan: 4,
            //   search: true,
            //   row: true,
            //   rules: [{
            //     required: true,
            //     message: "请输入网格名称",
            //     trigger: "blur",
            //   }, ],
            // },
        {
          overHidden: true,
              searchLabelWidth: 90,
          label: "所属派出所",
          prop: "pcsName",
          addDisplay: false,
          editDisplay: false,
          viewDisplay: false,
          searchSpan: 4,
          search: true,
          row: true,
              searchSpan: 4,
              // parent: false,
              prop: "pcsName",
              type: "tree",
              dicUrl: "/api/blade-system/dept/treeByDept?deptId=1727974759086493697",
              props: {
                label: "title",
                value: "title"
              },
          rules: [{
            required: true,
            message: "请输入网格名称",
                message: "请选择所属派出所",
            trigger: "blur",
          },],
        }, 
        {
          overHidden: true,
              // hide: true,
              parent: false,
          label: "所属社区",
          addDisplay: false,
          editDisplay: false,
          viewDisplay: false,
          prop: "communityName",
          search: true,
          searchSpan: 4,
          searchLabelWidth: 76,
              width: 150,
              type: "tree",
              dicUrl: "/api/blade-system/region/treeToCommunity",
              props: {
                label: "name",
                value: "name",
              },
              cascader: ["gridCode"],
          rules: [{
            required: true,
            message: "请选择所属社区",
            trigger: "blur",
          }],
              }, ],
        },
            // {
            //   overHidden: true,
            //   label: "所属社区",
            //   addDisplay: false,
            //   editDisplay: false,
            //   viewDisplay: false,
            //   prop: "communityName",
            //   search: true,
            //   searchSpan: 4,
            //   searchLabelWidth: 76,
            //   rules: [{
            //     required: true,
            //     message: "请选择所属社区",
            //     trigger: "blur",
            //   }],
            // },
        {
          hide: true,
          parent: false,
@@ -175,23 +214,7 @@
            trigger: "blur",
          },],
        },
        // {
        //   label: "责任民警联系电话",
        //   prop: "principalPhone",
        //   span: 12,
        //   searchSpan: 4,
        //   rules: [{
        //     required: true,
        //     message: "请输入联系电话",
        //     trigger: "blur",
        //   },
        //   {
        //     validator: validatorPhone,
        //     trigger: 'blur'
        //   }
        //   ],
        //   slot: true
        // },
        {
          label: "区域",
          prop: "geom",
src/views/publicSecurity/ninePlaceManage/archivesManage.vue
@@ -176,16 +176,36 @@
                trigger: "blur",
              }, ],
            },
            // {
            //   label: "辖区派出所",
            //   prop: "deptName",
            //   align: 'center',
            //   // search: true,
            //   searchSpan: 4,
            //   searchLabelWidth: 96,
            //   width: 120,
            //   searchPlaceholder: '请输入辖区派出所'
            // },
            {
              searchLabelWidth: 90,
              label: "辖区派出所",
              prop: "deptName",
              align: 'center',
              search: true,
              searchSpan: 4,
              searchLabelWidth: 96,
              width: 120,
              searchPlaceholder: '请输入辖区派出所'
            }, {
              // parent: false,
              prop: "deptName",
              type: "tree",
              dicUrl: "/api/blade-system/dept/treeByDept?deptId=1727974759086493697",
              props: {
                label: "title",
                value: "title"
              },
              rules: [{
                required: true,
                message: "请选择辖区派出所",
                trigger: "blur",
              }, ],
            },
            {
              label: "责任民警",
              prop: "policeName",
              align: 'center',
src/views/publicSecurity/noExplosionManage.vue
@@ -304,17 +304,37 @@
              }, ],
            },
            // {
            //   label: "派出所",
            //   prop: "pcsName",
            //   span: 24,
            //   row: true,
            //   searchSpan: 4,
            //   search: true,
            //   align: 'center'
            // },
            {
              label: "派出所",
              prop: "pcsName",
              span: 24,
              row: true,
              searchSpan: 4,
              searchLabelWidth: 90,
              label: "辖区派出所",
              search: true,
              align: 'center'
              searchSpan: 4,
              // parent: false,
              prop: "pcsName",
              type: "tree",
              dicUrl: "/api/blade-system/dept/treeByDept?deptId=1727974759086493697",
              props: {
                label: "title",
                value: "title"
              },
              rules: [{
                required: true,
                message: "请选择辖区派出所",
                trigger: "blur",
              }, ],
            },
            {
              searchLabelWidth: 90,
              label: "场所负责人",
              prop: "principal",
              span: 24,
src/views/publicSecurity/policeAlarmRecords.vue
@@ -240,14 +240,34 @@
              span: 24,
              overHidden: true,
            },
            // {
            //   label: "派出所名称",
            //   prop: "pcsName",
            //   span: 24,
            //   row: true,
            //   searchSpan: 4,
            //   search: true,
            //   align: 'center'
            // },
            {
              width: 110,
              label: "派出所名称",
              prop: "pcsName",
              span: 24,
              row: true,
              searchSpan: 4,
              search: true,
              align: 'center'
              searchSpan: 4,
              // parent: false,
              prop: "pcsName",
              type: "tree",
              dicUrl: "/api/blade-system/dept/treeByDept?deptId=1727974759086493697",
              props: {
                label: "title",
                value: "title"
              },
              rules: [{
                required: true,
                message: "请选择派出所名称",
                trigger: "blur",
              }, ],
            },
            {
src/views/publicSecurity/positionManage/fileManage.vue
@@ -127,15 +127,36 @@
              align: 'center',
              slot: true,
              width: 120
            }, {
            },
            // {
            //   label: "辖区派出所",
            //   prop: "deptName",
            //   align: 'center',
            //   search: true,
            //   searchSpan: 4,
            //   width: 120,
            //   searchLabelWidth: 96
            // },
            {
              searchLabelWidth: 90,
              label: "辖区派出所",
              prop: "deptName",
              align: 'center',
              search: true,
              searchSpan: 4,
              width: 120,
              searchLabelWidth: 96
            }, {
              // parent: false,
              prop: "deptName",
              type: "tree",
              dicUrl: "/api/blade-system/dept/treeByDept?deptId=1727974759086493697",
              props: {
                label: "title",
                value: "title"
              },
              rules: [{
                required: true,
                message: "请选择辖区派出所",
                trigger: "blur",
              }, ],
            },
            {
              label: "地区",
              prop: "townStreetName",
              align: 'center',