From 262919ad055f1b5bca47171badf090ca5f5fccba Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 16 十月 2023 09:32:01 +0800
Subject: [PATCH] modified: src/api/plan/customerorder.js modified: src/views/plan/customerorder/customerorder-form.vue modified: vue.config.js
---
src/views/plan/customerorder/customerorder-form.vue | 328 +++++++++++++++++++++++++++++-------------------------
1 files changed, 176 insertions(+), 152 deletions(-)
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index e33a374..f1bb5ec 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"
+ 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>
@@ -71,9 +71,15 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="瀹㈡埛璁㈠崟鐘舵��" prop="coState">
- <el-select
- v-model="dataForm.coState"
+ <el-form-item label="瀹㈡埛璁㈠崟鐘舵��" prop="returnStatus">
+ <el-input
+ v-model="dataForm.returnStatus"
+ placeholder=""
+ filterable
+ style="width: 100%"
+ disabled></el-input>
+ <!-- <el-select
+ v-model="dataForm.returnStatus"
placeholder=""
filterable
style="width: 100%"
@@ -86,13 +92,13 @@
:value="item.value"
:disabled="!ediSource"
/>
- </el-select>
+ </el-select> -->
</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"
@@ -102,89 +108,12 @@
</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="packageRequire">
+ <el-form-item label="涓氬姟鍛�" prop="salesMan">
<el-input
- v-model="dataForm.packageRequire"
+ 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="闆朵欢鍙�" 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="閿�鍞欢鍙�" 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">
@@ -205,6 +134,110 @@
</el-select>
</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="packageRequire">
+ <el-input
+ v-model="dataForm.packageRequire"
+ 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="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="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">
<el-form-item label="宸ヨ壓鏂囦欢鍙�" prop="docNumber">
<el-input
@@ -215,11 +248,10 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="涓氬姟鍛�" prop="salesmanName">
+ <el-form-item label="鏀惰揣鍦板潃" prop="shippingAddress">
<el-input
- v-model="dataForm.salesmanName"
+ v-model="dataForm.shippingAddress"
placeholder=""
- disabled
></el-input>
</el-form-item>
</el-col>
@@ -227,7 +259,7 @@
<el-row>
</el-row>
<el-row>
- <el-col :span="6">
+ <!-- <el-col :span="6">
<el-form-item label="璐ㄩ噺瑕佹眰" prop="qualityRequire">
<el-input
v-model="dataForm.qualityRequire"
@@ -235,8 +267,8 @@
disabled
></el-input>
</el-form-item>
- </el-col>
- <el-col :span="6">
+ </el-col> -->
+ <!-- <el-col :span="6">
<el-form-item label="鐢熶骇闇�姹傝鏄�" prop="otherProductRequire">
<el-input
v-model="dataForm.otherProductRequire"
@@ -244,8 +276,8 @@
disabled
></el-input>
</el-form-item>
- </el-col>
- <el-col :span="6">
+ </el-col> -->
+ <!-- <el-col :span="6">
<el-form-item label="绯荤粺" prop="divisionSystem">
<el-input
v-model="dataForm.divisionSystem"
@@ -253,28 +285,10 @@
disabled
></el-input>
</el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鏀惰揣鍦板潃" prop="shippingAddress">
- <el-input
- v-model="dataForm.shippingAddress"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
+ </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"
@@ -282,8 +296,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"
@@ -300,19 +314,10 @@
disabled
></el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
</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-col :span="6">
<el-form-item label="OTC鎺ㄩ�佺姸鎬�" prop="remark">
<span>{{
dataForm.otcPartSync != null
@@ -322,16 +327,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
>
@@ -339,7 +344,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 +359,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">
@@ -722,6 +727,7 @@
getCustomerOrder,
addCustomerOrder,
putCustomerOrder,
+ updateCustomerOrderById,
download,
getOtcCustomerOrderFileList,
otcDownload,
@@ -776,17 +782,39 @@
showSynchronize: false,
selectOrderParam: null,
selectOrderObj: {},
+ aaaaa:{},
dataForm: {
id: 0,
sourceId: '',
- customerOrderNo: '',
+ contractNo: '',
customerNo: '',
customerName: '',
- coState: '',
- coLineNo: '',
+ returnStatus: '',
+ deliveryDate: '',
+ salesMan: '',
+ salerWorkCode: '',
+ manufactureAttr: '',
+ buyQtyDue: 0,
+ productName: '',
+ productType: '',
partNo: '',
+ docNumber: '',
+ shippingAddress: '',
+ remark: '',
+ otcUnit: '',
+ coState: '',
+ customerPartSpec: '',
+ entityName: '',
+ factoryPlaceOrderDate: '',
+ isCp: '',
+ originalContractStatus: '',
+ placeOrderDate: '',
+ province: '',
+
+ customerOrderNo: '',
+ coLineNo: '',
customerPartName: '',
- buyQtyDue: '',
+ otcQuantity: '',
wantedDeliveryDate: '',
plannedDeliveryDate: '',
customerPoNo: '',
@@ -802,11 +830,7 @@
ifsSalesUnit: null,
ifsConvFactor: null,
unit: null,
- otcUnit: null,
otcQuantity: null,
- docNumber: null,
- manufactureAttr: 'N',
- customerPartSpec: null,
division: null,
printType: null,
printingRequirements: null,
@@ -815,14 +839,10 @@
qualityRequire: null,
otherProductRequire: null,
divisionSystem: null,
- shippingAddress: null,
- salesmanName: null,
lengthRequirement: null,
- remark: null,
otcPartSync: null,
finalCustomerName: null,
productGroup: null,
- productType: null,
centralizedMiningProperty: null,
orderDescription: null,
otcLineNo: null,
@@ -959,7 +979,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 +1017,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
@@ -1053,7 +1077,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) {
@@ -1107,7 +1131,7 @@
this.$refs.dataForm.validate((valid) => {
if (valid) {
if (this.dataForm.id) {
- putCustomerOrder(this.dataForm)
+ updateCustomerOrderById(this.dataForm)
.then((data) => {
this.$message.success('淇敼鎴愬姛')
this.visible = false
--
Gitblit v1.9.3