feat:所有问题来源都可以选择专项督察明细

src/components/negative/add.vue

@@ -68,22 +68,17 @@
                     <el-row>
                         <el-col
                             :span="12"
-                            v-if="
-                                form.problemSourcesCode === ProblemSources.ZXDC
-                            "
                         >
                             <el-form-item
                                 label="专项督察"
                                 prop="specialSupervision"
-                                :rules="{
-                                    required: true,
-                                    message: '请选择专项督察',
-                                    trigger: ['blur'],
-                                }"
                             >
                                 <el-select
                                     v-model="form.specialSupervision"
+                                    multiple
                                     clearable
+                                    collapse-tags
+                                    placeholder="请选择专项督察"
                                 >
                                     <el-option
                                         v-for="item in dict.specialSupervision"
@@ -108,7 +103,6 @@
                                 content="如未下拉项中找到对应的通报期数，请前往通报管理中补充对应的通报"
                                 prop="reportNumber"
                                 :rules="{
-                                    required: form.specialSupervision !== '2',
                                     message: '请输入通报期数',
                                     trigger: ['blur'],
                                 }"
@@ -612,6 +606,15 @@ const form = ref({
     timeLimit: TimeLimit.WORK_137,
     approvalFlow: ApprovalFlow.SECOND,
     problems: [],
+    specialSupervision: [],
+});
+
+// 专项督察多选转逗号分隔字符串
+const specialSupervisionStr = computed(() => {
+    if (Array.isArray(form.value.specialSupervision)) {
+        return form.value.specialSupervision.filter(v => v).join(',');
+    }
+    return form.value.specialSupervision;
 });
 
 watch(
@@ -636,6 +639,10 @@ async function handleAddNegative() {
     form.value.thingFiles = form.value.thingFiles.filter(
         (item) => item.filePath
     );
+    // 专项督察多选转逗号分隔字符串
+    if (Array.isArray(form.value.specialSupervision)) {
+        form.value.specialSupervision = form.value.specialSupervision.filter(v => v).join(',');
+    }
     loading.value = true;
     try {
         await addNegative(form.value);
@@ -649,6 +656,7 @@ async function handleAddNegative() {
         hostLevel: HostLevel.THREE,
         timeLimit: TimeLimit.WORK_137,
         approvalFlow: ApprovalFlow.SECOND,
+        specialSupervision: [],
     };
   reportData.value=null;
     feedback.msgSuccess("下发成功");

src/components/negative/description.vue

@@ -40,7 +40,7 @@
             </div>
             <div class="col col-6" v-if="negative.specialSupervision">
                 <label>专项督察</label>
-                <span>{{ getDictLable(dict.specialSupervision, negative.specialSupervision) }}</span>
+                <span>{{ getInvolveProblem(negative.specialSupervision, dict.specialSupervision) }}</span>
             </div>
             <div class="col col-6" v-if="negative.reportNumber">
                 <label>警情期数</label>
@@ -82,7 +82,7 @@
     </div>
 </template>
 <script setup>
-import { getDictLable, getInvolveProblem } from "@/utils/util";
+import { getInvolveProblem } from "@/utils/util";
 const negative = inject('negative')
 import useCatchStore from "@/stores/modules/catch";
 const catchSotre = useCatchStore();

src/views/jwpy/query_110jcj.vue

@@ -1067,20 +1067,28 @@ const formData = ref({});
 const formRef = ref(null);
 
 function handleEdit(row) {
-  console.log(row);
+  const form = {...row};
-  editShow.value = true;
-  formData.value = {...row};
   if (row.involveProblem) {
-    formData.value.involveProblem =
+    form.involveProblem = row.involveProblem.split(",");
-        formData.value.involveProblem.split(",");
+  } else {
+    form.involveProblem = [];
+  }
+  if (row.specialSupervision) {
+    form.specialSupervision = row.specialSupervision.split(",");
   } else {
-    formData.value.involveProblem = [];
+    form.specialSupervision = [];
   }
+  formData.value = form;
+  editShow.value = true;
 }
 
 async function handleSumbit() {
   await formRef.value.validate();
-  await updateNegative(formData.value);
+  const submitData = JSON.parse(JSON.stringify(formData.value));
+  if (Array.isArray(submitData.specialSupervision)) {
+    submitData.specialSupervision = submitData.specialSupervision.filter(v => v).join(',');
+  }
+  await updateNegative(submitData);
   editShow.value = false;
   feedback.msgSuccess("操作成功");
   getList();

src/views/jwpy/query_122jcj.vue

@@ -1067,20 +1067,28 @@ const formData = ref({});
 const formRef = ref(null);
 
 function handleEdit(row) {
-  console.log(row);
+  const form = {...row};
-  editShow.value = true;
-  formData.value = {...row};
   if (row.involveProblem) {
-    formData.value.involveProblem =
+    form.involveProblem = row.involveProblem.split(",");
-        formData.value.involveProblem.split(",");
+  } else {
+    form.involveProblem = [];
+  }
+  if (row.specialSupervision) {
+    form.specialSupervision = row.specialSupervision.split(",");
   } else {
-    formData.value.involveProblem = [];
+    form.specialSupervision = [];
   }
+  formData.value = form;
+  editShow.value = true;
 }
 
 async function handleSumbit() {
   await formRef.value.validate();
-  await updateNegative(formData.value);
+  const submitData = JSON.parse(JSON.stringify(formData.value));
+  if (Array.isArray(submitData.specialSupervision)) {
+    submitData.specialSupervision = submitData.specialSupervision.filter(v => v).join(',');
+  }
+  await updateNegative(submitData);
   editShow.value = false;
   feedback.msgSuccess("操作成功");
   getList();

src/views/jwpy/query_cjglfw.vue

@@ -1067,20 +1067,28 @@ const formData = ref({});
 const formRef = ref(null);
 
 function handleEdit(row) {
-  console.log(row);
+  const form = {...row};
-  editShow.value = true;
-  formData.value = {...row};
   if (row.involveProblem) {
-    formData.value.involveProblem =
+    form.involveProblem = row.involveProblem.split(",");
-        formData.value.involveProblem.split(",");
+  } else {
+    form.involveProblem = [];
+  }
+  if (row.specialSupervision) {
+    form.specialSupervision = row.specialSupervision.split(",");
   } else {
-    formData.value.involveProblem = [];
+    form.specialSupervision = [];
   }
+  formData.value = form;
+  editShow.value = true;
 }
 
 async function handleSumbit() {
   await formRef.value.validate();
-  await updateNegative(formData.value);
+  const submitData = JSON.parse(JSON.stringify(formData.value));
+  if (Array.isArray(submitData.specialSupervision)) {
+    submitData.specialSupervision = submitData.specialSupervision.filter(v => v).join(',');
+  }
+  await updateNegative(submitData);
   editShow.value = false;
   feedback.msgSuccess("操作成功");
   getList();

src/views/jwpy/query_jwpy_total.vue

@@ -1102,20 +1102,28 @@ const formData = ref({});
 const formRef = ref(null);
 
 function handleEdit(row) {
-  console.log(row);
+  const form = {...row};
-  editShow.value = true;
-  formData.value = {...row};
   if (row.involveProblem) {
-    formData.value.involveProblem =
+    form.involveProblem = row.involveProblem.split(",");
-        formData.value.involveProblem.split(",");
+  } else {
+    form.involveProblem = [];
+  }
+  if (row.specialSupervision) {
+    form.specialSupervision = row.specialSupervision.split(",");
   } else {
-    formData.value.involveProblem = [];
+    form.specialSupervision = [];
   }
+  formData.value = form;
+  editShow.value = true;
 }
 
 async function handleSumbit() {
   await formRef.value.validate();
-  await updateNegative(formData.value);
+  const submitData = JSON.parse(JSON.stringify(formData.value));
+  if (Array.isArray(submitData.specialSupervision)) {
+    submitData.specialSupervision = submitData.specialSupervision.filter(v => v).join(',');
+  }
+  await updateNegative(submitData);
   editShow.value = false;
   feedback.msgSuccess("操作成功");
   getList();

src/views/jwpy/query_rjckfw.vue

@@ -1067,20 +1067,28 @@ const formData = ref({});
 const formRef = ref(null);
 
 function handleEdit(row) {
-  console.log(row);
+  const form = {...row};
-  editShow.value = true;
-  formData.value = {...row};
   if (row.involveProblem) {
-    formData.value.involveProblem =
+    form.involveProblem = row.involveProblem.split(",");
-        formData.value.involveProblem.split(",");
+  } else {
+    form.involveProblem = [];
+  }
+  if (row.specialSupervision) {
+    form.specialSupervision = row.specialSupervision.split(",");
   } else {
-    formData.value.involveProblem = [];
+    form.specialSupervision = [];
   }
+  formData.value = form;
+  editShow.value = true;
 }
 
 async function handleSumbit() {
   await formRef.value.validate();
-  await updateNegative(formData.value);
+  const submitData = JSON.parse(JSON.stringify(formData.value));
+  if (Array.isArray(submitData.specialSupervision)) {
+    submitData.specialSupervision = submitData.specialSupervision.filter(v => v).join(',');
+  }
+  await updateNegative(submitData);
   editShow.value = false;
   feedback.msgSuccess("操作成功");
   getList();

src/views/jwpy/query_zfba.vue

@@ -1067,20 +1067,28 @@ const formData = ref({});
 const formRef = ref(null);
 
 function handleEdit(row) {
-  console.log(row);
+  const form = {...row};
-  editShow.value = true;
-  formData.value = {...row};
   if (row.involveProblem) {
-    formData.value.involveProblem =
+    form.involveProblem = row.involveProblem.split(",");
-        formData.value.involveProblem.split(",");
+  } else {
+    form.involveProblem = [];
+  }
+  if (row.specialSupervision) {
+    form.specialSupervision = row.specialSupervision.split(",");
   } else {
-    formData.value.involveProblem = [];
+    form.specialSupervision = [];
   }
+  formData.value = form;
+  editShow.value = true;
 }
 
 async function handleSumbit() {
   await formRef.value.validate();
-  await updateNegative(formData.value);
+  const submitData = JSON.parse(JSON.stringify(formData.value));
+  if (Array.isArray(submitData.specialSupervision)) {
+    submitData.specialSupervision = submitData.specialSupervision.filter(v => v).join(',');
+  }
+  await updateNegative(submitData);
   editShow.value = false;
   feedback.msgSuccess("操作成功");
   getList();

src/views/mobileSupervise/Query_xcdc.vue

@@ -1068,20 +1068,28 @@ const formData = ref({});
 const formRef = ref(null);
 
 function handleEdit(row) {
-  console.log(row);
+  const form = {...row};
-  editShow.value = true;
-  formData.value = {...row};
   if (row.involveProblem) {
-    formData.value.involveProblem =
+    form.involveProblem = row.involveProblem.split(",");
-        formData.value.involveProblem.split(",");
+  } else {
+    form.involveProblem = [];
+  }
+  if (row.specialSupervision) {
+    form.specialSupervision = row.specialSupervision.split(",");
   } else {
-    formData.value.involveProblem = [];
+    form.specialSupervision = [];
   }
+  formData.value = form;
+  editShow.value = true;
 }
 
 async function handleSumbit() {
   await formRef.value.validate();
-  await updateNegative(formData.value);
+  const submitData = JSON.parse(JSON.stringify(formData.value));
+  if (Array.isArray(submitData.specialSupervision)) {
+    submitData.specialSupervision = submitData.specialSupervision.filter(v => v).join(',');
+  }
+  await updateNegative(submitData);
   editShow.value = false;
   feedback.msgSuccess("操作成功");
   getList();

src/views/work/Query.vue

@@ -43,7 +43,9 @@
                       style="width: 200px"
                       placeholder="专项督察"
                       clearable
-                      v-model="query.specialSupervision"
+                      v-model="query.specialSupervisions"
+                      multiple
+                      collapse-tags
                   >
                     <el-option
                         v-for="item in dict.specialSupervision"
@@ -252,7 +254,9 @@
                             style="width: 146px"
                             placeholder="专项督察"
                             clearable
-                            v-model="query.specialSupervision"
+                            v-model="query.specialSupervisions"
+                            multiple
+                            collapse-tags
                         >
                             <el-option
                                 v-for="item in dict.specialSupervision"
@@ -870,22 +874,17 @@
                 <el-row>
                     <el-col
                         :span="12"
-                        v-if="
-                            formData.problemSourcesCode === ProblemSources.ZXDC
-                        "
                     >
                         <el-form-item
                             label="专项督察"
                             prop="specialSupervision"
-                            :rules="{
-                                required: true,
-                                message: '请选择专项督察',
-                                trigger: ['blur'],
-                            }"
                         >
                             <el-select
                                 v-model="formData.specialSupervision"
+                                multiple
                                 clearable
+                                collapse-tags
+                                placeholder="请选择专项督察"
                             >
                                 <el-option
                                     v-for="item in dict.specialSupervision"
@@ -1299,20 +1298,29 @@ const formData = ref({});
 const formRef = ref(null);
 
 function handleEdit(row) {
-    console.log(row);
+    const form = { ...row };
-    editShow.value = true;
-    formData.value = { ...row };
     if (row.involveProblem) {
-        formData.value.involveProblem =
+        form.involveProblem = row.involveProblem.split(",");
-            formData.value.involveProblem.split(",");
     } else {
-        formData.value.involveProblem = [];
+        form.involveProblem = [];
     }
+    if (row.specialSupervision) {
+        form.specialSupervision = row.specialSupervision.split(",");
+    } else {
+        form.specialSupervision = [];
+    }
+    formData.value = form;
+    editShow.value = true;
 }
 
 async function handleSumbit() {
     await formRef.value.validate();
-    await updateNegative(formData.value);
+    // 专项督察多选转逗号分隔字符串
+  const submitData = JSON.parse(JSON.stringify(formData.value));
+  if (Array.isArray(submitData.specialSupervision)) {
+    submitData.specialSupervision = submitData.specialSupervision.filter(v => v).join(',');
+  }
+  await updateNegative(submitData);
     editShow.value = false;
     feedback.msgSuccess("操作成功");
     getList();