问题修复

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 },

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) => {

src/pages/new-purchase/accept/acceptDetails.vue

@@ -67,6 +67,18 @@
                         ><div class="cont">{{ item.typeName }}</div></uni-col
                     >
                 </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">计量单位：</uni-col>
+                    <uni-col :span="18"
+                        ><div class="cont">{{ item.unitName }}</div></uni-col
+                    >
+                </uni-row>
+                <uni-row :gutter="24">
+                    <uni-col :span="6">物资厂家：</uni-col>
+                    <uni-col :span="18"
+                        ><div class="cont">{{ item.supplierName }}</div></uni-col
+                    >
+                </uni-row>
                 <uni-row :gutter="24">
                     <uni-col :span="6">到货数量：</uni-col>
                     <uni-col :span="18"

src/pages/new-purchase/bind/coding-scan.vue

@@ -3,6 +3,9 @@
     <view class="page-container">
         <div class="card" style="margin-bottom: 10px">
             <uni-forms :model="formData" label-width="100" :border="true">
+                <uni-forms-item label="物资类型：" name="maTypeModel">
+                    <span class="form-view">{{ queryParams.maTypeModel }}</span>
+                </uni-forms-item>
                 <uni-forms-item label="物资名称：" name="maTypeName">
                     <span class="form-view">{{ queryParams.maTypeName }}</span>
                 </uni-forms-item>

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. 编码绑定

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 userAuthorizedNodes = auditingList.value.filter(e => e.configValues.includes(userId.value))
-                const currentIndex = auditingList.value.findIndex(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
                 }

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 = {