制单

shop/src/service/single/index.js

@@ -86,7 +86,7 @@ export class SingleService extends BaseService {
 	}
 
 	/** *
-	 * 发货操作-打单 b
+	 * 发货操作-制单 b
 	 */
 	printOrder(data) {
 		return this.request({

shop/src/views/order/components/sel-order.vue

@@ -50,8 +50,8 @@
 						</div>
 						<!-- content -->
 						<div class="content-wrap">
-							<!-- 打单 -->
-							<template v-if="item.actionName == '打单'">
+							<!-- 制单 -->
+							<template v-if="item.actionName == '制单'">
 								<div v-if="$util.isEmpty(item.receive) && index == 0">
 									<el-button type="primary" @click="hasDeliver"
 										>有配送单</el-button
@@ -568,7 +568,7 @@ export default {
 			showShipManage: false,
 			shipData: [],
 			// dialog
-			// 打单信息
+			// 制单信息
 			relateData: {},
 			confirmSendVisit: false,
 			orderDialog: false,
@@ -753,7 +753,7 @@ export default {
 				});
 			});
 		},
-		//打单
+		//制单
 		async printOrderFn() {
 			await this.$service.single.printOrder({ id: this.id, option: 2 });
 			this.getDet();

store/src/admin/official/index.vue

@@ -122,7 +122,7 @@ export default {
         },
         {
           title: `<span class="app-color-1">规范化</span>管理订单`,
-          subTitle: `高效管理订单，从下单、打单、制作到发货、配送、 送达自动通知客户，大幅提升客户体验`,
+          subTitle: `高效管理订单，从下单、制单、制作到发货、配送、 送达自动通知客户，大幅提升客户体验`,
           img: `${this.$constant.imgUrl}/retail/official/content-2.png`
         },
         {

store/src/admin/order/components/sel-confirm.vue

@@ -53,7 +53,7 @@
 					</div>
 				</template>
 			</timeaxis-item>
-			<!-- 打单 -->
+			<!-- 制单 -->
 			<timeaxis-item class="axis-list com-wrap" bgcolor="none">
 				<template v-slot:content>
 					<div class="axis-slot-wrap">
@@ -231,7 +231,7 @@ export default {
 			}
 		}
 	}
-	// 打单
+	// 制单
 	.com-wrap {
 		.axis-det {
 			margin-top: 14px;

store/src/admin/order/components/sel-express-confirm.vue

@@ -43,7 +43,7 @@
 					</div>
 				</template>
 			</timeaxis-item>
-			<!-- 打单 -->
+			<!-- 制单 -->
 			<timeaxis-item class="axis-list com-wrap" bgcolor="none">
 				<template v-slot:content>
 					<div class="axis-slot-wrap">
@@ -182,7 +182,7 @@ export default {
 			}
 		}
 	}
-	// 打单
+	// 制单
 	.com-wrap {
 		.axis-det {
 			margin-top: 14px;

store/src/admin/order/components/sel-mention.vue

@@ -44,14 +44,14 @@
 					</div>
 				</template>
 			</timeaxis-item>
-			<!-- 打单 -->
+			<!-- 制单 -->
 			<timeaxis-item class="axis-list com-wrap" bgcolor="none">
 				<template v-slot:content>
 					<div class="axis-slot-wrap">
-						<div class="axis-title">打单</div>
+						<div class="axis-title">制单</div>
 						<div class="axis-det">
 							<div>2019-10-10 18:00:00</div>
-                            <div class="app-color-2">免打单</div>
+                            <div class="app-color-2">免制单</div>
 						</div>
 					</div>
 				</template>
@@ -115,7 +115,7 @@ export default {
             }
 		}
     }
