From 75e035a10a0faeff6b2ec4b9fcbf98d1536274f2 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 07 十二月 2023 10:57:15 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/technology/completeproductstructure/completeproductstructure-form.vue | 67 +++++++++++++++++++--------------
1 files changed, 38 insertions(+), 29 deletions(-)
diff --git a/src/views/technology/completeproductstructure/completeproductstructure-form.vue b/src/views/technology/completeproductstructure/completeproductstructure-form.vue
index b8febf2..b0931ef 100644
--- a/src/views/technology/completeproductstructure/completeproductstructure-form.vue
+++ b/src/views/technology/completeproductstructure/completeproductstructure-form.vue
@@ -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>
@@ -75,32 +75,26 @@
</el-input>
</el-form-item>
- <el-form-item label="鏇夸唬鍙�" prop="alternativeNo">
+ <!-- <el-form-item label="鏇夸唬鍙�" prop="alternativeNo">
<el-input
v-model="treeForm.alternativeNo"
placeholder="鏇夸唬鍙�"
disabled
>
</el-input>
- </el-form-item>
+ </el-form-item> -->
- <el-form-item label="鏇夸唬鎻忚堪" prop="alternativeDesc">
+ <!-- <el-form-item label="鏇夸唬鎻忚堪" prop="alternativeDesc">
<el-input
v-model="treeForm.alternativeDesc"
placeholder="鏇夸唬鎻忚堪"
disabled
>
</el-input>
- </el-form-item>
+ </el-form-item> -->
- <el-form-item label="缁濈紭棰滆壊">
- <el-input
- v-model="treeForm.insulationColor"
- placeholder="缁濈紭棰滆壊"
- >
- </el-input>
- </el-form-item>
- <el-form-item label="鎶ゅ棰滆壊">
+ <!-- -->
+ <!-- <el-form-item label="鎶ゅ棰滆壊">
<el-input v-model="treeForm.sheathColor" placeholder="鎶ゅ棰滆壊">
</el-input>
</el-form-item>
@@ -110,7 +104,7 @@
placeholder="鐗规��1"
>
</el-input>
- </el-form-item>
+ </el-form-item> -->
</el-col>
</el-row>
</el-form>
@@ -125,7 +119,7 @@
style="width: 100%;"
row-key="id"
border
- height="580"
+ height="720"
default-expand-all
@expand-change="expandChange"
:row-class-name="tableRowClassName"
@@ -134,6 +128,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 +233,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 +335,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 +413,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 +1017,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