采购成功的广告

ghsApp/src/pagesPurchase/components/pageSuccess.vue

@@ -11,14 +11,14 @@
 
 				<template>
 					<view style="width:690upx;overflow:hidden;padding-left:30upx;">
-						<view class="flex title" v-if="info.status == 3"> 入库前请确认售价: </view>
+						<view class="flex title" v-if="info.status == 3" style="color:#063a86;font-weight:bold;">售价不低于平均成本就有利润</view>
 						<view class="flex title" v-else> 确认售价: </view>
 						<view class="flex title">
 							<text style="font-size:24upx;font-weight:normal;color:#CCCCCC;">
 								<text style="color:black;font-weight:bold;margin:0 3upx 0 0;">花材名称</text>/
 								<text style="color:red;font-weight:normal;margin:0 3upx 0 3upx;">进价</text>/
 								<text style="color:black;font-weight:normal;margin:0 3upx 0 3upx;">本次成本</text>/
-								<text style="color:#3385FF;font-weight:normal;margin:0 3upx 0 3upx;">平均成本</text>/
+								<text style="color:#063a86;font-weight:bold;margin:0 3upx 0 3upx;">平均成本</text>/
 								<text style="color:#CCCCCC;margin:0 3upx 0 3upx;">旧批发价</text>/
 								<text style="color:#CCCCCC;margin:0 3upx 0 3upx;">入库数</text>/
 								<text style="color:#CCCCCC;margin:0 0upx 0 3upx;">原库存</text>
@@ -33,7 +33,7 @@
 											{{res.name?res.name.substr(0,11):''}}
 											<text style="color:red;margin-left:9upx;font-weight:normal;font-size:26upx;">¥{{res.bigPrice?parseFloat(res.bigPrice):0}}</text>
 											<text style="color:black;margin-left:9upx;font-size:26upx;font-weight:normal;">¥{{res.currentCost?parseFloat(res.currentCost):0}}</text>
-											<text style="color:#3385FF;margin-left:9upx;font-weight:normal;font-size:26upx;">¥{{res.cost?parseFloat(res.cost):0}}</text>
+											<text style="color:#063a86;margin-left:9upx;font-weight:bold;font-size:26upx;">¥{{res.cost?parseFloat(res.cost):0}}</text>
 											<text style="color:#CCCCCC;margin-left:9upx;font-weight:normal;font-size:26upx;">旧¥{{res.beforeModifyPrice?parseFloat(res.beforeModifyPrice):0}}</text>
 											<text style="color:#CCCCCC;margin-left:9upx;font-weight:normal;font-size:26upx;">{{res.itemNum?parseFloat(res.itemNum):0}}{{res.bigUnit}}</text>
 											<text style="color:#CCCCCC;margin-left:9upx;font-weight:normal;font-size:26upx;">{{res.beforeModifyStock?parseFloat(res.beforeModifyStock):0}}{{res.bigUnit}}</text>
@@ -197,9 +197,7 @@ export default {
 					if(res.code == 1){
 						if(res.data.status == 4){
 							that.$msg(res.msg)
-							setTimeout(function(){
-								that.pageTo({url: '/pagesPurchase/info?orderSn='+that.info.orderSn+'&refresh=1',type:2})
-							},1100)
+							that.pageTo({url: '/pagesPurchase/result?orderSn='+that.info.orderSn,type:2})
 						}
 					}
 				})
@@ -248,10 +246,7 @@ export default {
 				saveCgPrice({data:JSON.stringify(newProduct),cgId:targetId}).then(res => {
 					uni.hideLoading()
 					if(res.code == 1){
-						that.$msg(res.msg)
-						setTimeout(function(){
-							uni.navigateBack()
-						},1300)
+						that.pageTo({url: '/pagesPurchase/result?orderSn='+that.info.orderSn,type:2})
 					}
 				})
 			})
