From 6f12e3dc907c3a92fd8ba0605cf5c20230bb7b47 Mon Sep 17 00:00:00 2001
From: shil <452061493@qq.com>
Date: Fri, 25 Apr 2025 20:12:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=8A=95=E8=AF=89?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/administrative/appointmentBase.vue  |  2 +-
 src/views/administrative/appointmentList.vue  |  4 ++--
 src/views/enforce/comprehensiveAnalysis.vue   |  4 ++--
 src/views/enforce/sign.vue                    |  2 +-
 .../enterprise/compaint/compaintBase.vue      |  2 +-
 src/views/enterprise/compaint/uniteDept.vue   | 24 ++++++++++++-------
 src/views/enterprise/complaint.vue            |  8 ++++++-
 7 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/views/administrative/appointmentBase.vue b/src/views/administrative/appointmentBase.vue
index f3b21c0..00ae990 100644
--- a/src/views/administrative/appointmentBase.vue
+++ b/src/views/administrative/appointmentBase.vue
@@ -22,7 +22,7 @@
       <!--        </div>-->
 
       <van-tabs v-model:active="active" sticky @click-tab="onClickTab">
-          <van-tab v-for="(item, index) in data.list" :title="item.title">
+          <van-tab v-for="(item, index) in data.list" :title="item.title" :key="index">
               <div v-if="data.TabId == 0" style="height: calc(100vh - 1.2rem);">
                 <appointmentAdd :isReg="2" />
               </div>
diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue
index 9cd2c25..3a332a7 100644
--- a/src/views/administrative/appointmentList.vue
+++ b/src/views/administrative/appointmentList.vue
@@ -453,11 +453,11 @@
       }else{
           console.log("=====> route?.query?.id : ", data.currentId)
             cancelEnterpriseLawEnforcement(data.currentId,success =>{
-            router.go(-1);
+            // router.go(-1);
             data.currentId = "";
             data.showIsCancel = false;
             showSuccessToast("已取消并通知企业")
-            return;
+            queryList();
         });
       }
     };
diff --git a/src/views/enforce/comprehensiveAnalysis.vue b/src/views/enforce/comprehensiveAnalysis.vue
index bc243a6..cac9b09 100644
--- a/src/views/enforce/comprehensiveAnalysis.vue
+++ b/src/views/enforce/comprehensiveAnalysis.vue
@@ -146,8 +146,8 @@ const { useCommon } = $globalStore;
 const data = reactive({
   submitData: {
     searchType: "user",
-    // userId:useCommon.userId,
-    userId: "17608514096",
+    userId:useCommon.userId,
+    // userId: "17608514096",
     // userId: "17608508256",
     dateType: "year",
     beginTime: "",
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index 60c924d..987fcc3 100644
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@@ -100,7 +100,7 @@
                             rows="2"
                             autosize
                             type="textarea"
-                            maxlength="100"
+                            maxlength="1000"
                             placeholder="请输入 检查事项"
                             show-word-limit
                     />
diff --git a/src/views/enterprise/compaint/compaintBase.vue b/src/views/enterprise/compaint/compaintBase.vue
index 4e02f45..5fafed9 100644
--- a/src/views/enterprise/compaint/compaintBase.vue
+++ b/src/views/enterprise/compaint/compaintBase.vue
@@ -22,7 +22,7 @@
       <!--        </div>-->
 
       <van-tabs v-model:active="active" sticky @click-tab="onClickTab">
-          <van-tab v-for="(item, index) in data.list" :title="item.title">
+          <van-tab v-for="(item, index) in data.list" :title="item.title" :key="index">
               <div v-if="data.TabId == 0" style="height: calc(100vh - 1.2rem);">
                   <complaintNoScan isReg="0" :isNoScan="true"  />
               </div>
diff --git a/src/views/enterprise/compaint/uniteDept.vue b/src/views/enterprise/compaint/uniteDept.vue
index f3d7d9a..997068b 100644
--- a/src/views/enterprise/compaint/uniteDept.vue
+++ b/src/views/enterprise/compaint/uniteDept.vue
@@ -12,13 +12,14 @@
           <div class="subsearch">
             <input class="searchbox" v-model="searchParam.deptName" placeholder="请输入部门名称"/>
             <van-icon class="ibtn-reset" name="clear" @click="cancel()" title="重置"/>
-            <button class='btn-search' @click="queryUserList()">搜索</button>
+            <!-- <button class='btn-search' @click="queryUserList()">搜索</button> -->
+            <button class='btn-search' @click="queryList()">搜索</button>
             <button class='btn-search' @click="selectData()">确定</button>
           </div>
           <div class="search-result">
               <van-checkbox-group v-model="checked">
                   <van-cell-group inset>
-                      <van-cell v-for="(item, index) in deptList" :key="item">
+                      <van-cell v-for="(item, index) in data.deptInList" :key="index">
                           <div style="display: flex; justify-content: space-between;">
                               <div @click="toggle(item.deptId)">
                                   <van-checkbox :name="item.deptId+';-;'+item.deptName" :ref="el => checkboxRefs[item.deptId] = el" @click.stop>
@@ -45,7 +46,7 @@
 <script setup>
   import {queryDepts, nextDeptByparentId, queryUsersNoPermission} from '@/api/user'
   import {Icon, showSuccessToast,showToast } from 'vant';
-  import {ref,defineEmits,getCurrentInstance,defineProps } from 'vue';
+  import {ref,defineEmits,getCurrentInstance,defineProps, reactive } from 'vue';
   const {useCommon} = $globalStore
   const emits = defineEmits(['reciveData','close']);
   const router = useRouter();
@@ -59,6 +60,9 @@
           default: false
         },
     });
