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/customerorder/customerorder-form.vue | 243 ++++++++++--------------------------------------
1 files changed, 52 insertions(+), 191 deletions(-)
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index b56d973..6c5ec49 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -48,24 +48,6 @@
></el-input>
</el-form-item>
</el-col>
- <!-- <el-col :span="6">-->
- <!-- <el-form-item label="OTC琛屽彿" prop="otcLineNo">-->
- <!-- <el-input-->
- <!-- v-model="dataForm.otcLineNo"-->
- <!-- placeholder=""-->
- <!-- disabled-->
- <!-- ></el-input>-->
- <!-- </el-form-item>-->
- <!-- </el-col>-->
- <!-- <el-col :span="6">-->
- <!-- <el-form-item label="GSM琛屽彿" prop="coLineNo">-->
- <!-- <el-input-->
- <!-- v-model="dataForm.coLineNo"-->
- <!-- placeholder=""-->
- <!-- disabled-->
- <!-- ></el-input>-->
- <!-- </el-form-item>-->
- <!-- </el-col>-->
<el-col :span="6">
<el-form-item label="瀹㈡埛缂栧彿" prop="customerNo">
<el-input
@@ -88,24 +70,6 @@
</el-col>
</el-row>
<el-row>
- <!-- <el-col :span="6">
- <el-form-item label="瀹㈡埛鐨勯浂浠跺彿" prop="customerPartNo">
- <el-input
- v-model="dataForm.customerPartNo"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col> -->
- <!-- <el-col :span="6">-->
- <!-- <el-form-item label="IFS琛屽彿" prop="ifsLineNo">-->
- <!-- <el-input-->
- <!-- v-model="dataForm.ifsLineNo"-->
- <!-- placeholder=""-->
- <!-- disabled-->
- <!-- ></el-input>-->
- <!-- </el-form-item>-->
- <!-- </el-col>-->
<el-col :span="6">
<el-form-item label="瀹㈡埛璁㈠崟鐘舵��" prop="coState">
<el-select
@@ -125,39 +89,41 @@
</el-select>
</el-form-item>
</el-col>
- <!-- <el-col :span="6">
- <el-form-item label="琛屽彿" prop="coLineNo">
- <el-input
- v-model="dataForm.coLineNo"
- placeholder=""
+ <el-col :span="6">
+ <el-form-item label="鏈熸湜浜よ揣鏃堕棿" prop="wantedDeliveryDate">
+ <el-date-picker
+ v-model="dataForm.wantedDeliveryDate"
+ style="width: 100%"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
:disabled="!ediSource"
- ></el-input>
+ >
+ </el-date-picker>
</el-form-item>
- </el-col> -->
- <!-- <el-col :span="6">
- <el-form-item label="瀹㈡埛鐨勯浂浠惰鏍�" prop="customerPartName">
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="璁″垝浜よ揣鏃堕棿" prop="plannedDeliveryDate">
+ <el-date-picker
+ v-model="dataForm.plannedDeliveryDate"
+ style="width: 100%"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍖呰瑕佹眰" prop="packageRequire">
<el-input
- v-model="dataForm.customerPartName"
+ v-model="dataForm.packageRequire"
placeholder=""
disabled
></el-input>
</el-form-item>
- </el-col> -->
+ </el-col>
</el-row>
- <!-- <el-row>-->
-
- <!-- <el-col :span="6">-->
- <!-- <el-form-item label="IFS浜よ揣鍙�" prop="ifsDeliveryNo">-->
- <!-- <el-input-->
- <!-- v-model="dataForm.ifsDeliveryNo"-->
- <!-- placeholder=""-->
- <!-- disabled-->
- <!-- ></el-input>-->
- <!-- </el-form-item>-->
- <!-- </el-col>-->
- <!-- </el-row>-->
<el-row>
- <el-col :span="6">
+ <!-- <el-col :span="6">
<el-form-item label="闆朵欢鍙�" prop="partNo">
<el-input v-model="dataForm.partNo" placeholder="" readonly>
<el-button
@@ -166,6 +132,15 @@
@click="openPartDialog()"
></el-button>
</el-input>
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="6">
+ <el-form-item label="鐩橀暱瑕佹眰" prop="lengthRequirement">
+ <el-input
+ v-model="dataForm.lengthRequirement"
+ placeholder=""
+ disabled
+ ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -187,15 +162,6 @@
</el-input>
</el-form-item>
</el-col>
- <!-- <el-col :span="6">-->
- <!-- <el-form-item label="IFS琛岄」鍙�" prop="ifsLineItemNo">-->
- <!-- <el-input-->
- <!-- v-model="dataForm.ifsLineItemNo"-->
- <!-- placeholder=""-->
- <!-- disabled-->
- <!-- ></el-input>-->
- <!-- </el-form-item>-->
- <!-- </el-col>-->
<el-col :span="6">
<el-form-item label="閿�鍞欢鍙�" prop="salesPartNo">
<el-input
@@ -257,87 +223,17 @@
></el-input>
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item label="涓氬姟鍛�" prop="salesmanName">
+ <el-input
+ v-model="dataForm.salesmanName"
+ placeholder=""
+ disabled
+ ></el-input>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row>
- <el-col :span="6">
- <el-form-item label="鏈熸湜浜よ揣鏃堕棿" prop="wantedDeliveryDate">
- <el-date-picker
- v-model="dataForm.wantedDeliveryDate"
- style="width: 100%"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- :disabled="!ediSource"
- >
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="璁″垝浜よ揣鏃堕棿" prop="plannedDeliveryDate">
- <el-date-picker
- v-model="dataForm.plannedDeliveryDate"
- style="width: 100%"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- >
- </el-date-picker>
- </el-form-item>
- </el-col>
- <!-- <el-col :span="6">
- <el-form-item label="瀹㈡埛闆朵欢瑙勬牸" prop="customerPartSpec">
- <el-input
- v-model="dataForm.customerPartSpec"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col> -->
- <!-- <el-col :span="6">-->
- <!-- <el-form-item label="浜嬩笟閮�" prop="division">-->
- <!-- <el-input-->
- <!-- v-model="dataForm.division"-->
- <!-- placeholder=""-->
- <!-- disabled-->
- <!-- ></el-input>-->
- <!-- </el-form-item>-->
- <!-- </el-col>-->
- </el-row>
- <el-row>
- <!-- <el-col :span="6">
- <el-form-item label="鍗板瓧鏂瑰紡" prop="printType">
- <el-input
- v-model="dataForm.printType"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍗板瓧瑕佹眰" prop="printingRequirements">
- <el-input
- v-model="dataForm.printingRequirements"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍗板瓧鍐呭" prop="printContent">
- <el-input
- v-model="dataForm.printContent"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col> -->
- <el-col :span="6">
- <el-form-item label="鍖呰瑕佹眰" prop="packageRequire">
- <el-input
- v-model="dataForm.packageRequire"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
</el-row>
<el-row>
<el-col :span="6">
@@ -376,44 +272,6 @@
></el-input>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="涓氬姟鍛�" prop="salesmanName">
- <el-input
- v-model="dataForm.salesmanName"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鐩橀暱瑕佹眰" prop="lengthRequirement">
- <el-input
- v-model="dataForm.lengthRequirement"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
- <!-- <el-col :span="6">
- <el-form-item label="鏈�缁堝鎴�" prop="remark">
- <el-input
- v-model="dataForm.finalCustomerName"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col> -->
- <!-- <el-col :span="6">
- <el-form-item label="浜у搧鍒嗙粍" prop="remark">
- <el-input
- v-model="dataForm.productGroup"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col> -->
</el-row>
<el-row>
<el-col :span="6">
@@ -481,7 +339,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-card header="璁㈠崟鍙傛暟" shadow="never">
+ <!-- <el-card header="璁㈠崟鍙傛暟" shadow="never">
<el-row>
<el-form-item
style="float:left;width: 50%"
@@ -496,7 +354,7 @@
></el-input
></el-form-item>
</el-row>
- </el-card>
+ </el-card> -->
</el-tab-pane>
<el-tab-pane label="OTC闄勪欢" type="card">
<el-table :data="fileList" style="width: 100%" height="500">
@@ -928,7 +786,7 @@
coLineNo: '',
partNo: '',
customerPartName: '',
- buyQtyDue: '',
+ otcQuantity: '',
wantedDeliveryDate: '',
plannedDeliveryDate: '',
customerPoNo: '',
@@ -1101,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
@@ -1139,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
--
Gitblit v1.9.3