From 16c4c1498daae97306c5b4cea9631ffc10b943ac Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 13 十月 2023 12:57:04 +0800
Subject: [PATCH] modified: src/const/crud/customerOrder/customerOrderForm.js modified: src/views/common/ztt-table.vue modified: src/views/plan/customerorder/customerorder-form.vue modified: src/views/plan/customerorder/index.vue modified: src/views/plan/customerorder/sample-customerorder-form.vue
---
src/views/plan/customerorder/customerorder-form.vue | 67 ++++++++++++++++++---------------
1 files changed, 37 insertions(+), 30 deletions(-)
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index e33a374..452eca0 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -32,17 +32,17 @@
<el-col :span="6">
<el-form-item label="鍚屾鏁版嵁鏉ユ簮" prop="sourceId">
<el-input
- v-model="dataForm.sourceId"
+ v-model="dataForm.sourceId == 0 ? '鍚屾' : '鎵嬪姩'"
placeholder=""
:disabled="!ediSource"
></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>
@@ -71,9 +71,9 @@
</el-row>
<el-row>
<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%"
@@ -90,9 +90,9 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鏈熸湜浜よ揣鏃堕棿" prop="wantedDeliveryDate">
+ <el-form-item label="鏈熸湜浜よ揣鏃堕棿" prop="deliveryDate">
<el-date-picker
- v-model="dataForm.wantedDeliveryDate"
+ v-model="dataForm.deliveryDate"
style="width: 100%"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
@@ -123,7 +123,7 @@
</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
@@ -133,11 +133,20 @@
></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="otcQuantity">
+ <el-form-item label="閿�鍞暟閲�" prop="buyQtyDue">
<el-input
- v-model="dataForm.otcQuantity"
+ v-model="dataForm.buyQtyDue"
placeholder=""
:disabled="!ediSource"
></el-input>
@@ -154,9 +163,9 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="閿�鍞欢鍙�" prop="salesPartNo">
+ <el-form-item label="閿�鍞欢鍙�" prop="partNo">
<el-input
- v-model="dataForm.salesPartNo"
+ v-model="dataForm.partNo"
placeholder=""
disabled
>
@@ -215,9 +224,9 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="涓氬姟鍛�" prop="salesmanName">
+ <el-form-item label="涓氬姟鍛�" prop="salesMan">
<el-input
- v-model="dataForm.salesmanName"
+ v-model="dataForm.salesMan"
placeholder=""
disabled
></el-input>
@@ -266,7 +275,7 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="浜у搧绫诲瀷" prop="remark">
+ <el-form-item label="浜у搧绫诲瀷" prop="productType">
<el-input
v-model="dataForm.productType"
placeholder=""
@@ -304,15 +313,6 @@
</el-row>
<el-row>
<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="OTC鎺ㄩ�佺姸鎬�" prop="remark">
<span>{{
dataForm.otcPartSync != null
@@ -339,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%"
@@ -354,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">
@@ -779,13 +779,17 @@
dataForm: {
id: 0,
sourceId: '',
+ contractNo: '',
customerOrderNo: '',
+ returnStatus: '',
+ deliveryDate: '',
customerNo: '',
customerName: '',
coState: '',
coLineNo: '',
partNo: '',
customerPartName: '',
+ otcQuantity: '',
buyQtyDue: '',
wantedDeliveryDate: '',
plannedDeliveryDate: '',
@@ -816,7 +820,7 @@
otherProductRequire: null,
divisionSystem: null,
shippingAddress: null,
- salesmanName: null,
+ salesMan: null,
lengthRequirement: null,
remark: null,
otcPartSync: null,
@@ -959,7 +963,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 +1001,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