From c548d245b49705472116b1638a6b730c934ef58a Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期二, 07 十一月 2023 11:20:10 +0800
Subject: [PATCH] 	modified:   src/views/quality/finishedProductInspection/finishedProduct-form.vue 	modified:   src/views/quality/rawMaterial/rawMaterial-form.vue

---
 src/views/quality/rawMaterial/rawMaterial-form.vue                   |   13 ++++++++++++-
 src/views/quality/finishedProductInspection/finishedProduct-form.vue |    1 +
 2 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index c5a4687..0eb8bdd 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -96,6 +96,7 @@
                         <el-table-column prop="required" label="鏍囧噯鍊�" width="240" ></el-table-column>
                         <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index" label="妫�娴嬪��"
                             width="240" style="text-align: center;">
+                            
                             <template slot-scope="scope">
                                 <el-col v-if="scope.row.itype === '1'">
                                     <el-tooltip v-if="scope.row.iname!=null" :disabled="scope.row.eId != null" 
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 0bd79dc..add151c 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -114,7 +114,16 @@
                 :data="list" border style="width: 100%;" height="400">
                   <el-table-column type="index" label="搴忓彿" width="60">
                   </el-table-column>
-
+                  <el-table-column prop="father" label="妫�楠岄」鐩�" width="260">
+                    <template slot-scope="scope">
+                      <el-input :disabled="dataForm.id != null" v-model="scope.row.father" placeholder="璇疯緭鍏ユ楠岄」鐩�"></el-input>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="note" label="妫�楠屾弿杩�" width="260">
+                    <template slot-scope="scope">
+                      <el-input :disabled="dataForm.id != null" v-model="scope.row.note" placeholder="妫�楠屾弿杩�"></el-input>
+                    </template>
+                  </el-table-column>
                   <el-table-column prop="name" label="椤圭洰" width="260">
                     <template slot-scope="scope">
                       <el-select v-if="projectList.length > 0" :disabled="dataForm.id != null" class="inline-input" v-model="scope.row.name"
@@ -315,6 +324,8 @@
       this.init()
       this.getDeviceList()
       this.restaurants = this.loadAll();
+      
+      console.log(this.dataForm);
     },
     watch:{
       dialogVisible(newVal){

--
Gitblit v1.9.3