jf %!s(int64=5) %!d(string=hai) anos
pai
achega
74f68514e7

+ 3 - 3
ghsApp/src/admin/billing/index.vue

@@ -183,10 +183,11 @@ export default {
 			this.isFocus = false;
 			this.isFocusOne = false;
 			this.$nextTick(()=>{
+				if(this.customData.bigCount==0 && this.customData.smallCount==0){
+					this.delAllEvent(this.customData)}
 				if (val.index === 0) {
 					this.modalCancel();
 				} else {
-					console.log(this.customData)
 					const {
 						bigCount,
 						smallCount,
@@ -197,8 +198,7 @@ export default {
 						ratio
 					} = this.customData;
 					const ratioNum = Number(ratio);
-
-					//超过库存时 设置为库存最大值
+					//超过库存时 设置为库存最大值 1
 					if (Number(bigCount) * ratioNum + Number(smallCount) > Number(bigNum) * ratioNum + Number(smallNum)) {
 						uni.showToast({
 							title: `库存只有${bigNum}${bigUnit}${smallNum}${smallUnit}`,

+ 3 - 2
ghsApp/src/components/module/allMoreSelectInput.vue

@@ -16,6 +16,7 @@
 				position: absolute;
 				width: 100%;
 				height: 100%;
+				opacity:1;
 				&.active{
 					opacity:0;
 				}
@@ -36,12 +37,12 @@
 <template>
 	<view class="change-input-box">
 		<view class="change-input">
-				<input :focus="isFocus" :class="isActive&&value?'active':''" type="number" @focus="initAllInput" @blur="moveAllInput" v-model="inputVal" @input="changeAllInput" >
+				<input :focus="isFocus" :style="isActive?'caret-color:rgba(0,0,0,0)':'caret-color:rgba(0,0,0,1)'" type="number" @focus="initAllInput" @blur="moveAllInput" v-model="inputVal" @input="changeAllInput" >
 				<text :class="isActive?'active':''">{{value?value:''}}</text>
 		</view>
 		<view class="unit">扎</view>
 		<view class="change-input">
-			<input :focus="isFocusOne" :class="isActiveOne&&valueOne?'active':''" type="number" @focus="initAllInputOne" @blur="moveAllInputOne" v-model="inputValOne" @input="changeAllInputOne" >
+			<input :focus="isFocusOne" :style="isActiveOne?'caret-color:rgba(0,0,0,0)':'caret-color:rgba(0,0,0,1)'" type="number" @focus="initAllInputOne" @blur="moveAllInputOne" v-model="inputValOne" @input="changeAllInputOne" >
 			<text :class="isActiveOne?'active':''">{{valueOne?valueOne:''}}</text>
 		</view>
 		<view class="unit">支</view>

+ 3 - 3
ghsApp/src/components/module/allSelectInput.vue

@@ -13,8 +13,9 @@
 			position: absolute;
 			width: 100%;
 			height: 100%;
+			//opacity:1;
 			&.active{
-				opacity:0;
+				//opacity:0;
 			}
 		}
 		text{
@@ -26,7 +27,7 @@
 </style>
 <template>
 	<view class="change-input">
-			<input :focus="isFocus" :class="isActive&&value?'active':''" type="number" @focus="initAllInput" @blur="moveAllInput" v-model="inputVal" @input="changeAllInput" :placeholder="value==''&&inputVal==''?placeholder:''">
+			<input :focus="isFocus" :style="isActive?'caret-color:rgba(0,0,0,0)':'caret-color:rgba(0,0,0,1)'"  type="number" @focus="initAllInput" @blur="moveAllInput" v-model="inputVal" @input="changeAllInput" :placeholder="value==''&&inputVal==''?placeholder:''">
 			<text :class="isActive?'active':''">{{value?value:''}}</text>
 	</view>
 </template>
@@ -57,7 +58,6 @@ export default {
 				this.$emit('moveAllInput',inputVal)
 			},
 			changeAllInput(e){
-				console.log(e)
     	if(e.detail.keyCode==8){
     		this.$emit('deleteInputVal')
 						return;

+ 2 - 2
ghsApp/src/components/module/app-commodity.vue

@@ -134,8 +134,8 @@ export default {
 			})
 		},
 		customNum() {
-			console.log(this.info)
-			if(!this.info.bigCount){
+			// if(!this.info.bigCount){
+			if(!this.bigCount && !this.smallCount){
 				let params = {
 					...this.info,
 					bigCount: this.bigCount,

+ 0 - 1
ghsApp/src/pagesPurchase/add.vue

@@ -220,7 +220,6 @@ export default {
 		affirm(val) {
 			// this.moveAllInput();
 			// this.moveAllInputOne();
-			console.log('this.customData)',this.customData)
 			this.isFocus = false;
 			this.isFocusOne = false;
 			this.$nextTick(()=>{

+ 0 - 1
ghsApp/src/pagesPurchase/components/CommodityPurchase.vue

@@ -98,7 +98,6 @@ export default {
 			this.$emit("changePrice", this.info, value);
 		},
 		customNum() {
-			console.log('this.info',this.info)
 			if(!this.bigCount && !this.smallCount){
 				let params = {
 					...this.info,