订单流程优化

admin-update/src/mock/userInfo.js

@@ -552,7 +552,7 @@ let menu = {
 		{
 			id: '1201',
 			parentId: '12',
-			name: '微信菜单',
+			name: '公众号菜单',
 			type: 1,
 			icon: 'iconkehuguanli',
 			orderNum: 12,

admin-update/src/views/member/list.vue

@@ -36,6 +36,7 @@
 			</template>
 
 			<template #table-column-userName="{scope}">
+
 				<el-link :underline="false" @click="detailShowFn(scope.row)" style="font-size:12px;">{{ scope.row.userName}}</el-link>
 			</template>
 

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

@@ -80,6 +80,15 @@
 								label="地址"
 								width="280px"
 							></el-table-column>
+							<el-table-column
+								property="print"
+								label="操作"
+								width="110px"
+							>
+							<el-button type="primary" icon="el-icon-printer"></el-button>
+							</el-table-column>
+
+
 						</el-table>
 					</div>
 				</div>
@@ -92,7 +101,7 @@
 							<el-table-column property="bookMobile" label="手机号"></el-table-column>
 							<el-table-column
 								property="reachDate"
-								label="送到时间"
+								label="期望送到时间"
 							></el-table-column>
 							<el-table-column property="cardInfo" label="祝福语"></el-table-column>
 						</el-table>

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

@@ -16,6 +16,10 @@
 							<div class="label">订单号</div>
 							<div class="val">{{ orderData.orderSn }}</div>
 						</div>
+						<div class="info-list">
+							<div class="label">下单客户</div>
+							<div class="val">{{ orderData.bookName }}</div>
+						</div>
 						<div class="info-list">
 							<div class="label">下单时间</div>
 							<div class="val">{{ orderData.addTime | formatTime }}</div>
@@ -60,8 +64,8 @@
 										v-if="!$util.isEmpty(item.receive)"
 										:info="item.receive"
 									/>
-									<span v-else>暂无配送用户信息</span>
-									<div style="margin-top: 10px">
+									<span v-else>配送信息未登记</span>
+									<div style="margin-top: 10px" v-if="!$util.isEmpty(item.receive)">
 										<el-button size="mini" @click="printOrderFn(index)">{{
 											index == 0 ? '打印' : '重打'
 										}}</el-button>
@@ -101,10 +105,20 @@
 							<!-- 送达 -->
 							<template v-if="item.actionName == '送达'">
 								<div v-if="item.finishTime == 0">
-									<el-button type="primary" @click="orderReachFn"
-										>确认已送达</el-button
-									>
-									<div class="prompt-text">送达会自动通知客户哦</div>
+
+<el-popover
+  placement="top"
+  width="160"
+  v-model="visible">
+  <p>确认送达？</p>
+  <div style="text-align: right; margin: 0">
+    <el-button size="mini" type="text" @click="visible = 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-popover>
+
+									<div class="prompt-text">确认后会自动通知客户已送达~</div>
 								</div>
 							</template>
 							<!-- 订单分类 -->
@@ -623,7 +637,7 @@ export default {
 				await this.$service.single.printOrder({ id: this.orderData.id, option: 1 });
 			}
 
-			this.$message.success('打单成功！');
+			//this.$message.success('打单成功！');
 			this.getDet();
 
 			this.$service.order.deliver({ id: this.orderData.id }).then(res => {
@@ -652,7 +666,7 @@ export default {
 		// 确认送达
 		orderReachFn() {
 			this.$service.single.orderReach({ id: this.orderData.id, option: 1 }).then(res => {
-				this.$message.success('确认送达成功！');
+				this.$message.success('已确认！');
 				this.getDet();
 			});
 		},
@@ -791,6 +805,9 @@ export default {
 .ship-draw-wrap {
 	.el-drawer__header {
 		margin-bottom: 20px;
+		span{
+		    outline:none;
+		}
 	}
 }
 

admin-update/src/views/order/list.vue

@@ -20,7 +20,7 @@
 
 			<!-- 单号 -->
 			<template #table-column-orderSn="{scope}">
-                <el-link :underline="false" @click="detailShowFn(scope.row)" style="font-size:12px;">{{ scope.row.orderSn}}</el-link>
+                <el-link :underline="false" @click="detailShowFn(scope.row)" style="font-size:12px;display:inline-block;">{{ scope.row.orderSn}}</el-link>
 			</template>
 
 			<!-- 订花人 -->
@@ -75,7 +75,7 @@
 			<template #table-column-currentFlow="{scope}">
 				<div class="steps-wrap">
 					<el-steps
-						:space="180"
+						:space="200"
 						:active="parseInt(scope.row.currentFlow)"
 						finish-status="success"
 						size="mini"
@@ -83,7 +83,7 @@
 					>
 						<el-step
 							title=""
-							v-for="(item, index) in parseInt(5)"
+							v-for="(item, index) in parseInt(scope.row.totalFlow)"
 							:key="index"
 						></el-step>
 					</el-steps>
@@ -91,8 +91,30 @@
 				<!-- <div>{{ scope.row.currentFlow }}</div> -->
 			</template>
 
+			<!-- 送达时间 -->
+			<template #table-column-reachTime="{scope}">
+			<span v-if="scope.row.sendType == 0">-</span>
+            <span v-else>
+                <span v-if="scope.row.reachTime == ''">-</span>
+                <span v-else>{{scope.row.reachTime}}</span>
+                </span>
+			</template>
+
+			<!-- 通知送到 -->
+			<template #table-column-inform="{scope}">
+			<span v-if="scope.row.sendType == 0">-</span>
+            <span v-else>
+
+                <i
+                    class="el-icon-success"
+                    v-if="scope.row.inform == 1"
+                    style="color:#67C23A;font-size:19px;"
+                ></i>
+                <i class="el-icon-success" v-else style="color:#C0C4CC;font-size:19px;"></i>
+            </span>
+			</template>
+
 			<!-- 操作 -->
-			<!-- 发货 -->
 			<template #slot-column-option="{scope}">
 				<template v-if="scope.row.status == 0">
 					<el-button type="text" size="small" disabled>自取</el-button>
@@ -103,7 +125,7 @@
 				</template>
 				<template v-else>
 
-                                <template v-if="scope.row.currentFlow == 0">
+                                <template v-if="scope.row.currentFlow == 1">
                 					<el-button type="text" size="small" @click="noSendShipFn(scope.row)"
                 						>自取</el-button
                 					>
@@ -231,7 +253,7 @@ export default {
 							prop: 'orderSn',
 							label: '单号',
 							align: 'center',
-							width: '240'
+							width: '260'
 						},
 						{
 							prop: 'bookName',
@@ -257,6 +279,12 @@ export default {
 							align: 'center',
 							width: '110'
 						},
+						{
+							prop: 'reachTime',
+							label: '送达时间',
+							align: 'center',
+							width: 120
+						},
 						{
 							prop: 'prePrice',
 							label: '总价',
@@ -286,13 +314,8 @@ export default {
 							label: '状态',
 							align: 'center'
 						},
-						{
-							prop: 'reachTime',
-							label: '送达时间',
-							align: 'center'
-						},
                         {
-                            prop: 'reachTime',
+                            prop: 'inform',
                             label: '通知送到',
                             align: 'center'
                         },
@@ -309,6 +332,7 @@ export default {
 						// 同 element-ui Table-column Attributes
 						props: {
 							width: 150,
+							height:128,
 							align: 'center',
 							fixed: 'right',
 							label: '操作'
@@ -353,7 +377,7 @@ export default {
 }
 .steps-wrap {
 	width: 150px;
-	// height: 26px;
+	//height: 26px;
 	margin:0 auto;
 }
 </style>
@@ -361,21 +385,21 @@ export default {
 <style lang="scss">
 .order-list-wrap {
 	.el-step__head.is-process {
-		color: #21bc88;
-		border-color: #21bc88;
+		color: #c0c4cc;
+		border-color: #c0c4cc;
 		.el-step__icon.is-text {
-			background-color: #21bc88;
+			background-color: #c0c4cc;
 		}
 	}
 	.el-step__head.is-success {
-		color: #3385ff;
-		border-color: #3385ff;
+		color: #409EFF;
+		border-color: #409EFF;
 		.el-step__icon.is-text {
-			background-color: #3385ff;
+			background-color: #409EFF;
 			font-size:1px;
 		}
 		.el-step__line {
-			background-color: #3385ff;
+			background-color: #409EFF;
 			.el-step__line-inner{
 			    display:inline-block;
 			}
@@ -397,7 +421,7 @@ export default {
 		height: 1px;
 		left: 16px;
 		right: -16px;
-		top: 10px;
+		top: 11px;
 	}
 
 }

admin-update/src/views/setting/level.vue

@@ -38,7 +38,7 @@
 		</div>
 		<!-- 提示 -->
 		<div v-if="isModify" class="prompt-text">
-			点此上方的数字即可修改，提交后将不能再次修改，请谨慎操作。
+			提交后将不能再次修改，请确认后再提交。
 		</div>
 		<!-- 按钮 -->
 		<div v-if="isModify" class="btn-wrap">