From 1d22e1b84c1b64a43dc09f6ae8fd1f1fdf243a32 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 29 三月 2025 14:33:19 +0800
Subject: [PATCH] 设备工具明细bug

---
 src/views/business/materialOrder/customsInspection.vue |   42 +++++++++++++++++++++++++-----------------
 1 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index b7af486..c95345c 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -32,17 +32,17 @@
       <el-form ref="addObj" :inline="true" :model="addObj" :rules="addObjRules" label-width="90px">
         <el-row>
           <el-col :span="6">
-            <el-form-item class="addObj-form-item" label="閲囪喘璁㈠崟鍙�:">
+            <el-form-item class="addObj-form-item" label="閲囪喘璁㈠崟鍙�:" prop="orderNo">
               <el-input v-model="addObj.orderNo" class="addObj-info" clearable disabled placeholder="" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="addObj-form-item" label="濮旀墭鍗曚綅:">
+            <el-form-item class="addObj-form-item" label="濮旀墭鍗曚綅:" prop="company">
               <el-input v-model="addObj.company" class="addObj-info" clearable disabled placeholder="" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="addObj-form-item" label="鎺ユ敹鏃堕棿:">
+            <el-form-item class="addObj-form-item" label="鎺ユ敹鏃堕棿:" prop="receiverDate">
               <el-date-picker
                 v-model="addObj.receiverDate"
                 disabled
@@ -55,29 +55,29 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="addObj-form-item" label="闆朵欢鍙�:">
+            <el-form-item class="addObj-form-item" label="闆朵欢鍙�:" prop="partNo">
               <el-input v-model="addObj.partNo" class="addObj-info" clearable disabled placeholder="" size="small"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item class="addObj-form-item" label="鏍峰搧鍚嶇О:">
+            <el-form-item class="addObj-form-item" label="鏍峰搧鍚嶇О:" prop="sample">
               <el-input v-model="addObj.sample" class="addObj-info" clearable disabled placeholder="" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="addObj-form-item" label="鏍峰搧鎬绘暟:">
+            <el-form-item class="addObj-form-item" label="鏍峰搧鎬绘暟:" prop="qtyArrived">
               <el-input v-model="addObj.qtyArrived" class="addObj-info" clearable disabled placeholder="" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="addObj-form-item" label="鎶ユ浜�:">
+            <el-form-item class="addObj-form-item" label="鎶ユ浜�:" prop="declareUser">
               <el-input v-model="addObj.declareUser" class="addObj-info" clearable disabled size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="addObj-form-item" label="鎵规鍙�:">
+            <el-form-item class="addObj-form-item" label="鎵规鍙�:" prop="updateBatchNo">
               <el-input v-model="addObj.updateBatchNo" class="addObj-info" clearable disabled size="small"></el-input>
             </el-form-item>
           </el-col>
@@ -133,7 +133,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="addObj-form-item" label="澶囨敞:">
+            <el-form-item class="addObj-form-item" label="澶囨敞:" prop="remark">
               <el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2}" :disabled="active>1" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
                         size="small" type="textarea"></el-input>
             </el-form-item>
@@ -356,10 +356,9 @@
       </span>
     </el-dialog>
     <el-dialog :close-on-click-modal="false" :close-on-press-escape="false"
-               :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
                :show-close="false" :visible.sync="bsm3Dia"
                title="鍖洪棿鍊煎~鍐�" width="800px">
-      <el-table :data="editTable" height="80vh" style="width: 100%">
+      <el-table :data="editTable" height="80vh" style="width: 100%" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
         <!-- inspectionItemList -->
         <el-table-column label="妫�楠岄」" prop="inspectionItemList" width="180">
         </el-table-column>
@@ -609,6 +608,7 @@
   watch: {
     sampleList() {
       this.addObj.method = null
+      this.productList = []
     },
     productList: {
       deep: true,
@@ -645,6 +645,12 @@
     this.getInfo();
   },
   activated() {
+    this.$refs.addObj.resetFields()
+    this.addObj.createTime = ''
+    this.addObj.id = ''
+    this.addObj.updateTime = ''
+    this.sampleList = []
+    this.productList = []
     this.active = this.$route.query.active
     this.orderType = this.$route.query.orderType
     this.currentId = this.$route.query.currentId
@@ -652,11 +658,9 @@
     this.customsInspection = this.$route.query.customsInspection
     this.getInfo();
   },
-  getInfo() {
-    this.getUserNowList() // 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
-    this.selectStandardMethods() // 鑾峰彇妫�楠屾爣鍑嗕笅鎷夋鏁版嵁
-    this.getInfo() // 鑾峰彇鏁版嵁
-  },
+  // getInfo() {
+  //   this.getInfo() // 鑾峰彇鏁版嵁
+  // },
   methods: {
     save1 () {
       if (this.bsm1DiaList.length > 0) {
@@ -697,6 +701,8 @@
     },
     // 鑾峰彇鏁版嵁
     getInfo () {
+      this.getUserNowList() // 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
+      this.selectStandardMethods() // 鑾峰彇妫�楠屾爣鍑嗕笅鎷夋鏁版嵁
       if (this.active == 2) {
         let orderId = ''
         if (!this.customsInspection.enterOrderId && this.customsInspection.quarterOrderId) {
@@ -1897,5 +1903,7 @@
   background-color: #ffffff;
 
 }
-
+>>>.warning-row {
+  color: #1890FF;
+}
 </style>

--
Gitblit v1.9.3