Merge remote-tracking branch 'origin/master'

src/views/unqualified/DetailCom.vue

@@ -56,7 +56,6 @@
               <div class="desc" v-if="index === 0">
                 检验人员:{{ item[`user1`] }}
               </div>
-
               <div class="desc" v-if="index === 1">
                 技术人员:{{ item[`user1`] }}
               </div>
@@ -66,7 +65,6 @@
               <div class="desc" v-if="index === 1">
                 责任部门:{{ item[`user2`] }}
               </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>
 

src/views/unqualified/handle20.vue

@@ -9,72 +9,109 @@
       :model="remark"
       label-width="150"
       :rules="rules1"
-      style="max-width: 600px; margin-left: 80px; margin-top: 20px"
+      style="max-width: 800px; margin-left: 72px; margin-top: 20px"
+      class="remark-form"
     >
-      <el-form-item label="分析处置要求：" prop="content2">
-        <el-input
-          v-model="remark.content2"
-          type="textarea"
-          :autosize="{ minRows: 3, maxRows: 6 }"
-        />
-      </el-form-item>
-      <el-form-item label="技术人员" prop="user1">
-        <el-tree-select v-model="remark.user1" :data="userList" filterable />
-      </el-form-item>
-      <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="content3">
-        <el-input
-          v-model="remark.content3"
-          type="textarea"
-          :autosize="{ minRows: 3, maxRows: 6 }"
-        />
-      </el-form-item>
-      <el-form-item label="分析单位:" prop="company">
-        <el-input v-model="remark.company" />
-      </el-form-item>
-      <el-form-item label="采取的措施：" prop="content4">
-        <el-input
-          v-model="remark.content4"
-          type="textarea"
-          :autosize="{ minRows: 3, maxRows: 6 }"
-        />
-      </el-form-item>
-      <el-form-item label="分析单位" prop="users">
-        <!--        <el-tree-select-->
-        <!--          v-model="remark.users"-->
-        <!--          :data="userList"-->
-        <!--          multiple-->
-        <!--          filterable-->
-        <!--          allow-create-->
-        <!--          default-first-option-->
-        <!--          placeholder="输入后按回车键可自定义输入"-->
-        <!--        />-->
-        <el-input v-model="remark.users" />
-      </el-form-item>
+      <div class="border">
+        <el-form-item label="分析处置要求：" prop="content2">
+          <el-input
+            v-model="remark.content2"
+            type="textarea"
+            :autosize="{ minRows: 3, maxRows: 6 }"
+          />
+        </el-form-item>
+        <el-form-item label="技术人员" prop="user1">
+          <el-tree-select v-model="remark.user1" :data="userList" filterable />
+        </el-form-item>
+        <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="fileUrl">
+          <FilesUpload
+            v-model:src="remark.fileUrl"
+            :generate-pdf="false"
+            v-model:file-name-list="fileNameList"
+          />
+        </el-form-item>
+      </div>
+      <div class="border">
+        <el-form-item label="原因分析：" prop="content3">
+          <el-input
+            v-model="remark.content3"
+            type="textarea"
+            :autosize="{ minRows: 3, maxRows: 6 }"
+          />
+        </el-form-item>
+        <el-form-item label="分析单位:" prop="company">
+          <el-input v-model="remark.company" />
+        </el-form-item>
+        <el-form-item label="附件" prop="fileUrl1">
+          <FilesUpload
+            v-model:src="remark.fileUrl1"
+            :generate-pdf="false"
+            v-model:file-name-list="fileNameList1"
+          />
+        </el-form-item>
+      </div>
+      <div class="border">
+        <el-form-item label="采取的措施：" prop="content4">
+          <el-input
+            v-model="remark.content4"
+            type="textarea"
+            :autosize="{ minRows: 3, maxRows: 6 }"
+          />
+        </el-form-item>
+        <el-form-item label="分析单位" prop="users">
+          <!--        <el-tree-select-->
+          <!--          v-model="remark.users"-->
+          <!--          :data="userList"-->
+          <!--          multiple-->
+          <!--          filterable-->
+          <!--          allow-create-->
+          <!--          default-first-option-->
+          <!--          placeholder="输入后按回车键可自定义输入"-->
+          <!--        />-->
+          <el-input v-model="remark.users" />
+        </el-form-item>
+        <el-form-item label="附件" prop="fileUrl2">
+          <FilesUpload
+            v-model:src="remark.fileUrl2"
+            :generate-pdf="false"
+            v-model:file-name-list="fileNameList2"
+          />
+        </el-form-item>
+      </div>
 
