From e8a050f2e5e9f868b16971b2facba4024d81abbe Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 30 六月 2025 09:51:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/components/operation/HiddenDangerParam.vue |   46 +++++++++++++++++++++++++++++++++++++---------
 1 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/admin/src/components/operation/HiddenDangerParam.vue b/admin/src/components/operation/HiddenDangerParam.vue
index f3e73ea..f90e997 100644
--- a/admin/src/components/operation/HiddenDangerParam.vue
+++ b/admin/src/components/operation/HiddenDangerParam.vue
@@ -4,6 +4,7 @@
     width="600px"
     :visible.sync="isShowModal"
     :confirm-working="isWorking"
+    @close="close"
     @confirm="confirm"
   >
     <el-form :model="param" ref="paramRef" :rules="rules">
@@ -12,6 +13,16 @@
       </el-form-item>
       <el-form-item label="鑱旂郴鐢佃瘽" prop="mobile">
         {{ userInfo.mobile }}
+      </el-form-item>
+      <el-form-item label="妫�鏌ョ被鍨�" prop="checkTypeId">
+        <el-select v-model="param.checkTypeId" placeholder="璇烽�夋嫨">
+          <el-option
+              v-for="item in checkTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="鎻愭姤鏃堕棿" prop="submitTime">
         <el-date-picker
@@ -23,7 +34,7 @@
         />
       </el-form-item>
       <el-form-item label="璐ｄ换閮ㄩ棬" prop="companyId">
-        <el-select @change="getAddrList" v-model="param.companyId">
+        <el-select @change="getAddrList" clearable filterable v-model="param.companyId">
           <el-option v-for="op in department" :key="op.id" :label="op.name" :value="op.id"></el-option>
         </el-select>
       </el-form-item>
@@ -38,7 +49,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="澶勭悊浜�" prop="checkUserId">
-        <el-select v-model="param.checkUserId" placeholder="璇烽�夋嫨">
+        <el-select v-model="param.checkUserId" filterable placeholder="璇烽�夋嫨">
           <el-option
             v-for="item in memberList"
             :key="item.id"
@@ -125,6 +136,7 @@
       userInfo: this.$store.state.userInfo,
       uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/uploadBatch',
       typeList: [],
+      checkTypeList: [],
       addrList: [],
       memberList: [],
       fileList: [],
@@ -138,6 +150,7 @@
         areaId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
         cateId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
         checkUserId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
+        checkTypeId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
         companyId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
         faceImgUrl: [{ required: true, message: '璇蜂笂浼�', trigger: 'change' }],
 
@@ -150,18 +163,24 @@
     this.initData()
   },
   methods: {
-    
+
     initData () {
       allList({ type: 1 }).then(res => { // 绫诲瀷
         this.typeList = res || []
       })
-      memberList({}).then(res => {
-        this.memberList = res || []
+      allList({ type: 2}).then(res => { // 妫�鏌ョ被鍨�
+        this.checkTypeList = res || []
+        if(this.checkTypeList.length>0){
+          this.param.checkTypeId = res[0].id
+        }
       })
+      // memberList({}).then(res => {
+      //   this.memberList = res || []
+      // })
       this.getfindCompanyTreePage()
     },
     getfindCompanyTreePage() {
-      companyGetListPost({})
+      companyGetListPost({queryHiddenDanger: 1})
         .then(res => {
           if (res && res.length > 0) {
             this.department = res
@@ -170,9 +189,14 @@
     },
     getAddrList() {
       const { companyId } = this.param
-      allList({ type: 0,companyId }).then(res => { // 浣嶇疆
-        this.addrList = res || []
-      })
+      this.$set(this.param, 'areaId', '')
+      this.$set(this.param, 'checkUserId', '')
+      this.addrList = []
+      if(companyId){
+        allList({ type: 0,companyId }).then(res => { // 浣嶇疆
+          this.addrList = res || []
+        })
+      }
     },
     changeArea (e) {
       const item = this.addrList.find(i => i.id === e)
@@ -239,6 +263,10 @@
     handleDelImg (i) {
       this.fileList.splice(i, 1)
     },
+    close(){
+      this.isShowModal = false
+      this.$emit('close')
+    },
     // 鍚屾淇℃伅
     confirm () {
       this.$refs.paramRef.validate((valid) => {

--
Gitblit v1.9.3