标本退回功能

main.js

@@ -4,7 +4,7 @@ import App from './App'
 import wx from 'weixin-jsapi'
 // import VConsole from 'vconsole';
 // new VConsole();
-console.info('v2.4.5');
+console.info('v2.4.6');
 Vue.prototype.wx = wx //声明扫码
 Vue.prototype.audios = [] //待播放的语音集合
 // #endif

pages/receipt_infopage/receipt_infopage.vue

@@ -99,7 +99,8 @@
         </view>
         <view class="page_item_foot_text">
           <text class="text1">任务类型</text>
-          <text class="text2">{{ infoDATA.taskType.taskName }}<template v-if="infoDATA.goodsRemark">-{{infoDATA.goodsRemark}}</template></text>
+          <text class="text2">{{ infoDATA.taskType.taskName }}<template
+              v-if="infoDATA.goodsRemark">-{{infoDATA.goodsRemark}}</template></text>
         </view>
         <view class="page_item_foot_text" v-if="infoDATA.taskType.associationType.value==='inspect'">
           <text class="text1">是否半程陪检</text>
@@ -281,7 +282,9 @@
           infoDATA.taskType.associationType.value != 'drugsBag' &&
           infoDATA.taskType.associationType.value != 'specimen' &&
           infoDATA.taskType.associationType.value != 'specimenPlan'
-        " hover-class="seimin-btn-hover"><smallScreen :sData="infoDATA" :sType="1">扫码</smallScreen></view>
+        " hover-class="seimin-btn-hover">
+          <smallScreen :sData="infoDATA" :sType="1">扫码</smallScreen>
+        </view>
         <view :class="[infoDATA.taskType.specialCloseButton == 1 ? 'btn3' : 'btn2']" @click="photograph(infoDATA)" v-if="
           infoDATA.gdState.value != 2 &&
           infoDATA.taskType.associationType.value != 'jPBag' &&
@@ -306,7 +309,9 @@
           infoDATA.taskType.associationType.value != 'patientTransport' &&
           infoDATA.taskType.associationType.value != 'inspect' &&
           infoDATA.taskType.associationType.value != 'other'
-        " hover-class="seimin-btn-hover"><smallScreen :sData="infoDATA" :sType="2">扫码</smallScreen></view>
+        " hover-class="seimin-btn-hover">
+        <smallScreen :sData="infoDATA" :sType="2">扫码</smallScreen>
+      </view>
       <view class="btn3" @click="specialCloseClick()" v-if="
           infoDATA.gdState.value != 2 &&
           infoDATA.taskType.associationType.value != 'patientTransport' &&
@@ -455,29 +460,25 @@
           this.textareaFlag = false;
           this.textareaText = "";
           if (result.state == 200) {
-            setTimeout(() => {
-              uni.hideLoading();
-              this.models = {
-                disjunctor: true,
-                content: "工单关闭成功",
-                icon: "success",
-                operate: {
-                  know: "知道了",
-                },
-              };
-            }, 100);
+            uni.hideLoading();
+            this.models = {
+              disjunctor: true,
+              content: "工单关闭成功",
+              icon: "success",
+              operate: {
+                know: "知道了",
+              },
+            };
           } else {
-            setTimeout(() => {
-              uni.hideLoading();
-              this.models = {
-                disjunctor: true,
-                content: "工单关闭失败",
-                icon: "error",
-                operate: {
-                  know: "知道了",
-                },
-              };
-            }, 100);
+            uni.hideLoading();
+            this.models = {
+              disjunctor: true,
+              content: "工单关闭失败",
+              icon: "error",
+              operate: {
+                know: "知道了",
+              },
+            };
           }
         });
       },

pages/scanning_B/scanning_B.vue

@@ -34,15 +34,23 @@
     <view class="foot_btn">
       <view class="btn3" @click="showAlert()">知道了</view>
       <block v-if="res.scanCodeSpecimenOrderSign == 1">
-        <view class="btn3" @click="buildAndOrderSign(res.data.id,res.workOrder.id)" v-if="res.workOrder&&(res.workOrder.gdState.value == 2||res.workOrder.gdState.value == 4)">接单并签到</view>
-        <view class="btn3" @click="orderSign(res.workOrder)" v-if="res.workOrder&&res.workOrder.gdState.value != 2&&res.workOrder.gdState.value != 4">执行工单</view>
+        <view class="btn3" @click="buildAndOrderSign(res.data.id,res.workOrder.id)"
+          v-if="res.workOrder&&(res.workOrder.gdState.value == 2||res.workOrder.gdState.value == 4)">接单并签到</view>
+        <view class="btn3" @click="orderSign(res.workOrder)"
+          v-else-if="res.workOrder&&res.workOrder.gdState.value != 2&&res.workOrder.gdState.value != 4">执行工单</view>
         <view class="btn3" @click="buildAndOrderSign(res.data.id)" v-if="!res.workOrder && res.data">建单并签到</view>
       </block>
