BUG修复

pages/scanning_Result/scanning_Result.vue

@@ -690,20 +690,23 @@
       },
       // 跳转完成工单页面
       gotoOver() {
-        // uni.navigateTo({
-        //   url: `../scanning/scanning?type=${this.queryObj.type}&type1=${
-        //     this.queryObj.type1
-        //   }&id=${encodeURIComponent(JSON.stringify([this.wcId]))}&deptCode=${
-        //     this.queryObj.deptCode
-        //   }&dept=${this.queryObj.dept}&speNum=${this.speNum}&content=${this.content}`,
-        // });
-        uni.navigateTo({
-          url: `../specimenCheckingEnd/specimenCheckingEnd?type=${this.queryObj.type}&type1=${
-            this.queryObj.type1
-          }&id=${encodeURIComponent(JSON.stringify([this.wcId]))}&deptCode=${
-            this.queryObj.deptCode
-          }&dept=${this.queryObj.dept}&speNum=${this.speNum}&content=${this.content}`,
-        });
+        if(this.queryObj.type === 'specimenPlan'){
+          uni.navigateTo({
+            url: `../specimenCheckingEnd/specimenCheckingEnd?type=${this.queryObj.type}&type1=${
+              this.queryObj.type1
+            }&id=${encodeURIComponent(JSON.stringify([this.wcId]))}&deptCode=${
+              this.queryObj.deptCode
+            }&dept=${this.queryObj.dept}&speNum=${this.speNum}&content=${this.content}`,
+          });
+        }else{
+          uni.navigateTo({
+            url: `../scanning/scanning?type=${this.queryObj.type}&type1=${
+              this.queryObj.type1
+            }&id=${encodeURIComponent(JSON.stringify([this.wcId]))}&deptCode=${
+              this.queryObj.deptCode
+            }&dept=${this.queryObj.dept}&speNum=${this.speNum}&content=${this.content}`,
+          });
+        }
       },
       // 继续执行工单,当扫错科室码的时候，直接跳过，默默执行正确的科室码
       goToRight(id) {

pages/scanning_djEnd/scanning_djEnd.vue

@@ -960,24 +960,27 @@
       },
       // 跳转完成工单页面
       gotoOver() {
-        // uni.navigateTo({
-        //   url: `../scanning/scanning?type=${this.queryObj.type}&type1=${
-        //   this.queryObj.type1
-        // }&deptCode=${this.queryObj.code}&dept=${
-        //   this.queryObj.dept
-        // }&id=${encodeURIComponent(JSON.stringify(this.wcId))}&content=${
-        //   this.content
-        // }`,
-        // });
-        uni.navigateTo({
-          url: `../specimenCheckingEnd/specimenCheckingEnd?type=${this.queryObj.type}&type1=${
-          this.queryObj.type1
-        }&deptCode=${this.queryObj.code}&dept=${
-          this.queryObj.dept
-        }&id=${encodeURIComponent(JSON.stringify(this.wcId))}&content=${
-          this.content
-        }`,
-        });
+        if(this.queryObj.type === 'specimenPlan'){
+          uni.navigateTo({
+            url: `../specimenCheckingEnd/specimenCheckingEnd?type=${this.queryObj.type}&type1=${
+            this.queryObj.type1
+          }&deptCode=${this.queryObj.code}&dept=${
+            this.queryObj.dept
+          }&id=${encodeURIComponent(JSON.stringify(this.wcId))}&content=${
+            this.content
+          }`,
+          });
+        }else{
+          uni.navigateTo({
+            url: `../scanning/scanning?type=${this.queryObj.type}&type1=${
+            this.queryObj.type1
+          }&deptCode=${this.queryObj.code}&dept=${
+            this.queryObj.dept
+          }&id=${encodeURIComponent(JSON.stringify(this.wcId))}&content=${
+            this.content
+          }`,
+          });
+        }
       },
       //一对一完成工单
       Scanning_complete1(id) {

pages/scanning_djInfo/scanning_djInfo.vue

@@ -424,11 +424,11 @@
         this.gotoFlag = false;
         if(isScan){
           uni.navigateTo({
-            url: `../noScanSpecimen/noScanSpecimen?deptName=${this.queryObj.dept}workOrderId=${encodeURIComponent(JSON.stringify(this.queryObj.ids))}&deptCode=${this.queryObj.deptCode}&isScan=1`,
+            url: `../noScanSpecimen/noScanSpecimen?deptName=${this.queryObj.dept}&workOrderId=${encodeURIComponent(JSON.stringify(this.queryObj.ids))}&deptCode=${this.queryObj.deptCode}&isScan=1`,
           });
         }else{
           uni.navigateTo({
-            url: `../noScanSpecimen/noScanSpecimen?deptName=${this.queryObj.dept}workOrderId=${encodeURIComponent(JSON.stringify(this.queryObj.ids))}&deptCode=${this.queryObj.deptCode}`,
+            url: `../noScanSpecimen/noScanSpecimen?deptName=${this.queryObj.dept}&workOrderId=${encodeURIComponent(JSON.stringify(this.queryObj.ids))}&deptCode=${this.queryObj.deptCode}`,
           });
         }
       },