@@ -302,10 +297,7 @@ export default {
 			batchChangePrice({data:JSON.stringify(newProduct),changeType:'cg',targetId:targetId,appVersion:1}).then(res => {
 				uni.hideLoading()
 				if(res.code == 1){
-					that.$msg(res.msg)
-					setTimeout(function(){
-						that.pageTo({url: '/pagesPurchase/info?orderSn='+that.info.orderSn+'&refresh=1',type:2})
-					},1100)
+					that.pageTo({url: '/pagesPurchase/result?orderSn='+that.info.orderSn,type:2})
 				}
 			})
 		},

ghsApp/src/pagesPurchase/result.vue

@@ -1,33 +1,61 @@
 <template>
-	<appResult :title="'入库成功'">
-		<button class="admin-button-com blue big" @click="goOn">继续入库</button>
-		<button class="admin-button-com big" @click="goClose">关闭</button>
-	</appResult>
-</template>
+<appResult :title="title">
+
+  	<button class="admin-button-com big blue" @click="goDetail()">查看详情</button>
+    <button class="admin-button-com big blue" @click="goOn()">继续入库</button>
+	<button class="admin-button-com big" @click="goList">入库记录</button>
+    <button class="admin-button-com big" @click="goBackHome">返回</button>
+
+    <!-- #ifdef MP-WEIXIN -->
+    <view style="width:688upx;height:20upx;background-color: #ece5e5;"></view>
+    <ad-custom unit-id="adunit-42a99bd9e25e3626" v-if="currentEnv=='production'" style="width:688upx;"></ad-custom>
+    <ad-custom unit-id="adunit-9523c840341ccb1f" v-else style="width:688upx;"></ad-custom>
+    <!-- #endif -->
 
+</appResult>
+
+</template>
 <script>
-import appResult from "@/components/app-result";
+import appResult from "@/components/app-result"
+import { CURRENT_ENV } from "@/config"
 export default {
-	name: "BillingResult", // 开单结果
-	components: {
-		appResult
-	},
-	methods: {
-		goOn() {
-			this.$util.pageTo({ url: "/pagesPurchase/add", type: 2 });
-		},
-		goClose() {
-			this.$util.pageTo({ url: "/pagesPurchase/order", type: 2 });
-		},
-		init(){
-
-		}
-	}
+  name: "result",
+  components: {
+    appResult
+  },
+  mixins: [],
+  data() {
+    return {
+      title:'操作成功',
+      currentEnv:'production'
+    };
+  },
+  onLoad() {
+    //当前环境
+    this.currentEnv = CURRENT_ENV
+  },
+  methods: {
+    init() {
+    },
+    goDetail() {
+        let orderSn = this.option.orderSn?this.option.orderSn:''
+        this.$util.pageTo({url: "/pagesPurchase/info?orderSn="+orderSn,type:2})
+    },
+    goOn(){
+        this.$util.pageTo({url: "/pagesPurchase/supplier",type:2})
+    },
+    goList(){
+        this.$util.pageTo({url: "/pagesPurchase/order",type:2})
+    },
+    goBackHome() {
+      uni.navigateBack({ delta: 1 });
+    }
+  },
 };
 </script>
 <style lang="scss" scoped>
 .admin-button-com {
-	margin-bottom: 20upx;
-	width: 100%;
+  margin-bottom:30upx;
+  width: 100%;
 }
-</style>
+</style>

ghsApp/src/pagesPurchase/supplier.vue

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

ghsApp/src/pagesStorehouse/allot/result.vue

@@ -1,10 +1,10 @@
 <template>
 <appResult :title="title">
 
-  	<button class="admin-button-com big" @click="goDetail()">查看详情</button>
-    <button class="admin-button-com big" @click="goOn()">继续出库</button>
-	<button class="admin-button-com big default" @click="goList">出库列表</button>
-    <button class="admin-button-com big default" @click="goBackHome">返回</button>
+  	<button class="admin-button-com big blue" @click="goDetail()">查看详情</button>
+    <button class="admin-button-com big blue" @click="goOn()">继续出库</button>
+	<button class="admin-button-com big" @click="goList">出库列表</button>
+    <button class="admin-button-com big" @click="goBackHome">返回</button>
 
     <!-- #ifdef MP-WEIXIN -->
     <view style="width:688upx;height:20upx;background-color: #ece5e5;"></view>