打印流程的优化

mobile-code/src/admin/home/order.vue

@@ -35,7 +35,7 @@
                 </template>
 				<template v-else-if="['5','6'].indexOf(item.status) != -1">
 				    <div v-if="item.sendType == 3" class="admin-button-com default" style="color: #dddddd;border-color:#dddddd;">已自取</div>
-				    <div v-else class="admin-button-com default" @click.stop="seeSendFn(item)" style="color:#67C23A;border-color:#67C23A">已送达</div>
+				    <div v-else class="admin-button-com default" @click.stop="seeSendFn(item)" style="color: #dddddd;border-color:#dddddd;">已送达</div>
 				</template>
 				<template v-else>
                     <template v-if="item.currentFlow == 1">

mobile-code/src/admin/order/components/sel-express-confirm.vue

@@ -142,18 +142,14 @@ export default {
 		    }
 		},
 		manualConfirmReachFn(e){
-		    console.log('aaaa')
 			if (e.index === 0) {
 				this.cancelConfirmReachFn()
 			} else {
             	this.confirmReachFn()
 			}
-		    return false
 		},
 		cancelConfirmReachFn(){
-			console.log('bbb')
 			this.showManualConfirmModal = false
-            // return false
 		}
 	}
 }

mobile-code/src/admin/order/components/sel-ship-manage.vue

@@ -12,8 +12,11 @@
 				<template v-slot:content>
 					<div class="axis-slot-wrap">
 						<div class="axis-title">发货</div>
-						<div class="axis-det btn-wrap">
-							<button class="admin-button-com big blue confirm-btn" @click="sendSelfFn" style="margin:auto;">自己送</button>
+                        <div v-if="orderData.hasDeliver == 1" class="axis-det btn-wrap">
+                            <button class="admin-button-com big blue confirm-btn" @click="sendSelfFn(1)">确认发货</button>
+                        </div>
+						<div v-else class="axis-det btn-wrap">
+							<button class="admin-button-com big blue confirm-btn" @click="sendSelfFn(0)" style="margin:auto;">自己送</button>
 							<button class="admin-button-com big blue confirm-btn" @click="sendShipFn" style="margin:auto;">代送</button>
 						</div>
 					</div>
@@ -29,7 +32,7 @@
 							<block v-if="!$util.isEmpty(orderComData[1].receive)">
 								<card-name :info="orderComData[1].receive" />
 								<div class="btn-wrap-com">
-									<button class="admin-button-com default" @click="printOrderFn">重打</button>
+									<button class="admin-button-com default" @click="mobilePrintFn">重打</button>
 								</div>
 							</block>
 						</div>
@@ -81,7 +84,7 @@
 			</template>
 		</modal-module>
 		<!-- 删除提示 -->
-		<modal-module :show="selfShipModal" @cancel="modalCancel" @click="shipModalClick" content="确认自己配送？" color="#333" :size="32" padding="30rpx 30rpx"></modal-module>
+		<modal-module :show="selfShipModal" @cancel="modalCancel" @click="shipModalClick" :content="selfShipHint" color="#333" :size="32" padding="30rpx 30rpx"></modal-module>
 	</div>
 </template>
 
@@ -137,7 +140,8 @@ export default {
 				}
 			],
 			// 自己送
-			selfShipModal: false
+			selfShipModal: false,
+			selfShipHint:''
 		}
 	},
 	methods: {
@@ -150,7 +154,12 @@ export default {
 				sendSide: 1
 			}
 		},
-		sendSelfFn() {
+		sendSelfFn(num) {
+		    if(num == 0){
+		        this.selfShipHint='确认自己配送？';
+		    }else{
+		        this.selfShipHint='确认发货？';
+		    }
 			this.selfShipModal = true
 			this.form = {
 				sendType: 2,
@@ -208,6 +217,9 @@ export default {
 		modalCancel() {
 			this.shipModal = false
 			this.selfShipModal = false
+		},
+		mobilePrintFn(){
+		    this.$msg('此功能即将开通')
 		}
 	}
 }

mobile-code/src/admin/order/components/sel-ship.vue

@@ -30,7 +30,8 @@
                             <div class="btn-wrap-com">
                                 <!-- <button class="admin-button-com default">修改</button> -->
                                 <!-- <button class="admin-button-com default">明细</button> -->
-                                <button class="admin-button-com default" @click="printOrderFn">打印</button>
+                                <button class="admin-button-com default" @click="mobilePrintFn">打印</button>
+                                <button class="admin-button-com default" @click="printOrderFn">确定</button>
                             </div>
 						</div>
 					</div>
@@ -92,6 +93,9 @@ export default {
 					}
 				})
 			})
+		},
+		mobilePrintFn(){
+            this.$msg('此功能即将开通')
 		}
 	}
 }