jiangfeng 5 лет назад
Родитель
Сommit
b040cfa2f8

+ 13 - 10
hdApp/src/admin/billing/index.vue

@@ -30,7 +30,7 @@
 					<view class="item_list_bx suitSelectAll" v-for="(res,i) in suitFilterProductInfo" :key="i" :id="`class_${i}`">
 					<view class="item_list_bx suitSelectAll" v-for="(res,i) in suitFilterProductInfo" :key="i" :id="`class_${i}`">
 						<view class="item_list_title">{{ res.className }}</view>
 						<view class="item_list_title">{{ res.className }}</view>
 						<template v-for="(data,j) in res.child">
 						<template v-for="(data,j) in res.child">
-							<view style="height: 160rpx" :id="`class_${res.classId}_${data.id}`" :key="j" >
+							<view style="height: 200rpx" :id="`class_${res.classId}_${data.id}`" :key="j" >
 								<GoodsCommondity v-if="res.isActive"
 								<GoodsCommondity v-if="res.isActive"
 									:info.sync="data"
 									:info.sync="data"
 									:bigCount="getSelectItemById(data.id, res.classId).bigCount"
 									:bigCount="getSelectItemById(data.id, res.classId).bigCount"
@@ -81,6 +81,7 @@
 						<template v-for="(productItem, productIndex) in classItem.child">
 						<template v-for="(productItem, productIndex) in classItem.child">
 							<view style="height: 160rpx" :id="`class_${classItem.classId}_${productItem.id}`" :key="productIndex">
 							<view style="height: 160rpx" :id="`class_${classItem.classId}_${productItem.id}`" :key="productIndex">
 								<Commondity v-if="classItem.isActive"
 								<Commondity v-if="classItem.isActive"
+																				:offVerifyRepertory = 'true'
 									:info="productItem"
 									:info="productItem"
 									:bigCount="
 									:bigCount="
 										getSelectItemById(productItem.id, classItem.classId).bigCount
 										getSelectItemById(productItem.id, classItem.classId).bigCount
@@ -126,12 +127,14 @@
 				<view class="select-cmd_bx" v-if="customData">
 				<view class="select-cmd_bx" v-if="customData">
 					<view class="kc"> 库存 {{ customData.stock }} </view>
 					<view class="kc"> 库存 {{ customData.stock }} </view>
 					<view class="num_bx">
 					<view class="num_bx">
-						<allMoreSelectInput
-							:isActive="isActive" :isFocus="isFocus" :value="customData.bigCount"
-							:isActiveOne="isActiveOne" :isFocusOne="isFocusOne" :valueOne="customData.smallCount"
-							@deleteInputVal="deleteInputVal" @initAllInput="initAllInput" @moveAllInput="moveAllInput"
-							@deleteInputValOne="deleteInputValOne" @initAllInputOne="initAllInputOne" @moveAllInputOne="moveAllInputOne">
-						</allMoreSelectInput>
+						<!--<allMoreSelectInput-->
+							<!--:isActive="isActive" :isFocus="isFocus" :value="customData.bigCount"-->
+							<!--:isActiveOne="isActiveOne" :isFocusOne="isFocusOne" :valueOne="customData.smallCount"-->
+							<!--@deleteInputVal="deleteInputVal" @initAllInput="initAllInput" @moveAllInput="moveAllInput"-->
+							<!--@deleteInputValOne="deleteInputValOne" @initAllInputOne="initAllInputOne" @moveAllInputOne="moveAllInputOne">-->
+						<!--</allMoreSelectInput>-->
+						<input v-model="customData.bigCount" @focus="customData.bigCount = null" type="number" />扎
+						<input v-model="customData.smallCount" @focus="customData.smallCount = null" type="number" style="margin-left:24upx" />支
 					</view>
 					</view>
 				</view>
 				</view>
 			</template>
 			</template>
@@ -217,9 +220,9 @@ export default {
 		customNum(info) {
 		customNum(info) {
 			this.isModel = true;
 			this.isModel = true;
 			this.customData = info;
 			this.customData = info;
-			this.$nextTick(()=>{
-				this.initAllInput();
-			})
+			// this.$nextTick(()=>{
+			// 	this.initAllInput();
+			// })
 		},
 		},
 		modalCancel() {
 		modalCancel() {
 			this.isModel = false;
 			this.isModel = false;

+ 1 - 0
hdApp/src/components/module/app-commodity.vue

@@ -149,6 +149,7 @@ export default {
 		addEvents() {
 		addEvents() {
 			const ratio = Number(this.info.ratio);
 			const ratio = Number(this.info.ratio);
 			if(this.offVerifyRepertory){
 			if(this.offVerifyRepertory){
+				if(this.info.stock<=0){uni.showToast({title:'库存不足',icon:'none'});return;}
 				if (Number(this.bigCount) * ratio + Number(this.smallCount) >Number(this.info.bigNum) * ratio + Number(this.info.smallNum)) {
 				if (Number(this.bigCount) * ratio + Number(this.smallCount) >Number(this.info.bigNum) * ratio + Number(this.info.smallNum)) {
 					this.$msg("库存不足");
 					this.$msg("库存不足");
 					return
 					return

+ 11 - 9
hdApp/src/pagesPurchase/ghsProduct.vue

@@ -81,12 +81,14 @@
 				<view class="select-cmd_bx" v-if="customData">
 				<view class="select-cmd_bx" v-if="customData">
 					<view class="kc"> 库存 {{ customData.stock }} </view>
 					<view class="kc"> 库存 {{ customData.stock }} </view>
 					<view class="num_bx">
 					<view class="num_bx">
-						<allMoreSelectInput
-							:isActive="isActive" :isFocus="isFocus" :value="customData.bigCount"
-							:isActiveOne="isActiveOne" :isFocusOne="isFocusOne" :valueOne="customData.smallCount"
-							@deleteInputVal="deleteInputVal" @initAllInput="initAllInput" @moveAllInput="moveAllInput"
-							@deleteInputValOne="deleteInputValOne" @initAllInputOne="initAllInputOne" @moveAllInputOne="moveAllInputOne">
-						</allMoreSelectInput>
+						<!--<allMoreSelectInput-->
+							<!--:isActive="isActive" :isFocus="isFocus" :value="customData.bigCount"-->
+							<!--:isActiveOne="isActiveOne" :isFocusOne="isFocusOne" :valueOne="customData.smallCount"-->
+							<!--@deleteInputVal="deleteInputVal" @initAllInput="initAllInput" @moveAllInput="moveAllInput"-->
+							<!--@deleteInputValOne="deleteInputValOne" @initAllInputOne="initAllInputOne" @moveAllInputOne="moveAllInputOne">-->
+						<!--</allMoreSelectInput>-->
+						<input v-model="customData.bigCount" @focus="customData.bigCount = null" type="number" />扎
+						<input v-model="customData.smallCount" @focus="customData.smallCount = null" type="number" style="margin-left:24upx" />支
 					</view>
 					</view>
 				</view>
 				</view>
 			</template>
 			</template>
@@ -279,9 +281,9 @@ export default {
 		customNum(info) {
 		customNum(info) {
 			this.isModel = true;
 			this.isModel = true;
 			this.customData = info;
 			this.customData = info;
-			this.$nextTick(()=>{
-				this.initAllInput();
-			})
+			// this.$nextTick(()=>{
+			// 	this.initAllInput();
+			// })
 		},
 		},
 		toPage() {
 		toPage() {
 			this.$util.pageTo({
 			this.$util.pageTo({