基本结构成型

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

@@ -3,13 +3,13 @@
 	<view @click="changeProperty(1)">花材</view>
 	<view @click="changeProperty(0)">成品</view>
     <view @click="logout">退出</view>
-    <view @click="resetCustomer">选客户</view>
-	<view>临时商品</view>
-    <view @click="clearItemFn">清空花材</view>
+    <view @click="resetCustomer">选客</view>
+	<view>收款</view>
+    <view @click="clearItemFn">清空</view>
     <view @click="breakage">报损</view>
     <view @click="gosettleCommit">结算 </view>
 
-    <!-- 清空花材 -->
+    <!-- 清空 -->
     <uni-popup ref="clearItemRef" type="dialog">
         <uni-popup-dialog type="info" cancelText="取消" confirmText="确认" title="提示" content="确认清空？" @confirm="confirmClearItem"></uni-popup-dialog>
     </uni-popup>

hdPad/src/admin/home/workbench.vue

@@ -53,7 +53,7 @@ export default {
 	data() {
 		return {
 			//0成品 1花材
-			currentProperty:0,
+			currentProperty:1,
 			itemList:[],
 			currenSelectShop:{},
 			selectItem: {},

hdPad/src/admin/work/components/leftGoods.vue

@@ -0,0 +1,143 @@
+<template>
+    <view class="itemList-box">
+        <view class="title">花材列表</view>
+        <view class="itemList-item_box">
+            <view v-for="item in selectList" :key="item.id" class="show-item_box">
+                <view class="item-body_box not-active">
+                    <view class="flower-name_box">
+                        <view class="current-item-title"><text class="name">{{item.name}}</text><text @click.stop="delItem(item)" class="del">删除</text></view>
+                    </view>
+                    <view class="item-price-num">
+                        <template v-if="item.property && item.property == 1">
+                            <view v-if="item.unitType == 0">{{parseFloat(item.bigPrice)}}元/{{item.bigUnit}}</view>
+                            <view v-else>{{parseFloat(item.smallPrice)}}元/{{item.smallUnit}}</view>
+                            <view>{{item.buyNum}} {{item.unitType == 0 ? item.bigUnit : item.smallUnit}}</view>
+                        </template>
+                        <template v-else>
+                            <view>{{parseFloat(item.unitPrice)}}/份</view>
+                            <view>{{item.buyNum}}份</view>
+                        </template>
+                        <view>￥{{parseFloat((item.buyNum * item.unitPrice).toFixed(2))}}</view>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <view class="itemList-footer_box">
+            <view> 数量
+                <text style="margin-left:5upx;">
+                    <text v-if="Number(allCount.bigNum)>0">{{allCount.bigNum}}扎</text>
+                    <text v-if="Number(allCount.smallNum)>0">{{allCount.smallNum}}支</text>
+                </text>
+            </view>
+            <view> 合计 <text style="margin-left:5upx;">￥{{allPrice}}</text> </view>
+        </view>
+    </view>
+</template>
+<script>
+import productMins from "@/mixins/product";
+export default {
+    name:'leftItem',
+    components:{},
+	mixins: [productMins],
+	props: {
+		customId: {
+			type: Number,
+			default: 0
+		}
+    },
+    data(){
+        return {
+            totalShop:{ bigUnit: 0, smallUnit:0, totalPrice: 0 },
+            itemList:[],
+            selectJobType:'selectMake',
+            selectJobId:0
+        }
+    },
+    created(){
+    },
+    watch:{
+        customId:{
+            handler(newCustomId){
+                this.selectJobId = newCustomId
+            },
+            immediate:true
+        }
+    },
+    methods:{
+        delItem(item){
+            this.$util.hitRemind()
+            item.buyNum = 0
+            this.replaceItemFn(item,1,'sub')
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.itemList-box {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    & .title {
+        padding: 3upx;
+        font-size: 12upx;
+        background-color: rgba(72, 91, 107, 1);
+        color: #FFFFFF;
+    }
+    & .itemList-item_box {
+        overflow-y: auto;
+        flex: 1;
+        border: 1px solid #eee;
+        & .show-item_box {
+            padding: 2upx;
+            & .item-body_box {
+                border-radius: 2upx;
+                padding: 2upx;
+                font-size: 14upx;
+                color:#666666;
+                &.active {
+                    background-color: #d4d6d6;
+                }
+                &.not-active {
+                    background-color: #e7e9e9;
+                }
+                .item-price-num{
+                    color:#afaeae;
+                    font-size:10upx;
+                }
+                & .flower-name_box {
+                    padding: 0 5upx;
+                    .current-item-title {
+                        .name{
+                            color: #333333;
+                            font-weight: bold;
+                            overflow: hidden;
+                            text-overflow:ellipsis;
+                            white-space: nowrap;
+                            width:50upx;
+                        }
+                        .del{
+                            color:orange;
+                            font-size:12upx;
+                            float:right;
+                        }
+                    }
+                }
+                & > view:nth-child(2) {
+                    display: flex;
+                    align-items: center;
+                    justify-content: space-between;
+                    padding-top: 15upx;
+                }
+            }
+        }
+    }
+    & .itemList-footer_box {
+        height: 20upx;
+        border: 1px solid #eee;
+        font-size: 10upx;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+    }
+}
+</style>

hdPad/src/admin/work/components/leftItem.vue

@@ -49,7 +49,7 @@ export default {
         return {
             totalShop:{ bigUnit: 0, smallUnit:0, totalPrice: 0 },
             itemList:[],
-            selectJobType:'bill',
+            selectJobType:'make',
             selectJobId:0
         }
     },

hdPad/src/admin/work/components/middleButton.vue

@@ -1,145 +0,0 @@
-<template>
-<view class="button-area">
-	<view @click="changeProperty(1)">花材</view>
-	<view @click="changeProperty(0)">成品</view>
-    <view @click="logout">退出</view>
-    <view @click="resetCustomer">选客户</view>
-	<view>临时商品</view>
-    <view @click="clearItemFn">清空花材</view>
-    <view @click="breakage">报损</view>
-    <view @click="gosettleCommit">结算 </view>
-
-    <!-- 清空花材 -->
-    <uni-popup ref="clearItemRef" type="dialog">
-        <uni-popup-dialog type="info" cancelText="取消" confirmText="确认" title="提示" content="确认清空？" @confirm="confirmClearItem"></uni-popup-dialog>
-    </uni-popup>
-
-    <uni-popup ref="logoutRef" type="dialog">
-        <uni-popup-dialog type="info" cancelText="取消" confirmText="确认" title="提示" content="确认退出？" @confirm="confirmLogout"></uni-popup-dialog>
-    </uni-popup>
-
-    <!-- 扫码付款 -->
-    <uni-popup ref="toPayRef" background-color="#fff" type="center" :animation="false" :is-mask-click="false">
-        <toPayWay @cancelPay="cancelPay()" @selectPayWayBack="selectPayWayBack"></toPayWay>
-    </uni-popup>
-
-</view>
-</template>
-<script>
-import toPayWay from '@/components/to-pay-way.vue'
-import { createCreateOrder, wastageCreateOrder } from '@/api/home/index'
-import productMins from "@/mixins/product";
-export default {
-    name:'middleButton',
-	mixins: [productMins],
-    components:{ toPayWay },
-	props: {
-		customId: {
-			type: Number,
-			default: 0
-		}
-    },
-    data(){
-        return {
-            totalShop:{ bigUnit: 0, smallUnit:0, totalPrice: 0 }
-        }
-    },
-    created(){
-		
-    },
-	watch:{
-
-	},
-    methods:{
-		changeProperty(property){
-			this.$emit('changeProperty',property)
-		},
-		resetCustomer(){
-			this.$util.hitRemind()
-			this.$emit('resetCustomer')
-		},
-		cancelPay(){
-			this.$util.hitRemind()
-			this.$refs.toPayRef.close()
-		},
-		async settleReturn(){
-			this.$util.hitRemind()
-			this.setCreateOrder()
-		},
-		selectPayWayBack(price){
-			this.$util.hitRemind()
-			console.log(price)
-		},
-		breakage(){
-			this.$util.hitRemind()
-			if(this.$util.isEmpty(this.selectList)) {
-				this.$msg('请选择报损花材')
-				return false
-			}
-			this.$util.confirmModal({content:'确定报损吗？'},
-			async() => {
-				try {
-					let arr = this.itemList.map(i=>({
-						productId:i.id,
-						unitType: i.unitType,
-						num: i.currentNum
-					}))
-					wastageCreateOrder({
-						product: JSON.stringify(arr)
-					})
-					this.$msg("报损成功!");
-				}catch(err) {
-					console.log(err)
-				}
-			})
-		},
-		//清空花材弹框
-		clearItemFn(){
-			this.$util.hitRemind()
-			this.$refs.clearItemRef.open()
-		},
-		//确认清空花材
-		confirmClearItem(){
-			this.$util.hitRemind()
-		},
-		confirmLogout(){
-			this.$util.hitRemind()
-			uni.clearStorage()
-			this.$store.commit("setLoginInfo", {})
-			plus.runtime.restart()
-		},
-		logout(){
-			this.$util.hitRemind()
-			this.$refs.logoutRef.open()
-		},
-		delSelectItem(){
-			this.$util.hitRemind()
-		}
-    }
-}
-</script>
-<style lang="scss" scoped>
-.button-area {
-    height: 100vh;
-    display: flex;
-    flex-direction: column;
-	justify-content: space-around;
-    padding: 5upx;
-    padding-top: 12upx;
-    & > view {
-        border: 1upx solid #CCCCCC;
-        border-radius: 5upx;
-        text-align: center;
-        padding: 10upx 0;
-        color: #666666;
-        margin-bottom: 10upx;
-        font-size: 10upx;
-        text-align: center;
-        &.active {
-            color: #008000;
-            border-color: #008000;
-            border-radius: 2upx;
-        }
-    }
-}
-</style>

hdPad/src/admin/work/components/order-list.vue

@@ -6,7 +6,8 @@
             <view @tap="changeStatus(1)" :class="[{'checked':status===1}]">已完成</view>
             <view @tap="changeStatus('')" :class="[{'checked':status===''}]">全部</view>
         </view>
-        <scroll-view class="itemList-item_box" scroll-y="true" @scrolltolower="reachBottom" lower-threshold="50">
+        <scroll-view class="itemList-item_box" scroll-y="true" @scrolltolower="reachBottom" lower-threshold="50" refresher-enabled="true" 
+        :refresher-triggered="triggered" @refresherrefresh="onRefresh" @refresherrestore="onRestore">
             <view v-for="item in list.data" :key="item.id" class="show-item_box" @click="getOrder(item)">
                 <view :class="[selectOrderId==item.id ? 'active' : 'not-active', 'item-body_box']">
                     <view class="flower-name_box">
@@ -40,7 +41,9 @@ export default {
             selectJobId:0,
             groupList:[],
             status:0,
-            selectOrderId:0
+            selectOrderId:0,
+            triggered:false,
+            _freshing: false
         }
     },
     watch:{
@@ -55,6 +58,29 @@ export default {
         this.getWorkInfo()
     },
     methods:{
+        onRefresh(){
+            if (this._freshing){
+                return
+            }
+            this._freshing = true
+            //界面下拉触发，triggered可能不是true，要设为true
+            if (!this.triggered){
+                this.triggered = true
+            }
+            this.resetList()
+            this.getWorkInfo()
+            setTimeout(() => {
+                //触发onRestore，并关闭刷新图标  
+                this.triggered = false
+                this._freshing = false
+            }, 1000)
+        },
+        onRestore(){
+            console.log('onRestore')
+        },
+        onAbort() {  
+            console.log(1);  
+        },
         getOrder(item){
             this.selectOrderId = item.id
             this.$emit('getOrder',item)

hdPad/src/admin/work/components/rightGoodsArea.vue

@@ -0,0 +1,236 @@
+<template>
+    <view class="shop-listType_box">
+        <view class="shop-type_box">
+            <view v-for="item in allCategory" :key="item.id" :class="[currentCategory.id===item.id?'active':'']" @click="changeCategory(item)" > {{item.categoryName}} </view>
+        </view>
+        <view class="num-area" v-if="currentCategory.flower && currentCategory.flower ==1">
+            <view v-for="info in flowerNumList" :class="[flowerNum===info.num?'selected':'']" @click="setNum(info)" :key="info.num">{{info.name}}</view>
+        </view>
+        <scroll-view class="shop-show_box" enable-flex="true" scroll-y="true" lower-threshold="20" @scrolltolower="reachBottom">
+            <view class="goods-item-area">
+            <view v-for="item in list.data" :key="item.id" class="show-shop_box">
+                <view class="item-detail" @click="popAddModelFn(item)">
+                    <image class="img" :src="item.cover" mode="scaleToFill" ></image>
+                    <view class="shop-info_price">
+                        <view>
+                            <view>{{item.name}}</view>
+                            <view>￥{{parseFloat(item.price)}}</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            </view>
+        </scroll-view>
+
+        <slot name="footer"></slot>
+
+        <!-- 开单选花材输入数量和金额 -->
+        <uni-popup ref="kdSelectNumPriceRef" background-color="#fff" type="center" :animation="false">
+            <kdSelectNumPrice @confirmAddItemModel="confirmAddItemModel" :customData.sync="customData" @cancelKdSelectNumPrice="addItemModelHidden"></kdSelectNumPrice>
+        </uni-popup>
+
+    </view>
+</template>
+<script>
+import { getClass } from '@/api/category/index'
+import { getGoodsList } from '@/api/goods/index'
+import productMins from "@/mixins/product";
+import list from "@/mixins/list";
+import kdSelectNumPrice from '@/components/app-kd-select-num-price.vue'
+export default {
+    name:'rightItemArea',
+    components:{ kdSelectNumPrice },
+	mixins: [productMins,list],
+    data(){
+        return {
+            allCategory:[],
+            categoryId: '',
+            currentCategory:{},
+            selectJobType:'bill',
+            selectJobId:0,
+            flowerNum:0,
+            flowerNumList:[{num:0,name:'支数'},{num:6,name:6},{num:9,name:9},{num:11,name:11},{num:19,name:19},{num:33,name:33},{num:52,name:52},{num:66,name:66},{num:99,name:99}]
+        }
+    },
+	props: {
+		customId: {
+			type: Number,
+			default: 0
+		}
+    },
+    created(){
+        this.init()
+    },
+    watch:{
+        customId:{
+            handler(newCustomId){
+                this.selectJobId = newCustomId
+            },
+            immediate:true
+        }
+    },
+    methods:{
+        setNum(info){
+            this.$util.hitRemind()
+            this.flowerNum = info.num
+            this.list.data=[]
+            this.list.page = 1
+            this.list.finished = false
+            this.getGoodsData()
+        },
+		popAddModelFn(info) {
+            this.$util.hitRemind()
+			this.showAddModelFn({ ...info, buyNum: 1, unitPrice: info.price,unitType:0})
+		},
+        init(){
+            getClass().then(res=>{
+                if(res.code == 1){
+                    this.allCategory = res.data
+                    this.currentCategory = this.allCategory[0]
+                    this.getGoodsData()
+                }
+            })
+        },
+        getGoodsData(){
+            getGoodsList({cId:this.currentCategory.id,page:this.list.page,pageSize:30,flowerNum:this.flowerNum}).then(res=>{
+                if(res.code == 1){
+                    this.completes(res)
+                }
+            })
+        },
+        reachBottom(){
+            if (!this.list.finished) {
+                this.getGoodsData()
+            }
+        },
+        changeCategory(item){
+            this.$util.hitRemind()
+            this.list.data=[]
+            this.list.page = 1
+            this.list.finished = false
+            this.flowerNum = 0
+            this.currentCategory = item
+            this.getGoodsData()
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.shop-listType_box {
+    height: 100%;
+    border: 1px solid #eee;
+    display: flex;
+    flex-direction: column;
+    box-sizing: border-box;
+    & .shop-type_box {
+        max-height: 300upx;
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+        overflow-y: scroll;
+        & > view {
+            border:1px solid #e4e4e4;
+            padding: 12upx 0upx;
+            font-size: 15px;
+            min-width: 75upx;
+            text-align: center;
+            &.active {
+                background-color: #428369;
+                color: #ffffff;
+            }
+        }
+    }
+    & .num-area{
+        display: flex;
+        flex-wrap: wrap;
+        margin:8upx 0 8upx 0;
+        justify-content:space-around;
+        & > view {
+            border:1upx solid #CCCCCC;
+            width:30upx;
+            height:25upx;
+            border-radius:10upx;
+            display:flex;
+            justify-content:center;
+            align-items: center;
+            font-size:12upx;
+            color:#666666;
+        }
+        & .selected{
+            background-color:#CCCCCC;
+            color:white;
+        }
+    }
+    & .shop-show_box{
+        padding: 2upx;
+        overflow-y: scroll;
+        overflow-x: hidden;
+        & .goods-item-area{
+            flex: 1;
+            display: flex;
+            flex-wrap: wrap;
+            overflow-y: scroll;
+            overflow-x: hidden;
+            height:90vh;
+            & .show-shop_box{
+                & .item-detail{
+                    position: relative;
+                    margin-right: 9upx;
+                    margin-bottom: 6upx;
+                    width: 82upx;
+                    height: 82upx;
+                    & .img {
+                        width: 82upx;
+                        height: 82upx;
+                    }
+                    .shop-info_price {
+                        position: absolute;
+                        background-color: rgba(0, 0, 0, 0.5);
+                        bottom: 0;
+                        width: 100%;
+                        font-size: 12upx;
+                        color: #ffffff;
+                        height:25upx;
+                        & > view {
+                            font-size: 10upx;
+                            & > view:nth-child(1) {
+                                overflow: hidden;
+                                text-overflow:ellipsis;
+                                white-space: nowrap;
+                                width:90%;
+                            }
+                            & > view:nth-child(2) {
+                                font-size:8upx;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    & .shop-footer_box {
+        height: 40upx;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+        & > view {
+            height: 40upx;
+            padding: 5upx 25upx;
+            border-radius: 5upx;
+            font-size: 14upx;
+            margin: 0 10upx;
+            vertical-align: middle;
+            display: flex;
+            align-items: center;
+            &.btn-breakage {
+                background-color: #da9f5a;
+                color: #ffffff;
+            }
+            &.btn-account {
+                background-color: #009966;
+                color: #ffffff;
+            }
+        }
+    }
+}
+</style>

hdPad/src/admin/work/make.vue

@@ -14,7 +14,12 @@
             </view>
             <!-- 按钮操作 -->
             <view class="open-box">
-                <middleButton @resetCustomer="resetCustomer" :customId.sync="customId" @changeProperty="changeProperty"></middleButton>
+				<view class="button-area">
+					<view @click="logout">退出</view>
+					<view @click="clearItemFn">清空</view>
+					<view @click="breakage">报损</view>
+					<view>制作</view>
+				</view>
             </view>
         </view>
     </view>
@@ -22,13 +27,12 @@
 <script>
 import { mapGetters } from "vuex";
 import rightItemArea from './components/rightItemArea.vue'
-import middleButton from './components/middleButton.vue'
 import leftItem from './components/leftItem.vue'
 import casherNav from '@/components/casher-nav.vue'
 import productMins from "@/mixins/product";
 export default {
 	name: "make",
-	components: { rightItemArea,middleButton,leftItem, casherNav},
+	components: { rightItemArea,leftItem, casherNav},
 	mixins: [productMins],
 	data() {
 		return {
@@ -40,7 +44,7 @@ export default {
 			selectItemUser:{},
 			isLogin:2,
 			customId:0,
-            selectJobType:'bill',
+            selectJobType:'make',
             selectJobId:0,
 			chooseCustomer:false
 		}
@@ -105,6 +109,29 @@ export default {
 	}
 	& .open-box {
 		flex: 8;
+		.button-area {
+			height: 100vh;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-around;
+			padding: 5upx;
+			padding-top: 12upx;
+			& > view {
+				border: 1upx solid #CCCCCC;
+				border-radius: 5upx;
+				text-align: center;
+				padding: 10upx 0;
+				color: #666666;
+				margin-bottom: 10upx;
+				font-size: 10upx;
+				text-align: center;
+				&.active {
+					color: #008000;
+					border-color: #008000;
+					border-radius: 2upx;
+				}
+			}
+		}
 	}
 }
 </style>

hdPad/src/admin/work/modify.vue

@@ -1,9 +1,7 @@
 <template>
     <view>
         <view class="app-casher-area">
-            <view class="nav-left">
-                <casherNav></casherNav>
-            </view>
+            <view class="nav-left"> </view>
             <!-- 已选花材列表 -->
             <view class="itemList-box">
                 <leftItem></leftItem>
@@ -14,7 +12,12 @@
             </view>
             <!-- 按钮操作 -->
             <view class="open-box">
-                <middleButton @resetCustomer="resetCustomer" :customId.sync="customId" @changeProperty="changeProperty"></middleButton>
+
+				<view class="button-area">
+					<view @click="clearItemFn">清空</view>
+					<view>确认</view>
+				</view>
+
             </view>
         </view>
     </view>
@@ -22,13 +25,11 @@
 <script>
 import { mapGetters } from "vuex";
 import rightItemArea from './components/rightItemArea.vue'
-import middleButton from './components/middleButton.vue'
 import leftItem from './components/leftItem.vue'
-import casherNav from '@/components/casher-nav.vue'
 import productMins from "@/mixins/product";
 export default {
 	name: "modify",
-	components: { rightItemArea,middleButton,leftItem, casherNav},
+	components: { rightItemArea,leftItem},
 	mixins: [productMins],
 	data() {
 		return {
@@ -105,6 +106,29 @@ export default {
 	}
 	& .open-box {
 		flex: 8;
+		.button-area {
+			height: 100vh;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-around;
+			padding: 5upx;
+			padding-top: 12upx;
+			& > view {
+				border: 1upx solid #CCCCCC;
+				border-radius: 5upx;
+				text-align: center;
+				padding: 10upx 0;
+				color: #666666;
+				margin-bottom: 10upx;
+				font-size: 10upx;
+				text-align: center;
+				&.active {
+					color: #008000;
+					border-color: #008000;
+					border-radius: 2upx;
+				}
+			}
+		}
 	}
 }
 </style>

hdPad/src/admin/work/selectMake.vue

@@ -6,29 +6,32 @@
             </view>
             <!-- 已选花材列表 -->
             <view class="itemList-box">
-                <leftItem></leftItem>
+                <leftGoods></leftGoods>
             </view>
-            <!-- 分类和花材图片 -->
+            <!-- 成品 -->
             <view class="all-item-area">
-                <rightItemArea> </rightItemArea>
+                <rightGoodsArea> </rightGoodsArea>
             </view>
             <!-- 按钮操作 -->
             <view class="open-box">
-                <middleButton @resetCustomer="resetCustomer" :customId.sync="customId" @changeProperty="changeProperty"></middleButton>
+				<view class="button-area">
+					<view @click="logout">退出</view>
+					<view @click="clearItemFn">清空</view>
+					<view>制作</view>
+				</view>
             </view>
         </view>
     </view>
 </template>
 <script>
 import { mapGetters } from "vuex";
-import rightItemArea from './components/rightItemArea.vue'
-import middleButton from './components/middleButton.vue'
-import leftItem from './components/leftItem.vue'
+import rightGoodsArea from './components/rightGoodsArea.vue'
+import leftGoods from './components/leftGoods.vue'
 import casherNav from '@/components/casher-nav.vue'
-import productMins from "@/mixins/product";
+import productMins from "@/mixins/product"
 export default {
 	name: "make",
-	components: { rightItemArea,middleButton,leftItem, casherNav},
+	components: { rightGoodsArea,leftGoods, casherNav},
 	mixins: [productMins],
 	data() {
 		return {
@@ -40,7 +43,7 @@ export default {
 			selectItemUser:{},
 			isLogin:2,
 			customId:0,
-            selectJobType:'bill',
+            selectJobType:'selectMake',
             selectJobId:0,
 			chooseCustomer:false
 		}
@@ -105,6 +108,29 @@ export default {
 	}
 	& .open-box {
 		flex: 8;
+		.button-area {
+			height: 100vh;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-around;
+			padding: 5upx;
+			padding-top: 12upx;
+			& > view {
+				border: 1upx solid #CCCCCC;
+				border-radius: 5upx;
+				text-align: center;
+				padding: 10upx 0;
+				color: #666666;
+				margin-bottom: 10upx;
+				font-size: 10upx;
+				text-align: center;
+				&.active {
+					color: #008000;
+					border-color: #008000;
+					border-radius: 2upx;
+				}
+			}
+		}
 	}
 }
 </style>

hdPad/src/pagesStorehouse/allot/addExDetails.vue

@@ -63,13 +63,13 @@
 					</t-table>
 				</block>
 				<view class="btn-bar">
-					<button class="admin-button-com middle blue" v-if="!$util.isEmpty(selectList)" @click="gotoSelectPage">修改花材</button>
+					<button class="admin-button-com middle blue" v-if="!$util.isEmpty(selectList)" @click="gotoSelectPage">修改</button>
 					<button class="admin-button-com middle blue" v-else @click="gotoSelectPage">选择花材</button>
 				</view>
 			</view>
 		</view>
 		<view class="app-footer open_btn">
-			<button v-if="!$util.isEmpty(selectList)" class="admin-button-com middle default" @click="removeFromSave()">清空花材</button>
+			<button v-if="!$util.isEmpty(selectList)" class="admin-button-com middle default" @click="removeFromSave()">清空</button>
 			<button @click="stockOutFn()" class="admin-button-com middle blue">确认出库</button>
 		</view>
 	</view>

hdPad/src/pagesStorehouse/inventory/update.vue

@@ -63,8 +63,8 @@
 		</view>
 		<view class="bar-view" v-if="selectList.length>0">
 			<view class="btn-view">
-				<button class="admin-button-com middle default" @click="removeFromSave(0)" style="margin-left:30upx;">清空花材</button>
-				<button :class="['admin-button-com', 'middle']" @click="gotoSelectPage"> 修改花材 </button>
+				<button class="admin-button-com middle default" @click="removeFromSave(0)" style="margin-left:30upx;">清空</button>
+				<button :class="['admin-button-com', 'middle']" @click="gotoSelectPage"> 修改 </button>
 				<button v-if="!orderSn" :class="['admin-button-com', 'middle', { disabled: allCount == 0 }]" :disabled="allCount == 0" @click="confirmPop(1)"> 确认盘点 </button>
 				<button v-if="orderSn" :class="['admin-button-com', 'middle', { disabled: allCount == 0 }]" :disabled="allCount == 0" @click="confirmPop(2)"> 确认盘点 </button>
 			</view>