批发端结账

ghsApp/src/admin/clear/customInfo.vue

@@ -7,7 +7,7 @@
 			<view class="bills-info_box content-box">
 				<view class="order-info_box">
 					<view>订单日期：</view>
-					<view>{{ detailInfo.addTime.substr(5,11) }}</view>
+					<view>{{ detailInfo.addTime ? detailInfo.addTime.substr(5,11) : '' }}</view>
 				</view>
 				<view class="order-info_box">
 					<view>订单编码：</view>
@@ -16,7 +16,7 @@
 						<button @click="copy(detailInfo.orderSn)" class="admin-button-com default" > 复制 </button>
 					</view>
 				</view>
-				<view class="order-info_box">
+				<view class="order-info_box" v-if="detailInfo.status == 2">
 					<view>支付方式：</view>
 					<view>{{ detailInfo.payWay==0?'微信':detailInfo.payWay==1?'支付宝':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':'--' }}</view>
 				</view>
@@ -101,11 +101,15 @@
 			</view>
 
 		</view>
+		<view class="app-footer">
+			<button class="admin-button-com default" v-if="detailInfo.status == 1 && detailInfo.clearStyle==2" @click="cancelFn(detailInfo)">取消</button>
+			<button class="admin-button-com default" v-if="detailInfo.status == 1" @click="customHasClear(detailInfo)">客户已转账</button>
+			<button class="admin-button-com default" v-if="detailInfo.status == 1" open-type="share">邀客户结账</button>
+		</view>
 	</view>
 </template>
-
 <script>
-import { getCustomDetail } from "@/api/clear/index";
+import { getCustomDetail,cancel,confirmClear } from "@/api/clear/index";
 import productMins from "@/mixins/product";
 import TuiListCell from "@/components/plugin/list-cell";
 export default {
@@ -119,17 +123,54 @@ export default {
 			selectJobType: "order_change",
 			autoLoad: false,
 			stepActive: 0,
-			form: {
-				name: ""
-			},
+			form: { name: "" },
 			detailInfo: {},
 			loading: false
 		};
 	},
-	onShow() {
-		console.log('aabbcc')
+  	onShareAppMessage(res) {
+		return {
+			title: '点击查账和结账',
+			desc: "",
+			imgUrl: "",
+			path: "admin/clear/showBill?id="+this.detailInfo.id,
+		}
 	},
 	methods: {
+		cancelFn(info){
+			let that = this
+			that.$util.confirmModal({content:'确认取消？'},() => {
+				cancel({id:info.id}).then(res=>{
+					if(res.code == 1){
+						that.$msg('取消成功')
+						that.init()
+					}
+				})
+			})
+		},
+		customHasClear(info){
+			let that = this
+			that.$util.confirmModal({content:'确认客户已转账？'},() => {
+				uni.showActionSheet({
+					itemList: ['请选择收款方式：', '微信', '支付宝','现金','银行卡'],
+					success: function (respond) {
+						let currentIndex = respond.tapIndex
+						let inWay = [{name:"未选择",id:-1},{name:"微信",id:0},{name:"支付宝",id:1},{name:"现金",id:4},{name:"银行卡",id:5}]
+						if(currentIndex > 0){
+							payWay = inWay[currentIndex].id
+							confirmClear({id:info.id,payWay:payWay}).then(res=>{
+								if(res.code == 1){
+									this.$msg('操作成功')
+									this.init()
+								}
+							})
+						}else{
+							this.$msg("请选择收款方式");
+						}
+					}
+				})
+			})
+		},
 		copy(val) {
 			const self = this;
 			uni.setClipboardData({
@@ -350,14 +391,14 @@ export default {
 	justify-content: flex-end;
 	& .admin-button-com {
 		padding: 0;
-		margin-right: 15upx;
-		width: 140upx;
-		height: 70upx;
-		line-height: 70upx;
+		margin-right: 20upx;
+		width: 165upx;
+		height: 73upx;
+		line-height: 73upx;
 		text-align: center;
 		color: #3385ff;
 		border: 1upx solid #3385ff;
-		&.active{
+		&.disabled{
 			color: #666666;
 			border: 1upx solid #ccc;
 		}

ghsApp/src/admin/clear/showBill.vue

@@ -0,0 +1,91 @@
+<template>
+	<view class="app-content">
+		<view class="billing_box_bg">
+			<view class="top-view"> </view>
+			<view class="result-view">
+                <button class="admin-button-com big blue" style="width:45vh;" @click="showBill()">点此查账</button>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+import { getWeixinId } from "@/api/invite/index"
+export default {
+    name: "showBill",
+	data() {
+		return {
+			getAppIdList:{}
+		};
+	},
+	onLoad() {
+		let that = this
+		getWeixinId().then(res => {
+			that.getAppIdList = res.data
+		})
+	},
+	methods: {
+		showBill() {
+			let that = this
+			uni.navigateToMiniProgram({
+				//姜枫-2021.04.13
+				appId: that.getAppIdList.hd.miniAppId,
+				path: 'admin/clear/info?id='+that.option.id,
+				//develop 开发版 trial 体验版 release 正式版
+				envVersion: process.env.NODE_ENV === 'development' ? 'develop' : 'release',
+				extraData: {
+					'id': that.option.id
+				},
+				success (res) {
+				}
+			})
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.go-back{
+	width: 80%;
+	height: 80upx;
+	color: #FFFFFF;
+	margin-top: 50upx;
+	background: #3385FF;
+	border-radius: 10upx;
+	font-size:30upx;
+}
+.billing_box_bg {
+	position: relative;
+	padding: 60upx 30upx;
+	display: flex;
+	background: white;
+	flex-direction: column;
+    background-color: #f5f5f5;
+	.top-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 299upx;
+		background: #3385ff;
+		border-radius: 0upx 0upx 83upx 83upx;
+	}
+	.result-view {
+		position: relative;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 70upx;
+		width: 100%;
+		background: #ffffff;
+		border-radius: 20upx;
+		z-index: 1;
+		.iconchenggong {
+			font-size: 170upx;
+			color: $mainColor1;
+		}
+		.result-title {
+			margin: 50upx 0 70upx;
+			font-size: 32upx;
+		}
+	}
+}
+</style>

ghsApp/src/api/clear/index.js

@@ -18,4 +18,13 @@ export const getCustomClearList = async data => {
 //客户的结账单详情
 export const getCustomDetail = async id => {
 	return https.get("/clear/get-custom-full-info", { id });
-};
+};
+
+//取消
+export const cancel = data => {
+	return https.get('/clear/cancel', data)
+}
+
+export const confirmClear = data => {
+	return https.get('/order-clear/confirm-clear', data)
+}

ghsApp/src/pages.json

@@ -291,7 +291,8 @@
 			"root": "pagesArrears",
 			"pages": [
 				{ "path": "list", "style": { "navigationBarTitleText": "客户欠款", "enablePullDownRefresh": true } },
-				{ "path": "details", "style": { "navigationBarTitleText": "欠账订单", "enablePullDownRefresh": true } }
+				{ "path": "details", "style": { "navigationBarTitleText": "欠账订单", "enablePullDownRefresh": true } },
+				{ "path": "clearResult", "style": { "navigationBarTitleText": "结果"} }
 			]
 		},
 		{
@@ -321,7 +322,8 @@
 				{"path": "list","style": {"navigationBarTitleText": "结账记录"}},
 				{"path": "info","style": {"navigationBarTitleText": "详情"}},
 				{"path": "customList","style": {"navigationBarTitleText": "结账记录"}},
-				{"path": "customInfo","style": {"navigationBarTitleText": "详情"}}
+				{"path": "customInfo","style": {"navigationBarTitleText": "详情"}},
+				{"path": "showBill","style": {"navigationBarTitleText": "查账结账"}}
 			]
 		},
 		{

ghsApp/src/pagesArrears/clearResult.vue

@@ -0,0 +1,108 @@
+<template>
+	<view class="app-content">
+		<view class="billing_box_bg">
+			<view class="top-view"> </view>
+			<view class="result-view">
+				<view class="iconfont iconchenggong"></view>
+				<view class="result-title">账单已生成</view>
+				<button class="admin-button-com big blue" style="width:45vh;" open-type="share">邀客户结账</button>
+                <button class="admin-button-com big blue" style="width:45vh;margin-top:40upx;" @click="customHasClear">客户已转账</button>
+                <button class="admin-button-com big default" style="width:45vh;margin-top:40upx;" @click="goDetail">详情</button>
+				<button class="admin-button-com big default" style="width:45vh;margin-top:40upx;" @click="goBackHome">返回</button>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+import { confirmClear } from "@/api/clear/index";
+export default {
+    name: "success",
+	onShareAppMessage(res) {
+		return {
+			title: '点击查账和结账',
+			desc: "",
+			imgUrl: "",
+			path: "admin/clear/showBill?id="+this.option.id,
+		}
+	},
+	methods: {
+		goBackHome() {
+			uni.navigateBack({})
+		},
+		customHasClear(){
+			let that = this
+			that.$util.confirmModal({content:'确认客户已转账？'},() => {
+
+				uni.showActionSheet({
+					itemList: ['请选择收款方式：', '微信', '支付宝','现金','银行卡'],
+					success: function (respond) {
+						let currentIndex = respond.tapIndex
+						let inWay = [{name:"未选择",id:-1},{name:"微信",id:0},{name:"支付宝",id:1},{name:"现金",id:4},{name:"银行卡",id:5}]
+						if(currentIndex > 0){
+							payWay = inWay[currentIndex].id
+							confirmClear({id:this.option.id,payWay:payWay}).then(res=>{
+								if(res.code == 1){
+									this.$msg('操作成功')
+								}
+							})							
+						}else{
+							this.$msg("请选择收款方式");
+						}
+					}
+				})
+
+			})
+		},
+		goDetail(){
+			this.pageTo({url:'/admin/clear/customInfo',query:{id:this.option.id},type:2})
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.go-back{
+	width: 80%;
+	height: 80upx;
+	color: #FFFFFF;
+	margin-top: 50upx;
+	background: #3385FF;
+	border-radius: 10upx;
+	font-size:30upx;
+}
+.billing_box_bg {
+	position: relative;
+	padding: 60upx 30upx;
+	display: flex;
+	background: white;
+	flex-direction: column;
+    background-color: #f5f5f5;
+	.top-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 299upx;
+		background: #3385ff;
+		border-radius: 0upx 0upx 83upx 83upx;
+	}
+	.result-view {
+		position: relative;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 70upx;
+		width: 100%;
+		background: #ffffff;
+		border-radius: 20upx;
+		z-index: 1;
+		.iconchenggong {
+			font-size: 100upx;
+			color: $mainColor1;
+		}
+		.result-title {
+			margin: 50upx 0 70upx;
+			font-size: 32upx;
+		}
+	}
+}
+</style>

ghsApp/src/pagesArrears/details.vue

@@ -12,14 +12,7 @@
 		</view>
 		<view class="shop-list">
 			<block v-if="!$util.isEmpty(detailsList)">
-				<DetailsItem
-					v-for="(item, index) in detailsList"
-					:key="index"
-					:info="item"
-					:isEdit="true"
-					:isCheck="item.checked"
-					@click="checkItemEvent"
-				></DetailsItem>
+				<DetailsItem v-for="(item, index) in detailsList" :key="index" :info="item" :isEdit="true" :isCheck="item.checked" @click="checkItemEvent" ></DetailsItem>
 			</block>
 			<block v-else>
 				<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(detailsList)" />
@@ -34,27 +27,20 @@
 						<button class="admin-button-com blue middle" v-else>全选</button>
 
 					</view>
-					已选 <text class="price">{{ selectList.length }}</text> 笔
-					<text class="unit">¥</text>
-					<text class="price">{{ parseFloat(selectTotalAmount) }}</text>
+					已选 <text class="price">{{ selectList.length }}</text> 笔 <text class="unit">¥</text> <text class="price">{{ parseFloat(selectTotalAmount) }}</text>
 				</view>
 			</template>
 			<view class="btn-view">
-				<button :class="['admin-button-com', 'blue']" @click="isModelFun" >收款</button>
+				<button :class="['admin-button-com', 'blue']" @click="isModelFun" >提交</button>
 			</view>
 		</view>
-		<modal-module :show="isModel" @click="affirm" :title="'收款'" color="#333" :size="32" padding="30upx 30upx" >
+		<modal-module :show="isModel" @click="confirmData" :title="'确认金额'" color="#333" :size="32" padding="30upx 30upx" >
 			<template slot="customContent">
 				<view class="select-cmd_bx">
 					<view class="num_bx">
 						<view class="flex">金额：{{selectTotalAmount}}</view>
 						<view class="flex">实收：<input @focus="modifyPrice = null" v-model="modifyPrice" type="digit"/></view>
-						<view class="flex">减免：{{(selectTotalAmount - modifyPrice).toFixed(2)}}</view>
-						<view class="flex">付款：
-							<picker @change="payWayChange" :value="payWayindex" range-key="name" :range="payWayList">
-                        		<view class="uni-input" style="height:auto;border:2upx solid #ccc;width:300upx;padding:5upx 0 5upx 10upx;">{{payWayList[payWayindex].name}}</view>
-                    		</picker>
-						</view>
+						<view class="flex">优惠：{{(selectTotalAmount - modifyPrice).toFixed(2)}}</view>
 					</view>
 				</view>
 			</template>
@@ -79,7 +65,6 @@ export default {
 			listLoading: false,
 			isAllCheck: false,
 			isModel: false,
-			payWayList:[{name:"微信",id:0},{name:"支付宝",id:1},{name:"现金",id:4},{name:"银行卡",id:5}],
 			payWayindex:0,
 			payWay:0,
 			searchTime:'',
@@ -148,21 +133,6 @@ export default {
 			}
 			this.isModel = true;
 		},
-		affirm(val) {
-			if (val.index === 0) {
-				this.isModel = false;
-			} else {
-				let ids = this.selectList.map(ele => {
-					return {id:ele.id};
-				});
-				let parameter = {
-					id:JSON.stringify(ids),
-					customId:this.customInfo.id,
-					payWay:this.payWay
-				}
-				this.paySuccess(parameter)
-			}
-		},
 		selectDateFn(val){
 			this.searchTime = val.searchTime
 			this.startTime = val.startTime
@@ -210,6 +180,20 @@ export default {
 				}
 			}
 		},
+		confirmData(val) {
+			if (val.index === 0) {
+				this.isModel = false;
+			} else {
+				let ids = this.selectList.map(ele => {
+					return {id:ele.id};
+				});
+				let parameter = {
+					id:JSON.stringify(ids),
+					customId:this.customInfo.id
+				}
+				this.paySuccess(parameter)
+			}
+		},
 		batchEvent() {
 			try {
 				if (this.$util.isEmpty(this.selectList)) {
@@ -219,23 +203,31 @@ export default {
 				let ids = this.selectList.map(ele => {
 					return {id:ele.id};
 				});
-			let parameter = {
-					id:JSON.stringify(ids),
-				customId:this.customInfo.id,
-			}
-			let that = this;
-
-			that.$util.confirmModal({content:'确定已收款？'},() => {
-				that.paySuccess(parameter)
-			})
+				let parameter = {
+						id:JSON.stringify(ids),
+					customId:this.customInfo.id,
+				}
+				let that = this;
 
+				that.$util.confirmModal({content:'确定提交？'},() => {
+					that.paySuccess(parameter)
+				})
 			} catch (error) {}
 		},
 		async paySuccess(parameter) {
-			await clearOrderApi({...parameter,modifyPrice:this.modifyPrice,searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime});
-			this.pageTo({url:'/common/success', type: 2,query:{titleType:3}});
-		},
-		payFail() {
+			let that = this
+			uni.showLoading({mask:true})
+			const  res = await clearOrderApi({...parameter,modifyPrice:this.modifyPrice,searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime});
+			uni.hideLoading()
+			if(res.code == 1){
+				if(res.data.hasUnComplete && res.data.hasUnComplete == 1){
+					that.$util.confirmModal({content:'此客户还有待完成的账单',okText:'查看'},() => {
+						that.pageTo({url:'/admin/clear/customList',type:2})
+					})
+				}else{
+					that.pageTo({url:'/pagesArrears/clearResult',query:{id:res.data.id},type:2})
+				}
+			}
 		}
 	}
 };
@@ -369,4 +361,4 @@ export default {
 		}
 	}
 }
-</style>
+</style>

ghsApp/src/pagesClient/member/detail.vue

@@ -70,7 +70,7 @@
       <view class="module-com user-open_bx">
         <view class="input-line-wrap">
             <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="pageTo({ url: '/pagesArrears/details',query: {id: userInfo.id}})">
-              <div class="tui-title">欠款订单</div>
+              <div class="tui-title">待结订单</div>
             </tui-list-cell>
 
             <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="pageTo({ url: '/admin/custom/debtChange',query: {customId: userInfo.id}})">
@@ -78,7 +78,7 @@
             </tui-list-cell>
 
             <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="pageTo({ url: '/admin/clear/customList',query: {customId: userInfo.id}})">
-              <div class="tui-title">结账记录</div>
+              <div class="tui-title">结账单</div>
             </tui-list-cell>
 
             <tui-list-cell class="line-cell" :hover="false">

ghsApp/src/pagesOrder/detail.vue

@@ -8,7 +8,7 @@
 			<view class="address-des_bx content-box" @click='pageTo({url:"/pagesClient/member/detail",query: {id: detailInfo.customId}})'>
 				<view>
 					<view style="overflow:hidden;text-overflow:ellipsis;white-space: nowrap;width:450upx;"> {{ detailInfo.customName }} {{ detailInfo.customMobile }}</view>
-					<view style="margin-bottom:20upx;color:#333333">店长：{{ detailInfo.customSuper.name}}</view>
+					<view style="margin-bottom:20upx;color:#333333">店长：{{ detailInfo.customSuper.name||''}}</view>
 					<view>{{ detailInfo.customAddress}}</view>
 				</view>
 				<view>
@@ -317,13 +317,20 @@ export default {
 							id:JSON.stringify([{id:id}]),
 							customId:customId,
 							payWay:payWay,
-							modifyPrice:remainDebtPrice
+							modifyPrice:remainDebtPrice,
+							complete:1
 						}
 
 						that.$util.confirmModal({content:'确认结清欠款？'},() => {
 							clearOrderApi(params).then(res => {
 								if(res.code == 1) {
-									that.pageTo({url:'/common/success', type: 2,query:{titleType:1}});
+									if(res.data.hasUnComplete && res.data.hasUnComplete == 1){
+										that.$util.confirmModal({content:'此客户还有待完成的账单',okText:'查看'},() => {
+											that.pageTo({url:'/admin/clear/customList',type:2})
+										})
+									}else{
+										that.pageTo({url:'/common/success', type: 2,query:{titleType:1}})
+									}
 								}
 							})
 						})

hdApp/src/pagesPurchase/order.vue

@@ -16,7 +16,7 @@
               <text class="explain" @click="getBookItemExplain(ghsInfo)">预订说明</text>
             </view>
             <view class="store_btn">
-              <view class="btn_entrance" @click="pageTo({ url: '/admin/clear/list',query: {ghsId: ghsInfo.id}})">已建账单</view>
+              <view class="btn_entrance" @click="pageTo({ url: '/admin/clear/list',query: {ghsId: ghsInfo.id}})">结账单</view>
               <view class="btn_entrance" @click="pageTo({url:'/pagesPurchase/shopping'})" > 采购记录 </view>
               <view class="btn_entrance" @click="settleAccounts(ghsInfo)"> 待结订单 </view>
               <view class="btn_entrance" @click="pageTo({ url: '/admin/ghs/debtChange',query: {ghsId: ghsInfo.id}})">欠款变动明细-¥{{parseFloat(ghsInfo.debtAmount)}}</view>
@@ -223,7 +223,7 @@ export default {
           font-size: 28upx;
           color: #BBBBBB;
           padding: 10upx 10upx;
-          margin-left: 22upx;
+          margin-left: 20upx;
           text-decoration: underline;
           color:#666666;
         }