From 46d1f7328127cf975d11ce73d6c2071b6278a533 Mon Sep 17 00:00:00 2001 From: zhangdi <1104545947@qq.com> Date: Fri, 15 May 2026 10:59:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=95=80=E5=B1=82=E7=89=A9=E6=96=99=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E5=AE=A1=E6=A0=B8=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionManagement/coatingMaterial.js | 11 ++- src/views/basicData/components/inventory.vue | 2 +- .../coatingMater/materialRequirements.vue | 88 ++++++++++++++----- .../reworkOrder/index.vue | 1 + src/views/workRate/index.vue | 3 +- 5 files changed, 79 insertions(+), 26 deletions(-) diff --git a/src/api/productionManagement/coatingMaterial.js b/src/api/productionManagement/coatingMaterial.js index 4fa5fab3..84e23069 100644 --- a/src/api/productionManagement/coatingMaterial.js +++ b/src/api/productionManagement/coatingMaterial.js @@ -84,4 +84,13 @@ export const getWorkCenter = () =>{ url:'/api/blade-desk/bsWorkCenter/getList', method:'get' }) -} \ No newline at end of file +} + +// 二级审批 +export const secondConfirmBatch = row => { + return request({ + url: '/blade-desk/order/plateGoodsRecord/confirmBatch', + method: 'post', + params: row, + }); +}; \ No newline at end of file diff --git a/src/views/basicData/components/inventory.vue b/src/views/basicData/components/inventory.vue index 0112e987..66b42bf7 100644 --- a/src/views/basicData/components/inventory.vue +++ b/src/views/basicData/components/inventory.vue @@ -113,7 +113,7 @@ export default { type: 'select', filterable: true, remote: true, - dicUrl: `/api/blade-wms/stStorehouse/page?shName={{key}}`, + dicUrl: `/api/blade-wms/stStorehouse/page?current=1&&size=999999&&shName={{key}}`, props: { label: 'shName', value: 'id', diff --git a/src/views/productionManagement/components/coatingMater/materialRequirements.vue b/src/views/productionManagement/components/coatingMater/materialRequirements.vue index 745f4928..54d3ef85 100644 --- a/src/views/productionManagement/components/coatingMater/materialRequirements.vue +++ b/src/views/productionManagement/components/coatingMater/materialRequirements.vue @@ -23,7 +23,8 @@ - - + + - + 审批通过 审批不通过 + + 审批通过 + 审批不通过 + @@ -59,6 +65,7 @@ + @@ -68,7 +75,8 @@ import { confirmBatch, closeBatchs, removeByIds, - getOrderMoldPlanCaDeatils + getOrderMoldPlanCaDeatils, + secondConfirmBatch } from '@/api/productionManagement/coatingMaterial'; import coatingAddDialog from '../coatingAddDialog.vue'; import coatingColumnData from '../../js/coatingColumnData'; @@ -339,10 +347,12 @@ export default { // { label: '已关闭', value: '3' }, // { label: '审核通过', value: '4' }, // { label: '已过期', value: '5' }, - { label: '待审核', value: 10000 }, - { label: '审核通过', value: 10001 }, + { label: '待一级审核', value: 10000 }, + { label: '一级审核通过', value: 10001 }, { label: "使用中", value:10002}, - { label: '审核不通过', value: 10005 }, + { label: '一级审核不通过', value: 10005 }, + { label: '二级审核通过', value: 10007 }, + { label: '二级审核不通过', value: 10008 }, { label: '已完成',value:10004}, { label: '已超期', value: 10003 }, { label: '已关闭', value: 10006 }, @@ -413,7 +423,8 @@ export default { }, selectionList: [], confirmBatchId: null, - query:{} + query:{}, + rowItem:{} }; }, mounted() { @@ -501,17 +512,34 @@ export default { } }, approveRow(val) { + this.rowItem = val this.selectionList = [] this.selectionList.push(val); this.approveDialog = true; }, + // 一级批量审核 handleApprove() { if (this.selectionList.length != 0) { let tmp = this.selectionList.find(item => item.status != 10000) if(tmp){ - this.$message.error("请选择状态为【待审核】的数据") + this.$message.error("请选择状态为【待一级审核】的数据") return } + this.rowItem = this.selectionList[0] + this.approveDialog = true; + } else { + this.$message.error('请至少选择一条数据!'); + } + }, + // 二级批量审核 + secondHandleApprove(){ + if (this.selectionList.length != 0) { + let tmp = this.selectionList.find(item => item.status != 10001) + if(tmp){ + this.$message.error("请选择状态为【待二级审核】的数据") + return + } + this.rowItem = this.selectionList[0] this.approveDialog = true; } else { this.$message.error('请至少选择一条数据!'); @@ -521,17 +549,33 @@ export default { this.$refs.approveForm.validate(valid => { if (valid) { const ids = this.selectionList.map(item => item.id).join(','); - confirmBatch({ - ids:ids, - ...this.approveForm - }).then(res =>{ - if(res.data.code == 200){ - this.$message.success('审核成功'); - this.approveDialog = false; - this.selectionList = [] - this.onLoad() - } - }) + if(this.rowItem.status === 10000){ + confirmBatch({ + ids:ids, + ...this.approveForm + }).then(res =>{ + if(res.data.code == 200){ + this.$message.success('审核成功'); + this.approveDialog = false; + this.selectionList = [] + this.onLoad() + } + }) + } + if(this.rowItem.status === 10001){ + secondConfirmBatch({ + ids:ids, + ...this.approveForm + }).then(res =>{ + if(res.data.code == 200){ + this.$message.success('审核成功'); + this.approveDialog = false; + this.selectionList = [] + this.onLoad() + } + }) + } + // confirmBatch({ ...{ ids }, ...this.approveForm }).then(res => { // if (res.code === 200) { // this.$message.success('审核成功'); diff --git a/src/views/productionManagement/reworkOrder/index.vue b/src/views/productionManagement/reworkOrder/index.vue index 9dd5c536..c1cdd8fb 100644 --- a/src/views/productionManagement/reworkOrder/index.vue +++ b/src/views/productionManagement/reworkOrder/index.vue @@ -59,6 +59,7 @@ export default { components: { updateMakeQty, reworkDetails }, data() { return { + detailsShow: false, loading:false, searchCode: '', //返工单号 updateMakeQtyVisible: false, diff --git a/src/views/workRate/index.vue b/src/views/workRate/index.vue index 379ae5fb..1adb0220 100644 --- a/src/views/workRate/index.vue +++ b/src/views/workRate/index.vue @@ -171,7 +171,7 @@ selectedItemInfo.planEndTime }} {{ - processDetails.receiveMan + processDetails.receiveName }} {{ selectedItemInfo.factStartTime @@ -579,7 +579,6 @@ export default { return 'color: rgb(251, 170, 8)'; } }; - consolog.log(9999999,this.detailsForm) return [ { label: '车间订单号', value: this.detailsForm.woCode || '' }, { label: '流程卡号', value: this.detailsForm.cardNo || '' },