白求恩优化

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({