From f54ba6cd72447a2b16fa999a768dc6efdaa0c5ae Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Thu, 11 Jan 2024 17:33:57 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

---
 src/views/publicSecurity/keynotePersonnelManage.vue |  227 ++++++++++++--------------------------------------------
 1 files changed, 49 insertions(+), 178 deletions(-)

diff --git a/src/views/publicSecurity/keynotePersonnelManage.vue b/src/views/publicSecurity/keynotePersonnelManage.vue
index 30e8fb3..f39aa11 100644
--- a/src/views/publicSecurity/keynotePersonnelManage.vue
+++ b/src/views/publicSecurity/keynotePersonnelManage.vue
@@ -6,22 +6,13 @@
       @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
 
       <template slot-scope="scope" slot="menu">
-        <el-button type="text" size="small" icon="el-icon-view" plain @click="lookDetail(scope.row,0)">查 看
-        </el-button>
-        <el-button type="text" size="small" icon="el-icon-s-check" v-if="scope.row.status == 1" plain
-          @click="lookDetail(scope.row,1)">审 核
-        </el-button>
-        <el-button type="text" size="small" icon="el-icon-delete" plain @click="rowDel(scope.row)">删 除
+        <el-button type="text" size="small" icon="el-icon-view" plain @click="lookDetail(scope.row)">查 看
         </el-button>
       </template>
-
     </avue-crud>
 
-
-    <el-dialog title="" append-to-body :visible.sync="auditBasePopup" width="60%">
-      <campusReporting @colseDetail="colseDetail" v-if="taskType == 6" ref="campusReporting"></campusReporting>
-      <hotelReporting @colseDetail="colseDetail" v-if="taskType == 2" ref="hotelReporting"></hotelReporting>
-      <labelReporting @colseDetail="colseDetail" v-if="taskType == 3" ref="labelReporting"></labelReporting>
+    <el-dialog title="" append-to-body :visible.sync="auditBasePopup" width="80%">
+      <communityKeyNotePersonnel ref="communityKeyNotePersonnel"></communityKeyNotePersonnel>
     </el-dialog>
   </basic-container>
 </template>
@@ -29,23 +20,16 @@
 <script>
   import {
     statisticalLabels
-  } from "/src/api/userHouse/list/userHouseList"
+  } from "@/api/userHouse/list/userHouseList"
 
-  // import {
-  //   getList,
-  //   removeTask,
-  //   update,
-  //   add,
-  // } from "@/api/task/task"
 
   import {
     mapGetters
   } from "vuex"
 
+  import communityKeyNotePersonnel from './components/communityKeyNotePersonnel.vue'
+
   import website from '@/config/website'
