fix:不合格处置逻辑变更优化

src/views/sales/add.vue

@@ -49,7 +49,7 @@
             <div>{{ selectedOrder.workOrderCode }}</div>
           </el-form-item>-->
 
-          <el-form-item label="流转卡号" prop="seqs">
+          <el-form-item label="产品编号" prop="seqs">
             <el-select
               v-model="saleForm.seqs"
               value-key="orderCode"

src/views/unqualified/DetailCom.vue

@@ -62,13 +62,16 @@
               <div class="desc" v-if="index === 1">
                 联系电话:{{ item[`phone`] }}
               </div>
-              <div class="desc" v-if="index === 1">
+              <div class="desc" v-if="index === 1 && saleModel.auditType === '1'">
                 责任部门:{{ item[`user2`] }}
               </div>
+              <div class="desc" v-if="index === 1 && saleModel.auditType === '2'">
+                责任部门:{{ item[`user`] }}
+              </div>
               <div class="desc" v-if="index === 2 && saleModel.auditType === '1' ">分析单位:{{ item[`company`] }}</div>
-              <div class="desc" v-if="index === 2 && saleModel.auditType === '2' ">责任部门:{{ item[`company`] }}</div>
+              <div class="desc" v-if="index === 2 && saleModel.auditType === '2' ">责任部门:{{ item[`user`] }}</div>
 
-              <div class="desc" v-if="index === 3 && saleModel.auditType === '1' ">分析单位:{{ item[`user`] }}</div>
+              <div class="desc" v-if="index === 3 && saleModel.auditType === '1' ">分析单位:{{ item[`users`] }}</div>
               <div class="desc" v-if="index === 3 && saleModel.auditType === '2' ">责任部门:{{ item[`user`] }}</div>
 
               <div class="desc" v-if="index === 4 && saleModel.auditType === '1' ">分析单位:{{ item[`user`] }}</div>

src/views/unqualified/add.vue

@@ -29,16 +29,18 @@
               <el-option
                 v-for="item in orders"
                 :key="item.orderNo"
-                :label="item.orderName + `(批号: ${item.workOrderCode})`"
+                :label="item.workOrderCode"
                 :value="item"
               />
             </el-select>
+            <!--            :label="item.orderName + `(批号: ${item.workOrderCode})`"-->
+
           </el-form-item>
           <!--
           <el-form-item label="检验批号" hidden>
             <div>{{ selectedOrder.workOrderCode }}</div>
           </el-form-item>-->
-          <el-form-item label="流转卡号" prop="seqs">
+          <el-form-item label="产品编号" prop="seqs">
             <!--            <el-select-->
             <!--              v-model="saleForm.seqs"-->
             <!--              value-key="orderCode"-->
@@ -162,14 +164,14 @@
               filterable
             />
           </el-form-item>
-          <el-form-item label="检验人" prop="user1">
-            <el-tree-select
-              v-model="remark1.user1"
-              :data="userList"
-              filterable
-              multiple
-            />
-          </el-form-item>
+          <!--          <el-form-item label="检验人" prop="user1">-->
+          <!--            <el-tree-select-->
+          <!--              v-model="remark1.user1"-->
+          <!--              :data="userList"-->
+          <!--              filterable-->
+          <!--              multiple-->
+          <!--            />-->
+          <!--          </el-form-item>-->
           <el-form-item label="日期" prop="time">
             <el-date-picker
               v-model="remark1.time"
@@ -181,7 +183,7 @@
               style="width: 100%"
             />
           </el-form-item>
-          <el-form-item label="下一步处理人" prop="nextRemarkUser">
+          <el-form-item label="检验人" prop="nextRemarkUser">
             <el-tree-select
               v-model="remark1.nextRemarkUser"
               :data="userList"
