预订

ghs/src/mock/userInfo.js

@@ -167,7 +167,7 @@ let menu = {
 		{id: '1415',parentId: 1400,name: '新增采购',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/add',viewPath: 'views/in/add.vue',keepAlive: 1},
 		{id: '1420',parentId: 1400,name: '改价入库',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/change',viewPath: 'views/in/change.vue',keepAlive: 1},
 		
-		{id: '15',parentId: null,name: '花商',type: 0,icon: 'icondingdanguanli',orderNum: 3,router: '/in/ghs',viewPath: 'views/in/ghs.vue',keepAlive: 1},
+		{id: '15',parentId: null,name: '供货',type: 0,icon: 'icondingdanguanli',orderNum: 3,router: '/in/ghs',viewPath: 'views/in/ghs.vue',keepAlive: 1},
 		{id: '1505',parentId: 15,name: '商家列表',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/ghs',viewPath: 'views/in/ghs.vue',keepAlive: 1},
 		{id: '1509',parentId: 15,name: '商家业绩',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/yj',viewPath: 'views/in/yj.vue',keepAlive: 1},
 		{id: '1515',parentId: 15,name: '实时应付',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/due',viewPath: 'views/in/due.vue',keepAlive: 1},

ghs/src/views/member/list.vue

@@ -77,7 +77,8 @@
 
 			<template #slot-column-option="{scope}">
 				<el-button size="small" type="primary" @click="beginRecharge(scope.row)">充值清账</el-button>
-				<el-button size="small" type="primary" @click="kd(scope.row)">开单</el-button>
+				<el-button size="small" type="primary" @click="kd(scope.row,0)">开单</el-button>
+				<el-button size="small" type="primary" @click="kd(scope.row,1)">开预订单</el-button>
 			</template>
 
 			<template #table-column-recentExpend="{scope}">
@@ -300,11 +301,16 @@ export default {
 			let query = {}
 			this.$router.push({path:'/order/add',query})
 		},
-		kd(info){
+		kd(info,book){
 			let query = {}
 			query.customId = info.id
 			query.customName = info.name
-			this.$router.push({path:'/order/add',query})
+			query.book = book
+			if(book == 1){
+				this.$router.push({path:'/order/confirm',query})
+			}else{
+				this.$router.push({path:'/order/confirm',query})
+			}
 		},
 		beginRecharge(info){
 			this.rechargePop = true
@@ -396,7 +402,7 @@ export default {
 							prop: 'name',
 							label: '名称',
 							align: 'center',
-							width: 200
+							width: 160
 						},
 						{
 							prop: 'mobile',
@@ -450,19 +456,19 @@ export default {
 							prop: 'recentExpend',
 							label: '最近下单',
 							align: 'center',
-							width: 140
+							width: 120
 						},
 						{
 							prop: 'visitTime',
 							label: '最近访问',
 							align: 'center',
-							width: 140
+							width: 120
 						}
 					],
 					op: {
 						visible: true,
 						props: {
-							width: 220,
+							width: 270,
 							align: 'center',
 							fixed: 'right',
 							label: '操作'

ghs/src/views/order/confirm.vue

@@ -90,7 +90,7 @@
     </div>
     <div class="bottom_input">
         <span style="margin-right:10px;font-weight: 700;">花材</span>
-        <el-input style="width: 280px;font-size:13px" @input="beginSearchItem" @keyup.enter.native="pickAddCurrentItem" @focus="clearSeachVal" placeholder="这里搜索，光标插入 Ctrl + Q" type="text" ref="itemSearchRef" v-model="searchVal"></el-input>
+        <el-input style="width: 280px;font-size:13px" @input="beginSearchItem" @keyup.enter.native="pickAddCurrentItem" @focus="clearSeachVal" placeholder="这里搜索花材，插入光标 Ctrl + Q" type="text" ref="itemSearchRef" v-model="searchVal"></el-input>
         <div style="display: inline-block;" class="allPrice">{{allCount.kind}}种</div>
         <div style="display: inline-block;" class="allPrice">{{ allCount.bigLength }}扎</div>
         <div style="display: inline-block;" class="allPrice">¥{{ allPrice }}</div>