From c52465ae99f341ccb5139a95cf24d647672765d7 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 22 十一月 2023 13:26:30 +0800
Subject: [PATCH] 	modified:   src/views/quality/finishedProductInspection/finishedProducter-print.vue 	modified:   src/views/quality/finishedProductInspection/index.vue 	modified:   src/views/quality/teststandard/index.vue

---
 src/views/technology/completeproductstructure/completeproductstructure-form.vue |   49 ++++++++++++++++++++++++++++++++-----------------
 1 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/views/technology/completeproductstructure/completeproductstructure-form.vue b/src/views/technology/completeproductstructure/completeproductstructure-form.vue
index d0bdc16..74b5c07 100644
--- a/src/views/technology/completeproductstructure/completeproductstructure-form.vue
+++ b/src/views/technology/completeproductstructure/completeproductstructure-form.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="height: 100%">
     <div class="page-header">
       <div class="header-left">
         <a @click="$router.go(-1)"><i class="icon-btn-back"></i></a>
@@ -25,7 +25,7 @@
           <el-row>
             <el-col :span="24">
               <el-form-item label="BOM缂栧彿">
-                <el-input v-model="treeForm.number" placeholder="BOM缂栧彿">
+                <el-input v-model="treeForm.number" disabled placeholder="BOM缂栧彿">
                 </el-input>
               </el-form-item>
 
@@ -125,7 +125,7 @@
             style="width: 100%;"
             row-key="id"
             border
-            height="580"
+            height="720"
             default-expand-all
             @expand-change="expandChange"
             :row-class-name="tableRowClassName"
@@ -134,6 +134,7 @@
             <el-table-column label="闆朵欢鍚嶇О" prop="partName"></el-table-column>
             <el-table-column label="鍗曚綅" prop="unit"></el-table-column>
             <el-table-column label="鏁伴噺" prop="qpa"></el-table-column>
+            <el-table-column label="鐩樻暟" prop="discNum"></el-table-column>
           </el-table>
           <!-- <el-table
             class="tree-select-table"
@@ -238,7 +239,8 @@
   getPartAllStructureExt,
   addObj,
   getObj,
-  putObj
+  putObj,
+  updateObj
 } from '@/api/technology/completeproductstructure'
 import { remote } from '@/api/admin/dict'
 import productStructureDialog from '@/views/common/productstructure.vue'
@@ -339,17 +341,22 @@
       if (this.dataForm.id) {
         getObj(this.dataForm.id).then((response) => {
           var resultData = response.data.data
-          this.treeForm.partId = resultData.partId
-          this.treeForm.partNo = resultData.partNo
-          this.treeForm.partName = resultData.partName
-          this.treeForm.number = resultData.number
-          this.treeForm.insulationColor = resultData.insulationColor
-          this.treeForm.sheathColor = resultData.sheathColor
-          this.treeForm.characteristicOne = resultData.characteristicOne
-          this.treeForm.version = resultData.version
-          this.treeForm.alternativeNo = resultData.alternativeNo
-          this.treeForm.alternativeDesc = resultData.alternativeDesc
-          this.treeForm.bomTypeDb = resultData.bomTypeDb
+          console.log(resultData)
+          this.treeForm = resultData
+          // this.treeForm.id = resultData.id
+          // this.treeForm.partId = resultData.partId
+          // this.treeForm.partNo = resultData.partNo
+          // this.treeForm.partName = resultData.partName
+          // this.treeForm.number = resultData.number
+          // this.treeForm.insulationColor = resultData.insulationColor
+          // this.treeForm.sheathColor = resultData.sheathColor
+          // this.treeForm.characteristicOne = resultData.characteristicOne
+          // this.treeForm.version = resultData.version
+          // this.treeForm.alternativeNo = resultData.alternativeNo
+          // this.treeForm.alternativeDesc = resultData.alternativeDesc
+          // this.treeForm.bomTypeDb = resultData.bomTypeDb
+          // this.treeForm.state = resultData.state
+          // this.treeForm.remark = resultData.remark
           this.dataForm.state = resultData.state
           this.preViewData = []
           this.preViewData.push(resultData.tree)
@@ -412,7 +419,15 @@
       }
     },
     dataFormSubmit() {
-      console.log(this.treeForm)
+      let data = this.treeForm
+      if(data.id != null){
+        updateObj(data).then(res=>{
+          this.$message.success("淇濆瓨鎴愬姛")
+
+        }).catch(error=>{
+          this.$message.error("淇濆瓨澶辫触")
+        })
+      }
       // const mapTree = (org) => {
       //   const haveChildren =
       //     Array.isArray(org.children) && org.children.length > 0
@@ -1008,7 +1023,7 @@
 .completeProductStructure-design {
   float: left;
   width: 100%;
-  height: 650px;
+  height: 800px;
   padding: 10px 20px;
   border: 1px solid #ddd;
   background-color: #fff;

--
Gitblit v1.9.3