From 0270a1c72a4496ee88c0778cbc5fe22b17d9993e Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 04 Jan 2024 11:21:03 +0800
Subject: [PATCH] 公安安全

---
 src/views/publicSecurity/keynotePlaceManage.vue             |  127 ++++---
 src/views/publicSecurity/components/labelReporting.vue      |  120 +++++++
 src/api/task/task.js                                        |    8 
 src/views/publicSecurity/components/bailReportingDetail.vue |  154 +++++++++
 src/views/publicSecurity/bailReporting.vue                  |  112 ++----
 src/api/task/campusReporting.js                             |   13 
 src/views/publicSecurity/components/campusReporting.vue     |  168 ++++++++++
 src/views/publicSecurity/components/hotelReporting.vue      |  199 ++++++++++++
 src/api/task/bailReporting.js                               |   13 
 src/api/task/hotelReporting.js                              |   13 
 src/api/task/labelReporting.js                              |   13 
 11 files changed, 808 insertions(+), 132 deletions(-)

diff --git a/src/api/task/bailReporting.js b/src/api/task/bailReporting.js
new file mode 100644
index 0000000..9b92382
--- /dev/null
+++ b/src/api/task/bailReporting.js
@@ -0,0 +1,13 @@
+import request from '@/router/axios';
+
+
+
+export const getDetail = (params) => {
+  return request({
+    url: "/api/blade-taskBailReportingEvent/taskBailReportingEvent/detail",
+    method: "get",
+    params: {
+      ...params,
+    },
+  });
+};
\ No newline at end of file
diff --git a/src/api/task/campusReporting.js b/src/api/task/campusReporting.js
new file mode 100644
index 0000000..5b1b158
--- /dev/null
+++ b/src/api/task/campusReporting.js
@@ -0,0 +1,13 @@
+import request from '@/router/axios';
+
+
+
+export const getDetail = (params) => {
+  return request({
+    url: "/api/blade-taskCampusReportingEvent/taskCampusReportingEvent/detail",
+    method: "get",
+    params: {
+      ...params,
+    },
+  });
+};
\ No newline at end of file
diff --git a/src/api/task/hotelReporting.js b/src/api/task/hotelReporting.js
new file mode 100644
index 0000000..f16c874
--- /dev/null
+++ b/src/api/task/hotelReporting.js
@@ -0,0 +1,13 @@
+import request from '@/router/axios';
+
+
+
+export const getDetail = (params) => {
+  return request({
+    url: "/api/blade-taskHotelReporting/taskHotelReporting/detail",
+    method: "get",
+    params: {
+      ...params,
+    },
+  });
+};
\ No newline at end of file
diff --git a/src/api/task/labelReporting.js b/src/api/task/labelReporting.js
new file mode 100644
index 0000000..c129af0
--- /dev/null
+++ b/src/api/task/labelReporting.js
@@ -0,0 +1,13 @@
+import request from '@/router/axios';
+
+
+
+export const getDetail = (params) => {
+  return request({
+    url: "/api/blade-taskLabelReportingEvent/taskLabelReportingEvent/detail",
+    method: "get",
+    params: {
+      ...params,
+    },
+  });
+};
\ No newline at end of file
diff --git a/src/api/task/task.js b/src/api/task/task.js
index a3bcfb8..97fad1b 100644
--- a/src/api/task/task.js
+++ b/src/api/task/task.js
@@ -12,13 +12,11 @@
   })
 }
 
-export const remove = (ids) => {
+export const removeTask = (row) => {
   return request({
-    url: '/api/blade-task/task/remove',
+    url: '/api/blade-task/task/removeTask',
     method: 'post',
-    params: {
-      ids,
-    }
+    data: row
   })
 }
 
diff --git a/src/views/publicSecurity/bailReporting.vue b/src/views/publicSecurity/bailReporting.vue
index 12fe795..c74b132 100644
--- a/src/views/publicSecurity/bailReporting.vue
+++ b/src/views/publicSecurity/bailReporting.vue
@@ -4,34 +4,18 @@
       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}" slot="confirmFlag">
