Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghsApp/src/pagesStorehouse/inventory/update.vue

@@ -130,10 +130,10 @@
 				<button :class="['admin-button-com','middle',{ disabled: allCount == 0 }]" :disabled="allCount == 0" @click="saveToDraft">
 					保存到草稿
 				</button>
-				<button v-if="!orderSn" :class="['admin-button-com', 'middle', { disabled: allCount == 0 }]" :disabled="allCount == 0" @click="saveCheckOrderFun">
+				<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="saveCheckOrder">
+				<button v-if="orderSn" :class="['admin-button-com', 'middle', { disabled: allCount == 0 }]" :disabled="allCount == 0" @click="confirmPop(2)">
 					确认
 				</button>
 			</view>
@@ -301,32 +301,21 @@ export default {
 				this.initInfo();
 			} catch (error) {}
 		},
-		async saveCheckOrder() {
-			try {
-				let params = {
-					remark: this.remark
-				};
-				if (this.orderSn) {
-					params.orderSn = this.orderSn;
+		confirmPop(type) {
+			let self = this;
+			uni.showModal({
+				title: '提示',
+				content: '确认盘点?',
+				success: function (res) {
+					if (res.confirm) {
+						self.saveCheckOrder(type);
+					}
 				}
-				let formatList = this.selectList.map(ele => {
-					return {
-						bigNum: ele.bigCount,
-						smallNum: ele.smallCount,
-						productId: ele.id
-					};
-				});
-				params.itemInfo = JSON.stringify(formatList);
-				await updateCheckOrderApi(params);
-				this.$msg("盘点成功");
-				this.resetSelectInfoByType(this.pageType);
-				uni.navigateBack({
-					delta: 1
-				});
-			} catch (error) {}
+			});
 		},
-		async saveCheckOrderFun() {
+		async saveCheckOrder(type) {
 			try {
+				console.log(type)
 				let params = {
 					remark: this.remark
 				};
@@ -341,14 +330,19 @@ export default {
 					};
 				});
 				params.itemInfo = JSON.stringify(formatList);
-				await checkOrderApi(params);
+				//type 1直接确定 2保存草稿后在确定
+				if(type==1){
+					await checkOrderApi(params)
+				}else{
+					await updateCheckOrderApi(params)
+				}
 				this.$msg("盘点成功");
 				this.resetSelectInfoByType(this.pageType);
 				uni.navigateBack({
 					delta: 1
 				});
 			} catch (error) {}
-		}
+		},
 	}
 };
 </script>

hdApp/src/pagesStorehouse/inventory/update.vue

@@ -137,10 +137,10 @@
 				<button :class="['admin-button-com','middle',{ disabled: allCount == 0 }]" :disabled="allCount == 0" @click="saveToDraft">
 					保存到草稿
 				</button>
-				<button v-if="!orderSn" :class="['admin-button-com', 'middle', { disabled: allCount == 0 }]" :disabled="allCount == 0" @click="saveCheckOrderFun">
+				<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="saveCheckOrder">
+				<button v-if="orderSn" :class="['admin-button-com', 'middle', { disabled: allCount == 0 }]" :disabled="allCount == 0" @click="confirmPop(2)">
 					确认
 				</button>
 			</view>
@@ -307,31 +307,21 @@ export default {
 				this.$msg("保存成功");
 			} catch (error) {}
 		},
-		async saveCheckOrder() {
-			try {
-				let params = {
-					remark: this.remark
-				};
-				if (this.orderSn) {
-					params.orderSn = this.orderSn;
+		confirmPop(type) {
+			let self = this;
+			uni.showModal({
+				title: '提示',
+				content: '确认盘点?',
+				success: function (res) {
+					if (res.confirm) {
+						self.saveCheckOrder(type);
+					}
 				}
-				let formatList = this.selectList.map(ele => {
-					return {
-						bigNum: ele.bigCount,
-						smallNum: ele.smallCount,
-						productId: ele.id
-					};
-				});
-				params.itemInfo = JSON.stringify(formatList);
-				await updateCheckOrderApi(params);
-				this.$msg("盘点成功");
-				uni.navigateBack({
-					delta: 1
-				});
-			} catch (error) {}
+			});
 		},
-		async saveCheckOrderFun() {
+		async saveCheckOrder(type) {
 			try {
+				console.log(type)
 				let params = {
 					remark: this.remark
 				};
@@ -346,13 +336,19 @@ export default {
 					};
 				});
 				params.itemInfo = JSON.stringify(formatList);
-				await checkOrderApi(params);
+				//type 1直接确定 2保存草稿后在确定
+				if(type==1){
+					await checkOrderApi(params)
+				}else{
+					await updateCheckOrderApi(params)
+				}
 				this.$msg("盘点成功");
+				this.resetSelectInfoByType(this.pageType);
 				uni.navigateBack({
 					delta: 1
 				});
 			} catch (error) {}
-		}
+		},
 	}
 };
 </script>