fix

virgo.wzfrontend/yui_wx/pages.json

@@ -180,6 +180,30 @@
 		"style": {
 			"navigationBarTitleText": "账单详情"
 		}
+	}, {
+		"path": "pages/invoice/invoice",
+		"style": {
+			"navigationBarTitleText": "发票列表"
+		}
+	}, {
+		"path": "pages/invoiceDetail/invoiceDetail",
+		"style": {
+			"navigationBarTitleText": "发票详情"
+		}
+	},
+	{
+		"path" : "pages/billRecord/billRecord",
+		"style" : 
+		{
+			"navigationBarTitleText" : "账单付款"
+		}
+	},
+	{
+		"path" : "pages/billInvoice/billInvoice",
+		"style" : 
+		{
+			"navigationBarTitleText" : "账单发票"
+		}
 	}],
 	"tabBar": {
 		"color": "#8c8c8c",

virgo.wzfrontend/yui_wx/pages/bill/bill.vue

@@ -20,11 +20,16 @@
 					</view>
 					<view class="state">
 						<view></view>
-						<view class="tag">
+						<view class="tag" v-if="type === 1">
 							<div class="status-tag info" v-if="!item.status">待付款</div>
 							<div class="status-tag warning" v-else-if="item.status === 1">付款中</div>
 							<div class="status-tag success" v-else-if="item.status === 2">已付款</div>
 						</view>
+						<view class="tag" v-else>
+							<div class="status-tag warning" v-if="item.status === 1">付款中</div>
+							<div class="status-tag success" v-else-if="item.status === 2">已付款</div>
+							<div class="status-tag info" v-else-if="item.status === 3">待付款</div>
+						</view>
 					</view>
 					<view class="icon">
 						<uni-icons custom-prefix="iconfont" :type="menu.iconClass" color="#08979c" size="30">
@@ -63,7 +68,7 @@
 			uni.setNavigationBarTitle({
 				title: this.menu.title
 			});
-			uni.$on('reloadContract', () => {
+			uni.$on('reloadBill', () => {
 				this.mescroll.resetUpScroll(false);
 			})
 		},
@@ -98,6 +103,7 @@
 					pageSize: 10,
 					projectId: this.$store.getters.project.id
 				}
+				console.log(this.$store.getters.identity);
 				if (this.$store.getters.identity.id === 3 || this.$store.getters.identity.id === 6) {
 					postData['organizationId'] = this.$store.getters.organization.id;
 					this.getBillList(postData);

virgo.wzfrontend/yui_wx/pages/billDetail/billDetail.vue

@@ -3,8 +3,10 @@
 		<view class="detail">
 			<view class="detail-box">
 				<view class="title-box">
-					<view class="title">{{'第' + detail.phase + '期'}}</view>
-					<view class="date">{{detail.startDate}}至{{detail.endDate}}</view>
+					<view class="title" v-if="type == 1">{{'第' + detail.phase + '期'}}</view>
+					<view class="title" v-else>{{ detail.name}}</view>
+					<view class="date" v-if="type == 1">{{detail.startDate}}至{{detail.endDate}}</view>
+					<view class="date" v-else>{{detail.reminderDate}}</view>
 					<view class="title-icon">
 						<uni-icons type="icon-hetongwendang" custom-prefix="iconfont" color="#fff" size="18">
 						</uni-icons>
@@ -27,9 +29,9 @@
 				<view class="state">
 					<view></view>
 					<view class="tag">
-						<view class="status-tag info" v-if="!item.status">待付款</view>
-						<view class="status-tag warning" v-else-if="item.status === 1">付款中</view>
-						<view class="status-tag success" v-else-if="item.status === 2">已付款</view>
+						<view class="status-tag info" v-if="!detail.status">待付款</view>
+						<view class="status-tag warning" v-else-if="detail.status === 1">付款中</view>
+						<view class="status-tag success" v-else-if="detail.status === 2">已付款</view>
 					</view>
 				</view>
 			</view>
@@ -82,6 +84,12 @@
 				</view>
 			</view>
 		</view>
+		<view class="hui-button-box" v-if="operationBtn.length>0">
+			<view class="hui-button" v-for="(item,index) in operationBtn" :key="index"
+				@click="$navigateTo(item.type+'?billId='+billId+'&type='+type)">
+				{{item.name}}
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -94,15 +102,19 @@
 	export default {
 		data() {
 			return {
-				billId: '1',
-				type: '1',
-				detail: {}
+				billId: '',
+				type: '',
+				detail: {},
+				operationBtn: []
 			}
 		},
 		onLoad(body) {
-			// this.billId = body.billId;
-			// this.type = body.type;
+			this.billId = body.billId;
+			this.type = body.type;
 			this.init();
+			uni.$on('reloadBill', () => {
+				this.init();
+			})
 		},
 		methods: {
 			init() {
@@ -116,6 +128,21 @@
 			billSuccess(res) {
 				if (res.code === 200) {
 					this.detail = res.data;
+					if (!this.detail.status && (this.$store.getters.identity.id === 1 || this.$store.getters.identity
+							.id === 4)) {
+						this.operationBtn.push({
+							id: 1,
+							name: '账单付款',
+							type: '/pages/billRecord/billRecord'
+						})
+					}
+					if (this.detail.status === 1 && this.detail.organizationId === this.$store.getters.organization.id) {
+						this.operationBtn.push({
+							id: 2,
+							name: '账单发票',
+							type: '/pages/billInvoice/billInvoice'
+						})
+					}
 				}
 			}
 		},

virgo.wzfrontend/yui_wx/pages/billInvoice/billInvoice.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

virgo.wzfrontend/yui_wx/pages/billRecord/billRecord.vue

@@ -0,0 +1,84 @@
+<template>
+	<view class="form-box file-form-box bill-record">
+		<uni-forms label-position="top" :modelValue="formData">
+			<uni-forms-item label="付款名称" name="name">
+				<uni-easyinput type="text" v-model="formData.name" placeholder="请输入付款名称" />
+			</uni-forms-item>
+			<uni-forms-item label="回执单">
+				<upload ref="upload" accept="all" type="insert"></upload>
+			</uni-forms-item>
+		</uni-forms>
+		<view class="hui-button-box">
+			<view class="hui-button" @click="submit">保存</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import upload from '@/components/common/upload.vue'
+	import {
+		insertPaymentRecord,
+		putPaymentStatus
+	} from '@/request/api/contract.js'
+	import {
+		updatePayment
+	} from '@/request/api/bill.js'
+	export default {
+		data() {
+			return {
+				formData: {
+					name: '',
+					paymentId: '',
+					paymentOrdinaryId: ''
+				},
+				type: '',
+				billId: ''
+			}
+		},
+		onLoad(body) {
+			this.type = body.type;
+			this.billId = body.billId;
+			let type = this.type == '1' ? 'paymentId' : 'paymentOrdinaryId';
+			this.formData[type] = body.billId;
+		},
+		methods: {
+			submit() {
+				if (!this.formData.name) return this.$toast('请输入付款名称');
+				let attachment = this.$refs.upload.getFile();
+				if (attachment.length === 0) return this.$toast('请上传回执单');
+				let postData = JSON.parse(JSON.stringify(this.formData));
+				postData['attachment'] = JSON.stringify(attachment);
+				insertPaymentRecord(postData).then(res => {
+					if (res.code === 200) {
+						if (this.type === '1') {
+							putPaymentStatus(this.billId, 1);
+						} else {
+							updatePayment({
+								id: this.billId,
+								status: 1
+							})
+						}
+						this.$toast('操作成功');
+						uni.$emit('reloadBill');
+						setTimeout(() => {
+							this.$navigateBack();
+						}, 400)
+					}
+				})
+			}
+		},
+		components: {
+			upload
+		},
+	}
+</script>
+
+<style lang="scss">
+	.bill-record {
+		padding: 30rpx;
+
+		.file-form-box {
+			padding-bottom: 0rpx;
+		}
+	}
+</style>

virgo.wzfrontend/yui_wx/pages/index/index.vue

@@ -81,7 +81,7 @@
 				<view class="group-box">
 					<view class="small-box small-boxs">
 						<view class="small">
-							<view class="group-veiw bg9">
+							<view class="group-veiw bg9" @click="$navigateTo('/pages/invoice/invoice?type=2')">
 								<text class="label">合同发票</text>
 								<view class="group-icon">
 									<uni-icons custom-prefix="iconfont" type="icon-app-hetongguanli-hetongfapiao"
@@ -93,7 +93,7 @@
 					</view>
 					<view class="small-box small-boxs">
 						<view class="small">
-							<view class="group-veiw bg10">
+							<view class="group-veiw bg10" @click="$navigateTo('/pages/invoice/invoice?type=2')">
 								<text class="label">付款发票</text>
 								<view class="group-icon">
 									<uni-icons custom-prefix="iconfont" type="icon-integralrecord" color="#fff"

virgo.wzfrontend/yui_wx/pages/invoice/invoice.vue

@@ -0,0 +1,170 @@
+<template>
+	<view>
+		<mescroll-body top="30" bottom="40" @init="mescrollInit" @down="downCallback" @up="upCallback" :option="{}">
+			<view class="common-list">
+				<view class="common-item" v-for="(item,index) in list" :key="item.id"
+					@click="$navigateTo('/pages/invoiceDetail/invoiceDetail?invoiceId='+item.id+'&type='+type)">
+					<view class="title">{{item.name}}</view>
+					<view class="date">{{$field.findTypeName('invoiceType',item.invoiceType)}}</view>
+					<view class="other">
+						<view class="item">
+							<view class="label">收款方</view>
+							<view class="value">{{item.organizationName}}</view>
+						</view>
+						<view class="item">
+							<view class="label">付款方</view>
+							<view class="value">{{item.payMerchantName || item.payClientName}}</view>
+						</view>
+					</view>
+					<view class="state">
+						<view></view>
+						<view class="tag">
+							<div class="status-tag success" v-if="!item.status">正常</div>
+							<div class="status-tag error" v-else-if="item.status === 1">作废</div>
+						</view>
+					</view>
+					<view class="icon">
+						<uni-icons custom-prefix="iconfont" :type="menu.iconClass" color="#08979c" size="30">
+						</uni-icons>
+					</view>
+				</view>
+			</view>
+		</mescroll-body>
+	</view>
+</template>
+
+<script>
+	import {
+		getInvoiceListByPage
+	} from '@/request/api/invouce.js'
+	import {
+		bindProjectDetail
+	} from '@/request/api/organization.js'
+
+	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+	export default {
+		mixins: [MescrollMixin], // 使用mixin
+		data() {
+			return {
+				list: [],
+				type: '',
+				menu: {},
+				payClientId: '',
+				payMerchantId: ''
+			}
+		},
+		onLoad(body) {
+			this.type = parseInt(body.type) || 1;
+			this.menu = this.title();
+			uni.setNavigationBarTitle({
+				title: this.menu.title
+			});
+			uni.$on('reloadContract', () => {
+				this.mescroll.resetUpScroll(false);
+			})
+		},
+		methods: {
+			title() {
+				let str = {
+					title: '',
+					iconClass: 'icon-app-hetongguanli-hetongfapiao'
+				};
+				switch (this.type) {
+					case 1:
+						str = {
+							title: '合同发票',
+							iconClass: 'icon-app-hetongguanli-hetongfapiao'
+						};
+						break;
+					case 2:
+						str = {
+							title: '常规发票',
+							iconClass: 'icon-integralrecord'
+						};
+						break;
+					default:
+						break;
+				}
+				return str;
+			},
+			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
+			upCallback(page) {
+				let postData = {
+					currPage: page.num,
+					pageSize: 10,
+					projectId: this.$store.getters.project.id,
+					type: this.type
+				}
+				if (this.$store.getters.identity.id === 3 || this.$store.getters.identity.id === 6) {
+					postData['organizationId'] = this.$store.getters.organization.id;
+					this.getBillList(postData);
+				} else if (this.$store.getters.identity.id === 4) {
+					if (this.payMerchantId) {
+						postData['payMerchantId'] = this.payMerchantId;
+						this.getBillList(postData);
+						return;
+					}
+					bindProjectDetail({
+						bindOrganizationId: this.$store.getters.organization.id,
+						projectId: this.$store.getters.project.id,
+						identityId: 4
+					}).then(res => {
+						if (res.code === 200) {
+							if (res.data.length == 0) return this.mescroll.endBySize(0, 0);
+							this.payMerchantId = res.data[0].merchantId;
+							postData['payMerchantId'] = this.payMerchantId;
+							this.getBillList(postData);
+						} else {
+							this.mescroll.endErr();
+						}
+					}).catch(() => {
+						//联网失败, 结束加载
+						this.mescroll.endErr();
+					})
+				} else if (this.$store.getters.identity.id === 1) {
+					if (this.payClientId) {
+						postData['payClientId'] = this.payClientId;
+						this.getBillList(postData);
+						return;
+					}
+					bindProjectDetail({
+						userId: this.$store.getters.user.userId,
+						projectId: this.$store.getters.project.id,
+						identityId: 1
+					}).then(res => {
+						if (res.code === 200) {
+							if (res.data.length == 0) return this.mescroll.endBySize(0, 0);
+							this.payClientId = res.data[0].clientId;
+							postData['payClientId'] = this.payClientId;
+							this.getBillList(postData);
+						} else {
+							this.mescroll.endErr();
+						}
+					}).catch(() => {
+						//联网失败, 结束加载
+						this.mescroll.endErr();
+					})
+				}
+			},
+			getBillList(postData) {
+				getInvoiceListByPage(postData).then(res => {
+					if (res.code === 200) {
+						this.mescroll.endBySize(res.data.dataList.length, res.data.totalCount);
+						if (postData.currPage == 1) this.list = []; //如果是第一页需手动制空列表
+						let data = res.data.dataList;
+						this.list = this.list.concat(data); //追加新数据
+					} else {
+						this.mescroll.endErr();
+					}
+				}).catch(() => {
+					//联网失败, 结束加载
+					this.mescroll.endErr();
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>

virgo.wzfrontend/yui_wx/pages/invoiceDetail/invoiceDetail.vue

@@ -0,0 +1,86 @@
+<template>
+	<view class="invoice-detail" v-if="detail.id">
+		<view class="detail">
+			<view class="detail-box">
+				<view class="title-box">
+					<view class="title">{{detail.name}}</view>
+					<view class="date">{{$field.findTypeName('invoiceType',detail.type)}}</view>
+					<view class="title-icon">
+						<uni-icons type="icon-hetongwendang" custom-prefix="iconfont" color="#fff" size="18">
+						</uni-icons>
+					</view>
+				</view>
+				<view class="other">
+					<view class="item">
+						<view class="label">发票代码</view>
+						<view class="value">{{detail.code || '-'}}</view>
+					</view>
+					<view class="item">
+						<view class="label">发票号码</view>
+						<view class="value">{{detail.number || '-'}}</view>
+					</view>
+					<view class="item">
+						<view class="label">货物名称</view>
+						<view class="value">{{detail.cargoName || '-'}}</view>
+					</view>
+				</view>
+				<view class="state">
+					<view></view>
+					<view class="tag">
+						<div class="status-tag success" v-if="!detail.status">正常</div>
+						<div class="status-tag error" v-else-if="detail.status === 1">作废</div>
+					</view>
+				</view>
+			</view>
+			<view class="detail-box file-box" v-if="detail.attachment && detail.attachment !='[]'">
+				<view class="sub-title">
+					<uni-icons type="images-filled" class="inherit-icons" size="26" color="#08979c"></uni-icons>
+					<text class="sub-label">发票附件</text>
+				</view>
+				<view class="other">
+					<upload ref="upload" accept="all" :list="detail.attachment ? JSON.parse(detail.attachment) : []" type="preview">
+					</upload>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getInvoiceDetailById
+	} from '@/request/api/invouce.js'
+	import upload from '@/components/common/upload.vue'
+	export default {
+		data() {
+			return {
+				invoiceId: '',
+				type: '',
+				detail: {}
+			}
+		},
+		onLoad(body) {
+			this.invoiceId = body.invoiceId;
+			this.type = body.type;
+			this.init();
+		},
+		methods: {
+			init() {
+				if (!this.invoiceId) return;
+				getInvoiceDetailById(this.invoiceId).then(this.invoiceSuccess);
+			},
+			invoiceSuccess(res) {
+				if (res.code === 200) {
+					this.detail = res.data;
+				}
+			}
+		},
+		components: {
+			upload
+		}
+	}
+</script>
+
+<style>
+
+</style>

virgo.wzfrontend/yui_wx/pages/projectList/projectList.vue

@@ -66,21 +66,20 @@
 								if (res.code === 200) {
 									this.$store.dispatch('app/changeOrganization', res.data);
 									selectOrangaized(res.data);
-									this.selectProject(item);
+									this.selectProject(item,identity);
 								}
 							})
 						} else {
-							this.selectProject(item);
+							this.selectProject(item,identity);
 						}
 					}
 				});
 			},
-			selectProject(item) {
+			selectProject(item,identity) {
 				selectProject(item.id).then(res => {
 					if (res.code === 200) {
-						let node = item.projectListIdentity[res.tapIndex];
 						this.$store.dispatch('app/changeProject', item);
-						this.$store.dispatch('app/changeIdentity', node);
+						this.$store.dispatch('app/changeIdentity', identity);
 						uni.setStorageSync('vuex_state', this.$store.state);
 						this.$toast('切换成功');
 						setTimeout(() => {

virgo.wzfrontend/yui_wx/request/api/bill.js

@@ -46,4 +46,16 @@ export function getCommonPaymentDetailById(id) {
 		url: `/api/payment/ordinary/${id}`,
 		method: 'get'
 	})
+}
+/* 
+ * 更新账单
+ * 
+ * 
+ */
+export function updatePayment(data) {
+	return request({
+		url: `/api/payment/ordinary`,
+		method: 'put',
+		data: data
+	})
 }

virgo.wzfrontend/yui_wx/request/api/contract.js

@@ -61,4 +61,39 @@ export function getPaymentListByPage(data) {
 		method: 'post',
 		data: data
 	})
+}
+/* 
+ * 新增付款记录
+ * @param {Object} data = {}
+ * 
+ */
+export function insertPaymentRecord(data) {
+	return request({
+		url: `/api/payment/record`,
+		method: 'post',
+		data: data
+	})
+}
+/* 
+ * 新增发票记录
+ * @param {Object} data = {}
+ * 
+ */
+export function insertPaymentInvoice(data) {
+	return request({
+		url: `/api/payment/invoice`,
+		method: 'post',
+		data: data
+	})
+}
+/* 
+ * 更新合同账单状态
+ * @param {Object} data = {}
+ * 
+ */
+export function putPaymentStatus(id, status) {
+	return request({
+		url: `/api/payment/updateStatus/${id}/${status}`,
+		method: 'put',
+	})
 }

virgo.wzfrontend/yui_wx/request/api/invouce.js

@@ -0,0 +1,26 @@
+import {
+	request
+} from '@/request/request.js';
+/* 
+ * 分页获取发票列表
+ * 
+ * 
+ */
+export function getInvoiceListByPage(data) {
+	return request({
+		url: `/api/payment/invoice/${data.currPage}/${data.pageSize}`,
+		method: 'post',
+		data: data
+	})
+}
+/* 
+ * 通过id获取发票详情
+ * 
+ * 
+ */
+export function getInvoiceDetailById(id) {
+	return request({
+		url: `/api/payment/invoice/${id}/`,
+		method: 'get',
+	})
+}

virgo.wzfrontend/yui_wx/static/scss/common.scss

@@ -9,7 +9,12 @@
 	text-overflow: ellipsis;
 }
 //修改uni-ui样式
-.form-box {
+.form-box {
+	&.file-form-box{
+		.uni-forms{
+			padding-bottom: 10rpx;
+		}
+	}
 	.uni-forms {
 		background: #fff;
 		border-radius: 16rpx;

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/app.json

@@ -35,7 +35,11 @@
     "pages/contractDetail/contractDetail",
     "pages/requestSeal/requestSeal",
     "pages/bill/bill",
-    "pages/billDetail/billDetail"
+    "pages/billDetail/billDetail",
+    "pages/invoice/invoice",
+    "pages/invoiceDetail/invoiceDetail",
+    "pages/billRecord/billRecord",
+    "pages/billInvoice/billInvoice"
   ],
   "subPackages": [],
   "window": {

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -150,6 +150,9 @@
   white-space: nowrap;
   text-overflow: ellipsis;
 }
+.form-box.file-form-box .uni-forms {
+  padding-bottom: 10rpx;
+}
 .form-box .uni-forms {
   background: #fff;
   border-radius: 16rpx;

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/contract/clauseDetail.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/billInvoice/billInvoice.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "账单发票",
+  "usingComponents": {}
+}