-  import campusReporting from './components/campusReporting'
-  import hotelReporting from './components/hotelReporting'
-  import labelReporting from './components/labelReporting'
 
   export default {
     data() {
@@ -80,161 +64,61 @@
           // viewBtn: true,
           editBtn: false,
           delBtn: false,
-          selection: true,
+          addBtn: false,
+          // selection: true,
           dialogClickModal: false,
-          column: [
+          column: [{
+              span: 12,
+              label: "所属街道",
+              prop: "regionName",
+              searchSpan: 4,
+              align: 'center',
+              // search: true,
+              // hide: true,
+            },
             // {
             //   span: 12,
-            //   label: "场所名称",
-            //   prop: "name",
+            //   label: "所属社区",
+            //   prop: "communityName",
+            //   align: 'center',
             //   searchSpan: 4,
             //   search: true,
+            //   // hide: true,
             // },
             {
               span: 12,
-              label: "社区",
-              prop: "communityName",
+              label: "刑释解教人员",
+              prop: "number1",
+              align: 'center',
               searchSpan: 4,
-              search: true,
-              hide: true,
             },
             {
               span: 12,
-              label: "小区",
-              prop: "districtName",
+              label: "肇事肇祸精神障碍患者",
+              prop: "number2",
+              align: 'center',
               searchSpan: 4,
-              search: true,
-              hide: true,
             },
             {
               span: 12,
-              label: "名称",
-              prop: "realName",
+              label: "一般精神障碍患者",
+              prop: "number3",
+              align: 'center',
               searchSpan: 4,
-              search: true,
-            }, {
-              span: 12,
-              label: "电话",
-              prop: "phone",
-              searchSpan: 4,
-              search: true,
-            }, {
-              addDisplay: false,
-              editDisplay: false,
-              viewDisplay: false,
-              label: '类型',
-              prop: 'reportType',
-              type: 'radio',
-              slot: true,
-              search: true,
-              searchSpan: 3,
-              dicData: [{
-                label: '旅馆安全',
-                value: 2
-              }, {
-                label: '打金店',
-                value: 3
-              }, {
-                label: '二手手机维修',
-                value: 4
-              }, {
-                label: '二手车交易',
-                value: 5
-              }, {
-                label: '校园安全',
-                value: 6
-              }]
             },
             {
-              addDisplay: false,
-              editDisplay: false,
-              viewDisplay: false,
-              label: '审核状态',
-              prop: 'status',
-              type: 'radio',
-              slot: true,
-              dicData: [{
-                label: '待审核',
-                value: 1
-              }, {
-                label: '已审核',
-                value: 2
-              }, {
-                label: '未通过',
-                value: 3
-              }]
-            }, {
-              label: "创建时间",
-              prop: "createTime",
-              searchSpan: 4,
-
-            }, {
-              label: "所属街道",
-              // hide: true,
-              // search: true,
-              parent: false,
-              searchSpan: 4,
-              prop: "streetCode",
-              type: "tree",
-              dicUrl: "/api/blade-system/region/getTownTree",
-              props: {
-                label: "name",
-                value: "id"
-              },
-              rules: [{
-                required: true,
-                message: "请选择所属街道",
-                trigger: "blur",
-              }, ],
-            }, {
-              // hide: true,
-              // search: true,
-              parent: false,
-              searchSpan: 4,
-              label: "所属社区",
-              prop: "neiCode",
-              // search: false,
-              type: "tree",
-              dicUrl: "/api/blade-system/region/tree",
-              props: {
-                label: "name",
-                value: "id",
-              },
-              rules: [{
-                required: true,
-                message: "请选择所属社区",
-                trigger: "blur",
-              }, ],
-            }, {
-              // hide: true,
-              // search: true,
-              parent: false,
-              searchSpan: 4,
-              label: "小区",
-              prop: "aoiCode",
-              // search: false,
-              type: "tree",
-              dicUrl: "/api/blade-district/district/getDistrictTree",
-              props: {
-                label: "name",
-                value: "aoiCode"
-              },
-              rules: [{
-                required: true,
-                message: "请选择小区",
-                trigger: "blur",
-              }, ],
-            }, {
               span: 12,
-              label: "地址",
-              prop: "addressName",
+              label: "重点对象",
+              prop: "number4",
+              align: 'center',
               searchSpan: 4,
-              // search: true,
-              rules: [{
-                required: true,
-                message: "请输入场所名称",
-                trigger: "blur",
-              }, ],
+            },
+            {
+              span: 12,
+              label: "取保候审",
+              prop: "number5",
+              align: 'center',
+              searchSpan: 4,
             },
           ],
         },
@@ -251,9 +135,9 @@
     },
 
     components: {
-      campusReporting,
-      hotelReporting,
-      labelReporting,
+      communityKeyNotePersonnel,
+      // hotelReporting,
+      // labelReporting,
     },
 
     watch: {},
@@ -284,28 +168,15 @@
         this.onLoad(this.page)
       },
 
-      lookDetail(row, applyType) {
+      lookDetail(row) {
         this.auditBasePopup = true
         var that = this
-        if (row.reportType == 6) {
-          this.taskType = 6
-          this.$nextTick(() => {
-            that.$refs.campusReporting.init(row, applyType)
-          })
-        }
-        if (row.reportType == 2) {
-          this.taskType = 2
-          this.$nextTick(() => {
-            that.$refs.hotelReporting.init(row, applyType)
-          })
-        }
-        if (row.reportType == 3 || row.reportType == 4 || row.reportType == 5) {
-          this.taskType = 3
-          this.$nextTick(() => {
-            that.$refs.labelReporting.init(row, applyType)
-          })
-        }
+        this.$nextTick(() => {
+          that.$refs.communityKeyNotePersonnel.init(row)
+        })
       },
+
+
       auditCur(row) {
         this.curAuditRow = row
         this.auditBasePopup = true

--
Gitblit v1.9.3