@@ -619,20 +619,23 @@
       },
       // 跳转完成工单页面
       gotoOver() {
-        // uni.navigateTo({
-        //   url: `../scanning/scanning?type=${this.queryObj.type}&type1=${
-        //   this.queryObj.type1
-        // }&id=${encodeURIComponent(JSON.stringify(this.wcId))}&deptCode=${
-        //   this.queryObj.deptCode
-        // }&dept=${this.queryObj.dept}&content=${this.content}`,
-        // });
-        uni.navigateTo({
-          url: `../specimenCheckingEnd/specimenCheckingEnd?type=${this.queryObj.type}&type1=${
-          this.queryObj.type1
-        }&id=${encodeURIComponent(JSON.stringify(this.wcId))}&deptCode=${
-          this.queryObj.deptCode
-        }&dept=${this.queryObj.dept}&content=${this.content}`,
-        });
+        if(this.queryObj.type === 'specimenPlan'){
+          uni.navigateTo({
+            url: `../specimenCheckingEnd/specimenCheckingEnd?type=${this.queryObj.type}&type1=${
+            this.queryObj.type1
+          }&id=${encodeURIComponent(JSON.stringify(this.wcId))}&deptCode=${
+            this.queryObj.deptCode
+          }&dept=${this.queryObj.dept}&content=${this.content}`,
+          });
+        }else{
+          uni.navigateTo({
+            url: `../scanning/scanning?type=${this.queryObj.type}&type1=${
+            this.queryObj.type1
+          }&id=${encodeURIComponent(JSON.stringify(this.wcId))}&deptCode=${
+            this.queryObj.deptCode
+          }&dept=${this.queryObj.dept}&content=${this.content}`,
+          });
+        }
       },
       // 继续扫描
       Scanning_again() {

pages/specimenCheckingEnd/specimenCheckingEnd.vue

@@ -61,12 +61,30 @@
           success: (result) => {
             if (result.confirm) {
               console.log('用户点击确定');
-              uni.navigateTo({
-                url: `../scanning/scanning?type=${this.msg.type}&type1=${
-                  this.msg.type1
-                }&id=${encodeURIComponent(JSON.stringify([this.msg.id]))}&deptCode=${
-                  this.msg.deptCode
-                }&dept=${this.msg.dept}&speNum=${this.msg.speNum}&content=${this.msg.content}`,
+              uni.showLoading({
+                mask: true,
+                title: '加载中'
+              })
+              let postData = {
+                gdId: this.msg.id,
+                deptQrCode: this.msg.deptCode,
+              }; //起点科室id，选择的科室ids
+              post(`/api/addSpecimenRecordAndDept`, postData).then((res) => {
+                uni.hideLoading();
+                if (res.status == 200) {
+                  uni.navigateTo({
+                    url: `../scanning/scanning?type=${this.msg.type}&type1=${
+                      this.msg.type1
+                    }&id=${encodeURIComponent(JSON.stringify([this.msg.id]))}&deptCode=${
+                      this.msg.deptCode
+                    }&dept=${this.msg.dept}&speNum=${this.msg.speNum}&content=${this.msg.content}`,
+                  });
+                } else {
+                  uni.showToast({
+                    icon: "none",
+                    title: "请求失败！",
+                  });
+                }
               });
             } else if (result.cancel) {
               console.log('用户点击取消');