+    const data = reactive({
+        deptInList: []
+    })
         const searchParam = reactive( {
             //搜索框
             dataScopeId: useCommon.userId,
@@ -98,10 +102,14 @@
             emits('close');
           }
           const queryList = () =>{
+              if (null == searchParam.deptName || "" == searchParam.deptName) {
+                  showSuccessToast('部门过多, 请输入关键字!');
+                  return;
+              }
               queryDepts(searchParam, success => {
                   if (null != success.data && success.data.length > 0) {
-                      userList = [];
-                      dataList = success.data
+                    data.deptInList = [];
+                    data.deptInList = success.data
                   } else {
                       showToast ("暂无数据！")
                   }
@@ -114,8 +122,8 @@
                   return;
               }
               queryUsersNoPermission({"userName": searchKey}, success => {
-                  dataList = [];
-                  userList = success.data;
+                userList = [];
+                userList = success.data;
               }, error => {
               });
           }
@@ -126,10 +134,8 @@
           const selectData = () => {
               const res = ref([]);
               let checkeds = JSON.parse(JSON.stringify(checked.value));
-              console.log(checkeds);
               for (var i=0; i<checkeds.length; i++) {
                   var item = checkeds[i].split(";-;");
-                  console.log(item)
                   res.value.push({"deptId":item[0], "deptName":item[1]});
               }
               emits("reciveData", res.value);
diff --git a/src/views/enterprise/complaint.vue b/src/views/enterprise/complaint.vue
index 90f6f6a..d015a08 100644
--- a/src/views/enterprise/complaint.vue
+++ b/src/views/enterprise/complaint.vue
@@ -510,16 +510,22 @@
     }
     const reciveDept = (item) =>{
       console.log(item);
-      
+      var text = '';
+      var code_id = '';
       const arr = [];
       for (let index = 0; index < item.length; index++) {
         const element = item[index];
         console.log(element)
         var obj = {text: element.deptName, id: element.deptId}
         arr.push(obj);
+        text += element.deptName + ',';
+        code_id += element.deptId + ',';
       }
       console.log(arr)
       data.depts = arr;
+      
+      submitData.lawEnforcementIncidentText = text.substring(0, text.length-1);
+      submitData.complaintItemCodes = code_id.substring(0, code_id.length-1);
       console.log(data.depts.value)
     }
     const cancelDept = (index) => {