From a20489fcb197b876a0570b1aa9e3bd0994c722a0 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 02 十一月 2023 12:32:49 +0800
Subject: [PATCH] s
---
src/views/plan/customerorder/customerorder-form.vue | 417 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 238 insertions(+), 179 deletions(-)
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index 30be3cd..9427657 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -26,23 +26,23 @@
class="l-mes"
:disabled="!editable"
>
- <el-tabs type="border-card" ref="tabs">
+ <el-tabs type="border-card" ref="tabs" @tab-click="tabsClick">
<el-tab-pane label="涓昏" type="card">
<el-row>
<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,98 +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="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="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">
@@ -214,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
@@ -224,9 +248,35 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="涓氬姟鍛�" prop="salesmanName">
+ <el-form-item label="宸ヨ壓鏂囦欢鍚嶇О" prop="docName">
<el-input
- v-model="dataForm.salesmanName"
+ v-model="dataForm.docName"
+ placeholder=""
+ disabled
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍗曚綅" prop="otcUnit">
+ <el-select
+ v-model="dataForm.otcUnit"
+ placeholder=""
+ filterable
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in units"
+ :key="item.id"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </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>
@@ -234,27 +284,7 @@
</el-col>
</el-row>
<el-row>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="璐ㄩ噺瑕佹眰" prop="qualityRequire">
- <el-input
- v-model="dataForm.qualityRequire"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鐢熶骇闇�姹傝鏄�" prop="otherProductRequire">
- <el-input
- v-model="dataForm.otherProductRequire"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
+ <!-- <el-col :span="6">
<el-form-item label="绯荤粺" prop="divisionSystem">
<el-input
v-model="dataForm.divisionSystem"
@@ -262,28 +292,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"
@@ -291,8 +303,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"
@@ -309,10 +321,18 @@
disabled
></el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
<el-row>
<el-col :span="6">
+ <el-form-item label="鏀惰揣鍦板潃" prop="shippingAddress">
+ <el-input
+ v-model="dataForm.shippingAddress"
+ placeholder=""
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <!-- <el-col :span="6">
<el-form-item label="OTC鎺ㄩ�佺姸鎬�" prop="remark">
<span>{{
dataForm.otcPartSync != null
@@ -322,16 +342,31 @@
: ''
}}</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="comment">
<el-input
type="textarea"
:rows="3"
placeholder=""
- v-model="dataForm.orderDescription"
+ v-model="dataForm.comment"
+ maxlength="500"
+ show-word-limit
+ >
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="24">
+ <el-form-item label="浜у搧澶囨敞" prop="remark">
+ <el-input
+ type="textarea"
+ :rows="3"
+ placeholder=""
+ v-model="dataForm.remark"
maxlength="500"
show-word-limit
>
@@ -609,15 +644,16 @@
show-overflow-tooltip
>
</el-table-column>
- <el-table-column prop="lineNumber" align="center" label="琛屽彿">
- </el-table-column>
+ <!-- <el-table-column prop="lineNumber" align="center" label="琛屽彿"> -->
+ <!-- </el-table-column> -->
<el-table-column
prop="originalFileName"
align="center"
label="鍘熸枃浠跺悕"
+ width="200"
>
</el-table-column>
- <el-table-column prop="fileName" align="center" label="鏂囦欢鍚�">
+ <el-table-column prop="fileName" align="center" label="鏂囦欢鍚庣紑">
</el-table-column>
<el-table-column prop="createUser" align="center" label="涓婁紶浜�">
</el-table-column>
@@ -650,18 +686,18 @@
<!-- </el-table-column>-->
<el-table-column fixed="right" align="center" label="鎿嶄綔">
<template slot-scope="scope">
- <el-button
+ <!-- <el-button
@click="synchronizeFile(scope.row)"
type="text"
size="small"
- :disabled="scope.row.lineNumber !== dataForm.otcLineNo"
+ :disabled="scope.row.lineNumber !== dataForm.customerNo"
>鍚屾</el-button
- >
+ > -->
<el-button
@click="delProcessConfigFile(scope.row)"
type="text"
size="small"
- :disabled="scope.row.lineNumber !== dataForm.otcLineNo"
+ :disabled="scope.row.lineNumber !== dataForm.customerNo"
>鍒犻櫎</el-button
>
<el-button
@@ -722,6 +758,7 @@
getCustomerOrder,
addCustomerOrder,
putCustomerOrder,
+ updateCustomerOrderById,
download,
getOtcCustomerOrderFileList,
otcDownload,
@@ -779,14 +816,36 @@
dataForm: {
id: 0,
sourceId: '',
- customerOrderNo: '',
+ contractNo: '',
customerNo: '',
customerName: '',
- coState: '',
- coLineNo: '',
+ returnStatus: '',
+ deliveryDate: '',
+ salesMan: '',
+ salerWorkCode: '',
+ manufactureAttr: '',
+ buyQtyDue: 0,
+ productName: '',
+ productType: '',
partNo: '',
+ docNumber: '',
+ docName: '',
+ shippingAddress: '',
+ remark: '',
+ otcUnit: '',
+ coState: '',
+ customerPartSpec: '',
+ entityName: '',
+ factoryPlaceOrderDate: '',
+ isCp: '',
+ originalContractStatus: '',
+ placeOrderDate: '',
+ province: '',
+
+ customerOrderNo: '',
+ coLineNo: '',
customerPartName: '',
- buyQtyDue: '',
+ otcQuantity: '',
wantedDeliveryDate: '',
plannedDeliveryDate: '',
customerPoNo: '',
@@ -802,11 +861,7 @@
ifsSalesUnit: null,
ifsConvFactor: null,
unit: null,
- otcUnit: null,
- buyQtyDue: null,
- docNumber: null,
- manufactureAttr: 'N',
- customerPartSpec: null,
+ otcQuantity: null,
division: null,
printType: null,
printingRequirements: null,
@@ -815,14 +870,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,
@@ -842,7 +893,7 @@
coState: [],
coLineNo: [],
partNo: [{ required: true, message: '闆朵欢涓嶈兘涓虹┖', trigger: 'blur' }],
- buyQtyDue: [
+ otcQuantity: [
{ required: true, message: '閿�鍞暟閲忎笉鑳戒负绌�', trigger: 'blur' },
{ validator: validateSixDecimal, trigger: 'blur' }
],
@@ -959,7 +1010,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
@@ -970,6 +1021,11 @@
this.getManufactureAttrs('manufacture_attr_type')
},
methods: {
+ tabsClick(tab,even){
+ if(tab.index == 2){
+ this.getConfigFiles();
+ }
+ },
init(id) {
this.orderParamList = []
this.dataForm.id = id || 0
@@ -995,9 +1051,13 @@
// } else {
// console.log('2')
this.dataForm = response.data.data
+
// }
// this.fileList = response.data.data.customerOrderAttachmentList
- this.getFileList()
+ 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
@@ -1009,7 +1069,6 @@
// this.this.configContent.modelType = '01'
// this.configContent.orderId = this.dataForm.id
// this.configContent.orderId = response.data.data.customerOrderNo
- console.log(response.data.data)
if (response.data.data.processConfigDTO) {
// 鏈変繚瀛樼殑鏁版嵁
this.configContent = response.data.data.processConfigDTO
@@ -1053,7 +1112,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 +1166,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
@@ -1209,8 +1268,8 @@
delOutPutBatch(row) {},
addOutPutBatch() {},
submitUpload() {
- this.paramData.orderNumber = this.dataForm.customerOrderNo
- this.paramData.lineNumber = this.dataForm.otcLineNo
+ this.paramData.orderNumber = this.dataForm.contractNo
+ this.paramData.lineNumber = this.dataForm.customerNo
this.progrecessFileLoading = true
},
uploadSuccess() {
@@ -1219,8 +1278,8 @@
},
getConfigFiles() {
const param = {
- orderNumber: this.dataForm.customerOrderNo,
- lineNumber: this.dataForm.otcLineNo
+ orderNumber: this.dataForm.contractNo,
+ lineNumber: this.dataForm.customerNo
}
getProcessConfigFiles(param).then((res) => {
this.processConfigFileTableData = res.data.data
--
Gitblit v1.9.3