From 35ccec8d8676417c11ad47ee4cde3d1c58c0a20e Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期二, 17 十月 2023 13:23:17 +0800 Subject: [PATCH] modified: src/views/basic/part/index.vue modified: src/views/plan/customerorder/customerorder-form.vue modified: src/views/plan/customerorder/sample-customerorder-form.vue --- src/views/plan/customerorder/customerorder-form.vue | 72 +++++++++++++++++++++++------------- 1 files changed, 46 insertions(+), 26 deletions(-) diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue index bbe1d58..5eed5a3 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"> @@ -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"> @@ -653,14 +659,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 @@ -721,6 +727,7 @@ getCustomerOrder, addCustomerOrder, putCustomerOrder, + updateCustomerOrderById, download, getOtcCustomerOrderFileList, otcDownload, @@ -775,21 +782,39 @@ showSynchronize: false, selectOrderParam: null, selectOrderObj: {}, + aaaaa:{}, dataForm: { 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: '', @@ -805,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, @@ -818,14 +839,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, @@ -973,6 +990,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 @@ -1000,7 +1022,6 @@ this.dataForm = response.data.data // } // this.fileList = response.data.data.customerOrderAttachmentList - console.log(response.data.data.sourceId); const sourceId = response.data.data.sourceId if(sourceId === '0'){ this.getFileList() @@ -1016,7 +1037,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 @@ -1114,7 +1134,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 +1236,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 +1246,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