流程优化

hdApp/src/admin/home/order.vue

@@ -39,7 +39,8 @@
             <view class="app-color-3" style="font-size:28upx;font-weight:bold;color:#333333;">编号 {{ item.sendNum }}<text v-if="item.bookName!=''" style="margin-left:12upx;">| {{item.bookName}}</text></view>
             <view style="border:1upx solid red;border-radius:18upx;font-size:19upx;padding:5upx 10upx;background-color: red;color:white;" v-if="item.debt == 1">赊账</view>
             <view style="border:1upx solid #0e7ed8;border-radius:18upx;font-size:19upx;color:white;padding:5upx 10upx;background-color: #0e7ed8;" v-if="item.refund == 1">有售后</view>
-            <view style="font-size:28upx;" class='app-price app-green'>{{ item.status | constantfilter('ORDER_STATUS') }}</view>
+            <view style="font-size:28upx;" class='app-price app-green' v-if="item.status==2&&item.sendType==1">待取货</view>
+            <view style="font-size:28upx;" class='app-price app-green' v-else>{{ item.status | constantfilter('ORDER_STATUS') }}</view>
           </view>
           <view class="list-blo">
               <orderItem :info="item"></orderItem>
@@ -64,8 +65,13 @@
                 <view class="admin-button-com middle default" @click.stop="">扣库存</view>                
               </block>
 
-              <view class="admin-button-com middle" v-if="item.status == 2" @click.stop="sendOrderFn(item)">直接发货</view>
-              <view class="admin-button-com default" v-else @click.stop="">直接发货</view>
+              <block v-if="item.status == 2">
+                <view class="admin-button-com middle" v-if="item.sendType == 1" @click.stop="getOrderFn(item)">确认取货</view>
+                <view class="admin-button-com middle" v-else @click.stop="sendOrderFn(item)">确认发货</view>
+              </block>
+              <block v-if="item.status == 3">
+                <view class="admin-button-com middle" @click.stop="confirmReach(item)">确认送达</view>
+              </block>
 
               <view class="admin-button-com middle" v-if="item.payStatus == 1" @click.stop="printOrder(item)">打印</view>
               <view class="admin-button-com default" v-else @click.stop="">打印</view>
@@ -110,7 +116,7 @@ import orderItem from "./components/order-item";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import { list } from "@/mixins";
 import { onlinePrintOrder } from '@/api/order'
-import { getListB, sendOrder } from "@/api/order";
+import { getListB, sendOrder,fetchOrder,sendReach } from "@/api/order";
 import NotLogin from "@/components/not-login";
 import {getStaffList} from '@/api/staff'
 import AppSearchModule from "@/components/module/app-search"
@@ -219,6 +225,30 @@ export default {
     reduceOrderStock(item){
       this.$util.pageTo({url:'/admin/billing/index2?customId='+item.customId+'&orderId='+item.id+'&reduceStock=1'})
     },
+    getOrderFn(item){
+      let that = this
+      that.$util.confirmModal({content:'确认取货？'},() => {
+        fetchOrder({id:item.id}).then(res=>{
+          if(res.code == 1){
+            that.$msg('操作成功')
+            that.resetList()
+            that.getOrderList()
+          }
+        })          
+      })
+    },
+    confirmReach(item){
+      let that = this
+      that.$util.confirmModal({content:'确认送达？'},() => {
+        sendReach({id:item.id}).then(res=>{
+          if(res.code == 1){
+            that.$msg('操作成功')
+            that.resetList()
+            that.getOrderList()
+          }
+        })          
+      })
+    },
     sendOrderFn(item){
       let that = this
       that.$util.confirmModal({content:'确认发货？'},() => {

hdApp/src/api/order/index.js

@@ -23,6 +23,10 @@ export const sendOrder = data => {
 	return https.get("/order/send", data);
 };
 
+export const fetchOrder = data => {
+	return https.get("/order/fetch", data);
+};
+
 export const onlinePrintOrder = data => {
 	return https.get("/order/print-order", data);
 };