bugfix

pages/inspection/inspectionExecute/inspectionExecute.vue

@@ -115,7 +115,7 @@
     SM().then((ress1) => {
       // ----------------------------------
       let postData = {
-        queryTask: 'all',
+        queryTask: 'todo',
         code: ress1,
         idx: 0,
         sum: 1,
@@ -147,7 +147,7 @@
           }else{
             uni.hideLoading();
             uni.navigateTo({
-              url: `/pages/inspection/inspectionScanning/inspectionScanning?inspectionNodeCode=${res.data.code}&inspectionNodeName=${res.data.name}`
+              url: `/pages/inspection/inspectionScanning/inspectionScanning?inspectionNodeNewCode=${ress1}&inspectionNodeCode=${res.data.code}&inspectionNodeName=${res.data.name}`
             })
           }
         } else {

pages/inspection/inspectionScanning/inspectionScanning.vue

@@ -77,13 +77,14 @@
   
   // 数据
   const dataInfo = reactive({
-    tabs: [{id: 0, name: '巡检工单', value: 'all', num: ''}, {id: 1, name: '历史工单', value: '', num: ''}],
+    tabs: [{id: 0, name: '巡检工单', value: 'todo', num: ''}, {id: 1, name: '历史工单', value: 'close', num: ''}],
     tabActiveId: 0,//当前选择的tab
     list: [],//工单列表
     idx: 0,//页码
     hasMore: true,//是否有更多数据
     inspectionNodeDTO: {},
-    inspectionNodeCode: '',
+    inspectionNodeNewCode: '',//巡检点二维码
+    inspectionNodeCode: '',//巡检点原始二维码
     inspectionNodeName: '',
   })
   
@@ -93,31 +94,27 @@
       title: "加载中",
       mask: true,
     });
+    let postData = {
+      code: dataInfo.inspectionNodeNewCode,
+      taskId: data.id,
+      account: loginUserStore.loginUser.user.account,
+    };
     // 'inspection|$|1bd0c704-0962-4ed4-b5a6-b5bda3d78231'
     // 'inspection|$|bc9f61af-99c8-4c86-88f9-f29dd3fc43c0'
 		// 'inspection|$|92e7bb9a-5f58-42f6-991a-fcd67247e295'
-    SM().then((ress1) => {
-      let postData = {
-        code: ress1,
-        taskId: data.id,
-        account: loginUserStore.loginUser.user.account,
-      };
-      api_scanCode(postData).then((res) => {
-        uni.hideLoading();
-        if (res.status == 200) {
-          inspectionValueStore.setInspectionValueData(res.data);
-          uni.navigateTo({
-            url: `/pages/inspection/inspectionValue/inspectionValue?inspectionExecuteId=${data.id}`
-          })
-        } else {
-          uni.showToast({
-            icon: 'none',
-            title: res.msg || '请求数据失败！'
-          });
-        }
-      });
-    }).catch(err=>{
+    api_scanCode(postData).then((res) => {
       uni.hideLoading();
+      if (res.status == 200) {
+        inspectionValueStore.setInspectionValueData(res.data);
+        uni.navigateTo({
+          url: `/pages/inspection/inspectionValue/inspectionValue?inspectionExecuteId=${data.id}`
+        })
+      } else {
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
     });
   }
 
@@ -208,6 +205,7 @@
   
   onLoad((option) => {
     dataInfo.inspectionNodeCode = option.inspectionNodeCode;
+    dataInfo.inspectionNodeNewCode = option.inspectionNodeNewCode;
     dataInfo.inspectionNodeName = option.inspectionNodeName;
     getList(0);
   })