From c880739ec4cd5ede33b31eb98ad5f7628ea288e5 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期一, 11 十二月 2023 17:41:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/plan/customerorder/customerorder-form.vue | 456 +++++++++++++++++++++++++++++++------------------------- 1 files changed, 252 insertions(+), 204 deletions(-) diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue index 6c5ec49..0dc65bb 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="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"> @@ -214,6 +134,109 @@ </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="" + > + <el-button + slot="append" + icon="el-icon-search" + @click="openPartDialog()" + + ></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 +247,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 +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="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 +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,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 +341,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 +643,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 +685,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 +757,7 @@ getCustomerOrder, addCustomerOrder, putCustomerOrder, + updateCustomerOrderById, download, getOtcCustomerOrderFileList, otcDownload, @@ -779,12 +815,35 @@ dataForm: { id: 0, sourceId: '', - customerOrderNo: '', + contractNo: '', customerNo: '', customerName: '', - coState: '', - coLineNo: '', + returnStatus: '', + deliveryDate: '', + salesMan: '', + salerWorkCode: '', + manufactureAttr: '', + buyQtyDue: 0, + productName: '', + productType: '', partNo: '', + technologyDocumentId: '', + docNumber: '', + docName: '', + shippingAddress: '', + remark: '', + otcUnit: '', + coState: '', + customerPartSpec: '', + entityName: '', + factoryPlaceOrderDate: '', + isCp: '', + originalContractStatus: '', + placeOrderDate: '', + province: '', + + customerOrderNo: '', + coLineNo: '', customerPartName: '', otcQuantity: '', wantedDeliveryDate: '', @@ -802,11 +861,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 +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, @@ -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 @@ -982,9 +1038,7 @@ // if (response.data.data.customerOrderList != null) { // this.dataForm = response.data.data.customerOrderList // - // console.log('0') // if (this.dataForm.OrderOrContract) { - // console.log('1') // // 灏嗚鍗曡繕鏄悎鍚岃浆涔� // if (this.dataForm.OrderOrContract == '0') { // this.dataForm.OrderOrContract = '鍚堝悓' @@ -993,12 +1047,12 @@ // } // } // } 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 @@ -1012,7 +1066,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 @@ -1056,7 +1109,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) { @@ -1110,7 +1163,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 @@ -1137,25 +1190,34 @@ } }) }, - // 闆朵欢閫夋嫨 + // 闆朵欢閫夋嫨 openPartDialog() { - if ( - this.dataForm.coState === '01partUnCheck' || - this.dataForm.coState === '02technologyUnCheck' - ) { - this.showPart = true - } else { - this.$message.warning( - '璁㈠崟鍙湁鍦ㄣ�愰浂浠跺緟閫夈�戙�併�愬伐鑹烘枃浠跺緟閫夈�戠姸鎬佷笅锛屾墠鑳借繘琛岄浂浠朵慨鏀�' - ) - } + this.showPart = true }, selectPart(part) { if (part) { this.dataForm.partNo = part.partNo - this.$refs.dataForm.validateField('partNo', (valid) => {}) } }, + // 闆朵欢閫夋嫨 + // openPartDialog() { + // if ( + // this.dataForm.coState === '01partUnCheck' || + // this.dataForm.coState === '02technologyUnCheck' + // ) { + // this.showPart = true + // } else { + // this.$message.warning( + // '璁㈠崟鍙湁鍦ㄣ�愰浂浠跺緟閫夈�戙�併�愬伐鑹烘枃浠跺緟閫夈�戠姸鎬佷笅锛屾墠鑳借繘琛岄浂浠朵慨鏀�' + // ) + // } + // }, + // selectPart(part) { + // if (part) { + // this.dataForm.partNo = part.partNo + // this.$refs.dataForm.validateField('partNo', (valid) => {}) + // } + // }, // 鍏ㄥ睆 fullscreen() { this.isFullScreen = !this.isFullScreen @@ -1212,8 +1274,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() { @@ -1222,8 +1284,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 @@ -1242,9 +1304,6 @@ this.getConfigFiles() }, delProcessConfigFile(row) { - if (row.lineNumber !== this.dataForm.otcLineNo) { - this.$message.error('涓婁紶鏂囦欢琛屽彿涓庡綋鍓嶉攢鍞鍗曡鍙蜂笉涓�鑷达紝涓嶅厑璁稿垹闄�') - } else { this.$confirm('鏄惁鍒犻櫎宸ヨ壓閰嶇疆鏂囦欢', '鎻愮ず', { confirmButtonText: '纭畾', cancelButtonText: '鍙栨秷', @@ -1257,7 +1316,6 @@ .then((data) => { this.getConfigFiles() }) - } }, downloadProcessConfigFile(row) { downloadProcessConfigFile( @@ -1290,7 +1348,6 @@ // 淇濆瓨閰嶇疆鍗� saveConfig() { const configId = this.configContent.id - console.log(this.configContent) for ( let i = this.configContent.processConfigDataList.length - 1; i >= 0; @@ -1306,7 +1363,6 @@ } if (configId) { newProcessConfigEditOne(this.configContent).then((res) => { - console.log(res) if (res.data.code === 0) { this.$message.success('淇濆瓨鎴愬姛') this.init(this.configContent.orderId) @@ -1316,7 +1372,6 @@ }) } else { newProcessConfigAddOne(this.configContent).then((res) => { - console.log(res) if (res.data.code === 0) { this.$message.success('淇濆瓨鎴愬姛') this.init(this.configContent.orderId) @@ -1341,7 +1396,6 @@ } else { this.$message.error('璇ラ攢鍞鍗曞彿涓嬶紝娌℃湁鍏朵粬璁㈠崟琛�') /* const configId = this.configContent.id - console.log(this.configContent) for ( let i = this.configContent.processConfigDataList.length - 1; i >= 0; @@ -1357,7 +1411,6 @@ } if (configId) { newProcessConfigEdit(this.configContent).then((res) => { - console.log(res) if (res.data.code === 0) { this.$message.success('淇濆瓨鎴愬姛') this.init(this.configContent.orderId) @@ -1367,7 +1420,6 @@ }) } else { newProcessConfigAdd(this.configContent).then((res) => { - console.log(res) if (res.data.code === 0) { this.$message.success('淇濆瓨鎴愬姛') this.init(this.configContent.orderId) @@ -1379,7 +1431,6 @@ } }) /* const configId = this.configContent.id - console.log(this.configContent) for ( let i = this.configContent.processConfigDataList.length - 1; i >= 0; @@ -1395,7 +1446,6 @@ } if (configId) { newProcessConfigEdit(this.configContent).then((res) => { - console.log(res) if (res.data.code === 0) { this.$message.success('淇濆瓨鎴愬姛') this.init(this.configContent.orderId) @@ -1405,7 +1455,6 @@ }) } else { newProcessConfigAdd(this.configContent).then((res) => { - console.log(res) if (res.data.code === 0) { this.$message.success('淇濆瓨鎴愬姛') this.init(this.configContent.orderId) @@ -1467,7 +1516,6 @@ // var param = Object.assign({ current: 1, size: 20 }) // getProcessConfigPage(param).then((res) => { // const list = res.data.data.records - // console.log(list) // }) }, // 鑾峰彇纭 -- Gitblit v1.9.3