新药品

components/bigScreen/bigScreen.vue

@@ -238,11 +238,16 @@
               if(responeseData.orderStateValue == 2 || responeseData.orderStateValue == 3 || responeseData.orderStateValue == 4){
                 // 待抢单、待接单、待到达,进入起点科室流程
                 uni.navigateTo({
-                  url: `/pages/newDrug/createOrder/createOrder?drugsBagType=${responeseData.drugsBagType}&drugsBagId=${responeseData.drugsBagId}&orderId=${responeseData.orderId || ''}`,
+                  url: `/pages/newDrug/createOrder/createOrder?drugsBagType=${responeseData.drugsBagType}&drugsBagId=${responeseData.drugsBagId}&orderId=${responeseData.orderId || ''}&type=receive`,
                 });
               }else if(responeseData.orderStateValue == 5){
                 // 待送达,进入起点科室流程
                 this.pageNavigateByConfig(config, responeseData, responeseData, code)
+              }else{
+                // 查看药包信息
+                uni.navigateTo({
+                  url: `/pages/newDrug/createOrder/createOrder?drugsBagType=${responeseData.drugsBagType}&drugsBagId=${responeseData.drugsBagId}&type=view`,
+                });
               }
             }
           }else{
@@ -474,7 +479,7 @@
                           }else{
                             // 没有工单,进入起点科室流程
                             uni.navigateTo({
-                              url: `/pages/newDrug/createOrder/createOrder?drugsBagType=${res.drugsBagType}&drugsBagId=${res.drugsBagId}&orderId=${res.orderId || ''}`,
+                              url: `/pages/newDrug/createOrder/createOrder?drugsBagType=${res.drugsBagType}&drugsBagId=${res.drugsBagId}&type=build`,
                             });
                           }
                         }else{

pages/newDrug/createOrder/createOrder.vue

@@ -34,8 +34,8 @@
     <view class="foot_btn_spe">
       <view class="column">
         <view class="btn" @click="goIndex()">知道了</view>
-        <view class="btn" @click="createOrBuildOrder()" v-if="!orderId && config.drugsCreateSign === 1">建单并签到</view>
-        <view class="btn" @click="createOrBuildOrder(orderId)" v-if="orderId && config.drugsReceiveSign === 1">接单并签到</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>
     </view>
   </view>