From cc13fd19bf8f9a4445e81cd20e8e1f7f8cbfd2b3 Mon Sep 17 00:00:00 2001 From: jinna Date: Thu, 5 Mar 2026 18:29:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E6=8E=A5=E5=8F=A3=E8=81=94?= =?UTF-8?q?=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/outsourcingManagement/baseTemplate.js | 11 + src/api/outsourcingManagement/oemApproval.js | 20 + src/api/outsourcingManagement/oemOrder.js | 26 + src/views/oem/baseTemplate/index.vue | 227 +++--- .../oem/facInnerApproval/approvalDialog.vue | 74 +- src/views/oem/facInnerApproval/index.vue | 40 +- src/views/oem/oemApproval/approvalDialog.vue | 74 +- src/views/oem/oemApproval/index.vue | 671 +++++++++--------- src/views/oem/oemOrder/index.vue | 21 +- src/views/oem/oemOrder/manufacturerChange.vue | 70 +- src/views/oem/oemOrder/materialPrint.vue | 102 +++ 11 files changed, 811 insertions(+), 525 deletions(-) create mode 100644 src/api/outsourcingManagement/baseTemplate.js create mode 100644 src/api/outsourcingManagement/oemApproval.js create mode 100644 src/views/oem/oemOrder/materialPrint.vue diff --git a/src/api/outsourcingManagement/baseTemplate.js b/src/api/outsourcingManagement/baseTemplate.js new file mode 100644 index 0000000..78fbfe1 --- /dev/null +++ b/src/api/outsourcingManagement/baseTemplate.js @@ -0,0 +1,11 @@ +// 外协绩效模板 +import request from '@/axios'; + +// 列表 +export const getList = params => { + return request({ + url: '/api/blade-desk/mesOemAndAbility/page', + method: 'get', + params + }); +}; \ No newline at end of file diff --git a/src/api/outsourcingManagement/oemApproval.js b/src/api/outsourcingManagement/oemApproval.js new file mode 100644 index 0000000..1292e74 --- /dev/null +++ b/src/api/outsourcingManagement/oemApproval.js @@ -0,0 +1,20 @@ +// 转外协审批 +import request from '@/axios'; + +// 获取列表 +export const getList = params => { + return request({ + url: '/api/blade-desk/oemOrder/queryOemApproval', + method: 'get', + params + }); +}; + +// 审批 +export const oemApproval = data => { + return request({ + url: '/api/blade-desk/oemOrder/approval', + method: 'post', + data: data + }); +}; \ No newline at end of file diff --git a/src/api/outsourcingManagement/oemOrder.js b/src/api/outsourcingManagement/oemOrder.js index fee840a..ed602ad 100644 --- a/src/api/outsourcingManagement/oemOrder.js +++ b/src/api/outsourcingManagement/oemOrder.js @@ -26,4 +26,30 @@ export const getInProcess = data => { method: 'post', data }); +}; + +// 更改厂家 +export const changeFactory = data => { + return request({ + url: '/api/blade-desk/oemOrder/changeOemManufacturer', + method: 'post', + params:data + }); +}; + +// 外协厂商下拉 +export const getOemManufacturer = () => { + return request({ + url: '/api/blade-desk/BA/Oem/listForSelect', + method: 'get' + }); +}; + +// 领料单打印分页 +export const getPrintList = params => { + return request({ + url: '/api/blade-desk/oemOrder/oemMaterialRequisitionPage', + method: 'get', + params + }); }; \ No newline at end of file diff --git a/src/views/oem/baseTemplate/index.vue b/src/views/oem/baseTemplate/index.vue index da1bf1b..8671539 100644 --- a/src/views/oem/baseTemplate/index.vue +++ b/src/views/oem/baseTemplate/index.vue @@ -29,6 +29,7 @@ diff --git a/src/views/oem/facInnerApproval/index.vue b/src/views/oem/facInnerApproval/index.vue index 93dd614..e392e0e 100644 --- a/src/views/oem/facInnerApproval/index.vue +++ b/src/views/oem/facInnerApproval/index.vue @@ -21,7 +21,7 @@ @@ -65,7 +65,7 @@ export default { editBtnIcon: " ", viewBtnText: "详情", labelWidth: 120, - menuWidth: 120, + menuWidth: 80, dialogWidth: 1040, dialogClickModal: false, searchEnter: true, @@ -80,7 +80,7 @@ export default { searchLabelPosition: "left", searchGutter: 24, searchSpan: 6, - menuAlign: "left", + menuAlign: "center", gridBtn: false, searchMenuPosition: "right", addBtnIcon: " ", @@ -103,7 +103,7 @@ export default { { label: "零件号", prop: "partCode", - bind: "prWorkOrder.pjYieldOrder.partCode", + // bind: "prWorkOrder.pjYieldOrder.partCode", sortable: true, filter: true, span: 12, @@ -113,7 +113,7 @@ export default { { label: "批次号", prop: "batchNo", - bind: "prWorkOrder.batchNo", + // bind: "prWorkOrder.batchNo", sortable: true, filter: true, span: 12, @@ -123,7 +123,7 @@ export default { { label: "产品名称", prop: "partName", - bind: "prWorkOrder.pjYieldOrder.partName", + // bind: "prWorkOrder.pjYieldOrder.partName", sortable: true, filter: true, span: 12, @@ -132,8 +132,8 @@ export default { }, { label: "生产标识", - prop: "prodIdent", - bind: "prWorkOrder.pjYieldOrder.prodIdent", + prop: "productIdent", + // bind: "prWorkOrder.pjYieldOrder.prodIdent", sortable: true, filter: true, span: 12, @@ -143,7 +143,7 @@ export default { { label: "生产数量", prop: "makeQty", - bind: "prWorkOrder.makeQty", + // bind: "prWorkOrder.makeQty", sortable: true, filter: true, span: 12, @@ -152,8 +152,8 @@ export default { }, { label: "面积(d㎡)", - prop: "poArea", - bind: "prWorkOrder.pjYieldOrder.poArea", + prop: "totalArea", + // bind: "prWorkOrder.pjYieldOrder.poArea", sortable: true, filter: true, span: 12, @@ -206,8 +206,8 @@ export default { }, { label: "申请人", - prop: "userName", - bind: "createMan.userName", + prop: "proposer", + // bind: "createMan.userName", sortable: true, filter: true, span: 12, @@ -216,8 +216,8 @@ export default { }, { label: "审批人", - prop: "userName", - bind: "approvalMan.userName", + prop: "approver", + // bind: "approvalMan.userName", sortable: true, filter: true, span: 12, @@ -255,10 +255,18 @@ export default { }, methods: { approval(row) { + console.log('row--------',row) + if(!row && this.selectionList.length == 0){ + this.$message.error("请至少选择一条数据"); + return + } this.isOpen = true; }, - closeDialog() { + closeDialog(val) { this.isOpen = false; + if(val){ + this.onLoad() + } }, handleDelete() { if (this.selectionList.length === 0) { diff --git a/src/views/oem/oemApproval/approvalDialog.vue b/src/views/oem/oemApproval/approvalDialog.vue index 857df7f..341d943 100644 --- a/src/views/oem/oemApproval/approvalDialog.vue +++ b/src/views/oem/oemApproval/approvalDialog.vue @@ -1,16 +1,17 @@ diff --git a/src/views/oem/oemApproval/index.vue b/src/views/oem/oemApproval/index.vue index fa91b82..293d103 100644 --- a/src/views/oem/oemApproval/index.vue +++ b/src/views/oem/oemApproval/index.vue @@ -35,6 +35,7 @@ + + \ No newline at end of file