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/plan/manufacturingorder/productorder-form.vue | 36 +++++++++++-------------------------
1 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/src/views/plan/manufacturingorder/productorder-form.vue b/src/views/plan/manufacturingorder/productorder-form.vue
index d4fcf52..affcd01 100644
--- a/src/views/plan/manufacturingorder/productorder-form.vue
+++ b/src/views/plan/manufacturingorder/productorder-form.vue
@@ -89,6 +89,7 @@
<el-col :span="3">
<el-form-item label="瀹屾垚鏁伴噺" prop="qtyFinished">
<el-input-number
+ style= "width: 90%"
v-model="dataForm.qtyFinished"
placeholder=""
:controls="false"
@@ -107,7 +108,7 @@
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <!-- <el-col :span="6">
<el-form-item label="澶栨姢棰滆壊" prop="outerColor">
<el-input
readonly
@@ -124,10 +125,8 @@
placeholder=""
></el-input>
</el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="10">
- <el-col :span="6">
+ </el-col> -->
+ <el-col :span="6">
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="dataForm.remark" placeholder=""></el-input>
</el-form-item>
@@ -150,7 +149,8 @@
</el-select>
</el-form-item>
</el-col>
- <el-col
+ </el-row>
+ <!-- <el-col
:span="2"
v-if="permissions.plan_manufacturingorder_bom_sure"
>
@@ -175,8 +175,8 @@
<el-switch v-model="dataForm.standardConfirmStatus">
</el-switch>
</el-form-item>
- </el-col>
- <el-col :span="2">
+ </el-col> -->
+ <!-- <el-col :span="2">
<el-form-item
label="IFS杞﹂棿璁㈠崟鎺ユ敹鏃舵姤鍛婂伐搴�"
prop="isReportOperation"
@@ -185,7 +185,7 @@
<el-switch v-model="dataForm.isReportOperation" disabled>
</el-switch>
</el-form-item>
- </el-col>
+ </el-col> -->
<!-- <el-col :span="2">
<el-form-item label="BOM纭">
<el-switch >
@@ -204,7 +204,7 @@
</el-switch>
</el-form-item>
</el-col> -->
- </el-row>
+
</div>
<div class="productorder-detail">
<el-card class="productorder-list">
@@ -226,15 +226,7 @@
<el-option
v-for="item in dataForm.routingList"
:key="item.id"
- :label="
- item.routingNo +
- '-' +
- item.bomTypeDb +
- '-' +
- item.alternativeNo +
- '-' +
- item.alternativeDesc
- "
+ :label="item.routingNo "
:value="item.id"
>
</el-option>
@@ -1224,7 +1216,6 @@
this.getBomTypeDbOptions()
this.getManufactureAttrs('manufacture_attr_type')
this.getSysParam(sysParam.IS_REPORT_OPERATION)
- // console.log(this.components);
},
watch: {
'dataForm.partId'(newValue, oldValue) {
@@ -1239,9 +1230,6 @@
}
},
components(newVal,oldVal){
- console.log("鏂�",newVal);
- console.log("鑰�",oldVal);
- console.log(this.components);
},
currentRouting(newValue, oldValue) {
if (newValue && newValue.id) {
@@ -1292,7 +1280,6 @@
if (newValue && newValue.id) {
// 鏌ヨ浜у搧缁撴瀯瀵瑰簲鐨勭粍浠�
getBom(newValue.id).then((response) => {
- console.log("鏌�",this.components);
// this.components = [response.data.data.tree]
})
}
@@ -2096,7 +2083,6 @@
},
// 鏂板宸ュ簭
addOperation(operation) {
- console.log('operation', operation)
},
insertOperation(operation) {},
structSelectionChange(val) {
--
Gitblit v1.9.3