shish %!s(int64=2) %!d(string=hai) anos
pai
achega
af3cbdc444

+ 2 - 1
ghsApp/src/admin/billing/index2.vue

@@ -21,7 +21,8 @@
 				</div>
 				<view style="height: 120upx"></view>
 			</scroll-view>
-			<scroll-view scroll-y class="right-box" :scroll-top="globalScrollTopPlace" @scroll="globalGetScroll" :scroll-into-view="scroll_into_view" scroll-with-animation="true" lower-threshold="100" @scrolltolower="globalScrollBottom">
+			<scroll-view scroll-y class="right-box" :scroll-top="globalScrollTopPlace" @scroll="globalGetScroll" 
+			:scroll-into-view="scroll_into_view" scroll-with-animation="true" lower-threshold="100" @scrolltolower="globalScrollBottom">
 				<!--花材列表-->
 				<block v-if="!$util.isEmpty(globalItemData)">
 					<view class="item_list_bx selectAll">

+ 2 - 3
ghsApp/src/admin/changePrice/changeStock2.vue

@@ -128,9 +128,8 @@ export default {
 			})
 		},
 		initProduct(){
-			this.shopId = this.getMyShopInfo.id;
-			let type = '';
-			this.initData({ type, shopId: this.shopId,status:0,delStatus:0,requestType:'changeStock'});
+			this.globalRequestType = 'changeStock'
+			this.initData()
 		},
 		commitPrice(){
 			let that = this

+ 2 - 3
ghsApp/src/admin/changePrice/list2.vue

@@ -196,9 +196,8 @@ export default {
 			})
 		},
 		initProduct(){
-			this.shopId = this.getMyShopInfo.id;
-			let type = '';
-			this.initData({ type, shopId: this.shopId,status:0,requestType:'changePrice'});
+			this.globalRequestType = 'changePrice'
+			this.initData()
 		},
 		commitPrice(){
 			let that = this

+ 23 - 28
ghsApp/src/pagesPurchase/add.vue

@@ -6,7 +6,7 @@
 				<button class="admin-button-com middle blue" @click="selectFlowerNumFn()">选分类</button>
 			</view>
 			<view class="search-bar">
-				<app-search-module v-model="py" placeholder="输拼音首字母也可以搜" @input="goSearchFn"/>
+				<app-search-module ref="globalSearchRef" v-model="globalPy" placeholder="这里搜索" @input="globalSearch"/>
 			</view>
 			<view style="padding:0 0upx 0 20upx;" >
 				<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/ptItem/itemList' })">添花材</button>
@@ -18,19 +18,18 @@
 
 		<view class="scroll-middle_bx">
 			<scroll-view scroll-y scroll-with-animation class="tab-view">
-				<div v-for="(item, index) in globalClassItemList" :key="index" class="tab-bar-item" :class="[classIndex == index ? 'active' : '']" :data-current="index" @tap.stop="swichClass(index)">
-					<text style="text-align: center;">{{ item.className || "" }}</text>
+				<div v-for="(item, index) in globalClassData" :key="index" class="tab-bar-item" :class="[globalClassIndex == index ? 'active' : '']" :data-current="index" @tap.stop="globalSwitchClass(index,item)">
+					<text style="text-align: center;">{{ item.name || "" }}</text>
 				</div>
 			</scroll-view>
-			<scroll-view scroll-y class="right-box" :scroll-into-view="scroll_into_view" scroll-with-animation="true" @scroll="scroll_detail" lower-threshold="100" @scrolltolower="scroll_bottom">
-				<block v-if="!$util.isEmpty(globalClassItemList)">
-					<view class="item_list_bx selectAll" v-for="(classItem, classIndex) in globalClassItemList" :key="classIndex" :id="`class_${classIndex}`">
-						<view class="item_list_title">
-							{{ classItem.className }}
-						</view>
-						<template v-for="(productItem, productIndex) in classItem.child">
-							<view style="height:240upx" :id="`class_${classItem.classId}_${productItem.id}`" :key="productIndex">
-							<CommodityPurchase v-if="classItem.isActive"
+			<scroll-view scroll-y class="right-box" :scroll-into-view="scroll_into_view" scroll-with-animation="true" :scroll-top="globalScrollTopPlace" @scroll="globalGetScroll" 
+			 lower-threshold="100" @scrolltolower="globalScrollBottom">
+				<block v-if="!$util.isEmpty(globalItemData)">
+					<view class="item_list_bx selectAll">
+						<view class="item_list_title"></view>
+						<template v-for="(productItem, productIndex) in globalItemData">
+							<view style="height:240upx" :key="productIndex">
+							<CommodityPurchase
 								:type="selectJobType"
 								:key="productIndex"
 								:info="productItem"
@@ -42,7 +41,7 @@
 						</template>
 					</view>
 				</block>
-				<block v-else> <app-wrapper-empty title="加载中" :is-empty="$util.isEmpty(globalClassItemList)" /> </block>
+				<block v-else> <app-wrapper-empty title="加载中" :is-empty="$util.isEmpty(globalItemData)" /> </block>
 			</scroll-view>
 		</view>
 
@@ -78,19 +77,17 @@
 
 		<FooterCart :price="cgAllPriceFun" :count="allCount" @confirm="confirmSaveItem"></FooterCart>
 
-		<uni-popup ref="selectFlowerNumRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
+		<uni-popup ref="globalClassImgRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
 			<view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
 
-				<view v-for="(item, index) in globalClassItemList" :key="index" @tap.stop="changeClass(index)" style="margin-bottom:20upx;margin-left:3upx;">
-				<image :src="item.classCover" style="width:120upx;height:120upx;border-radius:10upx;"></image>
-				<view style="margin-top:5upx;overflow: hidden;white-space: nowrap;width:120upx;text-align:center;">{{item.className}}</view>
+				<view v-for="(item, index) in globalClassData" :key="index" @tap.stop="globalChangeClass(index,item)" style="margin-bottom:20upx;margin-left:3upx;">
+				<image :src="item.cover" style="width:120upx;height:120upx;border-radius:10upx;"></image>
+				<view style="margin-top:5upx;overflow: hidden;white-space: nowrap;width:120upx;text-align:center;">{{item.name}}</view>
 				</view>
 
 			</view>
 		</uni-popup>
 
-		<image v-if="showClassRemind" @click="hideClassRemind" style="position:absolute;width:610upx;height:699upx;top:225upx;left:80upx;z-index:9999;" :src="`${constant.imgUrl}/class_remind.png`"></image>
-
 	</view>
 </view>
 </template>
@@ -102,7 +99,7 @@ import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import CommodityPurchase from "./components/CommodityPurchase";
 import ModalModule from "@/components/plugin/modal";
 import FooterCart from "@/components/module/app-footer-cart";
-import productMins from "@/mixins/product";
+import productMins from "@/mixins/product2";
 import { mapGetters } from "vuex";
 import { delStatusUpdate } from '@/api/product';
 export default {
@@ -126,8 +123,7 @@ export default {
 			showSubmitModel: false,
 			autoLoad: false,//不自动请求花材数据
 			showButton:[{text: '取消',plain: true}, {text: '确定',plain: false}],
-			checkStock:false,//不需要验证库存
-			showClassRemind:false
+			globalCheckStock:false
 		};
 	},
 	computed:{
@@ -200,9 +196,8 @@ export default {
 
 		},
 		cgItemInit(){
-			this.shopId = this.getMyShopInfo.id;
-			let type = '';
-			this.initData({ type, shopId: this.shopId,status:0,requestType:'cg'});
+			this.globalRequestType = 'cg'
+			this.initData()
 		},
 		confirmSaveItem() {
 			if (this.$util.isEmpty(this.selectList)) {
@@ -297,9 +292,9 @@ export default {
 	}
 	.item_list_bx {
 		padding: 40upx 16upx;
-    &:last-child{
-      margin-bottom: 70upx;
-    }
+		&:last-child{
+			margin-bottom: 70upx;
+		}
 	}
 	.item_list_title {
 		margin-bottom: 20upx;

+ 20 - 27
ghsApp/src/pagesStorehouse/allot/exSelect.vue

@@ -6,7 +6,7 @@
 				<button class="admin-button-com middle blue" @click="selectFlowerNumFn()">图片分类</button>
 			</view>
 			<view class="search-bar">
-				<app-search-module v-model="py" placeholder="输拼音首字母也可以搜" @input="searchFn" />
+				<app-search-module ref="globalSearchRef" v-model="globalPy" placeholder="这里搜索" @input="globalSearch" />
 			</view>
 			<view style="float:right;">
 				<button class="admin-button-com middle blue" @click="removeFromSave()">清除花材</button>
@@ -14,24 +14,20 @@
 		</view>
 		<view class="scroll-middle_bx">
 			<scroll-view scroll-y scroll-with-animation class="tab-view">
-				<div v-for="(item, index) in globalClassItemList" :key="index" class="tab-bar-item" :class="[classIndex == index ? 'active' : '']" :data-current="index" @tap.stop="swichClass(index)">
-					<text>{{ item.className || "" }}</text>
+				<div v-for="(item, index) in globalClassData" :key="index" class="tab-bar-item" :class="[globalClassIndex == index ? 'active' : '']" :data-current="index" @tap.stop="globalSwitchClass(index,item)">
+					<text>{{ item.name || "" }}</text>
 				</div>
 				<view style="height: 120upx"></view>
 			</scroll-view>
 				<scroll-view scroll-y class="right-box" v-if="tabIndex == 0" :scroll-into-view="scroll_into_view" scroll-with-animation="true"
-																	@scroll="scroll_detail"
-																	lower-threshold="100"
-																	@scrolltolower="scroll_bottom">
-				<block v-if="!$util.isEmpty(globalClassItemList)">
-					<view class="item_list_bx selectAll" v-for="(classItem, classIndex) in globalClassItemList" :key="classIndex" :id="`class_${classIndex}`">
-						<view class="item_list_title"> {{ classItem.className }} </view>
-
-						<view v-if="classItem.child && !$util.isEmpty(classItem.child)">
-
-							<template v-for="(productItem, productIndex) in classItem.child">
-								<view style="height: 175upx" :id="`class_${classItem.classId}_${productItem.id}`" :key="productIndex">
-								<Commondity v-if="classItem.isActive"
+				:scroll-top="globalScrollTopPlace" @scroll="globalGetScroll" lower-threshold="100" @scrolltolower="globalScrollBottom">
+				<block v-if="!$util.isEmpty(globalItemData)">
+					<view class="item_list_bx selectAll">
+						<view class="item_list_title"></view>
+						<view v-if="!$util.isEmpty(globalItemData)">
+							<template v-for="(productItem, productIndex) in globalItemData">
+								<view style="height: 175upx" :key="productIndex">
+								<Commondity
 									:key="productIndex"
 									:info="productItem"
 									@showAddModelFn="showAddModelFn"
@@ -39,7 +35,6 @@
 								></Commondity>
 								</view>
 							</template>
-
 						</view>
 						<view v-else>
 							<view style="height:260upx;text-align:center;color:#CCCCCC;position: relative;">
@@ -50,7 +45,7 @@
 					</view>
 				</block>
 				<block v-else>
-					<app-wrapper-empty title="加载中" :is-empty="$util.isEmpty(globalClassItemList)" />
+					<app-wrapper-empty title="加载中" :is-empty="$util.isEmpty(globalItemData)" />
 				</block>
 			</scroll-view>
 			<block v-else>
@@ -90,19 +85,17 @@
 
 		<FooterCart :price="allPrice" :count="allCount" @confirm="confirmOut" ></FooterCart>
 
-		<uni-popup ref="selectFlowerNumRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
+		<uni-popup ref="globalClassImgRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
 			<view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
 
-				<view v-for="(item, index) in globalClassItemList" :key="index" @tap.stop="changeClass(index)" style="margin-bottom:20upx;margin-left:3upx;">
-				<image :src="item.classCover" style="width:120upx;height:120upx;border-radius:10upx;"></image>
-				<view style="margin-top:5upx;overflow: hidden;white-space: nowrap;width:120upx;text-align:center;">{{item.className}}</view>
+				<view v-for="(item, index) in globalClassData" :key="index" @tap.stop="globalChangeClass(index,item)" style="margin-bottom:20upx;margin-left:3upx;">
+				<image :src="item.cover" style="width:120upx;height:120upx;border-radius:10upx;"></image>
+				<view style="margin-top:5upx;overflow: hidden;white-space: nowrap;width:120upx;text-align:center;">{{item.name}}</view>
 				</view>
 
 			</view>
 		</uni-popup>
 
-		<image v-if="showClassRemind" @click="hideClassRemind" style="position:absolute;width:610upx;height:699upx;top:225upx;left:80upx;z-index:9999;" :src="`${constant.imgUrl}/class_remind.png`"></image>
-
 	</view>
 </view>
 </template>
@@ -113,7 +106,7 @@ import Commondity from "@/components/module/app-commodity";
 import FooterCart from "@/components/module/app-footer-cart";
 import ModalModule from "@/components/plugin/modal";
 import { COMMODITY_TYPE } from "@/utils/declare";
-import productMins from "@/mixins/product";
+import productMins from "@/mixins/product2";
 import allMoreSelectInput from "@/components/module/allMoreSelectInput";
 import allMoreSelectInputMins from "@/mixins/allMoreSelectInput";
 export default {
@@ -134,11 +127,10 @@ export default {
 			tabIndex: 0,
 			isAddInputFocus: false,
 			isAddModel: false,
-			checkStock: true,
+			globalCheckStock: true,
 			isSmallCount:false,
 			customData: { bigCount: 0, smallCount: 0, userPrice:0 },
 			showSubmitModel: false,
-			showClassRemind:false,
 			autoLoad: false
 		};
 	},
@@ -146,7 +138,8 @@ export default {
 		if (!this.$util.isEmpty(this.option.inShopId)){
 			this.selectJobId = this.option.inShopId
 		}
-		this.initData({requestType:'stockOut'})
+		this.globalRequestType = 'stockOut'
+		this.initData()
 	},
 	computed: {
 		confirmContent() {

+ 244 - 0
ghsApp/src/pagesStorehouse/components/pdItem2.vue

@@ -0,0 +1,244 @@
+<template>
+	<view class="item-cmd_bx" @click="showAddModelFn()">
+
+		<button @click.stop="copyCreate(info)" class="admin-button-com mini-btn default" 
+			style="position:absolute;bottom:22upx;font-size:24upx;left:1upx;z-index:20;">复制新建</button>
+
+		<view class="img_bx" style="background:#eeeeee">
+			<image :src="info.cover" lazy-load="true" :lazy-load-margin="0"></image>
+		</view>
+		<view class="cmd-info_bx">
+			<view class="tit" >
+				<text style="font-size:22upx;border:1upx solid #3385ff;color:white;background-color:#3385ff;margin-right:5upx;padding-left:5upx;padding-right:5upx;" 
+				v-if="info.frontHide && info.frontHide == 1">隐</text>
+				<text style="font-size:22upx;border:1upx solid #3385ff;color:white;background-color:#3385ff;margin-right:5upx;padding-left:5upx;padding-right:5upx;" 
+				v-if="info.presell == 1">预售</text>
+				{{ info.name || "" }}
+				<text v-if="info.variety && info.variety ==1" class="show-color"></text>
+			</view>
+			<view class="kc" style="position:absolute;top:55upx;">		
+				<block v-if="info.ratioType == 0">{{info.ratio}}{{info.smallUnit}}/{{info.bigUnit}}</block>
+				<block v-else>若干{{info.smallUnit}}/{{info.bigUnit}}</block>
+			</view>
+			<view class="kc num-open_bx flex-end">
+				<view class="price" style="position:absolute;top:55upx;font-weight:bold;">
+					¥{{ parseFloat(info.price) }}
+				</view>
+				<view style="text-align: right;margin-right:20upx;" >
+					<view class="open-bx" >
+						<i class="iconfont iconjian" @click.stop="reduceItemFn()" v-if="bigCount > 0 || smallCount > 0"></i>
+						<text class="num" >
+							<text style="font-weight:bold;color:#3385ff;" v-if="bigCount > 0">{{ `${bigCount}` }}</text>
+							<text v-if="smallCount > 0">{{ `${smallCount}` }}</text>
+						</text>
+						<i class="iconfont iconzeng" @click.stop="addItemFn()"></i>
+					</view>
+					<text v-if="Number(info.stock) > Number(info.stockWarning)" style="color:#333;margin-right:65upx;">还剩 {{ parseFloat(info.stock) }}</text>
+					<text v-else style="color:red;font-weight:bold;margin-right:65upx;">还剩 {{ parseFloat(info.stock) }}</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	name: "Commodity",
+	components: {},
+	mixins: [],
+	props: {
+		info: {
+			required: true,
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		scrollTop: {
+			type: Number,
+			default: 0
+		},
+		autoPrice: {},
+		isActive: {
+			type: Boolean,
+			default: false
+		},
+		checkStock: {
+			type: Boolean,
+			default: false
+		},
+		isAlterPrice: {
+			type: Boolean,
+			default: false
+		},
+		selectJobType:{
+			type: String,
+			default: ''
+		}
+	},
+	data() {
+		return {
+			ifFocus:false,
+			bigCount:0,
+			smallCount:0,
+			userPrice:0
+		};
+	},
+	watch:{
+		info:{
+			handler(newValue){
+				this.bigCount = newValue.bigCount
+				this.smallCount = newValue.smallCount
+				this.userPrice = newValue.userPrice
+			},
+			deep:true
+		}
+	},
+	created() {},
+	computed: {
+	},
+	mounted() {
+		this.bigCount = this.info.bigCount
+		this.smallCount = this.info.smallCount
+		this.userPrice = this.info.userPrice
+	},
+	methods: {
+		copyCreate(info){
+			this.pageTo({url: '/admin/item/copy?id='+info.id})
+		},
+		addItemFn () {
+			if(this.info && this.info.variety == 1 && this.selectJobType == 'bill'){
+				//小菊多颜色选择页
+				this.$emit("goToSpecialVariety", this.info);
+				return false
+			}
+			this.$emit("replaceItemFn", this.info,0,'add')
+		},
+		reduceItemFn() {
+			if(this.info && this.info.variety == 1 && this.selectJobType == 'bill'){
+				//小菊多颜色选择页
+				this.$emit("goToSpecialVariety", this.info);
+				return false
+			}
+			this.$emit("replaceItemFn", this.info,0,'sub')
+		},
+		showAddModelFn() {
+			if(this.info && this.info.variety == 1 && this.selectJobType == 'bill'){
+				//小菊多颜色选择页
+				this.$emit("goToSpecialVariety", this.info);
+				return false
+			}
+			this.$emit("showAddModelFn", { ...this.info, bigCount: this.bigCount, smallCount: this.smallCount, userPrice: this.userPrice})
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.item-cmd_bx {
+	position: relative;
+	margin-bottom: 20upx;
+	.img_bx {
+		height: 140upx;
+		width: 140upx;
+		position: absolute;
+		left: 0upx;
+		top: 0upx;
+		image{
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.cmd-info_bx {
+		padding-left: 160upx;
+		padding-bottom: 30upx;
+		& .tit {
+			font-size: 32upx;
+			font-weight: 700;
+			color: #333333;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			width:380upx;
+		}
+		.show-color{
+			display:inline-block;
+			width:25upx;
+			height:25upx;
+			background-color:rgb(9, 199, 9);
+			border-radius:15upx;
+			border:none;
+			margin-left:16upx;
+		}
+		& .kc {
+			position: relative;
+			color: #999999;
+			font-size: 24upx;
+			.price{
+				position: absolute;
+				left: 0;
+				bottom: 0;
+			}
+		}
+		& .num-open_bx {
+			display: flex;
+			align-items: center;
+			& .price {
+				font-size: 28upx;
+				color: #ff2842;
+				flex: 1;
+			}
+			& .open-bx {
+				display: flex;
+				align-items: center;
+				& .iconfont {
+					color: #3385ff;
+					font-size: 55upx;
+				}
+				.position{
+					display: block;
+					width: 70upx;
+					text-align: center;
+				}
+				.iconcachu {
+					margin: 0 6upx 0 20upx;
+					color: #ccc;
+					&.edit {
+						color: #3385ff;
+					}
+				}
+				& > .num {
+					display: inline-block;
+					width: 100upx;
+					height:50upx;
+					line-height:50upx;
+					text-align:center;
+					margin: 0 20upx;
+					color: #868686;
+					border-radius: 22upx;
+					background-color: #f5f5f5;
+					font-size: 28upx;
+				}
+				.change-input {
+					width: 164upx;
+					height: 60upx;
+					line-height: 60upx;
+					text-align: center;
+					background: #ffffff;
+					border: 1upx solid #dddddd;
+					border-radius: 4upx;
+					font-size: 25upx;
+				}
+				.btn-box{
+					width: 100upx;
+					height: 60upx;
+					line-height: 60upx;
+					color: #ffffff;
+					background: #3385ff;
+					text-align: center;
+					border-radius: 10upx;
+				}
+			}
+		}
+	}
+}
+</style>

+ 311 - 0
ghsApp/src/pagesStorehouse/inventory/select2.vue

@@ -0,0 +1,311 @@
+<template>
+<view class="app-content">
+	<view class="billing_box_bg">
+		<view class="input-wrap">
+			<view style="padding:0upx 0upx 0upx 0upx;margin-right:10upx;" >
+				<button class="admin-button-com middle blue" @click="selectFlowerNumFn()">图片分类</button>
+			</view>
+			<view class="search-bar">
+				<app-search-module ref="globalSearchRef" v-model="globalPy" placeholder="这里搜索" @input="globalSearch" />
+			</view>
+			<view style="padding:0 0upx 0 20upx;" >
+				<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/ptItem/itemList' })">添花材</button>
+			</view>
+			<view style="padding:0 0upx 0 20upx;" >
+				<button class="admin-button-com middle blue" @click="removeFromSave()">清除花材</button>
+			</view>
+		</view>
+		<view class="scroll-middle_bx">
+			<scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop">
+				<div v-for="(item, index) in globalClassData" :key="index" class="tab-bar-item" :class="[classIndex == index ? 'active' : '']" :data-current="index" @tap.stop="globalSwitchClass(index,item)" >
+					<text>{{ item.name || "" }}</text>
+				</div>
+				<view style="height: 120upx"></view>
+			</scroll-view>
+				<scroll-view scroll-y class="right-box" v-if="tabIndex == 0" :scroll-into-view="scroll_into_view" scroll-with-animation="true"
+				:scroll-top="globalScrollTopPlace" @scroll="globalGetScroll" lower-threshold="100" @scrolltolower="globalScrollBottom">
+				<!--内容部分 start -->
+				<block v-if="!$util.isEmpty(globalItemData)">
+					<view class="item_list_bx selectAll">
+						<view class="item_list_title"></view>
+						<view v-if="!$util.isEmpty(globalItemData)">
+							<template v-for="(productItem, productIndex) in globalItemData">
+								<view style="height:175upx" :key="productIndex">
+								<Commondity
+									:key="productIndex"
+									:info="productItem"
+									@showAddModelFn="showAddModelFn"
+									@replaceItemFn="replaceItemFn"
+								></Commondity>
+								</view>
+							</template>
+						</view>
+						<view v-else>
+							<view style="height:260upx;text-align:center;color:#CCCCCC;position: relative;">
+								<view style="position: absolute;margin:auto;top:130upx;left:0;right:0;bottom:0;">暂无花材</view>
+							</view>
+						</view>
+					</view>
+				</block>
+				<block v-else> <app-wrapper-empty title="加载中" :is-empty="$util.isEmpty(globalItemData)" /> </block>
+			</scroll-view>
+			<block v-else>
+				<view style="width:100%"><AppWrapperEmpty title="敬请期待" :is-empty="true" /></view>
+			</block>
+		</view>
+
+		<modal-module :show="isAddModel" @cancel="addItemModelHidden" @click="confirmAddItemModel" :title="customData.name" color="#333" :size="32" padding="30rpx 30rpx" >
+			<template slot="customContent">
+				<view class="select-cmd_bx" v-if="customData">
+					<view class="kc"> 库存{{ customData.stock?parseFloat(customData.stock):0 }} </view>
+					<view class="num_bx">
+						<!-- #ifdef APP-PLUS -->
+						<input style="width: 430upx" v-model="customData.bigCount" v-if="globalUnitType == 0" type="number" />
+						<text style="font-size:35upx;font-weight:bold;color:#666666;" v-if="globalUnitType == 0">扎</text>
+						<input style="width: 430upx" v-model="customData.smallCount" v-if="globalUnitType == 1" type="number" />
+						<text style="font-size:35upx;font-weight:bold;color:#666666;" v-if="globalUnitType == 1">支</text>
+						<!-- #endif -->
+
+						<!-- #ifdef MP-WEIXIN -->
+						<input style="width: 430upx" v-model="customData.bigCount" v-if="globalUnitType == 0" :focus="isAddInputFocus" type="number" />
+						<text style="font-size:35upx;font-weight:bold;color:#666666;" v-if="globalUnitType == 0">扎</text>
+						<input style="width: 430upx" v-model="customData.smallCount" v-if="globalUnitType == 1" :focus="isAddInputFocus" type="number" />
+						<text style="font-size:35upx;font-weight:bold;color:#666666;" v-if="globalUnitType == 1">支</text>
+						<!-- #endif -->
+
+						<button v-if="selectJobType == 'inventory'" style="position:absolute;top:263upx;left:230upx;" @click="customData.bigCount=99999" class="admin-button-com middle blue">盘点为零</button>
+
+					</view>
+				</view>
+			</template>
+		</modal-module>
+
+		<modal-module :show="showSubmitModel" @cancel="cancelEvent" @click="submitEvent" title="确认下一步?" color="#333" :size="32" padding="30upx 30upx" >
+		</modal-module>
+
+		<FooterCart :offPrice="true" :price="allPrice" :count="allCount" @confirm="confirmToSaveItem"></FooterCart>
+
+		<uni-popup ref="globalClassImgRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
+			<view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
+
+				<view v-for="(item, index) in globalClassData" :key="index" @tap.stop="globalChangeClass(index,item)" style="margin-bottom:20upx;margin-left:3upx;">
+				<image :src="item.cover" style="width:120upx;height:120upx;border-radius:10upx;"></image>
+				<view style="margin-top:5upx;overflow: hidden;white-space: nowrap;width:120upx;text-align:center;">{{item.name}}</view>
+				</view>
+
+			</view>
+		</uni-popup>
+
+	</view>
+</view>
+</template>
+
+<script>
+import AppSearchModule from "@/components/module/app-search";
+import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import Commondity from "../components/pdItem";
+import FooterCart from "@/components/module/app-footer-cart";
+import ModalModule from "@/components/plugin/modal";
+import productMins from "@/mixins/product2";
+import allMoreSelectInput from "@/components/module/allMoreSelectInput";
+import allMoreSelectInputMins from "@/mixins/allMoreSelectInput";
+import { mapGetters } from "vuex";
+export default {
+	name: "allotEx",
+	components: {
+		AppSearchModule,
+		AppWrapperEmpty,
+		Commondity,
+		ModalModule,
+		FooterCart,
+		allMoreSelectInput
+	},
+	mixins: [productMins,allMoreSelectInputMins],
+	data() {
+		return {
+			selectJobType: "inventory",
+			globalCheckStock: false,
+			isAddInputFocus: false,
+			isSmallCount:false,
+			tabIndex: 0,
+			customData: {
+				bigCount: 0,
+				smallCount: 0,
+				userPrice:0
+			},
+			showSubmitModel: false,
+			autoLoad: false
+		};
+	},
+	onShow(){
+		this.pdInit()
+	},
+	computed:{
+		...mapGetters(["getMyShopInfo","getLoginInfo"]),
+	},
+	onLoad() {
+		this.pdInit()
+	},
+	methods: {
+		pdInit(){
+			this.globalRequestType = 'check'
+			this.initData()
+			if(this.option.shopId){
+				this.selectJobId = this.option.shopId
+			}
+		},
+		changeClass(index){
+			this.$refs.selectFlowerNumRef.close()
+			this.swichClass(index)
+		},
+		selectFlowerNumFn(){
+			this.$refs.selectFlowerNumRef.open('top')
+		},
+		hideClassRemind(){
+
+		},
+		confirmToSaveItem() {
+			if(this.$util.isEmpty(this.selectList)){
+				this.$msg('请选择花材')
+				return false
+			}
+			let pdType = this.option.pdType ? this.option.pdType: ''
+			this.$util.pageTo({url: "/pagesStorehouse/inventory/update?pdType="+pdType+"&shopId="+this.option.shopId,type:2})
+		},
+		submitEvent(val) {
+			if (val.index === 0) {
+				this.cancelEvent()
+			} else {
+				uni.navigateBack({ delta: 1 })
+				this.cancelEvent()
+			}
+		},
+		cancelEvent() {
+			this.showSubmitModel = false;
+		},
+		change(e) {
+			if (this.tabIndex == e.index) {
+				return false;
+			} else {
+				this.tabIndex = e.index;
+			}
+		},
+		scrollTop() {}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.billing_box_bg {
+	height: 100%;
+	display: flex;
+	background: white;
+	flex-direction: column;
+	.input-wrap {
+		display: flex;
+		padding: 22upx 20upx 22upx 13upx;
+		.search-bar {
+			flex: 1;
+		}
+	}
+	.scroll-middle_bx {
+		flex: 1;
+		display: flex;
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+	}
+	.tab-view {
+		height: calc(100vh - 140upx);
+		width: 170upx;
+		flex-shrink: 0;
+		background-color: #f0f2f6;
+		.tab-bar-item {
+			position: relative;
+			width: 170upx;
+			height: 90upx;
+			box-sizing: border-box;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 26upx;
+			color: #444;
+			font-weight: 400;
+			.tag {
+				display: flex;
+				padding: 0 20upx;
+				align-items: center;
+				position: absolute;
+				right: 0;
+				top: 0;
+				height: 32upx;
+				background: #ff2842;
+				border-radius: 16upx;
+				color: #fff;
+				font-size: 20upx;
+			}
+      &:last-child{
+        margin-bottom: 110upx;
+      }
+		}
+		.active {
+			position: relative;
+			color: $mainColor;
+			font-size: 26upx;
+			background: #fff;
+		}
+		.active::before {
+			content: "";
+			position: absolute;
+			border-left: 8upx solid $mainColor;
+			height: 100%;
+			left: 0;
+		}
+	}
+	.right-box {
+		height: calc(100vh - 140upx);
+		flex: 1;
+		box-sizing: border-box;
+	}
+	.item_list_bx {
+		padding: 40upx 16upx;
+    &:last-child{
+      margin-bottom: 70upx;
+    }
+	}
+	.item_list_title {
+		margin-bottom: 20upx;
+		font-size: 24upx;
+		font-weight: 600;
+		color: #666666;
+	}
+	.select-cmd_bx {
+		& .kc {
+			color: #999999;
+			font-size: 28upx;
+			font-weight: 400;
+			margin-bottom:50upx;
+			text-align: center;
+			margin-top: 10upx;
+		}
+		& .num_bx {
+			display: flex;
+			align-items: center;
+			margin-bottom: 80upx;
+			& > input {
+				width: 200upx;
+				margin-left:40upx;
+				height: 80upx;
+				border: 1upx solid #dddddd;
+				border-radius: 4upx;
+				text-align: center;
+				margin-right: 24upx;
+				font-size: 40upx;
+			}
+		}
+	}
+}
+.class-popup-style{
+	z-index:99999;
+}
+</style>