全部出库

ghsApp/src/admin/stat/stock.vue

@@ -2,11 +2,10 @@
 	<view class="app-content">
 		<view class="ex-page">
 			<view class="input-wrap">
-				<view class="search-bar">
-					<app-search-module v-model="py" placeholder="输拼音首字母" @input="searchFn" />
-				</view>
 				<view style="padding:0 0upx 0 20upx;" >
-					<button class="admin-button-com middle blue" @click="allOutSelectShop()">全部出库</button>
+					<button class="admin-button-com middle blue" style="width:300upx;background-color:green;border:1upx solid green;margin-right:30upx;"
+					@click="allOutSelectShop(1)">全部出库并入库</button>
+					<button class="admin-button-com middle blue" @click="allOutSelectShop(0)">全部出库</button>
 				</view>
 			</view>
 			<view class="top-bar" style="margin-left:115upx;">实时</view>
@@ -90,7 +89,8 @@ export default {
 			searchContent:'',
             shopId:0,
             classItemData:[],
-			form:{shopId:0,shopName:'',hasSelect:0}
+			form:{shopId:0,shopName:'',hasSelect:0},
+			confirmIn:0
 		};
 	},
 	onShow(){
@@ -98,7 +98,9 @@ export default {
 		if(this.form.hasSelect == 1){
 			that.$util.confirmModal({content:'确认全部出库到'+this.form.shopName+'？'},() => {
 				that.form.hasSelect = 0
-				allOut({shopId:this.form.shopId}).then(res=>{
+				uni.showLoading({mask:true})
+				allOut({shopId:this.form.shopId,confirmIn:that.confirmIn}).then(res=>{
+					uni.hideLoading()
 					if(res.code == 1){
 						that.$msg(res.msg)
 						that.showStock()
@@ -111,7 +113,9 @@ export default {
 		this.showStock()
 	},
 	methods: {
-		allOutSelectShop(){
+		allOutSelectShop(flag){
+			//是否直接入库
+			this.confirmIn = flag
 			this.$util.pageTo({url: '/admin/shop/selectShop',query: {style:2}})
 		},
 		showStock(){

ghsApp/src/pagesPurchase/components/CommodityPurchase.vue

@@ -124,7 +124,7 @@ export default {
       justify-content: space-between;
       & .price {
         font-size: 29upx;
-        color: red;
+        color: black;
         -webkit-box-flex: 1;
         -webkit-flex: 1;
         flex: 1;