From d56d4ea3cc5e204e5676442e7dec072c62fb23fa Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Fri, 10 Oct 2025 12:21:24 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/materialsStation/index/index.vue | 2 +- .../toolsLease/toolsLeaseAdd.vue | 5 +++-- .../new-purchase/accept/acceptDetails.vue | 12 ++++++++++++ src/pages/new-purchase/bind/coding-scan.vue | 3 +++ src/pages/new-purchase/bind/details.vue | 5 +++-- src/pages/picking/review/details.vue | 19 ++++++++++++++++--- src/pages/picking/review/index.vue | 10 ++++++++++ 7 files changed, 48 insertions(+), 8 deletions(-) diff --git a/src/pages/materialsStation/index/index.vue b/src/pages/materialsStation/index/index.vue index 623bc9c..a814eb8 100644 --- a/src/pages/materialsStation/index/index.vue +++ b/src/pages/materialsStation/index/index.vue @@ -68,7 +68,7 @@ const todayDatas = reactive({ oneMonthNum: '', // 一个月 }) const isUsingList = ref([ - { path: 'toolsLease', name: '班组预领申请', src: 'lease', isShow: true }, + { path: 'toolsLease', name: '班组领料申请', src: 'lease', isShow: true }, { path: 'toolsOut', name: '材料站出库', src: 'outStore', isShow: true }, { path: 'toolsBack', name: '退料', src: 'back', isShow: true }, { path: 'equipmentRecord', name: '站内库存台账', src: 'ledger', isShow: true }, diff --git a/src/pages/materialsStation/toolsLease/toolsLeaseAdd.vue b/src/pages/materialsStation/toolsLease/toolsLeaseAdd.vue index f5be1eb..84aef0a 100644 --- a/src/pages/materialsStation/toolsLease/toolsLeaseAdd.vue +++ b/src/pages/materialsStation/toolsLease/toolsLeaseAdd.vue @@ -228,6 +228,7 @@ import { detailsLeaseTask, getAgreementInfoByIdApi, getPickDepartListApi, + getProListByDepartApi } from '@/services/materialsStation' import { useMemberStore } from '@/stores' const memberStore = useMemberStore() @@ -311,7 +312,7 @@ const getDetailsById = async () => { item.maCodeList = item.maCodeVoList || item.maCodeList || [] }) Object.assign(formData, res.data.leaseApplyInfo) - formData.proId = res.data.leaseApplyInfo.proId + formData.proId = String(res.data.leaseApplyInfo.proId) formData.projectId = prodRange.value.find( (item) => item.proId == res.data.leaseApplyInfo.proId, )?.projectId @@ -407,7 +408,7 @@ const getTeamList = async () => { // 获取工程 const getProjectListApi = async () => { try { - const res = await getProjectList({ unitId: null, isApp: true, teamName: formData.teamName }) + const res = await getProListByDepartApi({ teamName: formData.teamName }) if (!res.data || !res.data.length) return console.log('🚀 ~ getProjectListApi ~ res:', res) prodRange.value = res.data.map((item) => { diff --git a/src/pages/new-purchase/accept/acceptDetails.vue b/src/pages/new-purchase/accept/acceptDetails.vue index 0ae59e7..7ff1fd8 100644 --- a/src/pages/new-purchase/accept/acceptDetails.vue +++ b/src/pages/new-purchase/accept/acceptDetails.vue @@ -67,6 +67,18 @@ >
{{ item.typeName }}
+ + 计量单位： +
{{ item.unitName }}
 + + + 物资厂家： +
{{ item.supplierName }}
 + 到货数量：
+ + {{ queryParams.maTypeModel }} + {{ queryParams.maTypeName }} diff --git a/src/pages/new-purchase/bind/details.vue b/src/pages/new-purchase/bind/details.vue index e3f8449..8d182f4 100644 --- a/src/pages/new-purchase/bind/details.vue +++ b/src/pages/new-purchase/bind/details.vue @@ -161,7 +161,7 @@ const getOutboundDetailsData = async () => { // 右滑按钮事件 const onClick = (e, item) => { - const { maTypeName, typeName, purchaseNum, bindNum, checkNum, typeId } = item + const { maTypeName, typeName, purchaseNum, bindNum, checkNum, typeId,maTypeModel } = item const { index } = e // 更新 leaseApplyInfo @@ -172,7 +172,8 @@ const onClick = (e, item) => { purchaseNum, bindNum, checkNum, - typeId + typeId, + maTypeModel } // 1. 编码绑定 diff --git a/src/pages/picking/review/details.vue b/src/pages/picking/review/details.vue index 1139cb9..ab55b65 100644 --- a/src/pages/picking/review/details.vue +++ b/src/pages/picking/review/details.vue @@ -358,10 +358,20 @@ const handleReview = (action) => { if (res.confirm) { const comment = res.content; // 组装参数 - const currentAuditing = auditingList.value.filter(e => e.configValues.includes(userId.value)) // 获取当前审核的节点 - const currentIndex = auditingList.value.findIndex(e => e.configValues.includes(userId.value)) // 获取当前的索引 + const userAuthorizedNodes = auditingList.value.filter(e => e.configValues.includes(userId.value)) + if(userAuthorizedNodes.length === 0){ + uni.showToast({ + title: '未查询到您的审核权限！', + icon: 'none', + }) + } + let currentAuditing = userAuthorizedNodes.find(node => node.isAccept === 0) // 获取当前审核的节点 + // 如果没有待审核的节点，则使用第一个有权限的节点 + if (!currentAuditing) { + currentAuditing = userAuthorizedNodes[0] + } auditingParams.value.remark = comment - const { recordId, id, typeId, } = currentAuditing[0] + const { recordId, id, typeId } = currentAuditing Object.assign(auditingParams.value, { typeId, recordId, @@ -375,6 +385,9 @@ const handleReview = (action) => { auditingParams.value.unitName = formData.value.leaseUnit auditingParams.value.projectName = formData.value.leaseProject + + const currentIndex = auditingList.value.findIndex(e => e.id === id) // 获取当前的索引 + if (currentIndex !== auditingList.value.length - 1) { auditingParams.value.nextNodeId =auditingList.value[currentIndex + 1].id } diff --git a/src/pages/picking/review/index.vue b/src/pages/picking/review/index.vue index 95d3418..d5e2414 100644 --- a/src/pages/picking/review/index.vue +++ b/src/pages/picking/review/index.vue @@ -215,6 +215,16 @@ const onReview = (item) => { type: 1, })}`, }) + }else{ + uni.navigateTo({ + url: `/pages/picking/review/details?params=${JSON.stringify({ + id: item.id, + taskId: item.taskId, + flowId: item.flowId, + nodeId: item.nodeId, + type: 2, + })}`, + }) } // const params = {