seimin 1 周之前
父節點
當前提交
7a243b1bd9
共有 3 個文件被更改,包括 45 次插入12 次删除
  1. 14 7
      components/bigScreen/bigScreen.vue
  2. 21 5
      pages/newDrug/createOrder/createOrder.vue
  3. 10 0
      pages/newDrug/list.vue

+ 14 - 7
components/bigScreen/bigScreen.vue

@@ -241,7 +241,7 @@
241 241
                   url: `/pages/newDrug/createOrder/createOrder?drugsBagType=${responeseData.drugsBagType}&drugsBagId=${responeseData.drugsBagId}&orderId=${responeseData.orderId || ''}&type=receive`,
242 242
                 });
243 243
               }else if(responeseData.orderStateValue == 5 && responeseData.workerId == uni.getStorageSync('userData').user.id){
244
-                // 待送达(本人),进入终点科室流程
244
+                // 待送达(本人)进入终点科室流程
245 245
                 this.pageNavigateByConfig(config, responeseData, responeseData, code)
246 246
               }else{
247 247
                 // 查看药包信息
@@ -649,14 +649,21 @@
649 649
                     } else if (res.type == 'drugsBag') {
650 650
                       if (res.drugsBagType == 'drugsJpbag' || res.drugsBagType == 'drugsWestern' || res.drugsBagType == 'drugsReturn' || res.drugsBagType == 'drugsPoison' || res.drugsBagType == 'drugsHerbal') {
651 651
                         //新药品-扫静配|西药|退药|毒麻|中草药
652
-                        if(res.orderId){
653
-                          // 有工单
654
-                          this.getInfo(res, code);
655
-                        }else{
656
-                          // 没有工单,进入起点科室流程
652
+                        if(res.newOrderId){
653
+                          // 待送达合并工单
657 654
                           uni.navigateTo({
658
-                            url: `/pages/newDrug/createOrder/createOrder?drugsBagType=${res.drugsBagType}&drugsBagId=${res.drugsBagId}&type=build`,
655
+                            url: `/pages/newDrug/createOrder/createOrder?drugsBagType=${res.drugsBagType}&drugsBagId=${res.drugsBagId}&orderId=${res.orderId || ''}&type=merge&newOrderId=${res.newOrderId || ''}`,
659 656
                           });
657
+                        }else{
658
+                          if(res.orderId){
659
+                            // 有工单
660
+                            this.getInfo(res, code);
661
+                          }else{
662
+                            // 没有工单,进入起点科室流程
663
+                            uni.navigateTo({
664
+                              url: `/pages/newDrug/createOrder/createOrder?drugsBagType=${res.drugsBagType}&drugsBagId=${res.drugsBagId}&type=build`,
665
+                            });
666
+                          }
660 667
                         }
661 668
                       }else{
662 669
                         //扫药包码

+ 21 - 5
pages/newDrug/createOrder/createOrder.vue

@@ -35,7 +35,8 @@
35 35
       <view class="column">
36 36
         <view class="btn" @click="goIndex()">返回</view>
37 37
         <view class="btn" @click="createOrBuildOrder()" v-if="queryObj.type === 'build' && config.drugsCreateSign === 1">建单并签到</view>
38
-        <view class="btn" @click="createOrBuildOrder(orderId)" v-if="queryObj.type === 'receive' && config.drugsReceiveSign === 1">接单并签到</view>
38
+        <view class="btn" @click="createOrBuildOrder()" v-if="queryObj.type === 'receive' && config.drugsReceiveSign === 1">接单并签到</view>
39
+        <view class="btn" @click="createOrBuildOrder()" v-if="queryObj.type === 'merge'">合并工单配送</view>
39 40
       </view>
40 41
     </view>
41 42
   </view>
@@ -152,19 +153,34 @@
152 153
           }
153 154
         })
154 155
       },
155
-      // 建单并签到/接单并签到-orderId
156
-      createOrBuildOrder(orderId){
156
+      // 建单并签到/接单并签到
157
+      createOrBuildOrder(){
158
+        let content = '';
159
+        if(this.queryObj.type === 'build'){
160
+          content = `请确认是否建单并签到?`;
161
+        }else if(this.queryObj.type === 'receive'){
162
+          content = `请确认是否接单并签到?`;
163
+        }else if(this.queryObj.type === 'merge'){
164
+          content = `您确认要合并工单进行配送吗?`;
165
+        }
157 166
         uni.showModal({
158 167
           title: "提示",
159
-          content: `请确认是否${orderId ? '接' : '建'}单并签到?`,
168
+          content,
160 169
           success: (result) => {
161 170
             if (result.confirm) {
162 171
               console.log("用户点击确定");
163 172
               let postData = {
164 173
                 type: this.queryObj.drugsBagType,
165 174
                 id: +this.queryObj.drugsBagId,
166
-                orderId,
167 175
               };
176
+              
177
+              if(this.queryObj.type === 'receive'){
178
+                postData.orderId = this.orderId;
179
+              }else if(this.queryObj.type === 'merge'){
180
+                postData.orderId = this.queryObj.newOrderId || undefined;
181
+                postData.oldOrderId = this.queryObj.orderId || undefined;
182
+              }
183
+              
168 184
               uni.showLoading({
169 185
                 title: "加载中",
170 186
                 mask: true,

+ 10 - 0
pages/newDrug/list.vue

@@ -31,6 +31,11 @@
31 31
         </view>
32 32
       </scroll-view>
33 33
     </view>
34
+    <view class="foot_btn_spe">
35
+      <view class="column">
36
+        <view class="btn" @click="goBack()">返回</view>
37
+      </view>
38
+    </view>
34 39
   </view>
35 40
 </template>
36 41
 <script>
@@ -51,6 +56,10 @@
51 56
       };
52 57
     },
53 58
     methods: {
59
+      // 返回
60
+      goBack(){
61
+        uni.navigateBack()
62
+      },
54 63
       // 详情
55 64
       toDetail(drugsBagId){
56 65
         if(this.config.showDrugsBagDetails != 1){
@@ -192,6 +201,7 @@
192 201
     }
193 202
 
194 203
     .foot_btn_spe {
204
+      padding: 0 24rpx;
195 205
       margin: 24rpx 0;
196 206
       display: flex;
197 207
       flex-direction: column;