From 99494d05f34ad75fc82fd9a5355dbe6118a1639c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 18 十月 2023 11:12:29 +0800
Subject: [PATCH] modified: src/const/crud/customerOrder/customerOrderForm.js modified: src/util/date.js 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 | 358 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 192 insertions(+), 166 deletions(-)
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index 452eca0..c19dd65 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -26,7 +26,7 @@
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">
@@ -34,7 +34,7 @@
<el-input
v-model="dataForm.sourceId == 0 ? '鍚屾' : '鎵嬪姩'"
placeholder=""
- :disabled="!ediSource"
+ disabled
></el-input>
</el-form-item>
</el-col>
@@ -72,7 +72,13 @@
<el-row>
<el-col :span="6">
<el-form-item label="瀹㈡埛璁㈠崟鐘舵��" prop="returnStatus">
- <el-select
+ <el-input
+ v-model="dataForm.returnStatus"
+ placeholder=""
+ filterable
+ style="width: 100%"
+ disabled></el-input>
+ <!-- <el-select
v-model="dataForm.returnStatus"
placeholder=""
filterable
@@ -86,7 +92,7 @@
:value="item.value"
:disabled="!ediSource"
/>
- </el-select>
+ </el-select> -->
</el-form-item>
</el-col>
<el-col :span="6">
@@ -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="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">
@@ -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,34 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="涓氬姟鍛�" prop="salesMan">
+ <el-form-item label="鏀惰揣鍦板潃" prop="shippingAddress">
<el-input
- v-model="dataForm.salesMan"
+ v-model="dataForm.shippingAddress"
+ placeholder=""
+ ></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 +283,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 +291,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="productType">
- <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 +302,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 +320,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
@@ -322,16 +333,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
>
@@ -654,14 +665,14 @@
@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 +733,7 @@
getCustomerOrder,
addCustomerOrder,
putCustomerOrder,
+ updateCustomerOrderById,
download,
getOtcCustomerOrderFileList,
otcDownload,
@@ -780,17 +792,34 @@
id: 0,
sourceId: '',
contractNo: '',
- customerOrderNo: '',
- returnStatus: '',
- deliveryDate: '',
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: '',
otcQuantity: '',
- buyQtyDue: '',
wantedDeliveryDate: '',
plannedDeliveryDate: '',
customerPoNo: '',
@@ -806,11 +835,7 @@
ifsSalesUnit: null,
ifsConvFactor: null,
unit: null,
- otcUnit: null,
otcQuantity: null,
- docNumber: null,
- manufactureAttr: 'N',
- customerPartSpec: null,
division: null,
printType: null,
printingRequirements: null,
@@ -819,14 +844,10 @@
qualityRequire: null,
otherProductRequire: null,
divisionSystem: null,
- shippingAddress: null,
- salesMan: null,
lengthRequirement: null,
- remark: null,
otcPartSync: null,
finalCustomerName: null,
productGroup: null,
- productType: null,
centralizedMiningProperty: null,
orderDescription: null,
otcLineNo: null,
@@ -974,6 +995,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
@@ -999,10 +1025,11 @@
// } else {
// console.log('2')
this.dataForm = response.data.data
+
// }
// this.fileList = response.data.data.customerOrderAttachmentList
const sourceId = response.data.data.sourceId
- if(sourceId != null){
+ if(sourceId === '0'){
this.getFileList()
}
this.orderParamList = response.data.data.orderParamList
@@ -1016,7 +1043,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
@@ -1060,7 +1086,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) {
@@ -1114,7 +1140,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
@@ -1216,8 +1242,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() {
@@ -1226,8 +1252,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