From 746fc975621dc0538d0dcc6d4c8b3f17fc13fe3c Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期一, 30 十月 2023 13:24:43 +0800 Subject: [PATCH] modified: src/api/equipment/equipment.js new file: src/api/quality/rawMaterial.js modified: src/api/technology/document.js new file: src/const/crud/quality/rawMaterial.js modified: src/router/views/index.js modified: src/views/common/teststandardradio.vue modified: src/views/equipment/equipment/index.vue modified: src/views/plan/customerorder/customerorder-form.vue modified: src/views/plan/customerorder/index.vue new file: src/views/quality/rawMaterial/index.vue new file: src/views/quality/rawMaterial/rawMaterial-form.vue modified: src/views/technology/document/document-form.vue modified: src/views/technology/operation/index.vue modified: src/views/technology/operation/operation-form.vue modified: src/views/technology/routing/index.vue modified: src/views/technology/routing/routing-form.vue modified: src/views/technology/structure/index.vue modified: src/views/technology/structure/single-structure-form.vue modified: vue.config.js --- src/views/plan/customerorder/customerorder-form.vue | 555 +++++++++++++++++++++++------------------------------- 1 files changed, 236 insertions(+), 319 deletions(-) diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue index b56d973..9427657 100644 --- a/src/views/plan/customerorder/customerorder-form.vue +++ b/src/views/plan/customerorder/customerorder-form.vue @@ -26,46 +26,28 @@ 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> </el-form-item> </el-col> - <!-- <el-col :span="6">--> - <!-- <el-form-item label="OTC琛屽彿" prop="otcLineNo">--> - <!-- <el-input--> - <!-- v-model="dataForm.otcLineNo"--> - <!-- placeholder=""--> - <!-- disabled--> - <!-- ></el-input>--> - <!-- </el-form-item>--> - <!-- </el-col>--> - <!-- <el-col :span="6">--> - <!-- <el-form-item label="GSM琛屽彿" prop="coLineNo">--> - <!-- <el-input--> - <!-- v-model="dataForm.coLineNo"--> - <!-- placeholder=""--> - <!-- disabled--> - <!-- ></el-input>--> - <!-- </el-form-item>--> - <!-- </el-col>--> <el-col :span="6"> <el-form-item label="瀹㈡埛缂栧彿" prop="customerNo"> <el-input @@ -88,28 +70,16 @@ </el-col> </el-row> <el-row> - <!-- <el-col :span="6"> - <el-form-item label="瀹㈡埛鐨勯浂浠跺彿" prop="customerPartNo"> - <el-input - v-model="dataForm.customerPartNo" - placeholder="" - disabled - ></el-input> - </el-form-item> - </el-col> --> - <!-- <el-col :span="6">--> - <!-- <el-form-item label="IFS琛屽彿" prop="ifsLineNo">--> - <!-- <el-input--> - <!-- v-model="dataForm.ifsLineNo"--> - <!-- placeholder=""--> - <!-- disabled--> - <!-- ></el-input>--> - <!-- </el-form-item>--> - <!-- </el-col>--> <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%" @@ -122,112 +92,28 @@ :value="item.value" :disabled="!ediSource" /> - </el-select> + </el-select> --> </el-form-item> </el-col> - <!-- <el-col :span="6"> - <el-form-item label="琛屽彿" prop="coLineNo"> - <el-input - v-model="dataForm.coLineNo" - placeholder="" + <el-col :span="6"> + <el-form-item label="鏈熸湜浜よ揣鏃堕棿" prop="deliveryDate"> + <el-date-picker + v-model="dataForm.deliveryDate" + style="width: 100%" + type="datetime" + value-format="yyyy-MM-dd HH:mm:ss" :disabled="!ediSource" - ></el-input> + > + </el-date-picker> </el-form-item> - </el-col> --> - <!-- <el-col :span="6"> - <el-form-item label="瀹㈡埛鐨勯浂浠惰鏍�" prop="customerPartName"> + </el-col> + <el-col :span="6"> + <el-form-item label="涓氬姟鍛�" prop="salesMan"> <el-input - v-model="dataForm.customerPartName" + 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="IFS浜よ揣鍙�" prop="ifsDeliveryNo">--> - <!-- <el-input--> - <!-- v-model="dataForm.ifsDeliveryNo"--> - <!-- 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="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="IFS琛岄」鍙�" prop="ifsLineItemNo">--> - <!-- <el-input--> - <!-- v-model="dataForm.ifsLineItemNo"--> - <!-- 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"> @@ -248,30 +134,7 @@ </el-select> </el-form-item> </el-col> - <el-col :span="6"> - <el-form-item label="宸ヨ壓鏂囦欢鍙�" prop="docNumber"> - <el-input - v-model="dataForm.docNumber" - placeholder="" - disabled - ></el-input> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="6"> - <el-form-item label="鏈熸湜浜よ揣鏃堕棿" prop="wantedDeliveryDate"> - <el-date-picker - v-model="dataForm.wantedDeliveryDate" - style="width: 100%" - type="datetime" - value-format="yyyy-MM-dd HH:mm:ss" - :disabled="!ediSource" - > - </el-date-picker> - </el-form-item> - </el-col> - <el-col :span="6"> + <!-- <el-col :span="6"> <el-form-item label="璁″垝浜よ揣鏃堕棿" prop="plannedDeliveryDate"> <el-date-picker v-model="dataForm.plannedDeliveryDate" @@ -281,55 +144,8 @@ > </el-date-picker> </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> - </el-form-item> </el-col> --> - <!-- <el-col :span="6">--> - <!-- <el-form-item label="浜嬩笟閮�" prop="division">--> - <!-- <el-input--> - <!-- v-model="dataForm.division"--> - <!-- placeholder=""--> - <!-- disabled--> - <!-- ></el-input>--> - <!-- </el-form-item>--> - <!-- </el-col>--> - </el-row> - <el-row> <!-- <el-col :span="6"> - <el-form-item label="鍗板瓧鏂瑰紡" prop="printType"> - <el-input - v-model="dataForm.printType" - placeholder="" - disabled - ></el-input> - </el-form-item> - </el-col> - <el-col :span="6"> - <el-form-item label="鍗板瓧瑕佹眰" prop="printingRequirements"> - <el-input - v-model="dataForm.printingRequirements" - placeholder="" - disabled - ></el-input> - </el-form-item> - </el-col> - <el-col :span="6"> - <el-form-item label="鍗板瓧鍐呭" prop="printContent"> - <el-input - v-model="dataForm.printContent" - placeholder="" - disabled - ></el-input> - </el-form-item> - </el-col> --> - <el-col :span="6"> <el-form-item label="鍖呰瑕佹眰" prop="packageRequire"> <el-input v-model="dataForm.packageRequire" @@ -337,57 +153,21 @@ disabled ></el-input> </el-form-item> - </el-col> + </el-col> --> </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-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="otherProductRequire"> - <el-input - v-model="dataForm.otherProductRequire" - placeholder="" - disabled - ></el-input> - </el-form-item> - </el-col> - <el-col :span="6"> - <el-form-item label="绯荤粺" prop="divisionSystem"> - <el-input - v-model="dataForm.divisionSystem" - placeholder="" - 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-row> - <el-row> - <el-col :span="6"> - <el-form-item label="涓氬姟鍛�" prop="salesmanName"> - <el-input - v-model="dataForm.salesmanName" - placeholder="" - disabled - ></el-input> - </el-form-item> - </el-col> - <el-col :span="6"> + </el-col> --> + <!-- <el-col :span="6"> <el-form-item label="鐩橀暱瑕佹眰" prop="lengthRequirement"> <el-input v-model="dataForm.lengthRequirement" @@ -395,29 +175,28 @@ disabled ></el-input> </el-form-item> - </el-col> - <!-- <el-col :span="6"> - <el-form-item label="鏈�缁堝鎴�" prop="remark"> - <el-input - v-model="dataForm.finalCustomerName" - placeholder="" - disabled - ></el-input> - </el-form-item> </el-col> --> - <!-- <el-col :span="6"> - <el-form-item label="浜у搧鍒嗙粍" prop="remark"> - <el-input - v-model="dataForm.productGroup" - placeholder="" - disabled - ></el-input> - </el-form-item> - </el-col> --> - </el-row> - <el-row> <el-col :span="6"> - <el-form-item label="浜у搧绫诲瀷" prop="remark"> + <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="" @@ -426,6 +205,97 @@ </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 + v-model="dataForm.docNumber" + placeholder="" + disabled + ></el-input> + </el-form-item> + </el-col> + <el-col :span="6"> + <el-form-item label="宸ヨ壓鏂囦欢鍚嶇О" prop="docName"> + <el-input + 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> + </el-form-item> + </el-col> + </el-row> + <el-row> + <!-- <el-col :span="6"> + <el-form-item label="绯荤粺" prop="divisionSystem"> + <el-input + v-model="dataForm.divisionSystem" + placeholder="" + disabled + ></el-input> + </el-form-item> + </el-col> --> + </el-row> + <el-row> + <!-- <el-col :span="6"> <el-form-item label="閲囬泦鎬ц川" prop="centralizedMiningProperty"> <el-input v-model="dataForm.centralizedMiningProperty" @@ -433,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" @@ -451,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 @@ -464,16 +342,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="comment"> <el-input type="textarea" :rows="3" placeholder="" - v-model="dataForm.orderDescription" + v-model="dataForm.comment" maxlength="500" show-word-limit > @@ -481,7 +359,22 @@ </el-form-item> </el-col> </el-row> - <el-card header="璁㈠崟鍙傛暟" shadow="never"> + <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 + > + </el-input> + </el-form-item> + </el-col> + </el-row> + <!-- <el-card header="璁㈠崟鍙傛暟" shadow="never"> <el-row> <el-form-item style="float:left;width: 50%" @@ -496,7 +389,7 @@ ></el-input ></el-form-item> </el-row> - </el-card> + </el-card> --> </el-tab-pane> <el-tab-pane label="OTC闄勪欢" type="card"> <el-table :data="fileList" style="width: 100%" height="500"> @@ -751,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> @@ -792,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 @@ -864,6 +758,7 @@ getCustomerOrder, addCustomerOrder, putCustomerOrder, + updateCustomerOrderById, download, getOtcCustomerOrderFileList, otcDownload, @@ -921,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: '', @@ -944,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, @@ -957,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, @@ -1101,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 @@ -1112,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 @@ -1137,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 @@ -1151,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 @@ -1195,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) { @@ -1249,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 @@ -1351,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() { @@ -1361,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