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 | 114 +++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 70 insertions(+), 44 deletions(-) diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue index bbe1d58..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"> @@ -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"> @@ -190,7 +196,7 @@ </el-form-item> </el-col> <el-col :span="6"> - <el-form-item label="浜у搧绫诲瀷" prop="productType"> + <el-form-item label="闅跺睘鍝佺墝" prop="productType"> <el-input v-model="dataForm.productType" placeholder="" @@ -249,28 +255,34 @@ ></el-input> </el-form-item> </el-col> - </el-row> - <el-row> - </el-row> - <el-row> - <!-- <el-col :span="6"> - <el-form-item label="璐ㄩ噺瑕佹眰" prop="qualityRequire"> + <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.qualityRequire" + v-model="dataForm.customerPartSpec" 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> + </el-row> + <el-row> <!-- <el-col :span="6"> <el-form-item label="绯荤粺" prop="divisionSystem"> <el-input @@ -653,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 @@ -721,6 +733,7 @@ getCustomerOrder, addCustomerOrder, putCustomerOrder, + updateCustomerOrderById, download, getOtcCustomerOrderFileList, otcDownload, @@ -779,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: '', @@ -805,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, @@ -818,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, @@ -973,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 @@ -998,9 +1025,9 @@ // } else { // console.log('2') 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 +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 @@ -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