1.检验报告优化

src/views/statistic/inspectionReport/DetailCom.vue

@@ -43,7 +43,7 @@
         <td></td>
         <td colspan="2"></td>
         <td>检验日期</td>
-        <td colspan="2">{{ saleModel.created }}</td>
+        <td colspan="2">{{ saleModel.created && saleModel.created.split(' ')[0] }}</td>
       </tr>
 
       <!-- 数量信息 -->

src/views/statistic/inspectionReport/FillCom.vue

@@ -17,8 +17,8 @@
             :rules="rules"
             style="max-width: 600px"
           >
-            <el-form-item label="抽样数量" prop="seqNum">
-              <el-input v-model="saleForm.seqNum" />
+            <el-form-item label="批号" prop="workOrderCode">
+              <el-input :placeholder="workCode" v-model="saleForm.workOrderCode"/>
             </el-form-item>
             <el-form-item label="温度" prop="temperature">
               <el-input v-model="saleForm.temperature"></el-input>
@@ -184,6 +184,7 @@ const levelTypes = ref([
 const baseInfoRef = ref(null);
 const saleForm = reactive({
   id: "",
+  workOrderCode: "",
   seqNum: "",
   temperature: "",
   humidity: "",
@@ -240,7 +241,6 @@ const remark1 = reactive({
 });
 
 const rules = {
-  seqNum: [{ required: true, message: "请输入抽样数量", trigger: "blur" }],
   temperature: [{ required: true, message: "请输入温度", trigger: "blur" }],
   humidity: [{ required: true, message: "请输入湿度", trigger: "blur" }],
   pursuant: [{ required: true, message: "请输入检验依据", trigger: "blur" }],
@@ -295,6 +295,7 @@ const seqList = ref([]);
 
 // 用户信息
 const userInfo = ref({});
+const workCode = ref({});
 const userList = ref([]);
 const getUserInfo = async () => {
   getUserTree().then((data) => {
@@ -306,8 +307,9 @@ const showDrawer = (row) => {
   getUserInfo();
   getInspectionDetail(row.id).then((res) => {
     saleForm.id = res.data.id;
+    workCode.value = res.data.workOrderCode;
     saleForm.batchNum = res.data.batchNum;
-    saleForm.seqNum = res.data.seqNum;
+    saleForm.seqNum = res.data.batchNum;
     saleForm.temperature = res.data.temperature;
     saleForm.humidity = res.data.humidity;
     saleForm.pursuant = res.data.pursuant;
@@ -398,6 +400,9 @@ const confirmClick = () => {
 
         let p = {
           ...saleForm,
+          workOrderCode: (saleForm.workOrderCode == null || saleForm.workOrderCode === "")
+            ? workCode.value
+            : saleForm.workOrderCode,
           state: 1, // 待处理
           currentUserName: remark1.nextRemarkUser,
           remark3: JSON.stringify(remark1Copy),