From 60cde7048175902baa66fd81ddfd174aeda3292a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 02 四月 2024 13:08:34 +0800
Subject: [PATCH] 审核按钮权限

---
 src/views/quality/rawMaterial/rawMaterial-form.vue |   35 ++++++++++++++++++++++++-----------
 1 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 7be1a3d..87dc02e 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -92,10 +92,10 @@
             </el-row>
             <el-row>
                 <el-col :span="6">
-                    <el-form-item label="鎶ユ鏃ユ湡" prop="createTime">
+                    <el-form-item label="鎶ユ鏃ユ湡" prop="startTime">
                         <el-date-picker
-                        :disabled="dataForm.id!=null"
-                        v-model="dataForm.createTime"
+                        disabled
+                        v-model="dataForm.startTime"
                         type="datetime"
                         format="yyyy-MM-dd HH:mm:ss"
                         value-format="yyyy-MM-dd HH:mm:ss"
@@ -103,18 +103,23 @@
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
-                <el-col :span="6">
-                  <el-form-item label="鎶ユ浜�" prop="createUser" v-if="dataForm.id!=null">
+                <el-col :span="6" v-if="dataForm.id!=null">
+                  <el-form-item label="鎶ユ浜�" prop="createUser" >
                         <el-input v-model="dataForm.createUser" disabled />
                   </el-form-item>
                 </el-col>
-                <el-col :span="6">
-                  <el-form-item  prop="projectName" label="椤圭洰鍚嶇О" v-if="dataForm.id!=null">
+                <el-col :span="6" v-if="dataForm.id!=null">
+                  <el-form-item  prop="projectName" label="椤圭洰鍚嶇О" >
                     <el-tooltip :disabled="dataForm.projectName==null" :content="dataForm.projectName">
                       <el-input v-model="dataForm.projectName" disabled ></el-input>
                     </el-tooltip>
                   </el-form-item>
               </el-col>
+              <el-col :span="6">
+                    <el-form-item label="澶囨敞" prop="remark">
+                        <el-input v-model="dataForm.remark" />
+                    </el-form-item>
+                </el-col>
             </el-row>
         </el-form>
       </div>
@@ -188,7 +193,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!=''))" 
+                                :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&(resultVal!=null && resultVal!=''))"
                                 v-model="scope.row.testValueList[index]"
                                 :fetch-suggestions="querySearch"
                                 placeholder="璇疯緭鍏ユ垨閫夋嫨妫�娴嬪��" >
@@ -460,6 +465,7 @@
                 unit: '',
                 number: '',
                 supplier: '',
+                remark:'',
                 rawInsProducts: [{
                   deviceId: 0,
                   father:'',
@@ -481,7 +487,7 @@
             }],
             dataRule: {
               code:[{ required: true, message: '璇锋壂鎻忛�夋嫨闆朵欢', trigger: 'blur' }],
-              createTime: [{ required: true, message: '璇烽�夋嫨鎶ユ鏃ユ湡', trigger: 'blur' }]
+            //   startTime: [{ required: true, message: '璇烽�夋嫨鎶ユ鏃ユ湡', trigger: 'blur' }]
             },
             deviceList: [],
         }
@@ -620,6 +626,7 @@
           this.dataForm.code = param.code
           this.dataForm.name = param.name
           this.dataForm.formTime = param.formTime
+          this.dataForm.startTime = param.formTime
           this.dataForm.unit = param.unit
           this.dataForm.specs = param.specs
           this.dataForm.supplier = param.supplier
@@ -691,6 +698,7 @@
           if(res.data.code == 0 && (res.data.data=='1'|| res.data.data=='0')){
             sessionStorage.setItem("raw-resultVal-"+this.dataForm.id,res.data.data)
             this.$message.success("涓婃姤鎴愬姛");
+            this.$router.go(-1)
           }else{
             this.$message.error("涓婃姤澶辫触锛�",res.data.data);
           }
@@ -699,7 +707,9 @@
         });
       },
       addTeatValueColumn(){
-        this.empiricalValueAdd = this.empiricalValueAdd + 1;
+        this.$nextTick(()=>{
+            this.empiricalValueAdd = this.empiricalValueAdd + 1;
+        })
       },
       // 娣诲姞琛�
       clickAddLine(row,index) {
@@ -803,6 +813,8 @@
             this.dataForm.rawInsNo = data.rawInsNo
             this.dataForm.name = data.name
             this.dataForm.formTime = data.formTime
+            this.dataForm.startTime = data.startTime
+            this.dataForm.remark = data.remark
             this.dataForm.code = data.code
             this.dataForm.specs = data.specs
             this.dataForm.unit = data.runit
@@ -989,12 +1001,13 @@
                 this.list.forEach(item=>{
                 item.children.forEach(c=>{
                     c.testValue=c.testValueList.join(",")
+                    c.required = c.required.replace(',','锛�').replace('(','锛�').replace(')','锛�')
                 })
                 })
                 data.rawInsProducts = this.list
                 addRawInspects(data).then(res=>{
                     this.$message.success("淇濆瓨鎴愬姛")
-                    // this.$router.go(-1)
+                    this.$router.go(-1)
                 }).catch(error=>{
                 this.$message.error(error)
                 })

--
Gitblit v1.9.3