发货流程优化

admin-update/src/views/order/components/sel-order.vue

@@ -75,20 +75,38 @@
 							<template v-if="item.actionName == '发货'">
 								<div v-if="item.finishTime == 0">
 
+<template v-if="orderData.hasDeliver == 1">
+
                                     <el-popover
                                       placement="top"
                                       width="160"
                                       v-model="sendMySelfConfirm">
-                                      <p>确认自配送？</p>
+                                      <p>确认发送？</p>
                                       <div style="text-align: right; margin: 0">
                                         <el-button size="mini" type="text" @click="sendMySelfConfirm = false">取消</el-button>
                                         <el-button type="primary" size="mini" @click="sendMySelfFn">确定</el-button>
                                       </div>
-                                      <el-button type="primary" size="small" slot="reference">自己送</el-button>
+                                      <el-button type="primary" size="small" slot="reference">确认发送</el-button>
                                     </el-popover>
 
+</template>
+<template v-else>
+
+                                    <el-popover
+                                      placement="top"
+                                      width="160"
+                                      v-model="sendMySelfConfirm">
+                                      <p>确认自己配送？</p>
+                                      <div style="text-align: right; margin: 0">
+                                        <el-button size="mini" type="text" @click="sendMySelfConfirm = false">取消</el-button>
+                                        <el-button type="primary" size="mini" @click="sendMySelfFn">确定</el-button>
+                                      </div>
+                                      <el-button type="primary" size="small" slot="reference">自己送</el-button>
+                                    </el-popover>
 									<el-button type="primary" size="small" @click="sendShipFn" style="margin-left:15px;">代送</el-button>
 
+</template>
+
 								</div>
 								<div v-else>
 									<template v-if="!$util.isEmpty(item.sendInfo)">
@@ -117,17 +135,37 @@
 							<template v-if="item.actionName == '送达'">
 								<div v-if="item.finishTime == 0">
 
-<el-popover
-  placement="top"
-  width="160"
-  v-model="confirmSendVisit">
-  <p>确认已送达？</p>
-  <div style="text-align: right; margin: 0">
-    <el-button size="mini" type="text" @click="confirmSendVisit = false">取消</el-button>
-    <el-button type="primary" size="mini" @click="orderReachFn">确定</el-button>
-  </div>
-  <el-button slot="reference" size="small" type="primary" >确认送达</el-button>
-</el-popover>
+<template v-if="orderData.sendType == 3">
+
+    <el-popover
+      placement="top"
+      width="210"
+      v-model="confirmSendVisit">
+      <p>此订单由快递配送，送到会自动确认，确定要手动确认？</p>
+      <div style="text-align: right; margin: 0">
+        <el-button size="mini" type="text" @click="confirmSendVisit = false">取消</el-button>
+        <el-button type="primary" size="mini" @click="orderReachFn">确定</el-button>
+      </div>
+      <el-button slot="reference" size="small" type="primary" >确认送达</el-button>
+    </el-popover>
+
+</template>
+
+<template v-else>
+
+    <el-popover
+      placement="top"
+      width="160"
+      v-model="confirmSendVisit">
+      <p>确认已送达？</p>
+      <div style="text-align: right; margin: 0">
+        <el-button size="mini" type="text" @click="confirmSendVisit = false">取消</el-button>
+        <el-button type="primary" size="mini" @click="orderReachFn">确定</el-button>
+      </div>
+      <el-button slot="reference" size="small" type="primary" >确认送达</el-button>
+    </el-popover>
+
+</template>
 
 									<div class="prompt-text">确认后会自动通知客户</div>
 								</div>