From 67da82f0b0c24df5f19bbfcfec63801d9ae902d8 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 16:22:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/technology/completeproductstructure/completeproductstructure-form.vue | 43 ++++++++-----------------------------------
1 files changed, 8 insertions(+), 35 deletions(-)
diff --git a/src/views/technology/completeproductstructure/completeproductstructure-form.vue b/src/views/technology/completeproductstructure/completeproductstructure-form.vue
index c821f69..93e1376 100644
--- a/src/views/technology/completeproductstructure/completeproductstructure-form.vue
+++ b/src/views/technology/completeproductstructure/completeproductstructure-form.vue
@@ -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>
@@ -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"
@@ -299,7 +294,6 @@
},
computed: {
editable: function() {
- console.log()
if (!this.dataForm.id) {
return true
}
@@ -340,32 +334,11 @@
if (this.dataForm.id) {
getObj(this.dataForm.id).then((response) => {
var resultData = response.data.data
- 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)
this.tableData = resultData.bomComponentVOS
- // getPartAllStructureExt(this.treeForm).then((res) => {
- // const result = res.data
- // if (result.code === 0) {
- // this.tableData.push(result.data)
- // }
- // })
})
} else {
this.initDefaultForm()
--
Gitblit v1.9.3