陪检绩效

components/showModel/showModel.vue

@@ -204,7 +204,7 @@ export default {
 };
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 .showModel {
   position: fixed;
   left: 0;
@@ -225,7 +225,7 @@ export default {
 
     .showModel__header {
       font-size: 36rpx;
-      color: 000;
+      color: #000;
       height: 84rpx;
       display: flex;
       justify-content: center;
@@ -233,6 +233,7 @@ export default {
     }
 
     .showModel__article {
+      color: #000;
       margin: 40rpx auto 25rpx;
       width: 488rpx;
       padding: 60rpx 0;

components/smallScreen/smallScreen.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="smallScreen">
-    <view class="smallScreen_scan" @click="Scan_ss(sData,sType)">
+    <view class="smallScreen_scan" @click="getInspectAndPatientTransform(sData,sType)">
       <slot></slot>
     </view>
     <!-- 填写交接人账号弹窗 -->
@@ -15,6 +15,7 @@
 </template>
 
 <script>
+  import showModel from "../../components/showModel/showModel.vue";
   import selectAccount from "../../components/selectAccount/selectAccount.vue";
   import {
     post,
@@ -23,11 +24,12 @@
   export default {
     data() {
       return {
+        selectRadio: [], //单选框选中的数据，第一项是qrcode，第二项是名称
         // 单选框弹窗model1
         models4: {
           disjunctor: false,
         },
-        hosId: "",
+        hosId: uni.getStorageSync("userData").user.currentHospital.id,
         currentCode: '', //当前小扫描的科室二维码
         currentData: {}, //当前小扫描的工单对象
         // 填写交接人账号弹窗model
@@ -47,8 +49,10 @@
     },
     methods: {
       // 获取是否需要选择陪检方式
-      getInspectAndPatientTransform(){
-        if(this.typeData){
+      getInspectAndPatientTransform(sData,sType){
+        console.log(this.sData,this.sType);
+        // 患者陪检，患者其他服务，工单状态是待到达
+        if((this.sData.taskType.associationType.value === 'inspect' || this.sData.taskType.associationType.value === 'patientTransport') && this.sData.gdState.value == 4){
           const postData = {
             "idx":0,
             "sum":1,
@@ -70,8 +74,8 @@
             console.log(res)
             if (res.status == 200) {
               res.list = res.list || [];
-              if(res.list[0].signTypeIds && this.typeData.gdState.value == 4){
-                // 如果开启并且工单状态是待到达
+              if(res.list[0].signTypeIds){
+                // 如果开启
                 const postData = {
                   "idx":0,
                   "sum":9999,
@@ -85,6 +89,7 @@
                   if (res.status == 200) {
                     res.list = res.list || [];
                     let radioInspectionDistanceItem = res.list.map(v => ({id: v.id + "__" + v.inspectMode, inspectMode: v.inspectMode}));
+                    console.log(radioInspectionDistanceItem)
                     this.models4 = {
                       disjunctor: true,
                       title: "请选择陪检方式",
@@ -101,6 +106,8 @@
                     });
                   }
                 })
+              }else{
+                this.Scan_ss(sData,sType);
               }
             } else {
               uni.hideLoading();
@@ -110,6 +117,8 @@
               });
             }
           })
+        }else{
+          this.Scan_ss(sData,sType);
         }
       },
       // 选中单选框
@@ -124,7 +133,7 @@
           return;
         }
         this.models4.disjunctor = false;
-        this.allStart(this.typeData);
+        this.Scan_ss(this.sData,this.sType);
       },
       // 如果不是静配，药配，标本配送,标本轮巡
       // 科室签到（小扫描）
@@ -143,6 +152,7 @@
         if (this.currentCode) {
           let gdStateValue = data.gdState.value; //工单状态value
           let associationTypeValue = data.taskType.associationType.value; //关联类型value
+          
           // 患者陪检，并且工单状态是待到达
           if (
             gdStateValue == "4" &&
@@ -203,6 +213,10 @@
             };
             type = "handleTrans";
           }
+          if(gdStateValue == "4" && (associationTypeValue == "inspect" || associationTypeValue == "patientTransport")){
+            console.log(this.selectRadio)
+            list.inspectMode = this.selectRadio.length > 0 ? this.selectRadio[0] : undefined;
+          }
           post("/workerOrder/" + type, list).then((res) => {
             uni.hideLoading();
             if (res) {
@@ -445,9 +459,6 @@
     onShow(){
       this.SMFlag = true;
     },
-    onLoad(){
-      this.hosId = uni.getStorageSync("userData").user.currentHospital.id;
-    }
   };
 </script>
 

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.17');
+console.info('v2.4.18');
 Vue.prototype.wx = wx //声明扫码
 Vue.prototype.audios = [] //待播放的语音集合
 // #endif