shish 3 лет назад
Родитель
Сommit
0cbde2860b
3 измененных файлов с 23 добавлено и 4 удалено
  1. 4 0
      ghsApp/src/api/clear/index.js
  2. 1 1
      ghsApp/src/pages.json
  3. 18 3
      ghsApp/src/pagesArrears/details.vue

+ 4 - 0
ghsApp/src/api/clear/index.js

@@ -1,5 +1,9 @@
 import https from "@/plugins/luch-request_0.0.7/request";
 import https from "@/plugins/luch-request_0.0.7/request";
 
 
+export const getUnClear = data => {
+	return https.get("/clear/get-un-clear", data);
+};
+
 //供货商的结账单详情
 //供货商的结账单详情
 export const getDetail = async id => {
 export const getDetail = async id => {
 	return https.get("/clear/get-full-info", { id });
 	return https.get("/clear/get-full-info", { id });

+ 1 - 1
ghsApp/src/pages.json

@@ -309,7 +309,7 @@
 			"root": "pagesArrears",
 			"root": "pagesArrears",
 			"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": "clearResult", "style": { "navigationBarTitleText": "结果"} }
 				{ "path": "clearResult", "style": { "navigationBarTitleText": "结果"} }
 			]
 			]
 		},
 		},

+ 18 - 3
ghsApp/src/pagesArrears/details.vue

@@ -18,6 +18,10 @@
 				<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(detailsList)" />
 				<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(detailsList)" />
 			</block>
 			</block>
 		</view>
 		</view>
+		<view style="position:fixed;bottom:100upx;font-size:32upx;z-index:9999;background-color:red;width:100%;height:85upx;text-align:center;line-height:85upx;color:white;" 
+		v-if="!$util.isEmpty(unClear)" @click="goClear(unClear)">
+			<text>客户已有一个待结账单 ¥{{unClear.actPrice?parseFloat(unClear.actPrice):0}}</text><text style="font-weight:bold;margin-left:15upx;">查看</text>
+		</view>
 		<view :class="device == 'ios' ? 'ios-bar-view':'android-bar-view'">
 		<view :class="device == 'ios' ? 'ios-bar-view':'android-bar-view'">
 			<template>
 			<template>
 				<view class="info-view">
 				<view class="info-view">
@@ -40,7 +44,8 @@
 <script>
 <script>
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import DetailsItem from "./detailsItem";
 import DetailsItem from "./detailsItem";
-import { getDebtOrderList,clearOrderApi } from "@/api/arrears/index";
+import { getDebtOrderList,clearOrderApi } from "@/api/arrears";
+import { getUnClear } from "@/api/clear"
 import DateSelect from "@/components/module/dateSelect";
 import DateSelect from "@/components/module/dateSelect";
 import ModalModule from "@/components/plugin/modal";
 import ModalModule from "@/components/plugin/modal";
 export default {
 export default {
@@ -59,7 +64,8 @@ export default {
 			searchTime:'',
 			searchTime:'',
 			startTime:'',
 			startTime:'',
 			endTime:'',
 			endTime:'',
-			device:'android'
+			device:'android',
+			unClear:[]
 		};
 		};
 	},
 	},
 	onPullDownRefresh() {
 	onPullDownRefresh() {
@@ -74,6 +80,12 @@ export default {
 
 
 		this.device = uni.getSystemInfoSync().platform
 		this.device = uni.getSystemInfoSync().platform
 
 
+		getUnClear({customId:this.option.id}).then(res=>{
+			if(res.code == 1){
+				this.unClear = res.data.info
+			}
+		})
+
 	},
 	},
 	computed: {
 	computed: {
 		selectList() {
 		selectList() {
@@ -110,6 +122,9 @@ export default {
 		}
 		}
 	},
 	},
 	methods: {
 	methods: {
+		goClear(item){
+			this.$util.pageTo({url:'/admin/clear/customInfo?id='+item.id})
+		},
 		createOrder(){
 		createOrder(){
 			let that = this
 			let that = this
 			let price = parseFloat(that.modifyPrice)
 			let price = parseFloat(that.modifyPrice)
@@ -278,7 +293,7 @@ export default {
 		margin-top:98upx;
 		margin-top:98upx;
 		padding: 20upx 30upx;
 		padding: 20upx 30upx;
 		flex: 1;
 		flex: 1;
-		padding-bottom: 100upx;
+		padding-bottom: 170upx;
 	}
 	}
 	.ios-bar-view {
 	.ios-bar-view {
 		bottom: 0;
 		bottom: 0;