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

+ 1 - 0
ghsApp/src/admin/billing/index.vue

@@ -33,6 +33,7 @@
 						<template v-for="(productItem, productIndex) in classItem.child">
 							<view style="height: 160rpx" :id="`class_${classItem.classId}_${productItem.id}`" :key="productIndex">
 								<Commondity v-if="classItem.isActive"
+																				:offVerifyRepertory="true"
 									:info="productItem"
 									:bigCount="
 										getSelectItemById(productItem.id, classItem.classId).bigCount

+ 5 - 5
ghsApp/src/admin/home/apply.vue

@@ -61,11 +61,11 @@
                                 img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`,
                                 url: "/pagesStorehouse/stockWarn/manage"
                             },
-                            // {
-                            //     name: "盘点",
-                            //     img: `${this.$constant.imgUrl}/ghs/home/pandian.png`,
-                            //     url: "/pagesStorehouse/inventory/list"
-                            // },
+                            {
+                                name: "盘点",
+                                img: `${this.$constant.imgUrl}/ghs/home/pandian.png`,
+                                url: "/pagesStorehouse/inventory/list"
+                            },
                             {
                                 name: "员工",
                                 img: `${this.$constant.imgUrl}/ghs/home/yggl.png`,

+ 14 - 6
ghsApp/src/components/module/app-commodity.vue

@@ -29,10 +29,10 @@
 				<view class="price" v-else></view>
 
 				<view class="open-bx" style="padding-bottom: 40rpx" >
-					<allSelectInput :inputType="'digit'" :isActive="isAloneAllActive" :isFocus="isAloneAllFocus" :value="changeAutoPrice" :placeholder="'自动调价'"
-						@deleteInputVal="deleteInputVal" @initAllInput="initAloneAllInput" @moveAllInput="moveAllInput">
-					</allSelectInput>
-					<!--<input class="change-input" v-model="changeAutoPrice" type="digit" placeholder="自动调价"  selection-start="0" selection-end="1" />-->
+					<!--<allSelectInput :inputType="'digit'" :isActive="isAloneAllActive" :isFocus="isAloneAllFocus" :value="changeAutoPrice" :placeholder="'自动调价'"-->
+						<!--@deleteInputVal="deleteInputVal" @initAllInput="initAloneAllInput" @moveAllInput="moveAllInput">-->
+					<!--</allSelectInput>-->
+					<input class="change-input" @tap.stop="" @focus="changeAutoPrice = null" v-model="changeAutoPrice" type="digit" placeholder="自动调价"  selection-start="0" selection-end="1" />
 					<i :class="isShowSucceed?'position iconfont iconjihuo':'position'" ></i>
 					<view class="btn-box" @click="changePriceEvent">确定</view>
 				</view>
@@ -92,6 +92,10 @@ export default {
 			type: Boolean,
 			default: false
 		},
+		offVerifyRepertory: {
+			type: Boolean,
+			default: false
+		},
 	},
 	data() {
 		return {
@@ -149,11 +153,12 @@ export default {
 		},
 		addEvents() {
 			const ratio = Number(this.info.ratio);
-			// if(this.offVerifyRepertory){	}
+			if(this.offVerifyRepertory){
 				if (Number(this.bigCount) * ratio + Number(this.smallCount) >Number(this.info.bigNum) * ratio + Number(this.info.smallNum)) {
 					this.$msg("库存不足");
 					return
 				}
+			}
 
 			this.animationFun('add');
 			// let params = {
@@ -183,7 +188,10 @@ export default {
 		},
 		customNum() {
 			// if(!this.info.bigCount){
-			if(this.info.stock<=0){uni.showToast({title:'库存不足',icon:'none'});return;}
+			if(this.offVerifyRepertory){
+				if(this.info.stock<=0){uni.showToast({title:'库存不足',icon:'none'});return;}
+			}
+
 			if(!this.bigCount && !this.smallCount){
 				let params = {
 					...this.info,