+      <view class="btn3" @click="back(res.data,res.workOrder)"
+        v-if="res.data.speState&&(res.data.speState.value == 2||res.data.speState.value == 3||res.data.speState.value == 4||res.data.speState.value == 5)">
+        退回</view>
     </view>
     <!-- 填写交接人账号弹窗 -->
     <selectAccount v-if="hosModels.disjunctor" :title="hosModels.title" :disjunctor="hosModels.disjunctor" @ok="hosOk"
       @cancel="hosCancel">
     </selectAccount>
+    <!-- 弹窗 -->
+    <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
+      :operate="models.operate" @know="know"></showModel>
   </view>
 </template>
 <script>
@@ -53,6 +61,12 @@
   export default {
     data() {
       return {
+        // 弹窗model
+        models: {
+          disjunctor: false,
+        },
+        backSpecimen: {},
+        backStatus: '',
         infoDATA: {},
         res: {},
         // 填写交接人账号弹窗model
@@ -109,101 +123,208 @@
           });
         }
       },
+      // 退回
+      back(specimen, workOrder) {
+        this.backSpecimen = specimen;
+        this.backStatus = 'back';
+        uni.showModal({
+          title: '提示',
+          content: '是否退回？',
+          success: (res) => {
+            if (res.confirm) {
+              console.log('用户点击确定');
+              let postData = {
+                "idx": 0,
+                "sum": 1,
+                "hospitalConfig": {
+                  "hosId": uni.getStorageSync("userData").user.currentHospital.id,
+                  "key": "returnSpecimenWhetherHandover"
+                }
+              };
+              uni.showLoading({
+                title: "加载中",
+                mask: true,
+              });
+              post('/simple/data/fetchDataList/hospitalConfig', postData).then((result) => {
+                uni.hideLoading();
+                if (result.status == 200) {
+                  if (result.list[0].value == 1) {
+                    this.showSelectAccount();
+                  } else {
+                    this.backHandler(this.backSpecimen, workOrder);
+                  }
+                } else {
+                  uni.showToast({
+                    icon: "none",
+                    title: "请求失败！",
+                  });
+                }
+              })
+            } else if (res.cancel) {
+              console.log('用户点击取消');
+            }
+          }
+        });
+      },
       // 执行工单
       orderSign(workOrder) {
         this.type = 'orderSign';
-        uni.showLoading({
-          title: "加载中",
-          mask: true,
-        });
-        let postData = {
-          content: workOrder.startDept.qrcode,
-          taskTypeId: workOrder.taskType.id,
-          gdState: workOrder.gdState.id,
-        };
-        //检验二维码的有效性
-        post("/dept/scanning", postData).then((result) => {
-          this.currentCode = result.code;
-          if (result.state == 200 || result.state == 201) {
-            if (result.account) {
-              this.nextDeptOrder_s(workOrder, {
-                account: result.account,
-                accountName: result.name,
-                accountId: result.id,
+        uni.showModal({
+          title: '提示',
+          content: '是否执行工单？',
+          success: (res) => {
+            if (res.confirm) {
+              console.log('用户点击确定');
+              uni.showLoading({
+                title: "加载中",
+                mask: true,
               });
-            } else {
-              this.nextDeptOrder_s(workOrder);
+              let postData = {
+                content: workOrder.startDept.qrcode,
+                taskTypeId: workOrder.taskType.id,
+                gdState: workOrder.gdState.id,
+              };
+              //检验二维码的有效性
+              post("/dept/scanning", postData).then((result) => {
+                this.currentCode = result.code;
+                if (result.state == 200 || result.state == 201) {
+                  if (result.account) {
+                    this.nextDeptOrder_s(workOrder, {
+                      account: result.account,
+                      accountName: result.name,
+                      accountId: result.id,
+                    });
+                  } else {
+                    this.nextDeptOrder_s(workOrder);
+                  }
+                } else if (result.state == "0000") {
+                  uni.hideLoading();
+                  this.showSelectAccount();
+                } else {
+                  uni.hideLoading();
+                  uni.showToast({
+                    icon: "none",
+                    title: "请求失败！",
+                  });
+                }
+              });
+            } else if (res.cancel) {
+              console.log('用户点击取消');
             }
-          } else if (result.state == "0000") {
-            uni.hideLoading();
-            this.showSelectAccount();
-          } else {
-            uni.hideLoading();
-            uni.showToast({
-              icon: "none",
-              title: "请求失败！",
-            });
           }
         });
       },
       // 接单并签到或建单并签到
-      buildAndOrderSign(speId,orderId) {
+      buildAndOrderSign(speId, orderId) {
         this.type = 'buildAndOrderSign';
-        if(orderId){
+        if (orderId) {
           // 接单并签到
           this.type = 'specimenAssignAndSign';
-        }else{
+        } else {
           // 建单并签到
           this.type = 'buildAndOrderSign';
         }
-        uni.showLoading({
-          title: "加载中",
-          mask: true,
-        });
-        let postData = {
-          speId
-        }
-        if(orderId){
-          // 接单并签到
-          postData.orderId = orderId;
-        }
-        post("/workerOrder/specimenCreateAndSign", postData).then((res) => {
-          if (res.state == 200 || res.state == 201) {
-            uni.hideLoading();
-            if (res.status == 200) {
-              // 跳转到扫描科室
-              // type1: res.type, //type类型
-              // id: data.id, //工单ID
-              // deptCode: code, //二维码
-              // dept: res.dept //科室名称
-              uni.navigateTo({
-                url: `/pages/scanning_code/scanning_code?type=${
-                res.workOrder.taskType.associationType.value
-              }&type1=${res.type}&id=${res.workOrder.id}&deptCode=${
-                this.currentCode
-              }&dept=${res.dept}&accountObj=${encodeURIComponent(
-                JSON.stringify(undefined)
-              )}&deptId=${res.deptId}`,
+        uni.showModal({
+          title: '提示',
+          content: `是否${this.type == 'specimenAssignAndSign'?'接单并签到':'建单并签到'}？`,
+          success: (res) => {
+            if (res.confirm) {
+              console.log('用户点击确定');
+              uni.showLoading({
+                title: "加载中",
+                mask: true,
               });
-            } else {
-              uni.navigateTo({
-                url: `/pages/scanning_Result/scanning_Result?type=${res.workOrder.taskType.associationType.value}&type1=${res.type}&id=${res.workOrder.id}&status=600&msg=${res.msg}&isKs=1`,
+              let postData = {
+                speId
+              }
+              if (orderId) {
+                // 接单并签到
+                postData.orderId = orderId;
+              }
+              post("/workerOrder/specimenCreateAndSign", postData).then((res) => {
+                if (res.state == 200 || res.state == 201) {
+                  uni.hideLoading();
+                  if (res.status == 200) {
+                    // 跳转到扫描科室
+                    // type1: res.type, //type类型
+                    // id: data.id, //工单ID
+                    // deptCode: code, //二维码
+                    // dept: res.dept //科室名称
+                    uni.navigateTo({
+                      url: `/pages/scanning_code/scanning_code?type=${
+                      res.workOrder.taskType.associationType.value
+                    }&type1=${res.type}&id=${res.workOrder.id}&deptCode=${
+                      this.currentCode
+                    }&dept=${res.dept}&accountObj=${encodeURIComponent(
+                      JSON.stringify(undefined)
+                    )}&deptId=${res.deptId}`,
+                    });
+                  } else {
+                    uni.navigateTo({
+                      url: `/pages/scanning_Result/scanning_Result?type=${res.workOrder.taskType.associationType.value}&type1=${res.type}&id=${res.workOrder.id}&status=600&msg=${res.msg}&isKs=1`,
+                    });
+                  }
+                } else if (res.state == "0000") {
+                  uni.hideLoading();
+                  this.currentCode = res.code;
+                  this.res.workOrder = res.workOrder;
+                  this.showSelectAccount();
+                } else {
+                  uni.hideLoading();
+                  uni.showToast({
+                    icon: "none",
+                    title: res.msg || "请求失败！",
+                  });
+                }
               });
+            } else if (res.cancel) {
+              console.log('用户点击取消');
             }
-          } else if (res.state == "0000") {
-            uni.hideLoading();
-            this.currentCode = res.code;
-            this.res.workOrder = res.workOrder;
-            this.showSelectAccount();
-          } else {
-            uni.hideLoading();
-            uni.showToast({
-              icon: "none",
-              title: res.msg || "请求失败！",
-            });
           }
         });
       },
+      know() {
+        this.models.disjunctor = false;
+        if (this.models.icon === 'success') {
+          uni.navigateTo({
+            url: "../receiptpage/receiptpage",
+          });
+        }
+      },
+      // 退回
+      backHandler(specimen, workorder, data) {
+        console.log(specimen);
+        uni.showLoading({
+          title: '加载中',
+          mask: true
+        })
+        let postData = {
+          scode: specimen.scode,
+          hosId: uni.getStorageSync("userData").user.currentHospital.id,
+          speState: specimen.speState ? specimen.speState.id : undefined,
+          handoverId: data ? data.accountId : undefined,
+          handoverName: data ? data.accountName : undefined,
+          gdId: workorder ? workorder.id : undefined,
+        }
+        post('/workerOrder/returnSpecimen', postData).then(res => {
+          uni.hideLoading();
+          if (res.state == 200) {
+            this.models = {
+              disjunctor: true,
+              title: "提示",
+              content: `标本退回成功`,
+              icon: "success",
+            };
+          } else {
+            this.models = {
+              disjunctor: true,
+              title: "提示",
+              content: `标本退回失败`,
+              icon: "error",
+            };
+          }
+        })
+      },
       // 填写交接人账号-确认
       hosOk(data) {
         console.log(data);
@@ -248,7 +369,12 @@
           title: "加载中",
           mask: true,
         });
-        this.nextDeptOrder_s(this.res.workOrder, data);
+        if (this.backStatus = 'back') {
+          // 退回
+          this.backHandler(this.backSpecimen, this.res.workOrder, data);
+        } else {
+          this.nextDeptOrder_s(this.res.workOrder, data);
+        }
       },
       // 填写交接人账号-取消
       hosCancel() {