zhangzl
/
nsgk_wechat
1
0
Förgrening 0
Kod Ärenden 0 Pull-förfrågningar 0 Släpp 0 Wiki Aktiviteter
Bläddra i källkod

优化

master
pangdongxu 3 år sedan
förälder
8b916a9229
incheckning
76cb8992ef
5 ändrade filer med 183 tillägg och 34 borttagningar
Delad Vy
Diff Options
Show Stats Download Patch File Download Diff File
  1. +4
    -1
      pages/apply/paymentTemplate/add/add.js
  2. +3
    -4
      pages/apply/paymentTemplate/add/add.wxml
  3. +73
    -13
      pages/inCome/inCome.wxml
  4. +96
    -16
      pages/inCome/inCome.wxss
  5. +7
    -0
      project.private.config.json

+ 4
- 1
pages/apply/paymentTemplate/add/add.js Visa fil

@@ -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)+'的付款方！');


+ 3
- 4
pages/apply/paymentTemplate/add/add.wxml Visa fil

@@ -193,7 +193,7 @@
</view>
</van-field>

<van-field readonly wx:if="{{form.transfers[index].transferType == 11}}" label="可用余额(元)" value="{{ balance }}" placeholder="可用余额" border="{{ false }}" bind:change="onChange" input-align="right"/>
<van-field readonly wx:if="{{form.transfers[index].transferType == 11}}" label="可用余额(元)" value="{{ form.transfers[index].payerAccount }}" placeholder="可用余额" border="{{ false }}" data-value="form.transfers[{{index}}].payerAccount" bind:change="onChange" input-align="right"/>
<block wx:elif="{{form.transfers[index].transferType == 12}}">
<van-popup show="{{form.transfers[index].showMoneyOrder}}" round position="bottom" bind:close="closeBox" data-name="showMoneyOrder">
<van-picker
@@ -236,7 +236,7 @@
<van-field required label="资金用途" value="{{ form.transfers[index].payeeList[childrenIndex].remark }}" placeholder="请输入资金用途" border="{{ false }}" bind:change="onChange" data-value="form.transfers[{{index}}].payeeList[{{childrenIndex}}].remark" input-align="right"/>
</view>
</block>
<block wx:if="{{form.transfers[index].transferType == 11}}">
<block wx:elif="{{form.transfers[index].transferType == 11}}">
<view class="main-box table-box" wx:for="{{form.transfers[index].payeeList}}" wx:for-index="childrenIndex" wx:key="payeeId">
<van-field required value="{{ form.transfers[index].payeeList[childrenIndex].payee }}" placeholder="请输入收款方" border="{{ false }}" bind:change="onChange" input-align="right" data-value="form.transfers[{{index}}].payeeList[{{childrenIndex}}].payee">
<view slot="label">
@@ -244,11 +244,10 @@
</view>
</van-field>
<van-field required label=" 联系方式" value="{{ form.transfers[index].payeeList[childrenIndex].phone }}" placeholder="请输入联系方式" border="{{ false }}" bind:change="onChange" data-value="form.transfers[{{index}}].payeeList[{{childrenIndex}}].phone" input-align="right"/>
<van-field required label="申请使用金额" value="{{ form.transfers[index].payeeList[childrenIndex].unit }}" placeholder="请输入所属单位" border="{{ false }}" bind:change="onChange" data-value="form.transfers[{{index}}].payeeList[{{childrenIndex}}].unit" input-align="right"/>
<!-- <van-field required label="申请使用金额" value="{{ form.transfers[index].payeeList[childrenIndex].incomeAmount }}" placeholder="请输入申请使用金额" border="{{ false }}" bind:change="onChange" data-value="form.transfers[{{index}}].payeeList[{{childrenIndex}}].incomeAmount" input-align="right"/> -->
<van-field required label="资金用途" value="{{ form.transfers[index].payeeList[childrenIndex].remark }}" placeholder="请输入资金用途" border="{{ false }}" bind:change="onChange" data-value="form.transfers[{{index}}].payeeList[{{childrenIndex}}].remark" input-align="right"/>
</view>
</block>
<block wx:else>
<view class="main-box table-box" wx:for="{{form.transfers[index].payeeList}}" wx:for-index="childrenIndex" wx:key="payeeId">
<van-field required readonly value="{{ form.transfers[index].payeeList[childrenIndex].payee }}" placeholder="请选择收款方" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction ="down" bindtap="goPayeeList" data-payer="{{form.transfers[index].payer}}" data-index="{{index}}" data-isPeers="{{ form.transfers[index].isPeers }}" data-bankType="{{ form.transfers[index].bankType }}" data-accountType="{{ form.transfers[index].bankAccountType }}" data-transferType="{{ form.transfers[index].transferType }}">


+ 73
- 13
pages/inCome/inCome.wxml Visa fil

@@ -9,12 +9,10 @@
<view class="top-tit">收入单位</view>
<view class="top-title">{{bookName}}</view>
</view>
<view class="title">
<text>基础信息</text>
</view>
<text class="title">基础信息</text>
<view class="main-box table-box">
<view class="flex-block">
<text class="rules">收入时间</text>
<text class="rules">收入时间</text>
<view class="wrap" bindtap="onsrDate" >
{{formData.accountDate}}
</view>
@@ -95,11 +93,66 @@
</view>
</view>
<view class="title">
<text>附件</text>
</view>
<view class="main-box table-box">
<view style="margin:10px 0 5px;" class="flex-block">

