From 8d339e0f6b30f94cb7cf81da18b1c42908386f79 Mon Sep 17 00:00:00 2001
From: shil <452061493@qq.com>
Date: Mon, 26 May 2025 17:19:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E8=AE=B0=E9=A1=B5=E9=9D=A2=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E8=81=94=E5=90=88=E6=89=A7=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enforce/sign.vue | 104 ++++++++++++++++++++++++++++++++-----
 1 file changed, 92 insertions(+), 12 deletions(-)

diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index 3673696..21f7cf5 100644
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@@ -153,12 +153,27 @@
 
                   <van-divider class="divdsty" />
 
-                  <van-cell center title="开启联合检查">
+                  <van-cell center title="是否联合检查">
                     <template #right-icon>
                       <van-switch v-model="data.union_checked" @click="!data.union_checked"/>
                     </template>
                   </van-cell>
 
+                  <div class="add-inspect" v-if="data.union_checked">
+                    <div v-for="(item, index) in data.union_datas" :key="index" ref="radio_fales" @click="check_radio(Object.values(item)[0].unionNo, index)" class="item-inspect">
+                        <van-icon name="circle" />
+                      <div class="dept-inspect">
+                        <p v-for="(item2, index2) in item" :key="index2">{{item2.bureauDeptName}}</p>
+                      </div>
+                    </div>
+                    <div class="item-inspect" @click="check_radio(null, null)">
+                        <van-icon :name="data.allNo" />
+                      <div class="dept-inspect no-inspect">
+                        <p>以上皆不是</p>
+                      </div>
+                    </div>
+                  </div>
+
                   <van-cell center title="是否委托检查">
                     <template #right-icon>
                       <van-switch v-model="data.auth_checked" @click="!data.auth_checked"/>
@@ -263,9 +278,6 @@
 
       <DeptPopup :visible="data.deptChecked" :content="data.deptContent" @close="closePopup"
                  @reciveData="reciveDept"/>
-    
-    <!-- 联合执法选择 -->
-    <van-popup v-model:show="data.union_checked" position="bottom" :style="{ height: '30%' }" />
 
 
     </div>
@@ -305,6 +317,8 @@
 
     const {useCommon, useMy} = $globalStore
 
+    const radio_fales = ref([]);
+
     const router = useRouter();
     //路由参数
     const route = useRoute();
@@ -359,8 +373,12 @@
         checked: false,
         deptChecked: false,
         deptContent: '',
+        allNo: 'circle',
         union_checked: false,   // 联合检查选择
         auth_checked: false,   // 委托执法选择
+        union_datas: [],    // 联合检查用的分组list
+        check_union_no: '',     // 选中的联合检查编号
+        radio_flag: 'circle',    // 联合检查单选按钮的选择标识
     });
     var fileSize = 0;
     //保存参数
@@ -370,6 +388,8 @@
         //执法部门
         lawEnforcement: "",
         lawEnforcementId: "",
+        bureauDeptId:"",
+        bureauDeptName:"",
         //执法人员1
         lawEnforcer: "",
         lawEnforcerId: "",
@@ -404,6 +424,12 @@
         fileListObj: [],
         // 数据保存或提交 0 保存 1提交
         isSubmit: 0,
+        // 选择的联合检查编号
+        unionNo: '',
+        // 联合检查选择
+        hasUnion: 0, 
+        // 委托执法选择  
+        hasAuto: 0,   
         lawId: "",
         lawText: "",
         uniteCheck: "",
@@ -419,8 +445,6 @@
         deptObjs: [],
         userObjs: [],
         isUnite: 0,
-        bureauDeptId:"",
-        bureauDeptName:"",
 
     })
 
@@ -435,6 +459,22 @@
         submitData.reslut = 1;
     }
 
+    const check_radio = (unio_no, index) => {
+        for(var i=0; i<radio_fales.value.length; i++) {
+            radio_fales.value[i].querySelector('i').classList.remove("van-icon-checked")
+            radio_fales.value[i].querySelector('i').classList.add("van-icon-circle")
+        }
+        if (null == unio_no) {
+            data.allNo = "checked"
+        } else {
+            const itag = radio_fales.value[index].querySelector('i')
+            itag.classList.remove("van-icon-circle")
+            itag.classList.add("van-icon-checked")
+            data.allNo = "circle"
+            submitData.unionNo = unio_no
+        }
+    }
+
     const getLinkageByValueAndParentId = (value, parentId) => {
         // 查询检查要求字典信息
         queryLinkageDictByValueAndParentId({
@@ -578,11 +618,12 @@
     })
 
     const getUnionByHour = (enterpriseNumber) => {
+        data.union_datas = 
         console.log('----------> start : getUnionByHour: '+ enterpriseNumber)
         queryUnionByHour(enterpriseNumber, success => {
-            console.log("------------------------------>")
-            console.log(success)
-            console.log("<------------------------------")
+            if(success.success) {
+                data.union_datas = success.data;
+            }
         }, error => { console.log(error); })
     }
 
@@ -755,10 +796,13 @@
         data.overlayShow = true;    // 遮罩层
         submitData.userId = useCommon.userId;
         submitData.isUnite = 0;
-        if (data.checked) { submitData.isUnite = 1; }
+        // if (data.checked) { submitData.isUnite = 1; }   // 原来的联合检查, 忘记咋用了, 就没用了. 
         //联合检查
+        if (data.union_checked) {submitData.isUnite = 1;}
+        // 是否委托检查
+        if (data.auth_checked) {submitData.hasAuto = 1;}
 
-        // 处理回显附件
+        // 处理回显附件auth_checked
         for (var k = 0; k < data.fileListObj.length; k++) {
             var url = data.fileListObj[k].url;
             if (null != url) {
@@ -809,7 +853,11 @@
         submitData.isSubmit = type;
         submitData.userId = useCommon.userId;
         submitData.isUnite = 0;
-        if (data.checked) { submitData.isUnite = 1; }
+        // if (data.checked) { submitData.isUnite = 1; }   // 原来的联合检查, 忘记咋用了, 就没用了. 
+        //联合检查
+        if (data.union_checked) {submitData.hasUnion = 1;}
+        // 是否委托检查
+        if (data.auth_checked) {submitData.hasAuto = 1;}
 
         // 处理回显附件
         for (var k = 0; k < data.fileListObj.length; k++) {
@@ -1316,6 +1364,38 @@
         color: #1367fe;
     }
 
+    .item-inspect {
+      display: flex;
+      justify-content: space-between;
+    }
+
+    .item-inspect > i {
+      margin: 5% 2% 0 0;
+      color: #dfdddd;
+      font-size: 0.5rem;
+    }
+
+    .item-inspect > i.van-icon-checked {
+      color: #1367fe;
+    }
+
+    .dept-inspect {
+      margin: 2% 0;
+      padding: 0 2%;
+      width: calc(100% - 1rem);
+      background: #f3f4f5;
+      color: #666;
+    }
+
+    .dept-inspect p {
+      margin: 3% 0;
+      padding: 0;
+    }
+
+    .no-inspect {
+      background: none;
+    }
+
     .wrapper {
         display: flex;
         align-items: center;