配送流程的完善

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

@@ -64,7 +64,7 @@
 										v-if="!$util.isEmpty(item.receive)"
 										:info="item.receive"
 									/>
-									<span v-else>配送信息未登记</span>
+									<span v-else>无配送信息</span>
 									<div style="margin-top: 10px" v-if="!$util.isEmpty(item.receive)">
 										<el-button size="mini" @click="printOrderFn(index)">{{
 											index == 0 ? '打印' : '重打'
@@ -75,29 +75,41 @@
 							<!-- 发货 -->
 							<template v-if="item.actionName == '发货'">
 								<div v-if="item.finishTime == 0">
-									<el-button type="primary" @click="sendShipFn"
-										>确认发货</el-button
-									>
+
+
+<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>
 								</div>
 								<div v-else>
 									<template v-if="!$util.isEmpty(item.sendInfo)">
 										<div class="label-list">
-											配送方：{{ item.sendInfo.sendSideName }}
+											配送：{{ item.sendInfo.sideName }}
 										</div>
 										<div class="label-list">
-											距离：{{ item.sendInfo.sendDistance }}km
+											距离：{{ item.sendInfo.distance }}km
 										</div>
 										<div class="label-list">
-											运费：¥{{ item.sendInfo.sendCost }}
+											运费：¥{{ item.sendInfo.cost }}
 										</div>
 										<div class="label-list">
-											小费：¥{{ item.sendInfo.sendTip }}
+											小费：¥{{ item.sendInfo.tip }}
 										</div>
 									</template>
 									<template v-else>
 										<div class="label-list">
-											<span class="label">配送方：</span>
-											<span class="value">自己送</span>
+											<span class="label">配送：</span>
+											<span class="value">门店</span>
 										</div>
 									</template>
 								</div>
@@ -115,10 +127,10 @@
     <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" class="el-button el-button--primary" >确认送达</el-button>
+  <el-button slot="reference" size="small" type="primary" >确认送达</el-button>
 </el-popover>
 
-									<div class="prompt-text">确认后会自动通知客户已送达~</div>
+									<div class="prompt-text">确认后会自动通知客户</div>
 								</div>
 							</template>
 							<!-- 订单分类 -->
@@ -293,14 +305,7 @@
 					label-width="100px"
 					class="demo-form"
 				>
-					<el-form-item label="快递代送"
-						><el-switch
-							v-model="shipForm.sendType"
-							active-value="1"
-							inactive-value="0"
-						></el-switch>
-					</el-form-item>
-					<template v-if="shipForm.sendType == 1">
+					<template v-if="shipForm.sendType == 3">
 						<el-form-item label="送花时间" prop="sendTime">
 							<el-time-select
 								v-model="shipForm.sendTime"
@@ -310,16 +315,16 @@
 									end: '24:00'
 								}"
 								placeholder="选择时间"
-								size="samll"
+								size="small"
 								style="width: 100%"
 							>
 							</el-time-select>
 						</el-form-item>
-						<el-form-item label="配送方" prop="sendSide">
+						<el-form-item label="配送" prop="sendSide">
 							<el-select
 								v-model="shipForm.sendSide"
 								placeholder="请选择"
-								size="samll"
+								size="small"
 								style="width: 100%"
 							>
 								<el-option
@@ -489,6 +494,7 @@ export default {
 			},
 			addressArr: [],
 			ruleForm: {},
+			sendMySelfConfirm:false,
 			addressOptions: [],
 			addressProps: {
 				label: 'name',
@@ -498,9 +504,9 @@ export default {
 			// 发货弹窗
 			shipDialog: false,
 			shipForm: {
-				sendType: '0',
+				sendType: '2',
 				sendTime: '',
-				sendSide: ''
+				sendSide: 1
 			},
 			shipRuleForm: {},
 			sendSideOpt: [
@@ -650,12 +656,30 @@ export default {
 		fillFormFn() {
 			this.orderDialog = true;
 		},
-		// 发货
+		//确认发货 自己送
+		sendMySelfFn(){
+		    this.sendMySelfConfirm=false;
+		    this.shipForm.sendType=2;
+			this.$service.single
+				.orderDeliver({ id: this.orderData.id, option: 1, ...this.shipForm })
+				.then(res => {
+					this.getDet();
+					// this.shipDialog = false;
+					this.resetForm();
+				});
+		},
+		//确认发货 代送按钮显示
 		sendShipFn() {
 			this.shipDialog = true;
 		},
-		// 确认发货
+		//确认发货 代送 确认
 		submitShipFn() {
+
+		    if(this.shipForm.sendTime==''){
+		        this.$message.error('请选择时间');
+		        return false;
+		    }
+            this.shipForm.sendType=3;
 			this.$service.single
 				.orderDeliver({ id: this.orderData.id, option: 1, ...this.shipForm })
 				.then(res => {