<view class="main-box table-box" style="margin-top: 15px;">
<van-cell>
<!-- <view slot="icon">
<van-icon class-prefix="my-icon" name="extra" />
</view> -->
<view slot="title">
<view class="van-cell-text">附件<van-tag type="danger" style="margin-left: 10px;">可拍照</van-tag></view>
</view>
<view>
<view class="van-cell-text">总数<van-tag round color="#5CAE77" plain style="margin-left: 10px;"> {{form.transfers[index].fileNum?form.transfers[index].fileNum:0}}张 </van-tag></view>
</view>
</van-cell>
<view class="fj-box">
<view class="fj-li">
<view>
<text>收\n据</text>
</view>
<view class="img_box">
<view class="img_list" wx:for="{{sjPics}}" wx:for-index="index" wx:key="index">
<image class="img_li" src="{{item.file}}"bindlongpress="bindlongpressimg" data-status="sjPics" bindtap="imgPreviewImage" data-id='{{index}}'></image>
<van-icon name="/image/apply/img_delete.png" data-id="{{index}}" size="20px" data-status="sjPics" bindtap="deleteimg" />
</view>
<view class="img_list">
<image class="img_li img_add" src="/image/apply/fj_upload.png" data-index="{{index}}" bindtap="uploadSjPics"></image>
</view>
</view>
</view>
<view class="fj-li">
<view>
<text>发\n票</text>
</view>
<view class="img_box">

<view class="img_list" wx:for="{{fpPics}}" wx:for-index="index" wx:key="index">
<image class="img_li" src="{{item.file}}" data-status="fpPics" bindtap="imgPreviewImage" bindlongpress="bindlongpressimg" data-id='{{index}}'></image>
<van-icon name="/image/apply/img_delete.png" size="20px" data-id="{{index}}" data-status="fpPics" bindtap="deleteimg" />
</view>
<view class="img_list">
<image class="img_li img_add" src="/image/apply/fj_upload.png" data-index="{{index}}" bindtap="uploadFpPics"></image>
</view>
</view>
</view>
<view class="fj-li">
<view>
<text>其\n他</text>
</view>
<view class="img_box">
<view class="img_list" wx:for="{{qtPics}}" wx:for-index="index" wx:key="index">
<image class="img_li" src="{{item.file}}" data-status="qtPics" bindtap="imgPreviewImage" bindlongpress="bindlongpressimg" data-id='{{index}}'></image>
<van-icon name="/image/apply/img_delete.png" size="20px" data-id="{{index}}" data-status="qtPics" bindtap="deleteimg" />
</view>
<view class="img_list">
<image class="img_li img_add" src="/image/apply/fj_upload.png" data-index="{{index}}" bindtap="uploadQtPics"></image>
</view>
</view>
</view>
</view>

<!-- <view style="margin:10px 0 5px;" class="flex-block">
<text class="fjLable">收据</text>
<view class='content'>
<view class='img-box'>
@@ -142,7 +195,7 @@
<view class='img-list'>
<block wx:for="{{qtPics}}" wx:for-index="index" wx:key="index">
<view class='img-item'>
<van-icon class="close-ico" data-id="{{index}}" name="/image/apply/img_delete.png" size="20px" data-status="qtPics" bindtap="deleteimg" />
<van-icon class="close-ico" name="/image/apply/img_delete.png" size="20px" data-id="{{index}}" data-status="qtPics" bindtap="deleteimg" />
<image src='{{item.file}}' data-status="qtPics" bindtap="imgPreviewImage" class="imagea" bindlongpress="bindlongpressimg" data-id='{{index}}'></image>
</view>
</block>
@@ -152,11 +205,18 @@
</view>
</view>
</view>
</view>
</view> -->
</view>
<view class="main-box table-box" style="margin-top: 30rpx;">

<view class="bottom">
<!-- <view class="btn1" data-type="3" bindtap="goSubmit">提交复核</view> -->
<view class="btn1" data-code="1" bindtap="swichAccounting">暂存</view>
<view class="btn2" data-code="2" bindtap="swichAccounting">提交</view>
</view>

<!-- <view class="main-box table-box" style="margin-top: 30rpx;">
<view class="btn flex-block">
<button type="primary" data-code="1" bindtap="swichAccounting" plain="true">暂存</button>
<button type="primary" data-code="2" bindtap="swichAccounting">提交</button>
</view>
</view>
</view> -->

+ 96
- 16
pages/inCome/inCome.wxss Visa fil

@@ -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%;
}

+ 7
- 0
project.private.config.json Visa fil

@@ -94,6 +94,13 @@
"query": "",
"launchMode": "default",
"scene": null
},
{
"name": "收入登记",
"pathName": "pages/inCome/inCome",
"query": "",
"launchMode": "default",
"scene": null
}
]
}


Skriv Förhandsgranska
Laddar…
Avbryt
Spara