-	// 打单
+	// 制单
 	.com-wrap {
 		.axis-det {
 			margin-top: 14px;

store/src/admin/order/components/sel-order.vue

@@ -2,7 +2,7 @@
 	<div class="sel-order-module">
 		<!-- 列表 -->
 		<time-axis>
-			<!-- 打单 -->
+			<!-- 制单 -->
 			<timeaxis-item class="axis-list axis-first print-order" bgcolor="none">
 				<template v-slot:node>
 					<div class="tui-node node-big">
@@ -11,9 +11,9 @@
 				</template>
 				<template v-slot:content>
 					<div class="axis-slot-wrap">
-						<div class="axis-title">打单</div>
+						<div class="axis-title">制单</div>
 						<div class="axis-det">
-							<button class="admin-button-com big blue" @click="hasSendOrderFn">有配送单</button>
+							<button class="admin-button-com big blue" @click="hasSendOrderFn">跳过</button>
 							<button class="admin-button-com big blue" @click="pageTo({
 						url: '/admin/order/fill-form',
 						query: {
@@ -87,7 +87,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-	// 打单
+	// 制单
 	.print-order {
 		.axis-slot-wrap {
 			top: -4px !important;

store/src/admin/order/components/sel-pending-order.vue

@@ -30,11 +30,11 @@
 					</div>
 				</template>
 			</timeaxis-item>
-			<!-- 打单 -->
+			<!-- 制单 -->
 			<timeaxis-item class="axis-list com-wrap" bgcolor="none">
 				<template v-slot:content>
 					<div class="axis-slot-wrap">
-						<div class="axis-title">打单</div>
+						<div class="axis-title">制单</div>
 						<div class="axis-det">
 							<div>2019-10-10 18:00:00</div>
                             <card-name />
@@ -114,7 +114,7 @@ export default {
             }
 		}
     }
-	// 打单
+	// 制单
 	.com-wrap {
 		.axis-det {
 			margin-top: 14px;

store/src/admin/order/components/sel-ship-confirm.vue

@@ -53,7 +53,7 @@
 					</div>
 				</template>
 			</timeaxis-item>
-			<!-- 打单 -->
+			<!-- 制单 -->
 			<timeaxis-item class="axis-list com-wrap" bgcolor="none">
 				<template v-slot:content>
 					<div class="axis-slot-wrap">
@@ -139,7 +139,7 @@ export default {
 			}
 		}
 	}
-	// 打单
+	// 制单
 	.com-wrap {
 		.axis-det {
 			margin-top: 14px;

store/src/admin/order/components/sel-ship-manage.vue

@@ -26,7 +26,7 @@
 			<timeaxis-item class="axis-list com-wrap" bgcolor="none">
 				<template v-slot:content>
 					<div class="axis-slot-wrap">
-						<div class="axis-title">打单</div>
+						<div class="axis-title">制单</div>
 						<div class="axis-det">
 							<div class="app-color-0 app-bold">{{ orderComData[1].addTime | formatTime }}</div>
 							<block v-if="!$util.isEmpty(orderComData[1].receive)">
@@ -235,7 +235,7 @@ export default {
 			width: 40%;
 		}
 	}
-	// 打单
+	// 制单
 	.com-wrap {
 		.axis-det {
 			margin-top: 14px;

store/src/admin/order/components/sel-ship.vue

@@ -19,11 +19,11 @@
 					</div>
 				</template>
 			</timeaxis-item> -->
-			<!-- 打单 -->
+			<!-- 制单 -->
 			<timeaxis-item class="axis-list axis-first print-order" bgcolor="none">
 				<template v-slot:content>
 					<div class="axis-slot-wrap">
-						<div class="axis-title">打单</div>
+						<div class="axis-title">制单</div>
 						<div class="axis-det">
 							<div>{{ orderComData[0].addTime | formatTime }}</div>
                             <card-name :info="orderComData[0].receive" />
@@ -116,7 +116,7 @@ export default {
 			}
 		}
     }
-	// 打单
+	// 制单
 	.print-order {
 		.axis-det {
             margin-top: 14px;

store/src/admin/order/detail.vue

@@ -129,7 +129,9 @@
     <!-- 按钮 -->
     <div class="page-btn app-footer">
       <div class="flex-center">
-        <span>应付款</span>
+        <span v-if="data.status == 0">应付款</span>
+        <span v-else-if="data.status == 6">已退款</span>
+        <span else="data.status == 5">已付款</span>
         <span class="app-price">
           <span>￥</span>
           <span class="app-size-40">{{ data.prePrice }}</span>

store/src/api/order/index.js

@@ -79,7 +79,7 @@ export const orderSendDet = data => {
 }
 
 /** *
- * 发货操作-打单 b
+ * 发货操作-制单 b
  */
 export const printOrder = data => {
 	return https.post('/order-send/print-order', data)