From e9e0a3541f090f1d95786a4da0330985cf6e7614 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 30 十一月 2023 15:20:24 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/plan/manufacturingorder/productorder-form.vue | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/views/plan/manufacturingorder/productorder-form.vue b/src/views/plan/manufacturingorder/productorder-form.vue
index 212ad12..ba11120 100644
--- a/src/views/plan/manufacturingorder/productorder-form.vue
+++ b/src/views/plan/manufacturingorder/productorder-form.vue
@@ -501,7 +501,7 @@
@refreshTestStandardInfo="refreshTestStandardInfo"
></testStandardTable>
</el-tab-pane>
- <el-tab-pane
+ <!-- <el-tab-pane
label="鎶芥瑙勫垯"
key="tb2"
id="tb2"
@@ -587,7 +587,7 @@
</el-table>
</div>
</div>
- </el-tab-pane>
+ </el-tab-pane> -->
</el-tabs>
</el-col>
</el-row>
@@ -638,17 +638,11 @@
</el-row>
<el-row>
<el-table
- default-expand-all
- :data="components"
+ :data="components[0]"
@selection-change="structSelectionChange"
- row-key="id"
border
- :tree-props="{
- children: 'children'
- }"
style="width: 100%"
height="400px"
- :default-sort="{ prop: 'index' }"
>
<el-table-column type="selection" width="40" fixed="left" />
<el-table-column
@@ -759,7 +753,7 @@
</el-table-column>
</el-table>
</el-row>
- <el-row>
+ <!-- <el-row>
<el-col :span="24"
><div style="margin-top:5px;">
<span style="font-size:12px;">澶栧崗鍙戞枡琛�</span>
@@ -851,7 +845,7 @@
</el-table-column>
</el-table>
</el-col>
- </el-row>
+ </el-row> -->
</el-tab-pane>
<el-tab-pane label="瀹㈡埛璁㈠崟" id="ta3" key="ta3" name="ta3">
<CustomerOrder :orderId="dataForm.id" />
@@ -1071,6 +1065,7 @@
data() {
return {
+ componentsTable:[],
typeOptions: [],
paramTemplateSelArr: [],
paramTemplateSelCol: 'operationTemplateNo',
@@ -1232,6 +1227,7 @@
this.getBomTypeDbOptions()
this.getManufactureAttrs('manufacture_attr_type')
this.getSysParam(sysParam.IS_REPORT_OPERATION)
+ // console.log(this.components);
},
watch: {
'dataForm.partId'(newValue, oldValue) {
@@ -1245,7 +1241,11 @@
}
}
},
-
+ components(newVal,oldVal){
+ console.log("鏂�",newVal);
+ console.log("鑰�",oldVal);
+ console.log(this.components);
+ },
currentRouting(newValue, oldValue) {
if (newValue && newValue.id) {
if (this.dataForm.id != null && this.dataForm.id !== 0) {
@@ -1295,7 +1295,8 @@
if (newValue && newValue.id) {
// 鏌ヨ浜у搧缁撴瀯瀵瑰簲鐨勭粍浠�
getBom(newValue.id).then((response) => {
- this.components = [response.data.data.tree]
+ console.log("鏌�",this.components);
+ // this.components = [response.data.data.tree]
})
}
},
@@ -1397,6 +1398,7 @@
},
// 鏌ヨ褰撳墠杞﹂棿璁㈠崟淇℃伅
getOrderInfo() {
+ let that=this
getManufacturingOrder(this.dataForm.id).then((response) => {
this.dataForm = response.data.data
// 鎶婂伐鑹烘寕涓婂幓
@@ -1416,7 +1418,7 @@
}
// 鎶婁骇鍝佺粨鏋勭粍浠舵寕涓婂幓
if (this.dataForm.bomRoot) {
- this.components = [this.dataForm.bomRoot]
+ that.components = [this.dataForm.bomRoot]
}
})
},
--
Gitblit v1.9.3