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

pages/newDrug/checkPage/checkPage.vue

@@ -2,7 +2,9 @@
   <view class="Scanning_Result">
     <view class="Scanning_top">
       <view class="Scanning_top_icon">
-        {{workOrder.startDept ? workOrder.startDept.dept : ''}}<text class="newicon newicon-arrow-right-full"></text>{{workOrder.endDeptNames || ''}}
+        <text :class="{ red: workOrder.gdState && workOrder.gdState.value == 4 }">{{workOrder.startDept ? workOrder.startDept.dept : ''}}</text>
+        <text class="newicon newicon-arrow-right-full"></text>
+        <text :class="{ red: workOrder.gdState && workOrder.gdState.value == 5 }">{{workOrder.endDeptNames || ''}}</text>
       </view>
     </view>
 

pages/newDrug/continueScanning/continueScanning.vue

@@ -2,6 +2,8 @@
   <view class="Scanning_Result">
     <view class="Scanning_top">
       <view class="Scanning_top_icon">{{scanCount}}</view>
+      <view class="tips" v-if="workOrder.gdState && workOrder.gdState.value == 4">您已到达<text class="red">起点科室-{{workOrder.startDept.dept}},</text>请扫描核对药包码。</view>
+      <view class="tips" v-if="workOrder.gdState && workOrder.gdState.value == 5">您已到达<text class="red">终点科室-{{workOrder.endDeptNames}}</text>,请扫描核对药包码。</view>
     </view>
 
     <view class="Scanning_cont">
@@ -54,6 +56,7 @@
   export default {
     data() {
       return {
+        workOrder: {}, //工单信息
         drugsBag: {}, //药包信息
         queryObj: {}, //路由传递过来的数据
         scanCount: '', //已扫描数量
@@ -168,7 +171,7 @@
               });
             }else{
               uni.redirectTo({
-                url: `/pages/newDrug/continueScanning/continueScanning?drugsBagType=${this.queryObj.drugsBagType}&orderId=${this.queryObj.orderId}&scanOrHand=${type}&drugsBagId=${this.queryObj.drugsBagId}&orderStateValue=${this.queryObj.orderStateValue}`,
+                url: `/pages/newDrug/continueScanning/continueScanning?drugsBagType=${this.queryObj.drugsBagType}&orderId=${this.queryObj.orderId}&scanOrHand=${type}&drugsBagId=${ress.data.dto.id}&orderStateValue=${this.queryObj.orderStateValue}`,
               });
             }
           } else {
@@ -192,6 +195,9 @@
             if(res.data){
               this.scanCount = res.data.scanCount;
               this.drugsBag = res.data.dto || {};
+              let workOrder = res.data.workOrder || {};
+              workOrder.endDeptNames = workOrder.endDepts.map(v=>v.dept).toString();
+              this.workOrder = workOrder;
             }
           }else{
             uni.showToast({
@@ -224,7 +230,15 @@
     height: 100vh;
 
     .Scanning_top {
-      margin: 24rpx auto;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      .tips{
+        margin: 24rpx 0 40rpx;
+        text-align: justify;
+        font-weight: bold;
+        font-size: 30rpx;
+      }
       .Scanning_top_icon {
         font-size: 140rpx;
         color: #FF0000;

pages/newDrug/createOrder/createOrder.vue

@@ -33,7 +33,7 @@
 
     <view class="foot_btn_spe">
       <view class="column">
-        <view class="btn" @click="goIndex()">知道了</view>
+        <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(orderId)" v-if="queryObj.type === 'receive' && config.drugsReceiveSign === 1">接单并签到</view>
       </view>

pages/newDrug/photoRetention/photoRetention.vue

@@ -10,7 +10,9 @@
       <scroll-view scroll-y class="scrollContent">
         <view class="content">
           <view class="dept">
-            {{workOrder.startDept ? workOrder.startDept.dept : ''}}<text class="newicon newicon-arrow-right-full"></text>{{workOrder.endDeptNames || ''}}
+            <text :class="{ red: workOrder.gdState && workOrder.gdState.value == 4 }">{{workOrder.startDept ? workOrder.startDept.dept : ''}}</text>
+            <text class="newicon newicon-arrow-right-full"></text>
+            <text :class="{ red: workOrder.gdState && workOrder.gdState.value == 5 }">{{workOrder.endDeptNames || ''}}</text>
           </view>
           <view class="column">
             <view class="name">工单单号：</view>