已列出选中的花材

ghsPad/src/admin/home/components/select-user.vue → ghsPad/src/admin/home/components/customer-list.vue

@@ -1,8 +1,8 @@
 <template>
   <view class="app-select_user">
-    <view class="title">客户列表</view>
+    <view class="title">请选客户</view>
     <view class="app-userList_box">
-      <view :key="item.id" @click="selectUser(item)" class="userList-item_box" v-for="item in list">
+      <view :key="item.id" @click="selectCustomer(item)" class="userList-item_box" v-for="item in list">
         <view class="head-box">
           <image class="img" :src="item.avatar" mode="" ></image>
           <view class="name">{{item.name}}</view>
@@ -22,8 +22,10 @@
 import VKeyboard from "@/components/plugin/vKeyboard/VKeyboard.vue";
 import { customList } from '@/api/home/index'
 export default {
-  name: "selectUser",
-  components: { VKeyboard, },
+  name: "customerList",
+  components: { VKeyboard },
+	props: {
+  },
   data() {
     return {
 		searchUser: '',
@@ -35,8 +37,8 @@ export default {
     this.activeKeyboard();
   },
   methods: {
-    selectUser(val){
-      this.$emit('selectUser',val)
+    selectCustomer(info){
+      this.$emit('selectCustomer',info)
     },
     changSearch(val){
       this.init()
@@ -59,7 +61,6 @@ export default {
 		  this.init()
     },
     cancel(){
-      this.$emit('cancelSelectUser')
     }
   },
 };
@@ -69,13 +70,14 @@ export default {
   background-color: #ffffff;
   padding: 5upx;
   height: 99vh;
-  width:70vw;
+  width:100vw;
   display: flex;
   flex-direction: column;
   box-sizing: border-box;
   & .title {
     font-size: 12upx;
     color: #CCCCCC;
+    margin-left:5upx;
   }
   & .app-userList_box {
     padding: 5upx;
@@ -121,10 +123,10 @@ export default {
 		flex: 1;
   }
   & .input-serach_box {
-	  font-size: 20upx;
-	  line-height: 28upx;
+	  font-size: 16upx;
+	  line-height: 25upx;
 	  text-align: center;
-	  height: 28upx;
+	  height: 25upx;
     color:#CCCCCC;
   }
   & .input-placeholder {

ghsPad/src/admin/home/components/leftItem.vue

@@ -2,15 +2,15 @@
     <view class="itemList-box">
         <view class="title">花材列表</view>
         <view class="itemList-item_box">
-            <view v-for="item in itemList" :key="item.id" @click="selectCurrentActive(item)" class="show-item_box">
+            <view v-for="item in selectList" :key="item.id" @click="selectCurrentActive(item)" class="show-item_box">
                 <view :class="[ 'item-body_box', selectCurrentActiveItem.id===item.id?'active':'not-active']">
                     <view class="flower-name_box">
                         <view class="current-item-title"><text class="name">{{item.name}}</text><text @click.stop="delSelectItem" class="del">删除</text></view>
                     </view>
                     <view class="item-price-num">
-                        <view>{{parseFloat(item.currentUnitPrice)}}元/{{item.currentUnit}}</view>
-                        <view>{{item.currentNum}} {{item.currentUnit}}</view>
-                        <view>￥{{item.currentNum * item.currentUnitPrice}}</view>
+                        <view>{{parseFloat(item.bigPrice)}}元/{{item.bigUnit}}</view>
+                        <view>{{item.buyNum}} {{item.unitType == 0 ? item.bigUnit : item.smallUnit}}</view>
+                        <view>￥{{item.buyNum * item.unitPrice}}</view>
                     </view>
                 </view>
             </view>
@@ -27,16 +27,31 @@
     </view>
 </template>
 <script>
+import productMins from "@/mixins/product";
 export default {
     name:'leftItem',
-    mixins:{},
     components:{},
+	mixins: [productMins],
 	props: {
+		customId: {
+			type: Number,
+			default: 0
+		}
     },
     data(){
         return {
             totalShop:{ bigUnit: 0, smallUnit:0, totalPrice: 0 },
-            itemList:[]
+            itemList:[],
+            selectJobType:'bill',
+            selectJobId:0
+        }
+    },
+    watch:{
+        customId:{
+            handler(newCustomId){
+                this.selectJobId = newCustomId
+            },
+            immediate:true
         }
     },
     methods:{

ghsPad/src/admin/home/components/middleButton.vue

@@ -17,10 +17,6 @@
         <uni-popup-dialog type="info" cancelText="取消" confirmText="确认" title="提示" content="确认退出？" @confirm="confirmLogout"></uni-popup-dialog>
     </uni-popup>
 
-    <!-- 选客户 isShowUser -->
-    <uni-popup ref="selectUserRef" background-color="#fff" type="center" :animation="false">
-        <selectUser @selectUser="selectUserReturn" @cancelSelectUser="cancelSelectUser"> </selectUser>
-    </uni-popup>
     <!-- 结算弹框 isShowSettle -->
     <uni-popup ref="settlePopRef" background-color="#fff" type="center" :animation="false">
         <settlePop @settleReturn="settleReturn" ref="settlePop" :totalShop="totalShop"></settlePop>
@@ -34,13 +30,12 @@
 </template>
 <script>
 import settlePop from './settle-pop.vue'
-import selectUser from './select-user.vue'
 import selectPayWay from '@/components/select-pay-way.vue'
 import { createCreateOrder, wastageCreateOrder } from '@/api/home/index'
 export default {
     name:'middleButton',
     mixins:{},
-    components:{ settlePop,selectUser,selectPayWay },
+    components:{ settlePop,selectPayWay },
 	props: {
     },
     data(){
@@ -88,16 +83,6 @@ export default {
 		selectCurrentActive(item){
 				this.selectCurrentActiveItem = item
 		},
-		selectUserReturn(val){
-			this.selectItemUser = val
-			this.$refs.selectUserRef.close()
-		},
-		cancelSelectUser(){
-			this.$refs.selectUserRef.close()
-		},
-		selectUser(){
-			this.$refs.selectUserRef.open('center')
-		},
 		selectPayWayBack(price){
 			console.log(price)
 		},

ghsPad/src/admin/home/components/rightItemArea.vue

@@ -41,14 +41,26 @@ export default {
             arrShop:[],
             currenTypeShopList:[],
             isShowSettle: false,
-            selectJobType:'bill'
+            selectJobType:'bill',
+            selectJobId:0
         }
+    },
+	props: {
+		customId: {
+			type: Number,
+			default: 0
+		}
     },
     created(){
         this.init()
     },
     watch:{
-
+        customId:{
+            handler(newCustomId){
+                this.selectJobId = newCustomId
+            },
+            immediate:true
+        }
     },
     methods:{
 		popAddModelFn(info) {

ghsPad/src/admin/home/workbench.vue

@@ -4,13 +4,18 @@
 		<loginComponent></loginComponent>
 	</view>
 	<view v-else>
+		<view v-if="customId == 0">
+			<!-- 客户列表 -->
+			<customerList @selectCustomer="selectCustomer" @cancelselectCustom="cancelselectCustom"> </customerList>
+		</view>
+		<view v-else>
 		<view class="app-workbench_box">
 			<view class="nav-left">
 				<view class="item-list"> 收银 </view>
 			</view>
 			<!-- 已选花材列表 -->
 			<view class="itemList-box">
-				<leftItemComponent></leftItemComponent>
+				<leftItem :customId.sync="customId"></leftItem>
 			</view>
 			<!-- 按钮操作 -->
 			<view class="open-box">
@@ -18,9 +23,10 @@
 			</view>
 			<!-- 分类和花材图片 -->
 			<view class="all-item-area">
-				<rightItemArea> </rightItemArea>
+				<rightItemArea :customId.sync="customId"> </rightItemArea>
 			</view>
 		</view>
+		</view>
 	</view>
 </view>
 </template>
@@ -29,11 +35,12 @@ import { mapGetters } from "vuex";
 import autoUpdateApp from "@/mixins/autoUpdate";
 import rightItemArea from './components/rightItemArea.vue'
 import middleButton from './components/middleButton.vue'
-import leftItemComponent from './components/leftItem.vue'
+import customerList from './components/customer-list.vue'
+import leftItem from './components/leftItem.vue'
 import loginComponent from './login.vue'
 export default {
 	name: "workbench",
-	components: { rightItemArea,middleButton,  loginComponent, leftItemComponent },
+	components: { rightItemArea,middleButton,  loginComponent, leftItem, customerList },
 	mixins: [autoUpdateApp],
 	data() {
 		return {
@@ -42,7 +49,8 @@ export default {
 			selectItem: {},
 			selectCurrentActiveItem:{},
 			selectItemUser:{},
-			isLogin:false
+			isLogin:false,
+			customId:0
 		};
 	},
 	computed: {
@@ -69,6 +77,9 @@ export default {
 		}
 	},
 	methods: {
+		selectCustomer(info){
+			this.customId = info.id
+		},
 		init() {
 		},
 	}

ghsPad/src/components/plugin/vKeyboard/VKeyboard.vue

@@ -278,7 +278,6 @@ export default {
 			}
 		}
 	}
-
 	/*数字键盘*/
 	.digit-keyboard {
 		display: flex;