采购

ghsApp/src/pagesPurchase/components/pageSuccess.vue

@@ -31,7 +31,7 @@
 					<template v-if="!$util.isEmpty(info)">
 						<button v-if="info.status == 3" class="admin-button-com big blue" style="width:55vw;margin-top:50upx;" @click="commitChange">确认入库并改价</button>
 						<button v-if="info.status != 3" class="admin-button-com big blue" style="width:55vw;margin-top:50upx;" @click="commitChange">确认改价</button>
-						<button v-if="info.status == 3" class="admin-button-com big default" style="width:55vw;margin-top:30upx;" @click="goBackFn">稍后入库改价</button>
+						<button v-if="info.status == 3" class="admin-button-com big default" style="width:55vw;margin-top:30upx;" @click="goBackFn">稍后入库并改价</button>
 					</template>
 				</template>
 
@@ -174,9 +174,14 @@ export default {
 		commitModify(){
 			let that = this
 			let targetId = this.option.id ||0
+			uni.showLoading({mask:true})
 			batchChangePrice({data:JSON.stringify(this.productList),changeType:'cg',targetId:targetId}).then(res => {
+				uni.hideLoading()
 				if(res.code == 1){
 					that.$msg(res.msg)
+					setTimeout(function(){
+						uni.navigateBack()
+					},1300)
 				}
 			})
 		},

ghsApp/src/pagesPurchase/info.vue

@@ -199,7 +199,7 @@
 		<view class="app-footer open_btn">
 			<view v-if="detailInfo.status != 3" @click="changePrice()" class="admin-button-com big blue">修改价格</view>
 			<view v-if="detailInfo.status == 3" @click="cancelIn()" class="admin-button-com big blue">取消入库</view>
-			<view v-if="detailInfo.status == 3" @click="changePrice()" class="admin-button-com big blue">入库改价</view>
+			<view v-if="detailInfo.status == 3" @click="changePrice()" class="admin-button-com big blue" style="margin-right:45upx;margin-left:55upx;">入库改价</view>
 		</view>
 
 	</view>

ghsApp/src/pagesPurchase/supplier.vue

@@ -89,7 +89,7 @@ export default {
       this.pageTo({url: '/pagesGys/details?id='+item.id})
 		},
     goToCg (item) {
-      this.pageTo({url: '/pagesPurchase/add?ghsId='+item.id+'&ghsName='+item.name})
+      this.pageTo({url: '/pagesPurchase/add?ghsId='+item.id+'&ghsName='+item.name,type:2})
     }
   }
 }