From 76cb8992ef8dd6d793ea3d61e5e4108cc56b3002 Mon Sep 17 00:00:00 2001
From: pangdongxu <850374051@qq.com>
Date: Tue, 17 May 2022 10:03:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/apply/paymentTemplate/add/add.js | 5 +-
pages/apply/paymentTemplate/add/add.wxml | 7 +-
pages/inCome/inCome.wxml | 86 ++++++++++++++---
pages/inCome/inCome.wxss | 112 +++++++++++++++++++----
project.private.config.json | 7 ++
5 files changed, 183 insertions(+), 34 deletions(-)
diff --git a/pages/apply/paymentTemplate/add/add.js b/pages/apply/paymentTemplate/add/add.js
index 0c96cd0..e9024a0 100644
--- a/pages/apply/paymentTemplate/add/add.js
+++ b/pages/apply/paymentTemplate/add/add.js
@@ -735,7 +735,7 @@ Page({
[event.currentTarget.dataset.value+'.payerAccount']: event.detail.value.bankAccountNumber,
[event.currentTarget.dataset.value+'.bankTypeText']: array[0].dictLabel,
[event.currentTarget.dataset.value+'.bankType']: event.detail.value.bankType,
- balance:event.detail.value.balance,
+ [event.currentTarget.dataset.value+'.payerAccount']:event.detail.value.balance,
});
}
})
@@ -1086,6 +1086,9 @@ Page({
["form.transfers["+i+"].expenditureAmountTirme"]:true
})
return;
+ }else if(element.expenditureAmount>element.payerAccount){
+ UTIL.showToastNoneIcon('事项'+UTIL.convertToChinaNum(i+1)+'的支出金额不能超过付款账户余额！');
+ return;
}
if(element.payer == ''&&element.transferType != 12){
UTIL.showToastNoneIcon('请选择事项'+UTIL.convertToChinaNum(i+1)+'的付款方！');
diff --git a/pages/apply/paymentTemplate/add/add.wxml b/pages/apply/paymentTemplate/add/add.wxml
index 2d627ee..0bb40ca 100644
--- a/pages/apply/paymentTemplate/add/add.wxml
+++ b/pages/apply/paymentTemplate/add/add.wxml
@@ -193,7 +193,7 @@
-
+
-
+
@@ -244,11 +244,10 @@
-
+
-
diff --git a/pages/inCome/inCome.wxml b/pages/inCome/inCome.wxml
index 059becc..9d24561 100644
--- a/pages/inCome/inCome.wxml
+++ b/pages/inCome/inCome.wxml
@@ -9,12 +9,10 @@
收入单位
{{bookName}}
-
- 基础信息
-
+基础信息
- 收入时间
+ 收入时间
{{formData.accountDate}}
@@ -95,11 +93,66 @@
-
- 附件
-
-
-
+
+
+
+
+
+ 附件可拍照
+
+
+ 总数 {{form.transfers[index].fileNum?form.transfers[index].fileNum:0}}张
+
+
+
+
+
+ 收\n据
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 发\n票
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 其\n他
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+ 暂存
+ 提交
+
+
+
\ No newline at end of file
diff --git a/pages/inCome/inCome.wxss b/pages/inCome/inCome.wxss
index 81a5106..2ee508b 100644
--- a/pages/inCome/inCome.wxss
+++ b/pages/inCome/inCome.wxss
@@ -9,7 +9,6 @@
display: flex;
width: 94%;
margin: 0 auto;
- background-color: #ffffff;
border-radius: 10rpx;
margin-top: 3vw;
overflow: hidden;
@@ -40,7 +39,7 @@
padding-left: 14rpx;
color:'#fff';
}
-main-title{
+.main-title{
background-image: linear-gradient(to right, #2C8E68 , #B3DB62);
color: #ffffff;
font-size: 18rpx;
@@ -49,11 +48,11 @@ main-title{
}
.main-box{
background: #ffffff;
- padding: 20rpx 20rpx 10rpx;
+ padding: 20px;
width: 94%;
margin: 0 auto;
- border-radius: 10rpx;
- box-shadow: 0px 5rpx 5rpx rgba(0, 0, 0, 0.16);
+ border-radius: 10px;
+ box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.16);
}
.main-box block{
float: right;
@@ -63,22 +62,23 @@ main-title{
color: #888;
}
.title{
- padding: 10rpx calc(3% + 20px);
- color : #07c160;
- margin-top:30rpx;
- font-size:30rpx;
-}
-.table-box view{
-
+ padding: 10px calc(3% + 20px);
+ display: block;
}
-.table-box text{
- /* line-height: 55rpx; */
+.van-cell{
+ padding-left: 0!important;
+ padding-right: 0!important;
+ padding-top: 0!important;
+ margin-bottom: 15px;
}
.table-box .flex-block{
- line-height: 55rpx;
- margin-bottom: 5rpx;
+ margin-bottom: 15px;
display: flex;
justify-content: space-between;
+ align-items: center;
+}
+.table-box .flex-block:last-child{
+ margin-bottom: 0px;
}
.table-box .rules{
width: 200rpx;
@@ -209,4 +209,84 @@ main-title{
padding-left:80rpx;
padding-right:80rpx;
border-radius: 30rpx;
+}
+
+.fj-box text{
+ background-color: #5CAE77;
+ color: #ffffff;
+ text-align: center;
+ border-radius: 5px;
+ white-space:pre-wrap;
+ padding: 22px 8px;
+ display: block;
+}
+.fj-li{
+ margin-top: 20px;
+ display: flex;
+ /* flex-wrap: wrap; */
+}
+.fj-li .img_li{
+ width: 100%;
+ height: 18.5vw;
+}
+
+.fj-li .img_add{
+ overflow: hidden;
+}
+.img_box{
+ position: relative;
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+}
+.img_box .img_list{
+ width: 25%;
+ margin-left: 5%;
+ position: relative;
+}
+.img_box .img_list .van-icon{
+ font-size: 20px;
+ position: absolute;
+ top: 0;
+ right: 0;
+ transform: translate(50%,-50%);
+}
+.img_box .img_list:nth-child(n+4){
+ margin-top: 15px;
+}
+.bottom{
+ width: 84%;
+ margin: 0 auto;
+ text-align: center;
+ margin-top: 50px;
+ margin-bottom: 50px;
+ display: flex;
+}
+
+.bottom view {
+ width: 47%;
+ margin: 0 auto;
+ border-radius: 30px;
+ display: inline-block;
+}
+
+.bottom .btn1{
+ border: 1px solid #2C8E68;
+ padding: 8px 0px;
+ color: #2C8E68;
+}
+
+.bottom .btn2{
+ border: 1px solid transparent;
+ padding: 8px 0px;
+ background-image: linear-gradient(to right, #2C8E68, #5CAE77);
+ margin-left: 6%;
+ color: #fff;
+}
+.bottom .btn3{
+ border: 1px solid transparent;
+ padding: 8px 0px;
+ background-image: linear-gradient(to right, #2C8E68, #5CAE77);
+ color: #fff;
+ width: 100%;
}
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 581925c..f3a7daf 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -94,6 +94,13 @@
"query": "",
"launchMode": "default",
"scene": null
+ },
+ {
+ "name": "收入登记",
+ "pathName": "pages/inCome/inCome",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
}
]
}