领料出库，标签查询

src/pages/integratedQuery/electronicTag/index.vue

@@ -274,7 +274,7 @@
                         class="title"
                         style="text-align: center; font-weight: 450; font-size: 16px; "
                     >
-                    安徽顺凯有限公司
+                    安徽顺凯检测技术有限公司
                     </div>
                     <div
                         class="title"
@@ -298,7 +298,7 @@
                         "
                         >
                         <span >试样名称：</span>
-                        <span style="margin-left: 40px;">{{"攀登自锁器"}}</span>
+                        <span style="margin-left: 40px;">{{this.tagInfo.materialName}}</span>
                         </div>
                     </div>
 
@@ -318,7 +318,7 @@
                         "
                         >
                         <span >规格型号：</span>
-                        <span style="margin-left: 40px;">{{"1.5T"}}</span>
+                        <span style="margin-left: 40px;">{{this.tagInfo.materialModel}}</span>
                         </div>
                     </div>
 
@@ -338,7 +338,7 @@
                         "
                         >
                         <span >编号：</span>
-                        <span style="margin-left: 40px;">{{"W204-20648"}}</span>
+                        <span style="margin-left: 40px;">{{this.tagInfo.maCode}}</span>
                         </div>
                     </div>
 
@@ -358,7 +358,7 @@
                         "
                         >
                         <span >本次检验日期：</span>
-                        <span style="margin-left: 40px;">{{"2024-8-02"}}</span>
+                        <span style="margin-left: 40px;">{{this.tagInfo.thisCheckTime}}</span>
                         </div>
 
                     </div>
@@ -379,7 +379,7 @@
                         "
                         >
                         <span >下次检验日期：</span>
-                        <span style="margin-left: 40px;">{{"2025-7-02"}}</span>
+                        <span style="margin-left: 40px;">{{this.tagInfo.nextCheckTime}}</span>
                         </div>
 
                     </div>
@@ -401,7 +401,7 @@
                         "
                         >
                         <span >试验人：</span>
-                        <span style="margin-left: 40px;">{{"张三"}}</span>
+                        <span style="margin-left: 40px;">{{this.tagInfo.checkMan}}</span>
                         </div>
                     </div>
 
@@ -422,7 +422,7 @@
                         "
                         >
                         <span >检验结果：</span>
-                        <span style="margin-left: 40px;">{{"合格"}}</span>
+                        <span style="margin-left: 40px;">{{this.tagInfo.inspectStatus}}</span>
                         </div>
 
                     </div>