-        <el-tag size="small" :type="showConfirmFlag(row.confirmFlag).type">{{ showConfirmFlag(row.confirmFlag).text
-                }}</el-tag>
-      </template> -->
-
-      <!-- <template slot="menuLeft">
-        <el-button size="small" icon="el-icon-delete" plain v-if="permission.place_delete" @click="handleDelete">删 除
+      <template slot-scope="scope" slot="menu">
+        <el-button type="text" size="small" icon="el-icon-view" plain @click="lookDetail(scope.row)">查 看
         </el-button>
-      </template> -->
-
-      <!--   <template slot-scope="scope" slot="menu">
-        <el-button type="text" :disabled="scope.row.confirmFlag == 2" icon="el-icon-s-check" size="small"
-          v-if="permission.place_audit_cur && scope.row.confirmFlag != 4" @click="auditCur(scope.row)">审核
+        <el-button type="text" size="small" icon="el-icon-delete" plain @click="rowDel(scope.row)">删 除
         </el-button>
+      </template>
 
-        <el-button type="text" icon="el-icon-edit" size="small" v-if="permission.place_manage_tenants"
-          @click="ManageTenants(scope.row)">场所维护
-        </el-button>
-      </template> -->
     </avue-crud>
 
-    <el-dialog class="place-info-box" title="场所维护" append-to-body :visible.sync="roleBox" center @close="roleBoxClose">
-      <!-- <baseAllInfo></baseAllInfo> -->
-    </el-dialog>
-
-    <el-dialog class="place-info-box audit-info-box" title="审核" append-to-body :visible.sync="auditBasePopup"
-      width="30%">
-      <!-- <auditBase></auditBase> -->
+    <el-dialog class="place-info-box audit-info-box" title="查看详情" append-to-body :visible.sync="auditBasePopup"
+      width="80%">
+      <bailReportingDetail ref="bailReportingDetail"></bailReportingDetail>
     </el-dialog>
   </basic-container>
 </template>
@@ -39,7 +23,7 @@
 <script>
   import {
     getList,
-    remove,
+    removeTask,
     update,
     add,
   } from "@/api/task/task"
@@ -50,7 +34,7 @@
 
   import website from '@/config/website'
 
-  // import auditBase from './components/auditBase'
+  import bailReportingDetail from './components/bailReportingDetail'
   // import baseAllInfo from './components/baseAllInfo'
 
   export default {
@@ -79,10 +63,11 @@
           searchMenuSpan: 3,
           menuWidth: 280,
           border: true,
-          menu: false,
+          // menu: false,
           //stripe:true,
           index: true,
-          viewBtn: true,
+          // viewBtn: true,
+          delBtn: false,
           editBtn: false,
           selection: true,
           dialogClickModal: false,
@@ -92,22 +77,11 @@
               prop: "name",
               searchSpan: 4,
               search: true,
-              rules: [{
-                required: true,
-                message: "请输入场所名称",
-                trigger: "blur",
-              }, ],
             }, {
               span: 12,
               label: "地址",
               prop: "addressName",
               searchSpan: 4,
-              // search: true,
-              rules: [{
-                required: true,
-                message: "请输入场所名称",
-                trigger: "blur",
-              }, ],
             },
             {
               label: "创建时间",
@@ -163,10 +137,9 @@
       }
     },
 
-    // components: {
-    //   auditBase,
-    //   baseAllInfo
-    // },
+    components: {
+      bailReportingDetail,
+    },
 
     watch: {},
 
