From 9ae95491e7a06db3da572ddf98a08cd4694fe034 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 11 十月 2023 17:40:11 +0800
Subject: [PATCH] modified: src/views/plan/customerorder/customerorder-form.vue modified: src/views/plan/masterproductionschedule/index.vue
---
src/views/plan/masterproductionschedule/index.vue | 16 ++++++++--------
src/views/plan/customerorder/customerorder-form.vue | 17 ++++++++++-------
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index 30be3cd..6c5ec49 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -144,9 +144,9 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="閿�鍞暟閲�" prop="buyQtyDue">
+ <el-form-item label="閿�鍞暟閲�" prop="otcQuantity">
<el-input
- v-model="dataForm.buyQtyDue"
+ v-model="dataForm.otcQuantity"
placeholder=""
:disabled="!ediSource"
></el-input>
@@ -786,7 +786,7 @@
coLineNo: '',
partNo: '',
customerPartName: '',
- buyQtyDue: '',
+ otcQuantity: '',
wantedDeliveryDate: '',
plannedDeliveryDate: '',
customerPoNo: '',
@@ -803,7 +803,7 @@
ifsConvFactor: null,
unit: null,
otcUnit: null,
- buyQtyDue: null,
+ otcQuantity: null,
docNumber: null,
manufactureAttr: 'N',
customerPartSpec: null,
@@ -842,7 +842,7 @@
coState: [],
coLineNo: [],
partNo: [{ required: true, message: '闆朵欢涓嶈兘涓虹┖', trigger: 'blur' }],
- buyQtyDue: [
+ otcQuantity: [
{ required: true, message: '閿�鍞暟閲忎笉鑳戒负绌�', trigger: 'blur' },
{ validator: validateSixDecimal, trigger: 'blur' }
],
@@ -959,7 +959,7 @@
if (!this.dataForm.id) {
return true
}
- if (this.dataForm.id && this.dataForm.sourceId !== 'GSM') {
+ if (this.dataForm.id && (this.dataForm.sourceId != null && this.dataForm.sourceId !== 'GSM')) {
return true
}
return false
@@ -997,7 +997,10 @@
this.dataForm = response.data.data
// }
// this.fileList = response.data.data.customerOrderAttachmentList
- this.getFileList()
+ const sourceId = response.data.data.sourceId
+ if(sourceId != null){
+ this.getFileList()
+ }
this.orderParamList = response.data.data.orderParamList
this.title =
this.dataForm.customerName + this.dataForm.customerOrderNo
diff --git a/src/views/plan/masterproductionschedule/index.vue b/src/views/plan/masterproductionschedule/index.vue
index 988e12c..38dffbb 100644
--- a/src/views/plan/masterproductionschedule/index.vue
+++ b/src/views/plan/masterproductionschedule/index.vue
@@ -46,7 +46,7 @@
</el-dropdown-menu>
</el-dropdown>
- <el-dropdown
+ <!-- <el-dropdown
v-if="permissions.masterproductionschedule_doc_relate"
@command="documentHandle"
style="margin-left: 10px"
@@ -63,7 +63,7 @@
{{ item.label }}
</el-dropdown-item>
</el-dropdown-menu>
- </el-dropdown>
+ </el-dropdown> -->
<!--瀹℃牳鐘舵�佹敼鍙�-->
<el-dropdown
v-if="permissions.masterproductionschedule_audit_change"
@@ -598,12 +598,12 @@
size: 'small',
fun: this.customReserved
},
- {
- text: '鏌ョ湅搴撳瓨',
- type: 'text',
- size: 'small',
- fun: this.stockHandle
- },
+ // {
+ // text: '鏌ョ湅搴撳瓨',
+ // type: 'text',
+ // size: 'small',
+ // fun: this.stockHandle
+ // },
{
text: '鏉ユ簮',
type: 'text',
--
Gitblit v1.9.3