Merge branch 'master' of http://git.dashitech.com/seimin/zy-wechat

components/backModel/backModel.vue

@@ -89,11 +89,16 @@
     methods: {
       // 获取退回原因
       getReasonForReturn() {
-        post('/common/common/getDictionary', {
-          "type": "list",
-          "key": "reason_for_return"
+        post('/simple/data/fetchDataList/dictionary', {
+            "idx": 0,
+            "sum": 9999,
+            "dictionary": {
+                "key": "reason_for_return",
+                "extra5": "1"
+                
+            }
         }).then(res => {
-          this.list = res;
+          this.list = res.list || [];
         })
       },
       // 修改退回原因
@@ -133,7 +138,7 @@
     top: 0;
     bottom: 0;
     background-color: rgba(0, 0, 0, 0.2);
-    z-index: 999;
+    z-index: 998;
 
     .uni-list-cell {
       width: 90%;
@@ -160,6 +165,7 @@
           text-align: left;
           width: 100%;
           padding: 0 16rpx;
+          box-sizing: border-box;
         }
 
         .pickerBack {

pages/inspectList/inspectList.vue

@@ -24,7 +24,7 @@
               <view class="page_item_top_L">
                 <view class="L_time" @click="toPatientDetail(item)">
                   <template v-if="!item.execDept">
-                    <!-- 没有标记出行方式 -->
+                    <!-- 没有标记陪检方式 -->
                     <view class="circle"></view>
                     <view class="circle"></view>
                     <view class="circle"></view>
@@ -55,7 +55,7 @@
                     <text class="p_info">{{ item.residenceNo }}</text>
                   </view>
                   <view class="column">
-                    <text class="p_title">出行方式：</text>
+                    <text class="p_title">陪检方式：</text>
                     <text class="p_info">{{ (item.patientDTO && item.patientDTO.tripTypeDTO) ? item.patientDTO.tripTypeDTO.inspectMode : '' }}</text>
                   </view>
                 </view>
@@ -307,7 +307,7 @@
           "id": this.currentInspect.id,
           "execDeptId": execDeptId
         };
-        
+
         uni.showLoading({
           title: '加载中',
           mask: true,
@@ -679,13 +679,13 @@
     box-sizing: border-box;
     border-radius: 4rpx;
     background-color: #E5E8ED;
-  
+
     .toolbar-icon {
       font-size: 52rpx;
       margin-right: 16rpx;
       color: #49B856;
     }
-  
+
     .toolbar-sao {
       font-size: 36rpx;
       color: #333;
@@ -735,7 +735,7 @@
         .tab_dept {
           position: relative;
         }
-        
+
         .moreFilter {
           width: 48rpx;
           position: absolute;

pages/newDrug/createOrder/createOrder.vue

@@ -34,9 +34,10 @@
     <view class="foot_btn_spe">
       <view class="column">
         <view class="btn" @click="goIndex()">返回</view>
-        <view class="btn" @click="createOrBuildOrder()" v-if="queryObj.type === 'build' && config.drugsCreateSign === 1">建单并签到</view>
-        <view class="btn" @click="createOrBuildOrder()" v-if="queryObj.type === 'receive' && config.drugsReceiveSign === 1">接单并签到</view>
-        <view class="btn" @click="createOrBuildOrder()" v-if="queryObj.type === 'merge'">合并工单配送</view>
+        <view class="btn" @click="createOrBuildOrder('build')" v-if="queryObj.type === 'build' && config.drugsCreateSign === 1">建单并签到</view>
+        <view class="btn" @click="createOrBuildOrder('receive')" v-if="queryObj.type === 'receive' && config.drugsReceiveSign === 1">接单并签到</view>
+        <view class="btn" @click="createOrBuildOrder('merge')" v-if="queryObj.type === 'merge'">合并工单配送</view>
+        <view class="btn" @click="createOrBuildOrder('build')" v-if="workOrder.gdState && (workOrder.gdState.value == 4 || workOrder.gdState.value == 5) && config.urgentCreateOrder == 1">紧急配送建单</view>
       </view>
     </view>
   </view>
@@ -55,6 +56,7 @@
         drugsBag: {}, //药包信息
         config: {}, //药品的业务流程配置
         orderId: undefined, //根据药包查询到的工单ID
+        workOrder: {}, //工单
       };
     },
     methods: {
@@ -154,13 +156,13 @@
         })
       },
       // 建单并签到/接单并签到
-      createOrBuildOrder(){
+      createOrBuildOrder(type){
         let content = '';
-        if(this.queryObj.type === 'build'){
+        if(type === 'build'){
           content = `请确认是否建单并签到？`;
-        }else if(this.queryObj.type === 'receive'){
+        }else if(type === 'receive'){
           content = `请确认是否接单并签到？`;
-        }else if(this.queryObj.type === 'merge'){
+        }else if(type === 'merge'){
           content = `您确认要合并工单进行配送吗？`;
         }
         uni.showModal({
@@ -174,9 +176,9 @@
                 id: +this.queryObj.drugsBagId,
               };
               
-              if(this.queryObj.type === 'receive'){
+              if(type === 'receive'){
                 postData.orderId = this.orderId;
-              }else if(this.queryObj.type === 'merge'){
+              }else if(type === 'merge'){
                 postData.orderId = this.queryObj.newOrderId || undefined;
                 postData.oldOrderId = this.queryObj.orderId || undefined;
               }
@@ -223,6 +225,7 @@
               this.drugsBag = res.data.dto || {};
               this.orderId = this.queryObj.orderId;
               this.config = res.data.taskTypeConfig || {};
+              this.workOrder = res.data.workOrder || {};
             }
           }else{
             uni.showToast({

pages/receipt_infopage/receipt_infopage.vue

@@ -406,7 +406,7 @@
           infoDATA.taskType.associationType.value != 'specimenPlan' &&
           infoDATA.taskType.associationType.value != 'ordinary' &&
           infoDATA.taskType.specialCloseButton == 1
-        " hover-class="seimin-btn-hover">特殊情况关闭</view>
+        " hover-class="seimin-btn-hover">{{infoDATA.taskType.closeOrderCheckDept == 1 ? '扫描科室码关闭' : '特殊情况关闭'}}</view>
       </template>
       <!-- 如果不是患者陪检或患者转运或其他,万能交接 -->
       <!-- <view :class="[infoDATA.taskType.specialCloseButton == 1 ? 'btn3' : 'btn2']" v-if="
@@ -430,7 +430,7 @@
           infoDATA.taskType.associationType.value != 'inspect' &&
           infoDATA.taskType.associationType.value != 'other' &&
           infoDATA.taskType.specialCloseButton == 1
-        " hover-class="seimin-btn-hover">特殊情况关闭</view>
+        " hover-class="seimin-btn-hover">{{infoDATA.taskType.closeOrderCheckDept == 1 ? '扫描科室码关闭' : '特殊情况关闭'}}</view>
       <view class="btn3" @click="viewSpecimen(infoDATA)" v-if="
           infoDATA.taskType.associationType.value == 'specimen' ||
           infoDATA.taskType.associationType.value == 'specimenPlan'
@@ -497,6 +497,7 @@
     },
     data() {
       return {
+        deptCodeScan: '',//特殊关闭，扫码结果
         patientHandoverData: {},
         patientHandoverCode: '',
         other: {
@@ -1516,7 +1517,52 @@
         });
       },
       // 特殊情况关闭按钮
-      specialCloseClick() {
+      specialCloseClick(){
+        // 是否需要验证科室码
+        if(this.infoDATA.taskType.closeOrderCheckDept == 1){
+          this.specialCloseClickScan();
+        }else{
+          this.specialCloseClickText();
+        }
+      },
+      // 扫起点科室或终点科室
+      specialCloseClickScan(){
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
+        SM().then((content) => {
+          this.SMFlag = true;
+          this.specialCloseClickValidate(content);
+        }).catch(err => {
+          this.SMFlag = true;
+        });
+      },
+      // 校验科室
+      specialCloseClickValidate(content){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/workerOrder/scanCheck", {
+          type: 'workOrderDept', //匹配工单的起点科室或终点科室
+          workOrderId: this.dataId,
+          scanCode: content,
+        }).then((result) => {
+          uni.hideLoading();
+          if (result.state == 200) {
+            this.specialCloseClickText(content);
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: result.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
+      // 特殊情况填写内容
+      specialCloseClickText(content) {
+        this.deptCodeScan = content;
         this.textareaFlag = true;
         this.models = {
           title: "特殊情况关闭",
@@ -1536,6 +1582,7 @@
         post("/workerOrder/specialCaseClose", {
           workOrderId: this.dataId,
           reason: this.textareaText.trim(),
+          deptCode: this.deptCodeScan || undefined,
         }).then((result) => {
           this.models.disjunctor = false;
           this.textareaFlag = false;
@@ -1554,7 +1601,7 @@
             uni.hideLoading();
             this.models = {
               disjunctor: true,
-              content: "工单关闭失败",
+              content: result.msg || '工单关闭失败',
               icon: "error",
               operate: {
                 know: "返回",

pages/receiptpage/receiptpage.vue

@@ -116,38 +116,23 @@
                   }}<text v-if="item.reservationNumber">({{ item.reservationNumber }})</text>
                 </view>
                 <view style="font-weight: bold;">
-                  患者信息 : {{ item.patient ? item.patient.patientName : "-" }}({{
-                    item.patient ? item.patient.bedNum : "-"
-                  }})
-                </view>
-                <view v-if="item.goods">
-                  携带设备 :
-                  <text>{{ item.goods || "暂无" }}</text>
+                  患者信息 : {{ item.patient ? item.patient.patientName : "" }}({{ item.patient ? item.patient.bedNum : "" }})-{{ item.patient ? item.patient.residenceNo : "" }}
                 </view>
                 <view v-if="item.inspectScore">
                   陪检方式 :
                   <text>{{ item.inspectScore ? item.inspectScore.inspectMode : "暂无" }}</text>
                 </view>
+                <view v-if="item.goods">
+                  携带设备 :
+                  <text>{{ item.goods || "暂无" }}</text>
+                </view>
                 <view style="word-break: break-all;" v-if="item.workOrderRemark">
                   注意事项 :
                   <text>{{ item.workOrderRemark || "" }}</text>
                 </view>
-                <view v-if="item.patient.careLevel">
-                  护理等级 :
-                  <text :class="[
-                      item.patient.careLevel.value == 0 ||
-                      item.patient.careLevel.value == 1
-                        ? 'red'
-                        : 'green',
-                    ]">{{ item.patient.careLevel.name }}</text>
-                </view>
-                <view v-if="item.patient.illnessState">
-                  病情级别 :
-                  <text :class="{
-                      red:
-                        item.patient.illnessState.value == 2 ||
-                        item.patient.illnessState.value == 3,
-                    }">{{ item.patient.illnessState.name }}</text>
+                <view v-if="item.patient.careLevel || item.patient.illnessState">
+                  护理信息 :
+                  <template v-if="item.patient.careLevel"><text :class="[ item.patient.careLevel.value == 0 || item.patient.careLevel.value == 1 ? 'red' : 'green']">{{ item.patient.careLevel.name }}</text></template> <template v-if="item.patient.illnessState"><text :class="{ red: item.patient.illnessState.value == 2 || item.patient.illnessState.value == 3}">{{ item.patient.illnessState.name }}</text></template>
                 </view>
                 <view v-if="item.isAccompany === 1 || item.isAccompany === 0">
                   陪同情况 :
@@ -164,38 +149,23 @@
                   }}<text v-if="item.reservationNumber">({{ item.reservationNumber }})</text>
                 </view>
                 <view style="font-weight: bold;">
-                  患者信息 : {{ item.patient ? item.patient.patientName : "-" }}({{
-                    item.patient ? item.patient.bedNum : "-"
-                  }})
-                </view>
-                <view v-if="item.goods">
-                  携带设备 :
-                  <text>{{ item.goods || "暂无" }}</text>
+                  患者信息 : {{ item.patient ? item.patient.patientName : "" }}({{ item.patient ? item.patient.bedNum : "" }})-{{ item.patient ? item.patient.residenceNo : "" }}
                 </view>
                 <view v-if="item.inspectScore">
                   陪检方式 :
                   <text>{{ item.inspectScore ? item.inspectScore.inspectMode : "暂无" }}</text>
                 </view>
+                <view v-if="item.goods">
+                  携带设备 :
+                  <text>{{ item.goods || "暂无" }}</text>
+                </view>
                 <view style="word-break: break-all;" v-if="item.workOrderRemark">
                   注意事项 :
                   <text>{{ item.workOrderRemark || "暂无" }}</text>
                 </view>
-                <view v-if="item.patient.careLevel">
-                  护理等级 :
-                  <text :class="[
-                      item.patient.careLevel.value == 0 ||
-                      item.patient.careLevel.value == 1
-                        ? 'red'
-                        : 'green',
-                    ]">{{ item.patient.careLevel.name }}</text>
-                </view>
-                <view v-if="item.patient.illnessState">
-                  病情级别 :
-                  <text :class="{
-                      red:
-                        item.patient.illnessState.value == 2 ||
-                        item.patient.illnessState.value == 3,
-                    }">{{ item.patient.illnessState.name }}</text>
+                <view v-if="item.patient.careLevel || item.patient.illnessState">
+                  护理信息 :
+                  <template v-if="item.patient.careLevel"><text :class="[ item.patient.careLevel.value == 0 || item.patient.careLevel.value == 1 ? 'red' : 'green']">{{ item.patient.careLevel.name }}</text></template> <template v-if="item.patient.illnessState"><text :class="{ red: item.patient.illnessState.value == 2 || item.patient.illnessState.value == 3}">{{ item.patient.illnessState.name }}</text></template>
                 </view>
                 <view v-if="item.isAccompany === 1 || item.isAccompany === 0">
                   陪同情况 :
@@ -284,18 +254,19 @@
               <text class="red" v-if="item.gdState.value == 4 && item.taskType.carryingCourses[0].checkoutMethod.value == 1">可通过扫描科室码或者拍照进行签到</text>
               <text class="red" v-if="item.gdState.value == 4 && item.taskType.carryingCourses[0].checkoutMethod.value == 2">扫描交接人员二维码进行交接</text>
             </view>
-            <!-- 如果不是患者陪检或患者转运或其他,万能交接 -->
+            <!-- 如果不是患者陪检，患者转运，其他，万能交接，标本配送，标本轮巡 -->
             <view class="page_item_btn" v-if="
                 selectedLabelSlots == '执行中' &&
                 item.taskType.associationType.value != 'patientTransport' &&
                 item.taskType.associationType.value != 'inspect' &&
                 item.taskType.associationType.value != 'other' &&
-                item.taskType.associationType.value != 'ordinary' &&
-                !(item.taskType.associationType.value == 'specimen' && item.taskType.carryingCourses[1].checkoutMethod.value == 3 && item.gdState.value == 5)
+                item.taskType.associationType.value != 'specimen' &&
+                item.taskType.associationType.value != 'specimenPlan' &&
+                item.taskType.associationType.value != 'ordinary'
               " hover-class="seimin-btn-hover">
               <smallScreen :sData="item" :sType="2">扫码</smallScreen>
             </view>
-            <!-- 如果不是静配，药配，标本配送,标本轮巡,万能交接 -->
+            <!-- 如果不是静配，药配，万能交接，标本配送，标本轮巡-->
             <view class="page_item_btn_wrap" v-if="
                 selectedLabelSlots == '执行中' &&
                 item.taskType.associationType.value != 'jPBag' &&

pages/scanning_B/scanning_B.vue

@@ -64,10 +64,13 @@
 				<text v-html="speContent"></text>
 			</uni-popup-dialog>
 		</uni-popup>
+    <!-- 填写交接人工号弹窗 -->
+    <selectAccount @click.stop.native v-if="hosModels1.disjunctor" :disjunctor="hosModels1.disjunctor" @ok="hosOk1" @cancel="hosCancel1"></selectAccount>
   </view>
 </template>
 <script>
   import {
+    SM,
     get,
     post,
     webHandle
@@ -75,6 +78,8 @@
   export default {
     data() {
       return {
+        SMFlag:true,
+        extraData: {},
         loginUser: uni.getStorageSync("userData").user,
         bigScanShowSignBtn: false,//显示接单签到按钮或待到达本人
         bigScanArriveNotOwner: false,//支持待到达非本人
@@ -94,6 +99,10 @@
         hosModels: {
           disjunctor: false,
         },
+        // 填写交接人工号弹窗model
+        hosModels1: {
+          disjunctor: false,
+        },
         // 退回弹窗model
         backModels: {
           disjunctor: false,
@@ -359,9 +368,106 @@
           });
         }
       },
+      // ==================填写工号 start===============
+      // 填写交接人工号-确认
+      hosOk1(data) {
+        console.log(data);
+        const {
+          accountName,
+          account,
+          accountId
+        } = data;
+        if (!accountName && !account) {
+          //没有填写交接人
+          uni.showModal({
+            title: "提示",
+            content: "请填写交接人工号！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log("用户点击确定");
+              } else if (res.cancel) {
+                console.log("用户点击取消");
+              }
+            },
+          });
+          return;
+        } else if ((!accountName && account) || (accountName && !account)) {
+          //没有填写交接人
+          uni.showModal({
+            title: "提示",
+            content: "请填写正确的交接人工号！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log("用户点击确定");
+              } else if (res.cancel) {
+                console.log("用户点击取消");
+              }
+            },
+          });
+          return;
+        }
+        this.hosModels1.disjunctor = false;
+        this.validateAccount1(data);
+      },
+      // 填写交接人工号-取消
+      hosCancel1() {
+        this.hosModels1.disjunctor = false;
+        this.flag = true;
+      },
+      // 填写交接人工号弹窗
+      showSelectAccount1() {
+        this.hosModels1 = {
+          disjunctor: true,
+        };
+      },
+      // 手动填写工号校验
+      validateAccount1(accountObj){
+        const { accountName, account, accountId } = accountObj;
+        
+        this.backHandlerAfter(this.extraData.specimen, this.extraData.workorderId, accountObj)
+      },
+      // ==================填写工号 end===============
+      // 扫科室码
+      scanDeptCode(){
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
+        SM().then((content) => {
+          this.SMFlag = true;
+          this.backHandlerAfter(this.extraData.specimen, this.extraData.workorderId, this.extraData.data, content)
+        }).catch(err => {
+          this.SMFlag = true;
+        });
+      },
+      // 退回接口调用前查询验证方式
+      backHandler(specimen, workorderId, data){
+        this.extraData = {
+          specimen,
+          workorderId,
+          data,
+        }
+        console.log(this.backParams);
+        // extra7 验证方式 0无 1科室码 2动态码 3 填写工号
+        if(this.backParams.reasonForReturn.extra7 == 1){
+          // 科室码
+          this.scanDeptCode();
+        }else if(this.backParams.reasonForReturn.extra7 == 2){
+          // 动态码
+          this.scanDeptCode();
+        }else if(this.backParams.reasonForReturn.extra7 == 3){
+          // 填写工号
+          this.showSelectAccount1();
+        }else{
+          // 无
+          this.backHandlerAfter(specimen, workorderId, data)
+        }
+      },
       // 退回
-      backHandler(specimen, workorderId, data) {
-        console.log(specimen);
+      backHandlerAfter(specimen, workorderId, data, deptCode) {
+        console.log(specimen, workorderId, data, deptCode);
         const {
           reasonForReturn,
           remarks,
@@ -379,6 +485,7 @@
           handoverId: data ? data.accountId : undefined,
           handoverName: data ? data.accountName : undefined,
           gdId: workorderId || undefined,
+          deptCode: deptCode || undefined,
         }
         post('/workerOrder/returnSpecimen', postData).then(res => {
           uni.hideLoading();
@@ -393,7 +500,7 @@
             this.models = {
               disjunctor: true,
               title: "提示",
-              content: `标本退回失败`,
+              content: res.msg || `标本退回失败`,
               icon: "error",
             };
           }
@@ -745,6 +852,7 @@
       },
     },
 		onShow() {
+      this.SMFlag = true;
 			let that = this
 			// #ifdef APP-PLUS
 			uni.$off('scan') // 每次进来先 移除全局自定义事件监听器