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

ghsApp/src/admin/home/order.vue

@@ -2,10 +2,7 @@
   <div class="app-main app-content">
     <view class="input-wrap_box">
       <view>
-        <AppSearchModule
-          placeholder="请输入客户名称，支持拼音首字母"
-          @input="searchFn"
-        />
+        <AppSearchModule placeholder="请输入客户名称，支持拼音首字母" @search="searchFn"/>
       </view>
 
       <view class="select-dn_bx">

ghsApp/src/api/inventory/index.js

@@ -13,6 +13,12 @@ export const getCheckOrderListApi = async status => {
 export const updateCheckOrderApi = async data => {
 	return https.post("/check-order/update-order", data);
 };
+/** *
+ *  盘点确认,保存入库 2021.05.21 姜枫
+ */
+export const checkOrderApi = async data => {
+	return https.post("/check-order/create-order", data);
+};
 
 /** *
  * 编辑草稿 ，继续保存到草稿

ghsApp/src/pagesStorehouse/inventory/update.vue

@@ -130,6 +130,9 @@
 				<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>
 				<button v-if="orderSn" :class="['admin-button-com', 'middle', { disabled: allCount == 0 }]" :disabled="allCount == 0" @click="saveCheckOrder">
 					确认
 				</button>
@@ -145,7 +148,8 @@ import {
 	updateCheckOrderApi,
 	updateCheckOrderToDraftApi,
 	savaCheckOrderDraftApi,
-	getCheckOrderDetailApi
+	getCheckOrderDetailApi,
+	checkOrderApi
 } from "@/api/inventory/index";
 import {currentShop} from "@/api/shop/index";
 export default {
@@ -320,6 +324,30 @@ export default {
 					delta: 1
 				});
 			} catch (error) {}
+		},
+		async saveCheckOrderFun() {
+			try {
+				let params = {
+					remark: this.remark
+				};
+				if (this.orderSn) {
+					params.orderSn = this.orderSn;
+				}
+				let formatList = this.selectList.map(ele => {
+					return {
+						bigNum: ele.bigCount,
+						smallNum: ele.smallCount,
+						productId: ele.id
+					};
+				});
+				params.itemInfo = JSON.stringify(formatList);
+				await checkOrderApi(params);
+				this.$msg("盘点成功");
+				this.resetSelectInfoByType(this.pageType);
+				uni.navigateBack({
+					delta: 1
+				});
+			} catch (error) {}
 		}
 	}
 };

hdApp/src/admin/billing/affirmGhs.vue

@@ -431,7 +431,12 @@ export default {
 		},
 
 		purchaseFreight(info) {
+			const product = this.selectList.map(ele => {
+				return { productId: ele.id, bigNum: ele.bigCount, smallNum: ele.smallCount,classId:ele.classId,itemId:ele.itemId };
+			});
 			let params = {
+				ghsId: this.options.id,
+				product: JSON.stringify(product),
 				province: info.province,
 				city:info.city,
 				address:info.address,

hdApp/src/api/inventory/index.js

@@ -6,7 +6,12 @@ import https from "@/plugins/luch-request_0.0.7/request";
 export const getCheckOrderListApi = async status => {
 	return https.get("/check-order/list", { status });
 };
-
+/** *
+	*  盘点确认,保存入库 2021.05.21 姜枫
+	*/
+export const checkOrderApi = async data => {
+	return https.post("/check-order/create-order", data);
+};
 /** *
  * 编辑草稿 ,保存入库
  */

hdApp/src/pagesStorehouse/inventory/update.vue

@@ -137,6 +137,9 @@
 				<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>
 				<button v-if="orderSn" :class="['admin-button-com', 'middle', { disabled: allCount == 0 }]" :disabled="allCount == 0" @click="saveCheckOrder">
 					确认
 				</button>
@@ -152,7 +155,8 @@ import {
 	updateCheckOrderApi,
 	updateCheckOrderToDraftApi,
 	savaCheckOrderDraftApi,
-	getCheckOrderDetailApi
+	getCheckOrderDetailApi,
+	checkOrderApi
 } from "@/api/inventory/index";
 import {currentShop} from "@/api/shop/index";
 export default {
@@ -325,6 +329,29 @@ export default {
 					delta: 1
 				});
 			} catch (error) {}
+		},
+		async saveCheckOrderFun() {
+			try {
+				let params = {
+					remark: this.remark
+				};
+				if (this.orderSn) {
+					params.orderSn = this.orderSn;
+				}
+				let formatList = this.selectList.map(ele => {
+					return {
+						bigNum: ele.bigCount,
+						smallNum: ele.smallCount,
+						productId: ele.id
+					};
+				});
+				params.itemInfo = JSON.stringify(formatList);
+				await checkOrderApi(params);
+				this.$msg("盘点成功");
+				uni.navigateBack({
+					delta: 1
+				});
+			} catch (error) {}
 		}
 	}
 };