shish 1 год назад
Родитель
Сommit
4498d0f191

+ 2 - 2
ghsApp/src/pagesStorehouse/allot/modifyDetails.vue

@@ -39,7 +39,7 @@
 			<view class="btn-view">
 			<view class="btn-view">
 				<button class="admin-button-com middle" @click="goBack()" v-if="stockInfo.status == 2"> 返回 </button>
 				<button class="admin-button-com middle" @click="goBack()" v-if="stockInfo.status == 2"> 返回 </button>
 				<button class="admin-button-com middle blue" @click="putOut()" v-if="stockInfo.status == 2"> 一键出库到 </button>
 				<button class="admin-button-com middle blue" @click="putOut()" v-if="stockInfo.status == 2"> 一键出库到 </button>
-				<button class="admin-button-com middle blue" @click="pitchShop(0,'',inStockList)" v-if="stockInfo.status == 2"> 一键回调 </button>
+				<button class="admin-button-com middle blue" @click="pitchShop(stockInfo.outShopId,stockInfo.outShopName,inStockList)" v-if="stockInfo.status == 2"> 一键回调 </button>
 			</view>
 			</view>
 		</view>
 		</view>
 
 
@@ -96,7 +96,7 @@ export default {
 			let that = this
 			let that = this
 			let content = '确认出库到'+inShopName+'?'
 			let content = '确认出库到'+inShopName+'?'
 			if(inShopId == 0){
 			if(inShopId == 0){
-				content = '确认一键回调?'
+				content = '确认一键回调到'+inShopName+'?'
 			}
 			}
 			this.$refs.selectFlowerNumRef.close()
 			this.$refs.selectFlowerNumRef.close()
 			const changeList = inStockList.map(ele => { 
 			const changeList = inStockList.map(ele => { 

+ 2 - 2
ghsApp/src/pagesStorehouse/allot/putDetails.vue

@@ -85,7 +85,7 @@
 			<view class="btn-view">
 			<view class="btn-view">
 				<button class="admin-button-com middle" @click="goBack()" v-if="inStockData.status == 2"> 返回 </button>
 				<button class="admin-button-com middle" @click="goBack()" v-if="inStockData.status == 2"> 返回 </button>
 				<button class="admin-button-com middle blue" @click="putOut()" v-if="inStockData.status == 2"> 一键出库到 </button>
 				<button class="admin-button-com middle blue" @click="putOut()" v-if="inStockData.status == 2"> 一键出库到 </button>
-				<button class="admin-button-com middle blue" @click="pitchShop(0,'',inStockData)" v-if="inStockData.status == 2"> 一键回调 </button>
+				<button class="admin-button-com middle blue" @click="pitchShop(inStockData.outShopId,inStockData.outShopName,inStockData)" v-if="inStockData.status == 2"> 一键回调 </button>
 				<button class="admin-button-com middle blue" @click="modifyPut()" v-if="inStockData.status == 2"> 修改数量 </button>
 				<button class="admin-button-com middle blue" @click="modifyPut()" v-if="inStockData.status == 2"> 修改数量 </button>
 				<button class="admin-button-com middle blue" @click="cancelPutEvent" v-if="inStockData.status == 1"> 取消入库 </button>
 				<button class="admin-button-com middle blue" @click="cancelPutEvent" v-if="inStockData.status == 1"> 取消入库 </button>
 				<button class="admin-button-com middle blue" @click="confirmPutEvent" v-if="inStockData.status == 1"> 确认入库 </button>
 				<button class="admin-button-com middle blue" @click="confirmPutEvent" v-if="inStockData.status == 1"> 确认入库 </button>
@@ -174,7 +174,7 @@ export default {
 			let that = this
 			let that = this
 			let content = '确认出库到'+inShopName+'?'
 			let content = '确认出库到'+inShopName+'?'
 			if(inShopId == 0){
 			if(inShopId == 0){
-				content = '确认一键回调?'
+				content = '确认一键回调到'+inShopName+'?'
 			}
 			}
 			this.$refs.selectFlowerNumRef.close()
 			this.$refs.selectFlowerNumRef.close()
 			this.$util.confirmModal({content:content},() => {
 			this.$util.confirmModal({content:content},() => {