@@ -474,7 +474,18 @@ const codeImg = ref<string>('https://web-assets.dcloud.net.cn/unidoc/zh/shuijiao
 const isJj = ref<Number>(0)
 const maCodeTwo = ref<string>('')
 const optionList = ref([])
-const tagInfo = ref({})
+const tagInfo = ref({
+    isJj:null,
+    maCode:null,
+    materialName:null,
+    materialModel:null,
+    inspectStatus:null,
+    thisCheckTime:null,
+    nextCheckTime:null,
+    inspectMan:null,
+    checkMan:null,
+    phone:null,
+})
 
 onLoad(() => {
     isJj.value = null
@@ -504,7 +515,7 @@ const  changeTag =async () => {
             tagInfo.value = response.data[0]
         }
     });
-    isJj.value = 0 
+    isJj.value = tagInfo.value.isJj
     nextTick(() => {
     let canvas = null
     if(isJj.value==null){
@@ -515,10 +526,10 @@ const  changeTag =async () => {
 
     console.log("xxxxxxxxx",canvas)
     if (canvas!=null && isJj.value==0) {
-        chapter('机具检验专用章', '安徽送边电工程有限公司机具(物流)分公司', canvas);
+        chapter('机具检验专用章', '安徽送变电工程有限公司机具(物流)分公司', canvas);
     }
     if (canvas!=null && isJj.value==1) {
-        chapter('检验专用章', '安徽顺凯检测有限公司', canvas);
+        chapter('检验专用章', '安徽顺凯检测技术有限公司', canvas);
     }
 });
 }

src/pages/picking/outbound/details.vue

@@ -95,7 +95,7 @@
 
 <script setup>
 import { ref, onUnmounted } from 'vue'
-import { getOutboundDetailsAPI,leaseOutBackApi } from '@/services/picking/outbound.js'
+import { getOutboundDetailsAPI,getOutboundDetailsAPITwo,leaseOutBackApi } from '@/services/picking/outbound.js'
 import { onLoad, onShow } from '@dcloudio/uni-app' 
 const taskStatus = ref(3)//进行中
 const detailsList = ref([]) 
@@ -119,10 +119,13 @@ const leaseApplyInfo = ref({
     id: '', //              出库时所需参数 取详情接口 id
     typeId: '', //          出库时所需参数 取详情接口 typeId 
     manageType: '', //      出库时所需参数 取详情接口 manageType
+    publishTask: null, //      出库时所需参数 取详情接口 publishTask
 })
 
 onLoad((options) => {
     leaseApplyInfo.value.parentId = options.id
+    leaseApplyInfo.value.publishTask = options.publishTask
+    console.log('🚀 ~ onLoad ~ options:', options)
     getOutboundDetailsData()
 }) 
 onShow(() => {
@@ -130,7 +133,24 @@ onShow(() => {
 })
 // 获取列表详情
 const getOutboundDetailsData = async () => {
-    const { data: res } = await getOutboundDetailsAPI(leaseApplyInfo.value.parentId,keyWord.value) 
+    console.log('parentId:', leaseApplyInfo.value.parentId);
+    console.log('keyWord:', keyWord.value);
+    console.log('publishTask:', leaseApplyInfo.value.publishTask);
+    let { data: res } = {};
+    if (leaseApplyInfo.value.publishTask) {
+        // 如果 publishTask 不为空，则传递三个参数
+        res = await getOutboundDetailsAPITwo(
+            leaseApplyInfo.value.parentId,
+            keyWord.value,
+            leaseApplyInfo.value.publishTask
+        );
+    } else {
+        // 如果 publishTask 为空，则只传递两个参数
+        res = await getOutboundDetailsAPI(
+            leaseApplyInfo.value.parentId,
+            keyWord.value
+        );
+    }
     detailsList.value = res.leaseApplyDetailsList;
     leaseApplyInfo.value.taskId = res.leaseApplyInfo.taskId; 
     leaseApplyInfo.value.typeId = res.leaseApplyInfo.typeId; 

src/pages/picking/outbound/index.vue

@@ -132,7 +132,7 @@ const queryParams = ref({
     startTime: '', //                   开始时间
     endTime: '', //                     结束时间
     keyWord: '', //                     关键字
-    statusList: [3], //                 状态
+    statusList: [3,4,5], //                 状态
     pageNum: 1,
     pageSize: 3,
 })
@@ -222,7 +222,7 @@ const changeTab = (index) => {
 }
 // 点击跳转详情
 const handleItem = (item) => {
-    uni.navigateTo({ url: `/pages/picking/outbound/details?id=${item.id}` })
+    uni.navigateTo({ url: `/pages/picking/outbound/details?id=${item.id}&publishTask=${item.publishTask}` })
 }
 
 // 判断数据是否加载完毕

src/services/picking/outbound.js

@@ -19,6 +19,14 @@ export const getOutboundDetailsAPI = (id,keyWord) => {
         url: `/material/lease_apply_info/${id}?keyWord=${keyWord}`,
     })
 }
+
+
+export const getOutboundDetailsAPITwo = (id,keyWord,publishTask) => {
+    return http({
+        method: 'GET',
+        url: `/material/lease_apply_info/${id}?keyWord=${keyWord}&publishTask=${publishTask}`,
+    })
+}
 /**
  * 领料出库  ---- 物资详情
  */