@@ -394,11 +396,12 @@ const confirmClick = () => {
     }
   });
   remark1Ref.value.validate((valid) => {
+    remark1.nextRemarkUser = remark1.nextRemarkUser.join(",")
     if (valid) {
       let remark1Copy = {
         content: remark1.content,
         user: remark1.user,
-        user1: remark1.user1.join(","),
+        user1: "",
         time: remark1.time,
       };
       let remark2 = {
@@ -410,7 +413,7 @@ const confirmClick = () => {
       let p = {
         ...saleForm,
         ...selectedOrder.value,
-        currentUserName: remark1.nextRemarkUser.join(","),
+        currentUserName: remark1.nextRemarkUser,
         remark1: JSON.stringify(remark1Copy),
         remark2: JSON.stringify(remark2),
       };

src/views/unqualified/handle2.vue

@@ -0,0 +1,174 @@
+<template>
+  <el-drawer v-model="drawerVisible" size="1000">
+    <div>
+      <DetailCom ref="detailComRef"></DetailCom>
+    </div>
+
+    <el-form
+      ref="remarkRef"
+      :model="remark"
+      label-width="150"
+      :rules="rules1"
+      style="max-width: 600px; margin-left: 80px; margin-top: 20px"
+    >
+      <!--      <el-form-item label="原因分析" prop="content">-->
+      <!--        <el-input-->
+      <!--          v-model="remark.content"-->
+      <!--          type="textarea"-->
+      <!--          :autosize="{ minRows: 3, maxRows: 6 }"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="责任部门" prop="company" v-if="auditType == '2'">-->
+      <!--        <el-tree-select v-model="remark.company" :data="userList" filterable />-->
+      <!--      </el-form-item>-->
+      <el-form-item
+        label="下一步处理人"
+        prop="nextRemarkUser"
+        v-if="remark.state == 0"
+      >
+        <el-tree-select
+          v-model="remark.nextRemarkUser"
+          :data="userList"
+          filterable
+          multiple
+        />
+      </el-form-item>
+      <!--      <el-form-item label="附件" prop="fileUrl">-->
+      <!--        <FilesUpload-->
+      <!--          v-model:src="remark.fileUrl"-->
+      <!--          :generate-pdf="false"-->
+      <!--          v-model:file-name-list="fileNameList"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <el-form-item label="是否通过" prop="state">
+        <el-radio-group v-model="remark.state">
+          <el-radio :value="0">同意</el-radio>
+          <el-radio :value="1">不同意</el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
+
+    <template #footer>
+      <div class="drawer-bottom">
+        <el-button @click="cancelClick">取消</el-button>
+        <el-button type="primary" @click="confirmClick">提交</el-button>
+      </div>
+    </template>
+  </el-drawer>
+</template>
+
+<script setup>
+import DetailCom from "@/views/unqualified/DetailCom.vue";
+import {dealFeedback} from "@/api/unqualified/index";
+import {getUserTree} from "@/api/user/index";
+import {useUserStore} from "@/store";
+import FilesUpload from "@/components/Upload/FilesUpload.vue";
+
+const drawerVisible = ref(false);
+const detailComRef = ref(null);
+const saleModel = ref({});
+const userStore = useUserStore();
+const disabledDate = (time) => {
+  //选择今天以及今天之后的日期
+  return time.getTime() < Date.now() - 8.64e7; //如果没有后面的-8.64e7就是不可以选择
+  //选择今天以及今天之前的日期
+  //return time.getTime() > Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
+};
+const auditType = ref("1");
+const dutyDept = ref("");
+const showDrawer = (row) => {
+  auditType.value = row.auditType;
+  drawerVisible.value = true;
+  dutyDept.value = JSON.parse(row.remark2).user2;
+  saleModel.value = row;
+  nextTick(() => {
+    detailComRef.value && detailComRef.value.refreshView(row);
+  });
+
+  getUserInfo();
+};
+
+const rules1 = {
+  nextRemarkUser: [
+    {required: true, message: "请选择处理人", trigger: "change"},
+    {min: 2, max: 20, message: "长度在 2 到 20 个字符", trigger: "blur"},
+  ],
+};
+
+defineExpose({showDrawer});
+
+const remarkRef = ref(null);
+
+const remark = reactive({
+  user: "",
+  state: 0,
+});
+const fileNameList = ref([]);
+
+const cancelClick = () => {
+  drawerVisible.value = false;
+
+  remarkRef.value.resetFields();
+};
+
+const feedBackEmit = defineEmits(["finish"]);
+
+// 用户信息
+const userList = ref([]);
+const getUserInfo = async () => {
+  getUserTree().then((data) => {
+    userList.value = data.data;
+  });
+};
+
+const confirmClick = () => {
+  const date = new Date();
+  const now = date.getFullYear() + "年" + (date.getMonth() + 1) + "月" + date.getDate() + "日";
+  remark.user = dutyDept.value;
+  remark.nextRemarkUser = remark.nextRemarkUser.join(",")
+  // remark.user = userStore.user.username;
+  remarkRef.value.validate((valid) => {
+    if (valid) {
+      let remark1Copy = {
+        content: JSON.parse(saleModel.value.remark1).content,
+        user: JSON.parse(saleModel.value.remark1).user,
+        time: now,
+        state: remark.state,
+        user1: remark.user,
+      };
+      let remark2Copy = {
+        content: "",
+        user2: remark.nextRemarkUser,
+        time: "",
+      };
+      let p = {
+        id: saleModel.value.id,
+        remark1: JSON.stringify(remark1Copy),
+        remark2: JSON.stringify(remark2Copy),
+        currentUserName: remark.nextRemarkUser,
+        state: remark.state,
+        step: 3, //步骤 1 投书或建议处置意见 2 整改及纠正措施验证 3 处置情况的反馈意见
+      };
+      console.log(p, "pppppp")
+      dealFeedback(p).then(() => {
+        feedBackEmit("finish");
+        cancelClick();
+      });
+    } else {
+      console.log("remarkRef invalid");
+      return false;
+    }
+  });
+};
+</script>
+
+<style scoped lang="scss">
+@media print {
+  #print {
+    position: absolute; /* 或 absolute, fixed, 根据需要调整 */
+    top: 20px; /* 调整顶部位置 */
+    margin: 0; /* 重置边距 */
+    width: 1000px;
+  }
+}
+</style>

src/views/unqualified/handle20.vue

@@ -151,10 +151,11 @@ const drawerVisible = ref(false);
 const detailComRef = ref(null);
 const saleModel = ref({});
 const userStore = useUserStore();
+const dutyDept = ref("");
 const showDrawer = (row) => {
   drawerVisible.value = true;
   saleModel.value = row;
-
+  dutyDept.value = JSON.parse(row.remark2).user2;
   nextTick(() => {
     detailComRef.value && detailComRef.value.refreshView(row);
   });
@@ -243,6 +244,12 @@ const confirmClick = () => {
   remark.user = userStore.user.username;
   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 remark2Copy = {
         content: remark.content2,
         user: remark.user,
@@ -284,6 +291,7 @@ const confirmClick = () => {
 
       let p = {
         id: saleModel.value.id,
+        remark1: JSON.stringify(remark1),
         remark2: JSON.stringify(remark2Copy),
         remark3: JSON.stringify(remark3),
         remark4: JSON.stringify(remark4),

src/views/unqualified/handle21.vue

@@ -24,9 +24,9 @@
       <el-form-item label="联系电话" prop="phone">
         <el-input v-model="remark.phone" />
       </el-form-item>
-      <el-form-item label="责任部门" prop="user2">
-        <el-tree-select v-model="remark.user2" :data="userList" filterable />
-      </el-form-item>
+      <!--      <el-form-item label="责任部门" prop="user2">-->
+      <!--        <el-tree-select v-model="remark.user2" :data="userList" filterable />-->
+      <!--      </el-form-item>-->
 
       <el-form-item
         label="下一步处理人"
@@ -37,6 +37,7 @@
           v-model="remark.nextRemarkUser"
           :data="userList"
           filterable
+          multiple
         />
       </el-form-item>
       <el-form-item label="附件" prop="fileUrl">
@@ -79,10 +80,12 @@ const disabledDate = (time) => {
   //选择今天以及今天之前的日期
   //return time.getTime() > Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
 };
+const dutyDept = ref("");
 const showDrawer = (row) => {
   drawerVisible.value = true;
   saleModel.value = row;
-
+  dutyDept.value = JSON.parse(row.remark2).user2;
+  console.log(row, "ppp")
   nextTick(() => {
     detailComRef.value && detailComRef.value.refreshView(row);
   });
@@ -138,14 +141,15 @@ const getUserInfo = async () => {
 const confirmClick = () => {
   const date = new Date();
   const now = date.getFullYear() + "年" + (date.getMonth() + 1) + "月" + date.getDate() + "日";
-  remark.user = userStore.user.username;
+  remark.user = dutyDept.value;
+  remark.nextRemarkUser = remark.nextRemarkUser.join(",")
   remarkRef.value.validate((valid) => {
     if (valid) {
       let remark2Copy = {
         content: remark.content,
         user: remark.user,
         user1: remark.user1,
-        user2: remark.user2,
+        user2: remark.nextRemarkUser,
         phone: remark.phone,
         time: now,
         state: remark.state,

src/views/unqualified/handle3.vue

@@ -22,9 +22,9 @@
       <el-form-item label="分析单位" prop="company" v-if="auditType == '1'">
         <el-input v-model="remark.company" />
       </el-form-item>
-      <el-form-item label="责任部门" prop="company" v-if="auditType == '2'">
-        <el-tree-select v-model="remark.company" :data="userList" filterable />
-      </el-form-item>
+      <!--      <el-form-item label="责任部门" prop="company" v-if="auditType == '2'">-->
+      <!--        <el-tree-select v-model="remark.company" :data="userList" filterable />-->
+      <!--      </el-form-item>-->
       <el-form-item
         label="下一步处理人"
         prop="nextRemarkUser"
@@ -34,6 +34,7 @@
           v-model="remark.nextRemarkUser"
           :data="userList"
           filterable
+          multiple
         />
       </el-form-item>
       <el-form-item label="附件" prop="fileUrl">
@@ -77,11 +78,12 @@ const disabledDate = (time) => {
   //return time.getTime() > Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
 };
 const auditType = ref("1");
+const dutyDept = ref("");
 const showDrawer = (row) => {
   auditType.value = row.auditType;
   drawerVisible.value = true;
   saleModel.value = row;
-
+  dutyDept.value = JSON.parse(row.remark2).user;
   nextTick(() => {
     detailComRef.value && detailComRef.value.refreshView(row);
   });
@@ -139,14 +141,16 @@ const getUserInfo = async () => {
 const confirmClick = () => {
   const date = new Date();
   const now = date.getFullYear() + "年" + (date.getMonth() + 1) + "月" + date.getDate() + "日";
-  remark.user = userStore.user.username;
+  remark.user = dutyDept.value;
+  remark.nextRemarkUser = remark.nextRemarkUser.join(",")
+  // remark.user = userStore.user.username;
   remarkRef.value.validate((valid) => {
     if (valid) {
       let remark2Copy = {
         content: remark.content,
         user: remark.user,
         time: now,
-        company: remark.company,
+        company: remark.nextRemarkUser,
         state: remark.state,
         fileUrl: remark.fileUrl,
         fileName: fileNameList.value?.length > 0 ? fileNameList.value[0] : "",

src/views/unqualified/handle4.vue

@@ -35,6 +35,7 @@
           v-model="remark.nextRemarkUser"
           :data="userList"
           filterable
+          multiple
         />
       </el-form-item>
       <el-form-item label="附件" prop="fileUrl">
@@ -77,10 +78,11 @@ const disabledDate = (time) => {
   //选择今天以及今天之前的日期
   //return time.getTime() > Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
 };
+const dutyDept = ref("");
 const showDrawer = (row) => {
   drawerVisible.value = true;
   saleModel.value = row;
-
+  dutyDept.value = JSON.parse(row.remark4).user;
   nextTick(() => {
     detailComRef.value && detailComRef.value.refreshView(row);
   });
@@ -138,7 +140,8 @@ const getUserInfo = async () => {
 const confirmClick = () => {
   const date = new Date();
   const now = date.getFullYear() + "年" + (date.getMonth() + 1) + "月" + date.getDate() + "日";
-  remark.user = userStore.user.username;
+  remark.user = dutyDept.value;
+  remark.nextRemarkUser = remark.nextRemarkUser.join(",")
   remarkRef.value.validate((valid) => {
     if (valid) {
       let remark2Copy = {

src/views/unqualified/handle5.vue

@@ -35,6 +35,7 @@
           v-model="remark.nextRemarkUser"
           :data="userList"
           filterable
+          multiple
         />
       </el-form-item>
       <el-form-item label="附件" prop="fileUrl">
@@ -77,10 +78,11 @@ const disabledDate = (time) => {
   //选择今天以及今天之前的日期
   //return time.getTime() > Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
 };
+const dutyDept = ref("");
 const showDrawer = (row) => {
   drawerVisible.value = true;
   saleModel.value = row;
-
+  dutyDept.value = JSON.parse(row.remark5).user;
   nextTick(() => {
     detailComRef.value && detailComRef.value.refreshView(row);
   });
@@ -138,7 +140,8 @@ const getUserInfo = async () => {
 const confirmClick = () => {
   const date = new Date();
   const now = date.getFullYear() + "年" + (date.getMonth() + 1) + "月" + date.getDate() + "日";
-  remark.user = userStore.user.username;
+  remark.user = dutyDept.value;
+  remark.nextRemarkUser = remark.nextRemarkUser.join(",")
   remarkRef.value.validate((valid) => {
     if (valid) {
       let remark2Copy = {

src/views/unqualified/handle6.vue

@@ -24,6 +24,7 @@
             v-model="remark.nextRemarkUser"
             :data="userList"
             filterable
+            multiple
         />
       </el-form-item>
       <el-form-item label="是否通过" prop="state">
@@ -58,10 +59,12 @@ const disabledDate = (time)=> {
   //选择今天以及今天之前的日期
   //return time.getTime() > Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
 }
+const dutyDept = ref("");
 const showDrawer = (row) => {
   drawerVisible.value = true;
   saleModel.value = row;
-
+  dutyDept.value = JSON.parse(row.remark6).user;
+  console.log(row.remark6, "ddd")
   nextTick(() => {
     detailComRef.value && detailComRef.value.refreshView(row);
   });
@@ -117,7 +120,8 @@ const getUserInfo = async () => {
 const confirmClick = () => {
   const date = new Date();
   const now = date.getFullYear() + "年" + (date.getMonth() + 1) + "月" + date.getDate() + "日";
-  remark.user = userStore.user.username;
+  remark.user = dutyDept.value;
+  remark.nextRemarkUser = remark.nextRemarkUser.join(",")
   remarkRef.value.validate((valid) => {
     if (valid) {
       let remark2Copy = {

src/views/unqualified/handle7.vue

@@ -62,10 +62,11 @@ const disabledDate = (time)=> {
   //选择今天以及今天之前的日期
   //return time.getTime() > Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
 }
+const dutyDept = ref("");
 const showDrawer = (row) => {
   drawerVisible.value = true;
   saleModel.value = row;
-
+  dutyDept.value = JSON.parse(row.remark7).user;
   nextTick(() => {
     detailComRef.value && detailComRef.value.refreshView(row);
   });
@@ -121,7 +122,7 @@ const getUserInfo = async () => {
 const confirmClick = () => {
   const date = new Date();
   const now = date.getFullYear() + "年" + (date.getMonth() + 1) + "月" + date.getDate() + "日";
-  remark.user = userStore.user.username;
+  remark.user = dutyDept.value;
   remarkRef.value.validate((valid) => {
     if (valid) {
       let remark2Copy = {

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,24 @@
         class="btn"
         style="margin-bottom: 10px"
         @click="toAdd"
-        >新增</el-button
+      >新增
+      </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="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 +54,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,20 +68,23 @@
               link
               type="danger"
               @click="toDelete(row)"
-              >删除</el-button
+            >删除
+            </el-button
             >
             <el-button
               link
               v-if="
                 (row.state === 0 || row.state === 1) &&
-                userStore.user.username == row.currentUserName
+                row.currentUserName?.split(',').includes(userStore.user.username)
               "
               @click="handle(row)"
               type="primary"
-              >处理</el-button
+            >处理
+            </el-button
             >
             <el-button link @click="toDetail(row)" type="primary"
-              >详情</el-button
+            >详情
+            </el-button
             >
           </template>
         </el-table-column>
@@ -98,6 +102,7 @@
       <Detail ref="detailRef"></Detail>
       <Handle20 ref="handle20Ref" @finish="getData"></Handle20>
       <Handle21 ref="handle21Ref" @finish="getData"></Handle21>
+      <Handle2 ref="handle2Ref" @finish="getData"></Handle2>
       <Handle3 ref="handle3Ref" @finish="getData"></Handle3>
       <Handle4 ref="handle4Ref" @finish="getData"></Handle4>
       <Handle5 ref="handle5Ref" @finish="getData"></Handle5>
@@ -109,13 +114,15 @@
 
 <script setup>
 import Search from "@/components/Search/index.vue";
-import { useSpcStore, useUserStore, useDictionaryStore } from "@/store";
-const { dicts } = useDictionaryStore();
-import { deleteFeedback, getUnqualifiedData } from "@/api/unqualified/index";
+import {useSpcStore, useUserStore, useDictionaryStore} from "@/store";
+
+const {dicts} = useDictionaryStore();
+import {deleteFeedback, getUnqualifiedData} from "@/api/unqualified/index";
 import Add from "@/views/unqualified/add.vue";
 import Detail from "@/views/unqualified/detail.vue";
 import Handle20 from "@/views/unqualified/handle20.vue";
 import Handle21 from "@/views/unqualified/handle21.vue";
+import Handle2 from "@/views/unqualified/handle2.vue";
 import Handle3 from "@/views/unqualified/handle3.vue";
 import Handle4 from "@/views/unqualified/handle4.vue";
 import Handle5 from "@/views/unqualified/handle5.vue";
@@ -164,7 +171,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,
@@ -193,6 +200,7 @@ const toDelete = async (row) => {
 // 处理相关
 const handle20Ref = ref(null);
 const handle21Ref = ref(null);
+const handle2Ref = ref(null);
 const handle3Ref = ref(null);
 const handle4Ref = ref(null);
 const handle5Ref = ref(null);
@@ -203,7 +211,12 @@ const handle = (row) => {
     if (row.auditType == "1") {
       handle20Ref.value && handle20Ref.value.showDrawer(row); // 处理
     } else {
-      handle21Ref.value && handle21Ref.value.showDrawer(row); // 处理
+      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); // 处理
+      }
     }
   } else if (row.remark3 && !JSON.parse(row.remark3).content) {
     handle3Ref.value && handle3Ref.value.showDrawer(row); // 处理
@@ -230,11 +243,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;
     });
@@ -299,25 +312,30 @@ watch(
   padding: 20px;
   display: flex;
   flex-direction: column;
+
   .header {
     width: 100%;
     height: auto;
   }
+
   .table {
     flex: 1;
     padding-bottom: 20px;
   }
+
   .formView {
     width: 100%;
     height: 100%;
     display: flex;
     flex-direction: column;
     align-items: center;
+
     .formTitle {
       text-align: center;
       font-size: 20px;
       margin-bottom: 20px;
     }
+
     .formStyle {
       width: 400px;
     }