分配库存

ghsApp/src/admin/changePrice/setSon.vue

@@ -126,6 +126,11 @@ export default {
 					if(res.code == 1){
 						that.$msg(res.msg)
 						setTimeout(function(){
+							//返回上一页带参数
+							let pages = getCurrentPages();
+							let prevPage = pages[ pages.length - 2 ];
+							//修改上一页data里面的xjData
+							prevPage.$vm.addItemOk = 1
 							uni.navigateBack({})
 						},1200)
 					}

ghsApp/src/admin/item/sendStock.vue

@@ -12,7 +12,7 @@
 						<view v-for="(sonItem,xjIndex) in sonItemList" :key="xjIndex">
 							<view>
 								<view class="item-cmd_bx">
-									<view class="img_bx" style="background:#eeeeee">
+									<view class="img_bx" @click="pageTo({url:'/admin/item/detail?id='+ sonItem.id})" style="background:#eeeeee;z-index:999;">
 										<image :src="sonItem.cover"></image>
 									</view>
 									<view class="cmd-info_bx">
@@ -50,7 +50,9 @@
 	<script>
 	import AppWrapperEmpty from "@/components/app-wrapper-empty";
 	import { mapGetters } from "vuex";
-	import { getSonList,delMsItem,sendStockFn } from "@/api/item"
+	import { getSonList,delMsItem } from "@/api/item"
+	import { batchChangePrice } from '@/api/product'
+	import { checkOrderApi } from "@/api/inventory";
 	export default {
 		name: "sendStock",
 		components: {
@@ -62,11 +64,15 @@
 				sonItemList:[],
 				stock:0,
 				price:0,
-				remain:0
+				remain:0,
+				addItemOk:0
 			};
 		},
 		onShow(){
-			this.init()
+			if(this.addItemOk == 1){
+				this.init()
+				this.addItemOk = 0
+			}
 		},
 		onLoad(){
 			this.price = this.option.price ? parseFloat(this.option.price) : 0
@@ -131,7 +137,8 @@
 				}
 				let hasErr = false
 				let errText = ''
-				let productList = []
+				let priceList = []
+				let stockList = []
 				for (const item of this.sonItemList) {
 					if(Number(item.sendSonStock)>0){
 						if(Number(item.sendHyPrice)<=0){
@@ -149,8 +156,10 @@
 							errText = '请填写 '+item.name+' 批发价'
 							break
 						}
-						let groupItem = {id:item.id,stock:item.sendSonStock,lsPrice:item.sendLsPrice,pfPrice:item.sendPfPrice,hyPrice:item.sendHyPrice}
-						productList.push(groupItem)
+						let priceGroup = {id:item.id,skPrice:item.sendLsPrice,price:item.sendPfPrice,hjPrice:item.sendHyPrice}
+						priceList.push(priceGroup)
+						let stockGroup ={productId:item.id,bigNum:item.sendSonStock,smallNum:null}
+						stockList.push(stockGroup)
 					}else{
 						if(Number(item.sendPfPrice)>0){
 							hasErr = true
@@ -163,23 +172,29 @@
 					that.$msg(errText)
 					return false
 				}
-				if (this.$util.isEmpty(productList)){
+				if (this.$util.isEmpty(priceList)){
 					this.$msg('请填写数量和价格')
 					return false
 				}
-				console.log(productList)
-				console.log('---------')
-				let jsonProduct = JSON.stringify(productList)
-				let params = {product:jsonProduct}
+	
 				this.$util.confirmModal({content:'确认分配？'},() => {
-					sendStockFn(params).then(res=>{
+
+					let jsonPriceList = JSON.stringify(priceList);
+					batchChangePrice({data:jsonPriceList,appVersion:1}).then(res => {
 						if(res.code == 1){
-							that.$msg('分配成功')
-							setTimeout(function(){
-								//that.goBack()
-							},1200)
+
+							let jsonStock = JSON.stringify(stockList);
+							let name = this.option.name ? this.option.name : ''
+							checkOrderApi({pdType:'',itemInfo:jsonStock,remark:name+'分配增加库存'}).then(res => {
+								if(res.code == 1){
+									this.$msg(res.msg)
+								}
+							})
+
 						}
 					})
+
+
       			})
 			},
 			init(){

ghsApp/src/api/item/index.js

@@ -4,10 +4,6 @@ export const batchAddItem = data => {
 	return https.post('/item-ms/batch-add-item', data)
 }
 
-export const sendStockFn = data => {
-	return https.post('/item-ms/send-stock', data)
-}
-
 export const delMsItem = data => {
 	return https.get('/item-ms/del-item', data)
 }