From 966aba5c5836fd565b7cbda905bade237c074a20 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 13 十月 2023 14:47:10 +0800
Subject: [PATCH] modified: src/views/plan/customerorder/customerorder-form.vue modified: src/views/plan/customerorder/schedule-table.vue
---
src/views/plan/customerorder/customerorder-form.vue | 411 +++++++++++++++++++---------------------------------------
1 files changed, 138 insertions(+), 273 deletions(-)
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index b56d973..bbe1d58 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -32,40 +32,22 @@
<el-col :span="6">
<el-form-item label="鍚屾鏁版嵁鏉ユ簮" prop="sourceId">
<el-input
- v-model="dataForm.sourceId"
+ v-model="dataForm.sourceId == 0 ? '鍚屾' : '鎵嬪姩'"
placeholder=""
- :disabled="!ediSource"
+ disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="璁㈠崟鍙�" prop="customerOrderNo">
+ <el-form-item label="璁㈠崟鍙�" prop="contractNo">
<el-input
- v-model="dataForm.customerOrderNo"
- @blur="dataForm.customerOrderNo = $event.target.value.trim()"
+ v-model="dataForm.contractNo"
+ @blur="dataForm.contractNo = $event.target.value.trim()"
placeholder=""
:disabled="!ediSource"
></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,28 +70,10 @@
</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-form-item label="瀹㈡埛璁㈠崟鐘舵��" prop="returnStatus">
<el-select
- v-model="dataForm.coState"
+ v-model="dataForm.returnStatus"
placeholder=""
filterable
style="width: 100%"
@@ -125,109 +89,25 @@
</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="deliveryDate">
+ <el-date-picker
+ v-model="dataForm.deliveryDate"
+ 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="salesMan">
<el-input
- v-model="dataForm.customerPartName"
+ v-model="dataForm.salesMan"
placeholder=""
disabled
></el-input>
- </el-form-item>
- </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-form-item label="闆朵欢鍙�" prop="partNo">
- <el-input v-model="dataForm.partNo" placeholder="" readonly>
- <el-button
- slot="append"
- icon="el-icon-search"
- @click="openPartDialog()"
- ></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="閿�鍞暟閲�" prop="otcQuantity">
- <el-input
- v-model="dataForm.otcQuantity"
- placeholder=""
- :disabled="!ediSource"
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="浜у搧鍚嶇О" prop="productName">
- <el-input
- v-model="dataForm.productName"
- placeholder=""
- disabled
- >
- </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
- v-model="dataForm.salesPartNo"
- placeholder=""
- disabled
- >
- <el-button
- slot="append"
- icon="el-icon-search"
- @click="openSalesPartDialog()"
- v-show="dataForm.id"
- ></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="閿�鍞欢鎻忚堪" prop="salesPartName">
- <el-input
- v-model="dataForm.salesPartName"
- placeholder=""
- disabled
- >
- <el-button
- slot="append"
- icon="el-icon-search"
- @click="openSalesPartDialog()"
- v-show="dataForm.id"
- ></el-button>
- </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -248,30 +128,7 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="宸ヨ壓鏂囦欢鍙�" prop="docNumber">
- <el-input
- v-model="dataForm.docNumber"
- 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-col :span="6">
<el-form-item label="璁″垝浜よ揣鏃堕棿" prop="plannedDeliveryDate">
<el-date-picker
v-model="dataForm.plannedDeliveryDate"
@@ -281,55 +138,8 @@
>
</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"
@@ -337,31 +147,95 @@
disabled
></el-input>
</el-form-item>
+ </el-col> -->
+ </el-row>
+ <el-row>
+ <!-- <el-col :span="6">
+ <el-form-item label="闆朵欢鍙�" prop="partNo">
+ <el-input v-model="dataForm.partNo" placeholder="" readonly>
+ <el-button
+ slot="append"
+ icon="el-icon-search"
+ @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">
+ <el-form-item label="閿�鍞暟閲�" prop="buyQtyDue">
+ <el-input
+ v-model="dataForm.buyQtyDue"
+ placeholder=""
+ :disabled="!ediSource"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="浜у搧鍚嶇О" prop="productName">
+ <el-input
+ v-model="dataForm.productName"
+ placeholder=""
+ disabled
+ >
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="浜у搧绫诲瀷" prop="productType">
+ <el-input
+ v-model="dataForm.productType"
+ placeholder=""
+ disabled
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="閿�鍞欢鍙�" prop="partNo">
+ <el-input
+ v-model="dataForm.partNo"
+ placeholder=""
+ disabled
+ >
+ <el-button
+ slot="append"
+ icon="el-icon-search"
+ @click="openSalesPartDialog()"
+ v-show="dataForm.id"
+ ></el-button>
+ </el-input>
+ </el-form-item>
</el-col>
</el-row>
<el-row>
- <el-col :span="6">
- <el-form-item label="璐ㄩ噺瑕佹眰" prop="qualityRequire">
+ <!-- <el-col :span="6">
+ <el-form-item label="閿�鍞欢鎻忚堪" prop="salesPartName">
<el-input
- v-model="dataForm.qualityRequire"
+ v-model="dataForm.salesPartName"
placeholder=""
disabled
- ></el-input>
+ >
+ <el-button
+ slot="append"
+ icon="el-icon-search"
+ @click="openSalesPartDialog()"
+ v-show="dataForm.id"
+ ></el-button>
+ </el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="6">
- <el-form-item label="鐢熶骇闇�姹傝鏄�" prop="otherProductRequire">
+ <el-form-item label="宸ヨ壓鏂囦欢鍙�" prop="docNumber">
<el-input
- v-model="dataForm.otherProductRequire"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="绯荤粺" prop="divisionSystem">
- <el-input
- v-model="dataForm.divisionSystem"
+ v-model="dataForm.docNumber"
placeholder=""
disabled
></el-input>
@@ -372,43 +246,35 @@
<el-input
v-model="dataForm.shippingAddress"
placeholder=""
- disabled
></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-row>
+ <el-row>
<!-- <el-col :span="6">
- <el-form-item label="鏈�缁堝鎴�" prop="remark">
+ <el-form-item label="璐ㄩ噺瑕佹眰" prop="qualityRequire">
<el-input
- v-model="dataForm.finalCustomerName"
+ v-model="dataForm.qualityRequire"
placeholder=""
disabled
></el-input>
</el-form-item>
</el-col> -->
<!-- <el-col :span="6">
- <el-form-item label="浜у搧鍒嗙粍" prop="remark">
+ <el-form-item label="鐢熶骇闇�姹傝鏄�" prop="otherProductRequire">
<el-input
- v-model="dataForm.productGroup"
+ v-model="dataForm.otherProductRequire"
+ placeholder=""
+ disabled
+ ></el-input>
+ </el-form-item>
+ </el-col> -->
+ <!-- <el-col :span="6">
+ <el-form-item label="绯荤粺" prop="divisionSystem">
+ <el-input
+ v-model="dataForm.divisionSystem"
placeholder=""
disabled
></el-input>
@@ -416,16 +282,7 @@
</el-col> -->
</el-row>
<el-row>
- <el-col :span="6">
- <el-form-item label="浜у搧绫诲瀷" prop="remark">
- <el-input
- v-model="dataForm.productType"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
+ <!-- <el-col :span="6">
<el-form-item label="閲囬泦鎬ц川" prop="centralizedMiningProperty">
<el-input
v-model="dataForm.centralizedMiningProperty"
@@ -433,8 +290,8 @@
disabled
></el-input>
</el-form-item>
- </el-col>
- <el-col :span="6">
+ </el-col> -->
+ <!-- <el-col :span="6">
<el-form-item label="璁㈠崟琛屽娉�" prop="remark">
<el-input
v-model="dataForm.remark"
@@ -451,10 +308,10 @@
disabled
></el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
<el-row>
- <el-col :span="6">
+ <!-- <el-col :span="6">
<el-form-item label="OTC鎺ㄩ�佺姸鎬�" prop="remark">
<span>{{
dataForm.otcPartSync != null
@@ -464,16 +321,16 @@
: ''
}}</span>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item label="璁㈠崟璇存槑" prop="orderDescription">
+ <el-form-item label="璁㈠崟璇存槑" prop="remark">
<el-input
type="textarea"
:rows="3"
placeholder=""
- v-model="dataForm.orderDescription"
+ v-model="dataForm.remark"
maxlength="500"
show-word-limit
>
@@ -481,7 +338,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 +353,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">
@@ -921,13 +778,17 @@
dataForm: {
id: 0,
sourceId: '',
+ contractNo: '',
customerOrderNo: '',
+ returnStatus: '',
+ deliveryDate: '',
customerNo: '',
customerName: '',
coState: '',
coLineNo: '',
partNo: '',
customerPartName: '',
+ otcQuantity: '',
buyQtyDue: '',
wantedDeliveryDate: '',
plannedDeliveryDate: '',
@@ -958,7 +819,7 @@
otherProductRequire: null,
divisionSystem: null,
shippingAddress: null,
- salesmanName: null,
+ salesMan: null,
lengthRequirement: null,
remark: null,
otcPartSync: null,
@@ -1101,7 +962,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 +1000,11 @@
this.dataForm = response.data.data
// }
// this.fileList = response.data.data.customerOrderAttachmentList
- this.getFileList()
+ console.log(response.data.data.sourceId);
+ const sourceId = response.data.data.sourceId
+ if(sourceId === '0'){
+ this.getFileList()
+ }
this.orderParamList = response.data.data.orderParamList
this.title =
this.dataForm.customerName + this.dataForm.customerOrderNo
@@ -1195,7 +1060,7 @@
},
getFileList() {
this.fileList = []
- const queryParam = { orderNumber: this.dataForm.customerOrderNo }
+ const queryParam = { orderNumber: this.dataForm.contractNo }
getOtcCustomerOrderFileList(queryParam).then((response) => {
const resData = response.data
if (resData.code === 0) {
--
Gitblit v1.9.3