@@ -221,6 +194,13 @@
       }
     },
     methods: {
+      lookDetail(row) {
+        this.auditBasePopup = true
+        var that = this
+        this.$nextTick(() => {
+          that.$refs.bailReportingDetail.init(row)
+        })
+      },
       auditCur(row) {
         this.curAuditRow = row
         this.auditBasePopup = true
@@ -318,7 +298,8 @@
             type: "warning",
           })
           .then(() => {
-            return remove(row.id)
+            row.isDeleted = 1
+            return removeTask(row)
           })
           .then(() => {
             this.onLoad(this.page)
@@ -359,7 +340,7 @@
             type: "warning",
           })
           .then(() => {
-            return remove(this.ids)
+            // return remove(this.ids)
           })
           .then(() => {
             this.onLoad(this.page)
@@ -373,31 +354,24 @@
 
       beforeOpen(done, type) {
         if (["edit", "view"].includes(type)) {
-          getPlace(this.form.id).then((res) => {
-            this.form = res.data.data
-
-            if (this.form.imageUrls.length) {
-              this.form.imageUrls = this.form.imageUrls.split(",").filter(item => item != '').map(item => website
-                .minioUrl + item).join(',')
-            }
-
-            if (this.form.placePoiLabelVOList.length) {
-              let lebelTwo = this.form.placePoiLabelVOList.find(item => {
-                return item.type == 2
-              })
-
-              if (lebelTwo) this.form.label = String(lebelTwo.poiCode)
-
-              let lebelThree = this.form.placePoiLabelVOList.find(item => {
-                return item.type == 3
-              })
-
-              if (lebelThree) this.form.smallLabel = String(lebelThree.poiCode)
-            }
-
-            done()
-
-          })
+          // getPlace(this.form.id).then((res) => {
+          //   this.form = res.data.data
+          //   if (this.form.imageUrls.length) {
+          //     this.form.imageUrls = this.form.imageUrls.split(",").filter(item => item != '').map(item => website
+          //       .minioUrl + item).join(',')
+          //   }
+          //   if (this.form.placePoiLabelVOList.length) {
+          //     let lebelTwo = this.form.placePoiLabelVOList.find(item => {
+          //       return item.type == 2
+          //     })
+          //     if (lebelTwo) this.form.label = String(lebelTwo.poiCode)
+          //     let lebelThree = this.form.placePoiLabelVOList.find(item => {
+          //       return item.type == 3
+          //     })
+          //     if (lebelThree) this.form.smallLabel = String(lebelThree.poiCode)
+          //   }
+          //   done()
+          // })
         } else {
           done()
         }
diff --git a/src/views/publicSecurity/components/bailReportingDetail.vue b/src/views/publicSecurity/components/bailReportingDetail.vue
new file mode 100644
index 0000000..cc0b7e6
--- /dev/null
+++ b/src/views/publicSecurity/components/bailReportingDetail.vue
@@ -0,0 +1,154 @@
+<template>
+  <avue-form :option="option" v-model="data"></avue-form>
+</template>
+<script>
+  import {
+    getDetail
+  } from "@/api/task/bailReporting"
+  export default {
+    data() {
+      return {
+        data: {},
+        option: {
+          submitBtn: false,
+          emptyBtn: false,
+          column: [{
+            // span: 10,
+            label: '自查人名称',
+            prop: 'checkUserName',
+            disabled: true,
+          }, {
+            // span: 12,
+            label: '自查人手机',
+            prop: 'checkTelephone',
+            disabled: true,
+          }, {
+            label: '自查位置',
+            prop: 'location',
+            disabled: true,
+          }, {
+            label: '确认时间',
+            prop: 'confirmTime',
+            disabled: true,
+          }, {
+            label: '确认用户',
+            prop: 'confirmUserName',
+            disabled: true,
+          }, {
+            label: '确认意见',
+            prop: 'confirmNotion',
+            disabled: true,
+          }, {
+            label: '确认标记',
+            prop: 'confirmFlag',
+            disabled: true,
+            type: 'select',
+            dicData: [{
+              label: '待审核',
+              value: '1'
+            }, {
+              label: '审核通过',
+              value: '2'
+            }, {
+              label: '审核不通过',
+              value: '3'
+            }]
+          }, {
+            label: '申请时间',
+            prop: 'applyTime',
+            disabled: true,
+          }, {
+            label: '外出原因',
+            prop: 'applyName',
+            disabled: true,
+          }, {
+            label: '身份证号',
+            prop: 'idCard',
+            disabled: true,
+          }, {
+            label: '位置图片',
+            fileType: 'img',
+            type: "upload",
+            listType: "picture-card",
+            dataType: "string",
+            prop: 'locationImageUrls',
+            disabled: true,
+          }, {
+            label: '确认人电话',
+            prop: 'confirmUserTelephone',
+            disabled: true,
+          }, {
+            label: '出发-当前时间',
+            prop: 'startTime',
+            disabled: true,
+          }, {
+            label: '出发-报备位置',
+            prop: 'startLocation',
+            disabled: true,
+          }, {
+            label: '出发-位置图片',
+            fileType: 'img',
+            type: "upload",
+            listType: "picture-card",
+            dataType: "string",
+            prop: 'startImageUrls',
+            disabled: true,
+          }, {
+            label: '到达-当前时间',
+            prop: 'reachTime',
+            disabled: true,
+          }, {
+            label: '到达-报备位置',
+            prop: 'reachLocation',
+            disabled: true,
+          }, {
+            label: '到达-位置图片',
+            fileType: 'img',
+            type: "upload",
+            listType: "picture-card",
+            dataType: "string",
+            prop: 'reachImageUrls',
+            disabled: true,
+          }, {
+            label: '返回-当前时间',
+            prop: 'returnTime',
+            disabled: true,
+          }, {
+            label: '返回-报备位置',
+            prop: 'returnLocation',
+            disabled: true,
+          }, {
+            label: '返回-位置图片',
+            fileType: 'img',
+            type: "upload",
+            listType: "picture-card",
+            dataType: "string",
+            prop: 'returnImageUrls',
+            disabled: true,
+          }, {
+            label: '创建时间',
+            prop: 'createTime',
+            disabled: true,
+          }, ]
+        }
+      }
+    },
+    methods: {
+      init(data) {
+        this.getTaskDetail(data.id)
+      },
+
+      getTaskDetail(taskId) {
+        getDetail({
+          taskId: taskId
+        }).then((res) => {
+          this.data = res.data.data
+        })
+      }
+
+    }
+  }
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/views/publicSecurity/components/campusReporting.vue b/src/views/publicSecurity/components/campusReporting.vue
new file mode 100644
index 0000000..f852542
--- /dev/null
+++ b/src/views/publicSecurity/components/campusReporting.vue
@@ -0,0 +1,168 @@
+<template>
+  <avue-form :option="option" v-model="data"></avue-form>
+</template>
+<script>
+  import {
+    getDetail
+  } from "@/api/task/campusReporting"
+  export default {
+    data() {
+      return {
+        data: {},
+        option: {
+          submitBtn: false,
+          emptyBtn: false,
+          column: [{
+            label: '自查时间',
+            prop: 'checkTime',
+            disabled: true,
+          }, {
+            label: '自查人',
+            prop: 'checkUserName',
+            disabled: true,
+          }, {
+            label: '自查人手机号',
+            prop: 'checkTelephone',
+            disabled: true,
+          }, {
+            label: '自查位置',
+            prop: 'location',
+            disabled: true,
+          }, {
+            label: '安全通道',
+            prop: 'scStatus',
+            disabled: true,
+          }, {
+            label: '安全通道图片',
+            prop: 'scImageUrls',
+            fileType: 'img',
+            type: "upload",
+            listType: "picture-card",
+            dataType: "string",
+            disabled: true,
+          }, {
+            label: '未成年人入住登记本照片',
+            prop: 'uanImageUrls',
+            fileType: 'img',
+            type: "upload",
+            listType: "picture-card",
+            dataType: "string",
+            disabled: true,
+          }, {
+            label: '确认时间',
+            prop: 'confirmTime',
+            disabled: true,
+          }, {
+            label: '确认用户',
+            prop: 'confirmUserName',
+            disabled: true,
+          }, {
+            label: '确认意见',
+            prop: 'confirmNotion',
+            disabled: true,
+          }, {
+            label: '确认标记',
+            prop: 'confirmFlag',
+            type: 'select',
+            dicData: [{
+              label: '待审核',
+              value: '1'
+            }, {
+              label: '审核通过',
+              value: '2'
+            }, {
+              label: '审核不通过',
+              value: '3'
+            }],
+            disabled: true,
+          }, {
+            label: '校园名称',
+            prop: 'campusName',
+            disabled: true,
+          }, {
+            label: '消费器材数量',
+            prop: 'fireFacsNums',
+            disabled: true,
+          }, {
+            label: '消费器材状态',
+            prop: 'fireFacsStatus',
+            disabled: true,
+          }, {
+            label: '消费器材图片',
+            prop: 'fireFacsImageUrls',
+            fileType: 'img',
+            type: "upload",
+            listType: "picture-card",
+            dataType: "string",
+            disabled: true,
+          }, {
+            label: '消防器材种类',
+            prop: 'fireFacsType',
+            disabled: true,
+          }, {
+            label: '校园周边安全巡查照片',
+            prop: 'patrolImageUrls',
+            disabled: true,
+          }, {
+            label: '学校大门是否配备防撞装置',
+            prop: 'antiCollision',
+            disabled: true,
+          }, {
+            label: '校园防撞装置照片',
+            prop: 'antiCollisionImageUrls',
+            fileType: 'img',
+            type: "upload",
+            listType: "picture-card",
+            dataType: "string",
+            disabled: true,
+          }, {
+            label: '专职保安人数',
+            prop: 'fullSoNums',
+            disabled: true,
+          }, {
+            label: '兼职保安人数',
+            prop: 'partSoNums',
+            disabled: true,
+          }, {
+            label: '学校监控总数',
+            prop: 'monitorNums',
+            disabled: true,
+          }, {
+            label: '监控是否全覆盖',
+            prop: 'monitorOver',
+            disabled: true,
+          }, {
+            label: '高空抛物监控',
+            prop: 'highAltitudeMonitor',
+            disabled: true,
+          }, {
+            label: '高空抛物监控照片',
+            prop: 'haImageUrls',
+            fileType: 'img',
+            type: "upload",
+            listType: "picture-card",
+            dataType: "string",
+            disabled: true,
+          }, ]
+        }
+      }
+    },
+    methods: {
+      init(data) {
+        this.getTaskDetail(data.id)
+      },
+
+      getTaskDetail(taskId) {
+        getDetail({
+          taskId: taskId
+        }).then((res) => {
+          this.data = res.data.data
+        })
+      }
+
+    }
+  }
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/views/publicSecurity/components/hotelReporting.vue b/src/views/publicSecurity/components/hotelReporting.vue
new file mode 100644
index 0000000..9e62299
--- /dev/null
+++ b/src/views/publicSecurity/components/hotelReporting.vue
@@ -0,0 +1,199 @@
+<template>
+  <avue-form :option="option" v-model="data"></avue-form>
+</template>
+<script>
+  import {
+    getDetail
+  } from "@/api/task/hotelReporting"
+  export default {
+    data() {
+      return {
+        data: {},
+        option: {
+          submitBtn: false,
+          emptyBtn: false,
+          column: [{
+              label: '酒店名称',
+              prop: 'hotelName',
+              disabled: true,
+            }, {
+              label: '自查时间',
+              prop: 'checkTime',
+              disabled: true,
+            }, {
+              label: '自查人姓名',
+              prop: 'checkUserName',
+              disabled: true,
+            }, {
+              label: '自查人手机',
+              prop: 'checkTelephone',
+              disabled: true,
+            }, {
+              label: '自查位置',
+              prop: 'location',
+              disabled: true,
+            }, {
+              label: '灭火器数量',
+              prop: 'fireNums',
+              disabled: true,
+            }, {
+              label: '灭火器状态',
+              prop: 'fireStatus',
+              disabled: true,
+            }, {
+              label: '灭火器图片',
+              prop: 'fireImageUrls',
+              fileType: 'img',
+              type: "upload",
+              listType: "picture-card",
+              dataType: "string",
+              disabled: true,
+            }, {
+              label: '安全通道状态',
+              prop: 'scStatus',
+              disabled: true,
+            }, {
+              label: '安全通道图片',
+              prop: 'scImageUrls',
+              fileType: 'img',
+              type: "upload",
+              listType: "picture-card",
+              dataType: "string",
+              disabled: true,
+            }, {
+              label: '技防设施有无',
+              prop: 'pfFlag',
+              disabled: true,
+            }, {
+              label: '技防设施名称',
+              prop: 'pfName',
+              disabled: true,
+              type: 'select',
+              dicData: [{
+                  label: '有',
+                  value: '1'
+                },
+                {
+                  label: '无',
+                  value: '2'
+                }
+              ]
+            },
+            {
+              label: '技防设施照片',
+              prop: 'pfImageUrls',
+              fileType: 'img',
+              type: "upload",
+              listType: "picture-card",
+              dataType: "string",
+              disabled: true,
+            },
+            {
+              label: '接待未成年人需要做到五个必须',
+              prop: 'fiveMust',
+              disabled: true,
+              type: 'select',
+              dicData: [{
+                  label: "必须询问同住人员身份关系情况,并记录备查",
+                  value: '1'
+                },
+                {
+                  label: "必须立即向公安机关报告可以情况,并及时联系未成年人的父母获取其他监护人,同时采取相应安全保护措施",
+                  value: '2'
+                },
+                {
+                  label: "必须查验入住未成年人身份,并如实登记报送相关信息",
+                  value: '3'
+                },
+                {
+                  label: "必须询问未成年父母或者其他监护人的联系方式并记录备查",
+                  value: '4'
+                },
+                {
+                  label: "必须加强安全巡查和访客管理,预防针对未成年人的不法侵害",
+                  value: '5'
+                },
+                {
+                  label: "以上皆未做到",
+                  value: '6'
+                }
+              ]
+            },
+            {
+              label: '未成年人入住登记本照片',
+              prop: 'uanImageUrls',
+              fileType: 'img',
+              type: "upload",
+              listType: "picture-card",
+              dataType: "string",
+              disabled: true,
+            },
+            {
+              label: '是否完全实名制登记',
+              prop: 'realName',
+              disabled: true,
+            },
+            {
+              label: '确认时间',
+              prop: 'confirmTime',
+              disabled: true,
+            },
+            {
+              label: '确认用户',
+              prop: 'confirmUserName',
+              disabled: true,
+            },
+            {
+              label: '安全通道有无',
+              prop: 'scFlag',
+              disabled: true,
+            },
+            {
+              label: '确认意见',
+              prop: 'confirmNotion',
+              disabled: true,
+            },
+            {
+              label: '确认标记',
+              prop: 'confirmFlag',
+              type: 'select',
+              dicData: [{
+                label: '待审核',
+                value: '1'
+              }, {
+                label: '审核通过',
+                value: '2'
+              }, {
+                label: '审核不通过',
+                value: '3'
+              }],
+              disabled: true,
+            },
+            {
+              label: '创建时间',
+              prop: 'createTime',
+              disabled: true,
+            },
+          ]
+        }
+      }
+    },
+    methods: {
+      init(data) {
+        this.getTaskDetail(data.id)
+      },
+
+      getTaskDetail(taskId) {
+        getDetail({
+          taskId: taskId
+        }).then((res) => {
+          this.data = res.data.data
+        })
+      }
+
+    }
+  }
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/views/publicSecurity/components/labelReporting.vue b/src/views/publicSecurity/components/labelReporting.vue
new file mode 100644
index 0000000..17452ad
--- /dev/null
+++ b/src/views/publicSecurity/components/labelReporting.vue
@@ -0,0 +1,120 @@
+<template>
+  <avue-form :option="option" v-model="data"></avue-form>
+</template>
+<script>
+  import {
+    getDetail
+  } from "@/api/task/labelReporting"
+  export default {
+    data() {
+      return {
+        data: {},
+        option: {
+          submitBtn: false,
+          emptyBtn: false,
+          column: [{
+            label: '发生时间',
+            prop: 'happenTime',
+            disabled: true,
+          }, {
+            label: '身份证图片',
+            prop: 'imageUrls',
+            fileType: 'img',
+            type: "upload",
+            listType: "picture-card",
+            dataType: "string",
+            disabled: true,
+          }, {
+            label: '确认标记',
+            prop: 'confirmFlag',
+            disabled: true,
+          }, {
+            label: '确认时间',
+            prop: 'confirmTime',
+            disabled: true,
+          }, {
+            label: '位置',
+            prop: 'localtion',
+            disabled: true,
+          }, {
+            label: '确认意见',
+            prop: 'confirmNotion',
+            disabled: true,
+          }, {
+            label: '确认标记',
+            prop: 'confirmFlag',
+            type: 'select',
+            dicData: [{
+              label: '待审核',
+              value: '1'
+            }, {
+              label: '审核通过',
+              value: '2'
+            }, {
+              label: '审核不通过',
+              value: '3'
+            }],
+            disabled: true,
+          }, {
+            label: '手机号',
+            prop: 'phoneNumber',
+            disabled: true,
+          }, {
+            label: '房屋名称',
+            prop: 'houseName',
+            disabled: true,
+          }, {
+            label: '对象电话',
+            prop: 'transactionObjectTel',
+            disabled: true,
+          }, {
+            label: '交易金额',
+            prop: 'transactionMoney',
+            disabled: true,
+          }, {
+            label: '物品数量',
+            prop: 'goodsNums',
+            disabled: true,
+          }, {
+            label: '物品照片',
+            prop: 'goodsImageUrls',
+            fileType: 'img',
+            type: "upload",
+            listType: "picture-card",
+            dataType: "string",
+            disabled: true,
+          }, {
+            label: '交易对象',
+            prop: 'transactionObject',
+            disabled: true,
+          }, {
+            label: '交易过程',
+            prop: 'transactionProcess',
+            disabled: true,
+          }, {
+            label: '创建时间',
+            prop: 'createTime',
+            disabled: true,
+          }, ]
+        }
+      }
+    },
+    methods: {
+      init(data) {
+        this.getTaskDetail(data.id)
+      },
+
+      getTaskDetail(taskId) {
+        getDetail({
+          taskId: taskId
+        }).then((res) => {
+          this.data = res.data.data
+        })
+      }
+
+    }
+  }
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/views/publicSecurity/keynotePlaceManage.vue b/src/views/publicSecurity/keynotePlaceManage.vue
index 85802f5..900ab39 100644
--- a/src/views/publicSecurity/keynotePlaceManage.vue
+++ b/src/views/publicSecurity/keynotePlaceManage.vue
@@ -4,34 +4,22 @@
       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}" slot="confirmFlag">
-        <el-tag size="small" :type="showConfirmFlag(row.confirmFlag).type">{{ showConfirmFlag(row.confirmFlag).text
-                }}</el-tag>
-      </template> -->
 
-      <!-- <template slot="menuLeft">
-        <el-button size="small" icon="el-icon-delete" plain v-if="permission.place_delete" @click="handleDelete">删 除
+      <template slot-scope="scope" slot="menu">
+        <el-button type="text" size="small" icon="el-icon-view" plain @click="lookDetail(scope.row)">查 看
         </el-button>
-      </template> -->
+        <el-button type="text" size="small" icon="el-icon-delete" plain @click="rowDel(scope.row)">删 除
+        </el-button>
+      </template>
 
-      <!--   <template slot-scope="scope" slot="menu">
-        <el-button type="text" :disabled="scope.row.confirmFlag == 2" icon="el-icon-s-check" size="small"
-          v-if="permission.place_audit_cur && scope.row.confirmFlag != 4" @click="auditCur(scope.row)">审核
-        </el-button>
-
-        <el-button type="text" icon="el-icon-edit" size="small" v-if="permission.place_manage_tenants"
-          @click="ManageTenants(scope.row)">场所维护
-        </el-button>
-      </template> -->
     </avue-crud>
 
-    <el-dialog class="place-info-box" title="场所维护" append-to-body :visible.sync="roleBox" center @close="roleBoxClose">
-      <!-- <baseAllInfo></baseAllInfo> -->
-    </el-dialog>
 
-    <el-dialog class="place-info-box audit-info-box" title="审核" append-to-body :visible.sync="auditBasePopup"
-      width="30%">
-      <!-- <auditBase></auditBase> -->
+    <el-dialog class="place-info-box audit-info-box" title="查看详情" append-to-body :visible.sync="auditBasePopup"
+      width="80%">
+      <campusReporting v-if="taskType == 6" ref="campusReporting"></campusReporting>
+      <hotelReporting v-if="taskType == 2" ref="hotelReporting"></hotelReporting>
+      <labelReporting v-if="taskType == 3" ref="labelReporting"></labelReporting>
     </el-dialog>
   </basic-container>
 </template>
@@ -39,7 +27,7 @@
 <script>
   import {
     getList,
-    remove,
+    removeTask,
     update,
     add,
   } from "@/api/task/task"
@@ -49,13 +37,14 @@
   } from "vuex"
 
   import website from '@/config/website'
-
-  // import auditBase from './components/auditBase'
-  // import baseAllInfo from './components/baseAllInfo'
+  import campusReporting from './components/campusReporting'
+  import hotelReporting from './components/hotelReporting'
+  import labelReporting from './components/labelReporting'
 
   export default {
     data() {
       return {
+        taskType: 0,
         curRow: {},
         roleBox: false,
 
@@ -78,12 +67,13 @@
           searchShow: true,
           searchMenuSpan: 3,
           menuWidth: 280,
-          menu: false,
+          // menu: false,
           border: true,
           //stripe:true,
           index: true,
-          viewBtn: true,
+          // viewBtn: true,
           editBtn: false,
+          delBtn: false,
           selection: true,
           dialogClickModal: false,
           column: [{
@@ -175,10 +165,12 @@
       }
     },
 
-    // components: {
-    //   auditBase,
-    //   baseAllInfo
-    // },
+    components: {
+      campusReporting,
+      hotelReporting,
+      labelReporting
+
+    },
 
     watch: {},
 
@@ -233,6 +225,31 @@
       }
     },
     methods: {
+      lookDetail(row) {
+        this.auditBasePopup = true
+        var that = this
+        if (row.reportType == 6) {
+          this.taskType = 6
+          this.$nextTick(() => {
+            that.$refs.campusReporting.init(row)
+          })
+        }
+        if (row.reportType == 2) {
+          this.taskType = 2
+          this.$nextTick(() => {
+            that.$refs.hotelReporting.init(row)
+          })
+        }
+        if (row.reportType == 3 || row.reportType == 4 || row.reportType == 5) {
+          this.taskType = 3
+          this.$nextTick(() => {
+            that.$refs.labelReporting.init(row)
+          })
+        }
+
+
+
+      },
       auditCur(row) {
         this.curAuditRow = row
         this.auditBasePopup = true
@@ -330,7 +347,8 @@
             type: "warning",
           })
           .then(() => {
-            return remove(row.id)
+            row.isDeleted = 1
+            return removeTask(row)
           })
           .then(() => {
             this.onLoad(this.page)
@@ -385,31 +403,24 @@
 
       beforeOpen(done, type) {
         if (["edit", "view"].includes(type)) {
-          getPlace(this.form.id).then((res) => {
-            this.form = res.data.data
-
-            if (this.form.imageUrls.length) {
-              this.form.imageUrls = this.form.imageUrls.split(",").filter(item => item != '').map(item => website
-                .minioUrl + item).join(',')
-            }
-
-            if (this.form.placePoiLabelVOList.length) {
-              let lebelTwo = this.form.placePoiLabelVOList.find(item => {
-                return item.type == 2
-              })
-
-              if (lebelTwo) this.form.label = String(lebelTwo.poiCode)
-
-              let lebelThree = this.form.placePoiLabelVOList.find(item => {
-                return item.type == 3
-              })
-
-              if (lebelThree) this.form.smallLabel = String(lebelThree.poiCode)
-            }
-
-            done()
-
-          })
+          // getPlace(this.form.id).then((res) => {
+          //   this.form = res.data.data
+          //   if (this.form.imageUrls.length) {
+          //     this.form.imageUrls = this.form.imageUrls.split(",").filter(item => item != '').map(item => website
+          //       .minioUrl + item).join(',')
+          //   }
+          //   if (this.form.placePoiLabelVOList.length) {
+          //     let lebelTwo = this.form.placePoiLabelVOList.find(item => {
+          //       return item.type == 2
+          //     })
+          //     if (lebelTwo) this.form.label = String(lebelTwo.poiCode)
+          //     let lebelThree = this.form.placePoiLabelVOList.find(item => {
+          //       return item.type == 3
+          //     })
+          //     if (lebelThree) this.form.smallLabel = String(lebelThree.poiCode)
+          //   }
+          //   done()
+          // })
         } else {
           done()
         }

--
Gitblit v1.9.3