-      <el-form-item label="措施落实：" prop="content5">
-        <el-input
-          v-model="remark.content5"
-          type="textarea"
-          :autosize="{ minRows: 3, maxRows: 6 }"
-        />
-      </el-form-item>
-      <el-form-item label="分析单位" prop="user5">
-        <!--        <el-tree-select-->
-        <!--          v-model="remark.user5"-->
-        <!--          :data="userList"-->
-        <!--          filterable-->
-        <!--          allow-create-->
-        <!--          default-first-option-->
-        <!--          placeholder="输入后按回车键可自定义输入"-->
-        <!--        />-->
-        <el-input v-model="remark.user5" />
-      </el-form-item>
+      <div class="border">
+        <el-form-item label="措施落实：" prop="content5">
+          <el-input
+            v-model="remark.content5"
+            type="textarea"
+            :autosize="{ minRows: 3, maxRows: 6 }"
+          />
+        </el-form-item>
+        <el-form-item label="分析单位" prop="user5">
+          <!--        <el-tree-select-->
+          <!--          v-model="remark.user5"-->
+          <!--          :data="userList"-->
+          <!--          filterable-->
+          <!--          allow-create-->
+          <!--          default-first-option-->
+          <!--          placeholder="输入后按回车键可自定义输入"-->
+          <!--        />-->
+          <el-input v-model="remark.user5" />
+        </el-form-item>
+        <el-form-item label="附件" prop="fileUrl3">
+          <FilesUpload
+            v-model:src="remark.fileUrl3"
+            :generate-pdf="false"
+            v-model:file-name-list="fileNameList3"
+          />
+        </el-form-item>
+      </div>
 
       <el-form-item
         label="下一步处理人"
@@ -87,13 +124,6 @@
           filterable
         />
       </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>
@@ -128,7 +158,6 @@ const showDrawer = (row) => {
   nextTick(() => {
     detailComRef.value && detailComRef.value.refreshView(row);
   });
-
   getUserInfo();
 };
 const disabledDate = (time) => {
@@ -182,8 +211,14 @@ const remark = reactive({
   users: "",
   user5: "",
   fileUrl: "",
+  fileUrl1: "",
+  fileUrl2: "",
+  fileUrl3: "",
 });
 const fileNameList = ref([]);
+const fileNameList1 = ref([]);
+const fileNameList2 = ref([]);
+const fileNameList3 = ref([]);
 
 const cancelClick = () => {
   drawerVisible.value = false;
@@ -224,6 +259,8 @@ const confirmClick = () => {
         content: remark.content3,
         company: remark.company,
         time: now,
+        fileUrl: remark.fileUrl1,
+        fileName: fileNameList1.value?.length > 0 ? fileNameList1.value[0] : "",
       };
       let remark4 = {
         content: remark.content4,
@@ -231,11 +268,15 @@ const confirmClick = () => {
           ? remark.users.join(",")
           : remark.users,
         time: now,
+        fileUrl: remark.fileUrl2,
+        fileName: fileNameList2.value?.length > 0 ? fileNameList2.value[0] : "",
       };
       let remark5 = {
         content: remark.content5,
         user: remark.user5,
         time: now,
+        fileUrl: remark.fileUrl3,
+        fileName: fileNameList3.value?.length > 0 ? fileNameList3.value[0] : "",
       };
       let remark6 = {
         content: "",
@@ -259,7 +300,6 @@ const confirmClick = () => {
         cancelClick();
       });
     } else {
-      console.log("remarkRef invalid");
       return false;
     }
   });
@@ -275,4 +315,11 @@ const confirmClick = () => {
     width: 1000px;
   }
 }
+
+.border {
+  border: 1px solid #000000;
+  padding: 20px;
+  margin-bottom: 20px;
+  font-weight: 500;
+}
 </style>