shish 7 месяцев назад
Родитель
Сommit
e44cd26009

+ 2 - 1
ghsApp/src/pages.json

@@ -408,7 +408,8 @@
 			"pages": [
 			"pages": [
 				{ "path": "list", "style": { "navigationBarTitleText": "赊账单", "enablePullDownRefresh": true } },
 				{ "path": "list", "style": { "navigationBarTitleText": "赊账单", "enablePullDownRefresh": true } },
 				{ "path": "details", "style": { "navigationBarTitleText": "赊账单", "enablePullDownRefresh": true } },
 				{ "path": "details", "style": { "navigationBarTitleText": "赊账单", "enablePullDownRefresh": true } },
-				{ "path": "search", "style": { "navigationBarTitleText": "查找赊账单", "enablePullDownRefresh": false } }
+				{ "path": "search", "style": { "navigationBarTitleText": "查找赊账单", "enablePullDownRefresh": false } },
+				{ "path": "result", "style": { "navigationBarTitleText": "结果", "enablePullDownRefresh": false } }
 			]
 			]
 		},
 		},
 		{
 		{

+ 66 - 0
ghsApp/src/pagesGys/result.vue

@@ -0,0 +1,66 @@
+<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="selectClear">其他人结账</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 { CURRENT_ENV } from "@/config"
+export default {
+  name: "result",
+  components: {
+    appResult
+  },
+  mixins: [],
+  data() {
+    return {
+      title:'结账成功',
+      currentEnv:'production'
+    };
+  },
+  onLoad() {
+    //当前环境
+    this.currentEnv = CURRENT_ENV
+  },
+  methods: {
+    init() {
+    },
+    goDetail() {
+        let id = this.option.id?this.option.id:''
+        this.$util.pageTo({url: "/admin/clear/info?id="+id,type:2})
+    },
+    selectClear(){
+        this.$util.pageTo({url: "/pagesPurchase/supplier",type:2})
+    },
+    goOn(){
+        let ghsId = this.option.ghsId ? this.option.ghsId : 0
+        this.$util.pageTo({url: "/pagesGys/search?id="+ghsId,type:2})
+    },
+    goList(){
+        this.$util.pageTo({url: "/admin/clear/list",type:2})
+    },
+    goBackHome() {
+      uni.navigateBack({ delta: 1 });
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+.admin-button-com {
+  margin-bottom:30upx;
+  width: 100%;
+}
+</style>

+ 4 - 5
ghsApp/src/pagesGys/search.vue

@@ -142,14 +142,13 @@ export default {
 			that.$util.confirmModal({content:'确认提交?'},() => {
 			that.$util.confirmModal({content:'确认提交?'},() => {
 				uni.showLoading({mask:true})
 				uni.showLoading({mask:true})
 				clearOrderApi(params).then(ret=>{
 				clearOrderApi(params).then(ret=>{
+					that.showClearModel = false
 					uni.hideLoading()
 					uni.hideLoading()
 					if(ret.code == 1){
 					if(ret.code == 1){
 						that.getOrderList = []
 						that.getOrderList = []
-						uni.removeStorageSync('selected_cg_ghs_order_clear_'+that.option.id)
-						that.$msg('结账成功')
-						setTimeout(function(){
-							uni.navigateBack({})
-						},1200)
+						uni.removeStorageSync('selected_cg_ghs_order_clear_'+ghsId)
+						let id = ret.data.id?ret.data.id:0
+						that.pageTo({url: '/pagesGys/result?id='+id+'&ghsId='+ghsId,type:2})
 					}
 					}
 				})
 				})
 			})
 			})

+ 1 - 1
ghsApp/src/pagesPurchase/supplier.vue

@@ -205,7 +205,7 @@ export default {
       })
       })
     },
     },
     goToSearchDebt(item){
     goToSearchDebt(item){
-      this.pageTo({url: '/pagesGys/search?id='+item.id})
+      this.pageTo({url: '/pagesGys/search?id='+item.id,type:2})
     },
     },
     goToDebtList(item) {
     goToDebtList(item) {
       this.pageTo({url: '/pagesGys/details?id='+item.id})
       this.pageTo({url: '/pagesGys/details?id='+item.id})