From ddaa8803892b23b99579b5971449826c06b409cb Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 20 三月 2024 13:24:09 +0800
Subject: [PATCH] bug

---
 src/views/quality/rawMaterial/rawMaterial-form.vue |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 31e5075..7be1a3d 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -97,6 +97,8 @@
                         :disabled="dataForm.id!=null"
                         v-model="dataForm.createTime"
                         type="datetime"
+                        format="yyyy-MM-dd HH:mm:ss"
+                        value-format="yyyy-MM-dd HH:mm:ss"
                         placeholder="鎶ユ鏃ユ湡">
                         </el-date-picker>
                     </el-form-item>
@@ -186,6 +188,7 @@
                                 ref="testValueInput"
                                 @blur="checkTestValues(scope.row,'blur',$event)"
                                 @select="checkTestValues(scope.row,'select',$event)"
+                                :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&(resultVal!=null && resultVal!=''))" 
                                 v-model="scope.row.testValueList[index]"
                                 :fetch-suggestions="querySearch"
                                 placeholder="璇疯緭鍏ユ垨閫夋嫨妫�娴嬪��" >
@@ -255,7 +258,7 @@
                 :disabled="dataForm.rawInsNo==null || (resultVal!=null && resultVal!='')"
                 drag
                 ref="upload"
-                action="/mes/rawInsProduct/upload"
+                action="/mes/attachment/upload"
                 :auto-upload="true"
                 :headers="headers"
                 :before-upload="submitUpload"
@@ -270,7 +273,6 @@
                 </div>
               </el-upload>
             </div>
-
             <el-table :data="processConfigFileTableData" height="260px">
               <el-table-column
                 prop="rawInsNo"
@@ -400,10 +402,12 @@
   getObj,
   updateRawInsProduct,
   updateRawInspectsById,
-  getProcessConfigFiles,
-  downloadProcessConfigFile,
-  deleteProcessConfigFile,
   updateDeviceById, chooseIFS} from '@/api/quality/rawMaterial'
+  import {
+    getProcessConfigFiles,
+    deleteProcessConfigFile,
+    downloadProcessConfigFile
+ } from '@/api/quality/attachment'
   import rawMaterialPartDialog from '@/views/common/rawMaterial-part'
   import { getStore } from '@/util/store'
   import qrCodeApp from '@/views/common/qrCodeApp'
@@ -422,8 +426,9 @@
               Authorization: 'Bearer ' + getStore({ name: 'access_token' })
             },
             paramData: {
-              rawInsNo: '',
-              lineNumber: ''
+              no: '',
+              lineNumber: '',
+              type: 0
             },
             row: null,
             proIndex: 0,
@@ -519,8 +524,9 @@
       },
       getConfigFiles() {
         const param = {
-          rawInsNo: this.dataForm.rawInsNo,
-          lineNumber: this.dataForm.id
+          no: this.dataForm.rawInsNo,
+          lineNumber: this.dataForm.id,
+          type: 0
         }
         getProcessConfigFiles(param).then((res) => {
           this.processConfigFileTableData = res.data.data
@@ -546,7 +552,7 @@
           })
       },
       submitUpload() {
-        this.paramData.rawInsNo = this.dataForm.rawInsNo
+        this.paramData.no = this.dataForm.rawInsNo
         this.paramData.lineNumber = this.dataForm.id
         this.progrecessFileLoading = true
       },

--
Gitblit v1.9.3