fix:不合格处置外购件优化

src/views/unqualified/handle20.vue

@@ -122,6 +122,7 @@
           v-model="remark.nextRemarkUser"
           :data="userList"
           filterable
+          multiple
         />
       </el-form-item>
       <el-form-item label="是否通过" prop="state">
@@ -194,8 +195,7 @@ const rules1 = {
   ],
   company: [{required: true, message: "请输入责任部门", trigger: "change"}],
   nextRemarkUser: [
-    { required: true, message: "请选择处理人", trigger: "change" },
-    { min: 2, max: 20, message: "长度在 2 到 20 个字符", trigger: "blur" },
+    {required: true, message: "请选择处理人", trigger: "blur"},
   ],
 };
 
@@ -242,14 +242,15 @@ const confirmClick = () => {
   const date = new Date();
   const now = date.getFullYear() + "年" + (date.getMonth() + 1) + "月" + date.getDate() + "日";
   remark.user = userStore.user.username;
+  remark.nextRemarkUser = remark.nextRemarkUser.join(",")
   remarkRef.value.validate((valid) => {
     if (valid) {
-      let remark1 = {
-        content: JSON.parse(saleModel.value.remark1).content,
-        user: JSON.parse(saleModel.value.remark1).user,
-        user1: dutyDept.value,
-        time: now,
-      };
+      // let remark1 = {
+      //   content: JSON.parse(saleModel.value.remark1).content,
+      //   user: JSON.parse(saleModel.value.remark1).user,
+      //   user1: dutyDept.value,
+      //   time: now,
+      // };
       let remark2Copy = {
         content: remark.content2,
         user: remark.user,
@@ -291,7 +292,7 @@ const confirmClick = () => {
 
       let p = {
         id: saleModel.value.id,
-        remark1: JSON.stringify(remark1),
+        // remark1: JSON.stringify(remark1),
         remark2: JSON.stringify(remark2Copy),
         remark3: JSON.stringify(remark3),
         remark4: JSON.stringify(remark4),

src/views/unqualified/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="container2" id="shijian">
     <el-tabs v-model="activeName" type="card">
-      <el-tab-pane label="待处理" name="no" />
-      <el-tab-pane label="审核完成" name="ok" />
+      <el-tab-pane label="待处理" name="no"/>
+      <el-tab-pane label="审核完成" name="ok"/>
     </el-tabs>
     <div class="header">
       <Search
@@ -19,23 +19,23 @@
         class="btn"
         style="margin-bottom: 10px"
         @click="toAdd"
-        >新增
+      >新增
       </el-button>
       <el-table :data="tableData" border>
-        <el-table-column prop="formNo" label="编号" />
-        <el-table-column prop="materialModel" label="产品型号" />
-        <el-table-column prop="type" label="产品分类" />
-        <el-table-column prop="workOrderCode" label="生产批号" />
+        <el-table-column prop="formNo" label="编号"/>
+        <el-table-column prop="materialModel" label="产品型号"/>
+        <el-table-column prop="type" label="产品分类"/>
+        <el-table-column prop="workOrderCode" label="生产批号"/>
         <el-table-column
           prop="seqs"
           label="管号"
           width="200"
           overhidden="true"
         />
-        <el-table-column prop="seqNum" label="数量" />
-        <el-table-column prop="componentName" label="器件名称及型号" />
-        <el-table-column prop="num" label="数量" />
-        <el-table-column prop="company" label="供方单位" overhidden="true" />
+        <el-table-column prop="seqNum" label="数量"/>
+        <el-table-column prop="componentName" label="器件名称及型号"/>
+        <el-table-column prop="num" label="数量"/>
+        <el-table-column prop="company" label="供方单位" overhidden="true"/>
         <el-table-column
           prop="currentUserName"
           label="审核人"
@@ -53,7 +53,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="created" label="创建时间" />
+        <el-table-column prop="created" label="创建时间"/>
         <el-table-column
           align="center"
           width="160"
@@ -67,7 +67,7 @@
               link
               type="danger"
               @click="toDelete(row)"
-              >删除
+            >删除
             </el-button>
             <el-button
               link
@@ -79,17 +79,18 @@
               "
               @click="handle(row)"
               type="primary"
-              >处理
+            >处理
             </el-button>
             <el-button link @click="toDetail(row)" type="primary"
-              >详情
+            >详情
             </el-button>
             <el-button
               link
               v-if="row.state === 3 && hasRemarkButtonPerm"
               @click="handleRemark(row)"
               type="primary"
-              >备注</el-button
+            >备注
+            </el-button
             >
           </template>
         </el-table-column>
@@ -154,7 +155,8 @@
           @click="addRemark"
           class="add-btn"
           :icon="Plus"
-          >新增备注</el-button
+        >新增备注
+        </el-button
         >
       </div>
       <template #footer>
@@ -169,9 +171,9 @@
 
 <script setup>
 import Search from "@/components/Search/index.vue";
-import { useSpcStore, useUserStore, useDictionaryStore } from "@/store";
+import {useSpcStore, useUserStore, useDictionaryStore} from "@/store";
 
-const { dicts } = useDictionaryStore();
+const {dicts} = useDictionaryStore();
 import {
   deleteFeedback,
   getUnqualifiedData,
@@ -187,7 +189,7 @@ import Handle4 from "@/views/unqualified/handle4.vue";
 import Handle5 from "@/views/unqualified/handle5.vue";
 import Handle6 from "@/views/unqualified/handle6.vue";
 import Handle7 from "@/views/unqualified/handle7.vue";
-import { Plus, Delete } from "@element-plus/icons-vue";
+import {Plus, Delete} from "@element-plus/icons-vue";
 
 defineOptions({
   name: "SPCUnqualified",
@@ -231,7 +233,7 @@ const searchForm = [
 ];
 
 const getData = async (obj) => {
-  const { data, code } = await getUnqualifiedData({
+  const {data, code} = await getUnqualifiedData({
     ...searchRef.value.searchForm,
     pageNo: currentOption.page,
     pageSize: currentOption.limit,
@@ -269,10 +271,13 @@ const handle7Ref = ref(null);
 const handle = (row) => {
   if (row.remark2 && !JSON.parse(row.remark2).content) {
     if (row.auditType == "1") {
-      handle20Ref.value && handle20Ref.value.showDrawer(row); // 处理
+      if (row.remark1 && !JSON.parse(row.remark1).user1) {
+        handle2Ref.value && handle2Ref.value.showDrawer(row);
+      } else {
+        handle20Ref.value && handle20Ref.value.showDrawer(row); // 处理
+      }
     } else {
       if (row.remark1 && !JSON.parse(row.remark1).user1) {
-        console.log(row.remark1, "ddddpp[[[[");
         handle2Ref.value && handle2Ref.value.showDrawer(row);
       } else {
         handle21Ref.value && handle21Ref.value.showDrawer(row); // 处理
@@ -303,11 +308,11 @@ const getTextByAuditType = (state) => {
     const item = auditTypes.filter((v) => {
       console.log(
         "dictValue:" +
-          v.dictValue +
-          ",state:" +
-          state +
-          "..." +
-          (v.dictValue === state)
+        v.dictValue +
+        ",state:" +
+        state +
+        "..." +
+        (v.dictValue === state)
       );
       return v.dictValue === state;
     });