From e5486974dcbbfc0549c41eca4f87c7730f0aa981 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 09 十一月 2023 17:56:09 +0800
Subject: [PATCH] 	modified:   src/views/quality/finishedProductInspection/finishedProduct-form.vue 	modified:   src/views/quality/finishedProductInspection/index.vue 	modified:   src/views/quality/rawMaterial/rawMaterial-form.vue

---
 src/views/quality/rawMaterial/rawMaterial-form.vue |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 3535b6d..8487ea5 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -7,7 +7,7 @@
         <h2 v-else>缂栬緫-鍘熸潗鏂欐楠�</h2>
       </div>
       <div class="btn-group header-right">
-        <el-button @click="save()" v-if="this.dataForm.id==null">淇濆瓨</el-button>
+        <el-button type="primary" @click="save()" v-if="this.dataForm.id==null">淇濆瓨</el-button>
       </div>
     </div>
     <div class="page-main">
@@ -200,7 +200,7 @@
                   </el-table-column>
                   <el-table-column fixed="right" style="background-color: white;" v-if="dataForm.id == null" label="鎿嶄綔" width="150">
                     <template slot-scope="scope">
-                      <div v-if="scope.row.father!=null">
+                      <div v-if="scope.row.fId!=null">
                           <el-button type="text"  @click="addChildren(scope.row)">娣诲姞椤圭洰</el-button>
                           <el-button type="text" @click="delChildren(scope.row,scope.$index,true)">鍒犻櫎琛�</el-button>
                       </div>
@@ -358,7 +358,6 @@
       },
       // 纭鍥炶皟
       selectPart(param, nodePart, index) {
-        console.log(param)
         if (typeof param !== 'undefined') {
           this.dataForm.code = param.code
           this.dataForm.name = param.name
@@ -442,13 +441,14 @@
       },
       // 娣诲姞琛�
       clickAddLine(row) {
-        console.log(row);
         let ele = {
-            father: row.father?row.father:null,
+            fId: Math.random(),
+            father: null,
             iid: Math.random(),
             children:[]
         }
         if(row){
+          ele.father = row.father?row.father:null
           row.children.forEach(item => {
               ele.children.push({
                 deviceId: null,
@@ -472,7 +472,7 @@
             this.list.push(ele)
           })
         }else{
-          ele.push({
+          ele.children.push({
               deviceId: null,
               deviceName: null,
               iid: Math.random(),

--
Gitblit v1.9.3