优化

components/bigScreen/bigScreen.vue

@@ -241,7 +241,7 @@
                   url: `/pages/newDrug/createOrder/createOrder?drugsBagType=${responeseData.drugsBagType}&drugsBagId=${responeseData.drugsBagId}&orderId=${responeseData.orderId || ''}&type=receive`,
                 });
               }else if(responeseData.orderStateValue == 5 && responeseData.workerId == uni.getStorageSync('userData').user.id){
-                // 待送达(本人),进入终点科室流程
+                // 待送达(本人)，进入终点科室流程
                 this.pageNavigateByConfig(config, responeseData, responeseData, code)
               }else{
                 // 查看药包信息
@@ -649,14 +649,21 @@
                     } else if (res.type == 'drugsBag') {
                       if (res.drugsBagType == 'drugsJpbag' || res.drugsBagType == 'drugsWestern' || res.drugsBagType == 'drugsReturn' || res.drugsBagType == 'drugsPoison' || res.drugsBagType == 'drugsHerbal') {
                         //新药品-扫静配|西药|退药|毒麻|中草药
-                        if(res.orderId){
-                          // 有工单
-                          this.getInfo(res, code);
-                        }else{
-                          // 没有工单,进入起点科室流程
+                        if(res.newOrderId){
+                          // 待送达合并工单
                           uni.navigateTo({
-                            url: `/pages/newDrug/createOrder/createOrder?drugsBagType=${res.drugsBagType}&drugsBagId=${res.drugsBagId}&type=build`,
+                            url: `/pages/newDrug/createOrder/createOrder?drugsBagType=${res.drugsBagType}&drugsBagId=${res.drugsBagId}&orderId=${res.orderId || ''}&type=merge&newOrderId=${res.newOrderId || ''}`,
                           });
+                        }else{
+                          if(res.orderId){
+                            // 有工单
+                            this.getInfo(res, code);
+                          }else{
+                            // 没有工单,进入起点科室流程
+                            uni.navigateTo({
+                              url: `/pages/newDrug/createOrder/createOrder?drugsBagType=${res.drugsBagType}&drugsBagId=${res.drugsBagId}&type=build`,
+                            });
+                          }
                         }
                       }else{
                         //扫药包码

pages/newDrug/createOrder/createOrder.vue

@@ -35,7 +35,8 @@
       <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(orderId)" v-if="queryObj.type === 'receive' && config.drugsReceiveSign === 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>
     </view>
   </view>
@@ -152,19 +153,34 @@
           }
         })
       },
-      // 建单并签到/接单并签到-orderId
-      createOrBuildOrder(orderId){
+      // 建单并签到/接单并签到
+      createOrBuildOrder(){
+        let content = '';
+        if(this.queryObj.type === 'build'){
+          content = `请确认是否建单并签到？`;
+        }else if(this.queryObj.type === 'receive'){
+          content = `请确认是否接单并签到？`;
+        }else if(this.queryObj.type === 'merge'){
+          content = `您确认要合并工单进行配送吗？`;
+        }
         uni.showModal({
           title: "提示",
-          content: `请确认是否${orderId ? '接' : '建'}单并签到？`,
+          content,
           success: (result) => {
             if (result.confirm) {
               console.log("用户点击确定");
               let postData = {
                 type: this.queryObj.drugsBagType,
                 id: +this.queryObj.drugsBagId,
-                orderId,
               };
+              
+              if(this.queryObj.type === 'receive'){
+                postData.orderId = this.orderId;
+              }else if(this.queryObj.type === 'merge'){
+                postData.orderId = this.queryObj.newOrderId || undefined;
+                postData.oldOrderId = this.queryObj.orderId || undefined;
+              }
+              
               uni.showLoading({
                 title: "加载中",
                 mask: true,

pages/newDrug/list.vue

@@ -31,6 +31,11 @@
         </view>
       </scroll-view>
     </view>
+    <view class="foot_btn_spe">
+      <view class="column">
+        <view class="btn" @click="goBack()">返回</view>
+      </view>
+    </view>
   </view>
 </template>
 <script>
@@ -51,6 +56,10 @@
       };
     },
     methods: {
+      // 返回
+      goBack(){
+        uni.navigateBack()
+      },
       // 详情
       toDetail(drugsBagId){
         if(this.config.showDrugsBagDetails != 1){
@@ -192,6 +201,7 @@
     }
 
     .foot_btn_spe {
+      padding: 0 24rpx;
       margin: 24rpx 0;
       display: flex;
       flex-direction: column;