diff --git a/env/env.js b/env/env.js
index 67cd1c7..8253825 100644
--- a/env/env.js
+++ b/env/env.js
@@ -13,6 +13,6 @@ module.exports = {
},
IMGURL: {
URL_PREFIX: 'http://192.168.31.178:8080',
- // URL_PREFIX: 'https://dazu.nongshen.net',
+ // URL_PREFIX: 'https://dazu.nongshen.net/api',
}
}
\ No newline at end of file
diff --git a/pages/apply/approval/approval.json b/pages/apply/approval/approval.json
index bc56a53..97646a5 100644
--- a/pages/apply/approval/approval.json
+++ b/pages/apply/approval/approval.json
@@ -13,6 +13,7 @@
"van-action-sheet": "@vant/weapp/action-sheet/index",
"van-swipe-cell": "@vant/weapp/swipe-cell/index",
"van-dialog": "@vant/weapp/dialog/index",
- "van-field": "@vant/weapp/field/index"
+ "van-field": "@vant/weapp/field/index",
+ "van-empty": "@vant/weapp/empty/index"
}
}
\ No newline at end of file
diff --git a/pages/apply/approval/approval.wxml b/pages/apply/approval/approval.wxml
index fe77104..0c9df50 100644
--- a/pages/apply/approval/approval.wxml
+++ b/pages/apply/approval/approval.wxml
@@ -57,15 +57,25 @@
-
+
+
+
+ 选择审批模板
+
+
+
+ 保存审批模板
+
+
+
- 暂存
- 提交
+ 保存
+ 保存并提交
@@ -89,6 +99,7 @@
+
diff --git a/pages/apply/approval/approval.wxss b/pages/apply/approval/approval.wxss
index cccadd8..c1b615f 100644
--- a/pages/apply/approval/approval.wxss
+++ b/pages/apply/approval/approval.wxss
@@ -234,4 +234,29 @@ text{display: block;}
}
.van-button--normal {
background: linear-gradient(to right, #2C8E68, #5CAE77)!important;
+ }
+
+ .bottomBtn{
+ display: flex;
+ width: 94%;
+ margin: 0 auto;
+ justify-content:space-between;
+ }
+ .bottomBtn view{
+ display: flex;
+ width: 48%;
+ background-color: #ffffff;
+ border-radius: 5px;
+ box-shadow: 0px 5px 9px #DCDCDC;
+ padding: 10px 0px;
+ text-align: center;
+ align-items:center;
+ justify-content:center;
+ font-size: 14px;
+ color: #2C8E68;
+ }
+ .bottomBtn view image{
+ width: 18px;
+ height: 18px;
+ margin-right: 5px;
}
\ No newline at end of file
diff --git a/pages/apply/index.json b/pages/apply/index.json
index 0c83a4f..95130fe 100644
--- a/pages/apply/index.json
+++ b/pages/apply/index.json
@@ -7,6 +7,7 @@
"van-cell": "@vant/weapp/cell/index",
"van-cell-group": "@vant/weapp/cell-group/index",
"van-icon": "@vant/weapp/icon/index",
- "van-tag": "@vant/weapp/tag/index"
+ "van-tag": "@vant/weapp/tag/index",
+ "van-empty": "@vant/weapp/empty/index"
}
}
\ No newline at end of file
diff --git a/pages/apply/index.wxml b/pages/apply/index.wxml
index 0e17b86..64f67a8 100644
--- a/pages/apply/index.wxml
+++ b/pages/apply/index.wxml
@@ -27,6 +27,7 @@
{{item.balance}}
+
@@ -41,6 +42,7 @@
持有人：王强
+
@@ -65,5 +67,5 @@
-
+
\ No newline at end of file
diff --git a/pages/apply/paymentTemplate/add/add.js b/pages/apply/paymentTemplate/add/add.js
index 39bf39c..da25dcd 100644
--- a/pages/apply/paymentTemplate/add/add.js
+++ b/pages/apply/paymentTemplate/add/add.js
@@ -45,6 +45,9 @@ Page({
},
transfers:[{//事项信息集合以下是List对象信息
num:"一",
+ SJimage:[],
+ FPimage:[],
+ QTimage:[],
capitalExpenditureType:'1',//资金支出类别
capitalExpenditureTypeText:'结算类',//资金支出类别（展示用）
succeedAmount:'',//成功支付金额
@@ -52,7 +55,7 @@ Page({
payerAccount:'',//付款方账户
bankType:'',//所属银行
bankTypeText:'',//所属银行（展示用）
- isPeers:'',//是否同行
+ isPeers:'N',//是否同行
operatorCode:'',//操作员代码
enterpriseCode:'',//企业编码
expenditureAmount:'',//支出总金额
@@ -81,18 +84,18 @@ Page({
bankType:'',//所属银行0其他银行1中国银行2农商行（山东省）3农业银行4建设银行5工商银行
payeeAccount:'',//收款账户
}],
+ projectForm:{
+ projectId:'',
+ projectName:'',
+ projectContractor:'',
+ projectAmount:'',
+ projectBillNum:'',
+ projectFundType:'',
+ outId:'',
+ ynType:'1',
+ },
}],
},
- projectForm:{
- projectId:'',
- projectName:'',
- projectContractor:'',
- projectAmount:'',
- projectBillNum:'',
- projectFundType:'',
- outId:'',
- ynType:'1',
- },
contractionForm:{
id:'',
name:'',
@@ -130,7 +133,19 @@ Page({
res.data.transfers[index].payeeList.forEach( (response,i) => {
res.data.transfers[index].payeeList[i].bankTypeText = UTIL.getTransform(response.bankType,that.data.bankTypeOptions);
})
-
+ let prames = {
+ outId:res.data.transfers[index].id,
+ ynType: res.data.transfers[index].transferType=='1'||res.data.transfers[index].transferType=='2'||res.data.transfers[index].transferType=='4'?'1':'2'
+ }
+ // 工程项目查询
+ UTIL.httpRequest(API.URL_GET_GETPROJECTTO , prames, {
+ success: (res) => {
+ res.data.projectFundTypeText = UTIL.getTransform(res.data.projectFundType,that.data.projectFundTypeOptions);
+ that.setData({
+ ["form.transfers["+index+"].projectForm"]:res.data,
+ })
+ }
+ })
UTIL.httpRequest(
API.URL_GET_FINDLIST,
{
@@ -273,6 +288,21 @@ Page({
item.payeeList.forEach( (response,i) => {
item.payeeList[i].bankTypeText = UTIL.getTransform(response.bankType,that.data.bankTypeOptions);
})
+ if(item.capitalExpenditureType == 2){
+ let prames = {
+ outId:item.id,
+ ynType: item.transferType=='1'||item.transferType=='2'||item.transferType=='4'?'1':'2'
+ }
+ // 工程项目查询
+ UTIL.httpRequest(API.URL_GET_GETPROJECTTO , prames, {
+ success: (res) => {
+ res.data.projectFundTypeText = UTIL.getTransform(res.data.projectFundType,that.data.projectFundTypeOptions);
+ array.transfers[index].projectForm = res.data;
+ }
+ })
+ }
+
+
//收据附件
UTIL.httpRequest(
API.URL_GET_FINDLIST,
@@ -405,6 +435,26 @@ Page({
}
},1000)
+ }else{
+ //村账户查询参数
+ var perames = {
+ pageNum:1,
+ pageSize:999,
+ accountType:'102',
+ method:'post',
+ params: {
+ "townAccountType":"0"
+ }
+ }
+ // 付款方列表
+ UTIL.httpRequest(API.URL_GET_SELECTACCOUNTLIST , perames, {
+ success: (res) => {
+ that.setData({
+ accountOptions:res.rows,
+ })
+ }
+ })
+
}
},
@@ -634,10 +684,10 @@ Page({
console.log(event);
this.setData({
[event.currentTarget.dataset.name]: false,
- [event.currentTarget.dataset.value]: event.detail.value.projectName,
- ['projectForm.projectId']: event.detail.value.id,
- ['projectForm.projectContractor']: event.detail.value.projectContractor,
- ['projectForm.projectAmount']: event.detail.value.projectAmount,
+ [event.currentTarget.dataset.value+'.projectName']: event.detail.value.projectName,
+ [event.currentTarget.dataset.value+'.projectId']: event.detail.value.id,
+ [event.currentTarget.dataset.value+'.projectContractor']: event.detail.value.projectContractor,
+ [event.currentTarget.dataset.value+'.projectAmount']: event.detail.value.projectAmount,
});
},
onConfirmContraction(event) {
@@ -682,11 +732,28 @@ Page({
onChangeMoney(event){
console.log(event);
var that = this;
-
this.setData({
["form.transfers["+event.currentTarget.dataset.index+"].payeeList["+event.currentTarget.dataset.childrenindex+"].incomeAmount"]: event.detail,
- ["form.transfers["+event.currentTarget.dataset.index+"].expenditureAmount"]:event.detail,
+ // ["form.transfers["+event.currentTarget.dataset.index+"].expenditureAmount"]:event.detail,
})
+ var moneyCount = 0 ;
+ for (let i = 0; i < that.data.form.transfers.length; i++) {
+ const element = that.data.form.transfers[i];
+ for (let j = 0; j < element.payeeList.length; j++) {
+ const element2 = element.payeeList[j];
+ var allCount = 0 ;
+ moneyCount = parseFloat(moneyCount)+parseFloat(element2.incomeAmount);
+ allCount = parseFloat(allCount)+parseFloat(element2.incomeAmount);
+ this.setData({
+ ["form.transfers["+i+"].expenditureAmount"]:allCount,
+ })
+ }
+ }
+ this.setData({
+ ["form.approvalItemTemplate.totalAmount"]:moneyCount.toFixed(2),
+ })
+ console.log(moneyCount.toFixed(2));
+ console.log(allCount.toFixed(2));
},
back:function(){
wx.navigateBack({
@@ -710,6 +777,40 @@ Page({
},
goSubmit(e){
var that = this;
+ console.log(that.data.form);
+ var list = that.data.form,
+ approvalItems = list.approvalItemTemplate.approvalItems;
+ if(approvalItems == ''){
+ UTIL.showToastNoneIcon('请填写审批事项名称！');
+ return;
+ }
+
+ for (let i = 0; i < list.transfers.length; i++) {
+ const element = list.transfers[i];
+ if(element.applyDate == ''){
+ UTIL.showToastNoneIcon('请选择事项'+UTIL.convertToChinaNum(i+1)+'的申请时间！');
+ return;
+ }
+ if(element.remark == ''){
+ UTIL.showToastNoneIcon('请填写事项'+UTIL.convertToChinaNum(i+1)+'的支出原因！');
+ return;
+ }
+ if(element.payer == ''){
+ UTIL.showToastNoneIcon('请选择事项'+UTIL.convertToChinaNum(i+1)+'的付款方！');
+ return;
+ }
+ if(element.payeeList[0].payee == ''){
+ UTIL.showToastNoneIcon('请选择事项'+UTIL.convertToChinaNum(i+1)+'的收款方！');
+ return;
+ }
+ if(element.payeeList[0].incomeAmount == '' || element.payeeList[0].incomeAmount == undefined){
+ UTIL.showToastNoneIcon('请填写事项'+UTIL.convertToChinaNum(i+1)+'收款方的收入金额！');
+ return;
+ }
+ }
+
+
+
if(e.currentTarget.dataset.type == 1){
if(that.data.form.approvalItemTemplate.templateName == ''){
UTIL.showToastNoneIcon('请输入模板名称！');
@@ -724,16 +825,20 @@ Page({
}
that.data.form.method = 'POST';
that.data.form.approvalItemTemplate.dataType = e.currentTarget.dataset.type;
-
- let totalAmount = 0 ;
- for (let i = 0; i < that.data.form.transfers.length; i++) {
- totalAmount += parseInt(that.data.form.transfers[i].expenditureAmount);
- }
- that.data.form.approvalItemTemplate.totalAmount = totalAmount;
+
UTIL.httpRequest(API.URL_GET_SAVE, that.data.form, {
success: (res) => {
if (res.code == API.SUCCESS_CODE) {
for (let j = 0; j < res.data.transfers.length; j++) {
+ that.data.form.transfers[j].projectForm.ynType = res.data.transfers[j].transferType=='1'||res.data.transfers[j].transferType=='2'||res.data.transfers[j].transferType=='4'?'1':'2';
+ that.data.form.transfers[j].projectForm.outId = res.data.transfers[j].id;
+ that.data.form.transfers[j].projectForm.method = 'POST';
+ // 工程项目提交
+ UTIL.httpRequest(API.URL_GET_ADDPROJECTTO , that.data.form.transfers[j].projectForm, {
+ success: (res) => {
+
+ }
+ })
if(that.data.form.transfers[j].fileForm == undefined){continue;}
for (let i = 0; i < that.data.form.transfers[j].fileForm.length; i++) {
that.data.form.transfers[j].fileForm[i].tableId = res.data.transfers[j].id
@@ -759,6 +864,8 @@ Page({
}
}
+
+
if(e.currentTarget.dataset.type == 0){
wx.navigateTo({
url: '/pages/apply/approval/approval?id='+res.data.approvalItemTemplate.id+'&deptId='+res.data.approvalItemTemplate.deptId,
@@ -832,10 +939,19 @@ Page({
})
})
console.log(fileForm);
+
that.setData({
["form.transfers["+e.currentTarget.dataset.index+"].SJimage"]:res.tempFiles,
["form.transfers["+e.currentTarget.dataset.index+"].fileForm"]:fileForm,
})
+
+ let SJlength = that.data.form.transfers[e.currentTarget.dataset.index].SJimage.length;
+ let FPlength = that.data.form.transfers[e.currentTarget.dataset.index].FPimage.length;
+ let QTlength = that.data.form.transfers[e.currentTarget.dataset.index].QTimage.length;
+ let fileNum = parseInt( SJlength ) + parseInt( FPlength ) + parseInt( QTlength ) ;
+ that.setData({
+ ["form.transfers["+e.currentTarget.dataset.index+"].fileNum"]:fileNum,
+ })
}
})
},
@@ -864,6 +980,13 @@ Page({
["form.transfers["+e.currentTarget.dataset.index+"].FPimage"]:res.tempFiles,
["form.transfers["+e.currentTarget.dataset.index+"].fileForm"]:fileForm
})
+ let SJlength = that.data.form.transfers[e.currentTarget.dataset.index].SJimage.length;
+ let FPlength = that.data.form.transfers[e.currentTarget.dataset.index].FPimage.length;
+ let QTlength = that.data.form.transfers[e.currentTarget.dataset.index].QTimage.length;
+ let fileNum = parseInt( SJlength ) + parseInt( FPlength ) + parseInt( QTlength ) ;
+ that.setData({
+ ["form.transfers["+e.currentTarget.dataset.index+"].fileNum"]:fileNum,
+ })
}
})
},
@@ -892,6 +1015,13 @@ Page({
["form.transfers["+e.currentTarget.dataset.index+"].QTimage"]:res.tempFiles,
["form.transfers["+e.currentTarget.dataset.index+"].fileForm"]:fileForm
})
+ let SJlength = that.data.form.transfers[e.currentTarget.dataset.index].SJimage.length;
+ let FPlength = that.data.form.transfers[e.currentTarget.dataset.index].FPimage.length;
+ let QTlength = that.data.form.transfers[e.currentTarget.dataset.index].QTimage.length;
+ let fileNum = parseInt( SJlength ) + parseInt( FPlength ) + parseInt( QTlength ) ;
+ that.setData({
+ ["form.transfers["+e.currentTarget.dataset.index+"].fileNum"]:fileNum,
+ })
}
})
},
@@ -899,6 +1029,9 @@ Page({
let transList = this.data.form.transfers;
transList.push({
num:UTIL.convertToChinaNum(transList.length+1),
+ SJimage:[],
+ FPimage:[],
+ QTimage:[],
capitalExpenditureType:'',//资金支出类别
capitalExpenditureTypeText:'',//资金支出类别（展示用）
succeedAmount:'',//成功支付金额
@@ -968,9 +1101,16 @@ Page({
that.back()
}
},
- goSubmitUp(e){
+ deleteTransfers(e){
var that = this ;
-
+ if(that.data.form.transfers.length<2){
+ UTIL.showToastNoneIcon('最少保留一条事项');
+ return;
+ }
+ that.data.form.transfers.splice(e.currentTarget.dataset.index,1);
+ that.setData({
+ form:that.data.form
+ })
},
/**
* 生命周期函数--监听页面隐藏
diff --git a/pages/apply/paymentTemplate/add/add.wxml b/pages/apply/paymentTemplate/add/add.wxml
index 87f4085..cc0d000 100644
--- a/pages/apply/paymentTemplate/add/add.wxml
+++ b/pages/apply/paymentTemplate/add/add.wxml
@@ -11,18 +11,19 @@
提交日期：{{form.approvalItemTemplate.submitDate}}
提 交 人：{{form.approvalItemTemplate.submitter}}
联系电话：{{form.approvalItemTemplate.telephone}}
+ 总 金 额：{{form.approvalItemTemplate.totalAmount}}
- 事项{{form.transfers[index].num}}
+ 事项{{form.transfers[index].num}}
基础信息
-
+
-
+
-
+
关联项目
@@ -47,12 +48,12 @@
bind:cancel="closeBox"
bind:confirm="onConfirmProject"
data-name="showProject"
- data-value="projectForm.projectName"
+ data-value="form.transfers[{{index}}].projectForm"
/>
-
-
-
+
+
+
-
+
-
+
@@ -106,7 +107,7 @@
data-value="form.transfers[{{index}}]"
/>
-
+
-
+
付款方必填
@@ -147,8 +148,8 @@
-
-
+
+
@@ -186,16 +187,16 @@
-
+
姓名收款方
-
-
-
+
+
+
-
+
diff --git a/pages/apply/paymentTemplate/add/add.wxss b/pages/apply/paymentTemplate/add/add.wxss
index 35d03a4..4ce5f26 100644
--- a/pages/apply/paymentTemplate/add/add.wxss
+++ b/pages/apply/paymentTemplate/add/add.wxss
@@ -41,6 +41,7 @@ text{display: block;}
font-size: 18px;
padding: 10px 0;
text-align: center;
+ position: relative;
}
.main-box{
background: #ffffff;
@@ -337,4 +338,7 @@ text{display: block;}
.img_box{
position: relative;
width: 100%;
+ }
+ .van-cell--required:before {
+ left: -8px!important;
}
\ No newline at end of file
diff --git a/pages/apply/paymentTemplate/paymentTemplate.json b/pages/apply/paymentTemplate/paymentTemplate.json
index 8e81dac..5d22105 100644
--- a/pages/apply/paymentTemplate/paymentTemplate.json
+++ b/pages/apply/paymentTemplate/paymentTemplate.json
@@ -6,6 +6,16 @@
"van-dialog": "@vant/weapp/dialog/index",
"van-field": "@vant/weapp/field/index",
"van-collapse": "@vant/weapp/collapse/index",
- "van-collapse-item": "@vant/weapp/collapse-item/index"
+ "van-collapse-item": "@vant/weapp/collapse-item/index",
+ "van-row": "@vant/weapp/row/index",
+ "van-col": "@vant/weapp/col/index",
+ "van-tag": "@vant/weapp/tag/index",
+ "van-steps": "@vant/weapp/steps/index",
+ "van-button": "@vant/weapp/button/index",
+ "van-radio": "@vant/weapp/radio/index",
+ "van-radio-group": "@vant/weapp/radio-group/index",
+ "van-popup": "@vant/weapp/popup/index",
+ "van-picker": "@vant/weapp/picker/index",
+ "van-calendar": "@vant/weapp/calendar/index"
}
}
\ No newline at end of file
diff --git a/pages/apply/paymentTemplate/paymentTemplate.wxml b/pages/apply/paymentTemplate/paymentTemplate.wxml
index df8182c..09c2da7 100644
--- a/pages/apply/paymentTemplate/paymentTemplate.wxml
+++ b/pages/apply/paymentTemplate/paymentTemplate.wxml
@@ -4,7 +4,7 @@
支出申请
-
+
审批事项
支出总金额
@@ -34,19 +34,167 @@
-
+
- 代码是写出来给人看的，附带能在机器上运行
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+ 关联项目
+
+
+
+
+
+
+
+
+
+
+ 关联合同
+
+
+
+
+
+
+
+
+ 付款方信息
+
+
+
+
+
+ 付款方必填
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 收款方信息
+
+
+
+
+
+ 公户
+ 私户
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+ 姓名收款方
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 附件可拍照
+
+
+ 总数 {{form.transfers[index].fileNum?form.transfers[index].fileNum:0}}张
+
+
+
+
+
+ 收\n据
+
+
+
+
+
+
+
+
+ 发\n票
+
+
+
+
+
+
+
+
+ 其\n他
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/pages/apply/paymentTemplate/paymentTemplate.wxss b/pages/apply/paymentTemplate/paymentTemplate.wxss
index 7a51f55..2a7e205 100644
--- a/pages/apply/paymentTemplate/paymentTemplate.wxss
+++ b/pages/apply/paymentTemplate/paymentTemplate.wxss
@@ -53,6 +53,13 @@ text{display: block;}
}
.main-box{
+ background: #ffffff;
+ padding: 10px 0;
+ width: 100%;
+ margin: 0 auto;
+}
+
+.topBox{
background: #ffffff;
padding: 20px;
width: 94%;
@@ -70,6 +77,8 @@ text{display: block;}
box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.16);
width: 94%;
margin: 0 auto;
+ padding-top: 0;
+ margin-top: 15px;
}
.van-collapse-item__content{
padding: 0!important;
@@ -118,7 +127,7 @@ text{display: block;}
justify-content: center;
}
.title{
- padding: 10px calc(3% + 20px);
+ padding: 10px 0;
color: #2C8E68;
font-size: 16px;
}
@@ -221,4 +230,26 @@ text{display: block;}
}
.van-button--normal {
background: linear-gradient(to right, #2C8E68, #5CAE77)!important;
+}
+
+.fj-box text{
+ background-color: #5CAE77;
+ color: #ffffff;
+ text-align: center;
+ border-radius: 5px;
+ white-space:pre-wrap;
+ padding: 22px 15px;
+}
+.fj-li{
+ margin-top: 20px;
+ display: flex;
+ /* flex-wrap: wrap; */
+}
+.fj-li image{
+ width: 25%;
+ height: 18.5vw;
+ margin-left: 5%;
+}
+.fj-li image:nth-child(n+5){
+ margin-top: 15px;
}
\ No newline at end of file
diff --git a/pages/handle/expenditureAudit/expenditureAudit.js b/pages/handle/expenditureAudit/expenditureAudit.js
index 0b618ab..b5ec335 100644
--- a/pages/handle/expenditureAudit/expenditureAudit.js
+++ b/pages/handle/expenditureAudit/expenditureAudit.js
@@ -106,7 +106,22 @@ Page({
res.data.transfers[index].payeeList.forEach( (response,i) => {
res.data.transfers[index].payeeList[i].bankTypeText = UTIL.getTransform(response.bankType,that.data.bankTypeOptions);
})
-
+ console.log(res.data.transfers[index].capitalExpenditureType);
+ if(res.data.transfers[index].capitalExpenditureType == 2){
+ let prames = {
+ outId:res.data.transfers[index].id,
+ ynType: res.data.transfers[index].transferType=='1'||res.data.transfers[index].transferType=='2'||res.data.transfers[index].transferType=='4'?'1':'2'
+ }
+ // 工程项目查询
+ UTIL.httpRequest(API.URL_GET_GETPROJECTTO , prames, {
+ success: (res) => {
+ res.data.projectFundTypeText = UTIL.getTransform(res.data.projectFundType,that.data.projectFundTypeOptions);
+ that.setData({
+ ["form.transfers["+index+"].projectForm"]:res.data,
+ })
+ }
+ })
+ }
UTIL.httpRequest(
API.URL_GET_FINDLIST,
{
@@ -121,34 +136,13 @@ Page({
let list = [];
res.data.forEach((item2,index2)=>{
-
- wx.downloadFile({
- url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
- success (response) {
- if (response.statusCode === 200) {
- let fileForm = item.fileForm?item.fileForm:[];
- fileForm.push({
- file: response.tempFilePath,
- fileType:'1',
- bizPath:'transfer',
- tableName:'t_yinnong_transfer',
- tableId:''
- })
- console.log("--------------fileForm2 start----------------");
- console.log(fileForm);
- console.log("--------------fileForm2 end----------------");
- list.push({
- tempFilePath:response.tempFilePath
- })
- that.setData({
- ["form.transfers["+index+"].SJimage"]:list,
- ["form.transfers["+index+"].fileForm"]:fileForm
- });
- }
- }
+ list.push({
+ tempFilePath:URL_PREFIX+item2.fileUrl
})
+ that.setData({
+ ["form.transfers["+index+"].SJimage"]:list,
+ });
})
-
}
})
//发票
@@ -164,28 +158,13 @@ Page({
success: (res) => {
let list = [];
res.data.forEach((item2,index2)=>{
- wx.downloadFile({
- url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
- success (response) {
- if (response.statusCode === 200) {
- let fileForm = item.fileForm?item.fileForm:[];
- fileForm.push({
- file: response.tempFilePath,
- fileType:'2',
- bizPath:'transfer',
- tableName:'t_yinnong_transfer',
- tableId:item.id
- })
- list.push({
- tempFilePath:response.tempFilePath
- })
- that.setData({
- ["form.transfers["+index+"].FPimage"]:list,
- ["form.transfers["+index+"].fileForm"]:fileForm
- });
- }
- }
+
+ list.push({
+ tempFilePath:URL_PREFIX+item2.fileUrl
})
+ that.setData({
+ ["form.transfers["+index+"].FPimage"]:list,
+ });
})
}
})
@@ -201,30 +180,13 @@ Page({
{
success: (res) => {
let list = [];
- let fileForm = item.fileForm?item.fileForm:[];
res.data.forEach((item2,index2)=>{
- wx.downloadFile({
- url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
- success (response) {
- if (response.statusCode === 200) {
- let fileForm = item.fileForm?item.fileForm:[];
- fileForm.push({
- file: response.tempFilePath,
- fileType:'3',
- bizPath:'transfer',
- tableName:'t_yinnong_transfer',
- tableId:item.id
- })
- list.push({
- tempFilePath:response.tempFilePath
- })
- that.setData({
- ["form.transfers["+index+"].QTimage"]:list,
- ["form.transfers["+index+"].fileForm"]:fileForm
- });
- }
- }
+ list.push({
+ tempFilePath:URL_PREFIX+item2.fileUrl
})
+ that.setData({
+ ["form.transfers["+index+"].QTimage"]:list,
+ });
})
}
})
@@ -246,19 +208,23 @@ Page({
that.setData({spsxOptions:res.data.processSchedule.spsx})
}
that.setData({instanceId:res.data.instanceId})
- }
- })
- console.log(that.data.instanceId)
- // 查询现金审批事项流转进度
- UTIL.httpRequest(API.URL_GET_REVIEWPROCESS+that.data.instanceId , {method:'GET'}, {
- success: (res) => {
- console.log(res);
- if(res.data.processSchedule.spsx){
- that.setData({spsxOptions:res.data.processSchedule.spsx})
+
+ if(options.business == 'xj'){
+ console.log(that.data.instanceId)
+ // 查询现金审批事项流转进度
+ UTIL.httpRequest(API.URL_GET_REVIEWPROCESS+that.data.instanceId , {method:'GET'}, {
+ success: (res) => {
+ console.log(res);
+ if(res.data.processSchedule.spsx){
+ that.setData({spsxOptions:res.data.processSchedule.spsx})
+ }
+ that.setData({instanceId:res.data.instanceId})
+ }
+ })
}
- that.setData({instanceId:res.data.instanceId})
}
})
+
},
goDis(){
var that = this ;
diff --git a/pages/handle/expenditureAudit/expenditureAudit.wxml b/pages/handle/expenditureAudit/expenditureAudit.wxml
index f237677..4f0975e 100644
--- a/pages/handle/expenditureAudit/expenditureAudit.wxml
+++ b/pages/handle/expenditureAudit/expenditureAudit.wxml
@@ -11,6 +11,7 @@
提交日期：{{form.approvalItemTemplate.submitDate}}
提 交 人：{{form.approvalItemTemplate.submitter}}
联系电话：{{form.approvalItemTemplate.telephone}}
+ 总 金 额：{{form.approvalItemTemplate.totalAmount}}
事项{{form.transfers[index].num}}
@@ -28,11 +29,11 @@
关联项目
-
-
-
-
-
+
+
+
+
+
@@ -161,61 +162,61 @@
+
+
-
- 审批流程
-
-
- {{index+1}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.assigneeName}}
- {{item.deptLabel}}
-
- 同意
- 审核中
- 驳回
-
-
-
-
-
+
+ 审批流程
+
+
+ {{index+1}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.assigneeName}}
+ {{item.deptLabel}}
+
+ 同意
+ 审核中
+ 驳回
+
-
-
- {{ item.comment }}
-
- {{ sub.times(item.time) }}
-
+
+
+
+
-
-
-
+
+
+ {{ item.comment }}
+
+ {{ sub.times(item.time) }}
+
+
+
+
-
-
+
var times = function(time){
console.log(time)
diff --git a/pages/handle/expenditureAudit/expenditureAudit.wxss b/pages/handle/expenditureAudit/expenditureAudit.wxss
index d049cb1..372a725 100644
--- a/pages/handle/expenditureAudit/expenditureAudit.wxss
+++ b/pages/handle/expenditureAudit/expenditureAudit.wxss
@@ -191,7 +191,6 @@ text{display: block;}
}
.steps-box{
padding: 0;
- margin-top: 15px;
}
.steps-box .van-row{
padding: 0 20px;
diff --git a/pages/index/index.js b/pages/index/index.js
index bc778a6..44551aa 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -50,18 +50,21 @@ Page({
]
},
onLoad: function (options) {
-
- //获取用户信息
- this.getUserInfo()
- //获取滚动条高度
- this.computeBarLocation();
- //查询待办
- this.getTaskList();
- //查询已办
- this.getTaskDoneList();
- //查询dept
- this.getTreeDept();
+ //获取滚动条高度
+ this.computeBarLocation();
+ },
+
+ onShow(){
+ //获取用户信息
+ this.getUserInfo()
+ //查询待办
+ this.getTaskList();
+ //查询已办
+ this.getTaskDoneList();
+ //查询dept
+ this.getTreeDept();
},
+
reset:function(){
this.setData({
active:1,
@@ -160,10 +163,9 @@ Page({
success: (res) => {
console.log(res);
if (res.code == API.SUCCESS_CODE) {
- let a = this.data.yfqNum+res.total
+ let a = res.total
this.setData({yfqNum:a})
- let b = this.data.yfqList
- this.setData({yfqList:res.rows.concat(b)})
+ this.setData({yfqList:res.rows})
}
}, fail: (res) => {
},
@@ -479,7 +481,7 @@ Page({
},
gosee:function(e){
wx.navigateTo({
- url: '/pages/handle/expenditureAudit/expenditureAudit?id='+e.currentTarget.dataset.id+'&taskId='+e.currentTarget.dataset.taskid+'&type='+e.currentTarget.dataset.type,
+ url: '/pages/handle/expenditureAudit/expenditureAudit?id='+e.currentTarget.dataset.id+'&taskId='+e.currentTarget.dataset.taskid+'&type='+e.currentTarget.dataset.type+'&business='+e.currentTarget.dataset.business,
})
},
goUpdate(e){
@@ -487,4 +489,18 @@ Page({
url: '/pages/apply/paymentTemplate/add/add?id='+e.currentTarget.dataset.id,
})
},
+ showModal(){
+ wx.showModal({
+ title: '提示',
+ content: '功能正在开发中，敬请期待',
+ showCancel: false,
+ success (res) {
+ if (res.confirm) {
+ console.log('用户点击确定')
+ } else if (res.cancel) {
+ console.log('用户点击取消')
+ }
+ }
+ })
+ }
})
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index e9a05d9..e357362 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -54,13 +54,13 @@
收入登记
-
+
记账申请
-
+
@@ -69,23 +69,23 @@
-
+
收款人
-
+
付款人
-
+
合同报送
-
+
固资变动
-
+
资源变动
@@ -100,7 +100,7 @@
-
+
@@ -117,7 +117,7 @@
-
+
diff --git a/pages/payee/add/add.js b/pages/payee/add/add.js
index 5596101..a124048 100644
--- a/pages/payee/add/add.js
+++ b/pages/payee/add/add.js
@@ -130,12 +130,50 @@ Page({
goSubmit(){
console.log(this.data.form);
var that = this;
+
+ if(that.data.form.bankType == ''){
+ UTIL.showToastNoneIcon('请选择所属银行！');
+ return;
+ }
+ if(that.data.form.payee == ''){
+ UTIL.showToastNoneIcon('请填写户名！');
+ return;
+ }
+ if(that.data.form.payeeAccount == ''){
+ UTIL.showToastNoneIcon('请填写收款账号！');
+ return;
+ }
+ if(that.data.form.payeeType == ''){
+ UTIL.showToastNoneIcon('请选择收款人类型！');
+ return;
+ }
+ if(that.data.form.accountType == ''){
+ UTIL.showToastNoneIcon('请选择账户类型！');
+ return;
+ }
+ if(that.data.form.bankDeposit == ''){
+ UTIL.showToastNoneIcon('请选择开户行！');
+ return;
+ }
+ if(that.data.form.payeePaymentLines == ''){
+ UTIL.showToastNoneIcon('请输入联行号！');
+ return;
+ }
+
+
that.setData({
['form.method']:'POST'
})
UTIL.httpRequest(API.URL_GET_PAYEEADD, that.data.form, {
success: (res) => {
if (res.code == API.SUCCESS_CODE) {
+
+ let pages = getCurrentPages();
+ let currentPage = null; //当前页面
+ let prevPage = null; //上一个页面
+ currentPage = pages[pages.length - 1]; //获取当前页面，将其赋值
+ prevPage = pages[pages.length - 2]; //获取上一个页面，将其赋值
+ prevPage.onLoad(prevPage.options)
wx.navigateBack({
delta:1
})
diff --git a/pages/payee/add/add.wxml b/pages/payee/add/add.wxml
index 3b0dc95..7e5cfcd 100644
--- a/pages/payee/add/add.wxml
+++ b/pages/payee/add/add.wxml
@@ -15,7 +15,7 @@
data-value="form.bankType"
/>
-
+
@@ -30,7 +30,7 @@
data-value="form.payeeType"
/>
-
+
-
+
-
+
diff --git a/pages/payee/index.js b/pages/payee/index.js
index 7741933..5c971a6 100644
--- a/pages/payee/index.js
+++ b/pages/payee/index.js
@@ -28,6 +28,41 @@ Page({
payeeType:options.transferType,//申请转帐类型
index:options.index
})
+ var that = this;
+ // 获取收款账号列表
+ let prames = {
+ pageNum:1,
+ pageSize:999,
+ orderByColumn:'id',
+ isAsc:'asc',
+ isPeers:that.data.isPeers,//是否同行
+ bankType:that.data.bankType,//所属银行
+ accountType:that.data.accountType,//账户类型
+ payeeType:that.data.payeeType,//申请转帐类型
+ status:'0',
+ method:'GET'
+ }
+ console.log(prames);
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bank_type', {method:'GET'}, {
+ success: (res) => {
+ that.setData({
+ bankTypeOptions:res.data,
+ })
+ }
+ })
+ UTIL.httpRequest(API.URL_GET_SELECTLIST , prames, {
+ success: (res) => {
+ let array = res.rows ;
+ for (let i = 0; i < array.length; i++) {
+ array[i].payeeAccountText = array[i].payeeAccount.replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2");
+ console.log(that.data.bankTypeOptions.filter(function (e) { return e.dictValue == array[i].bankType; }));
+ array[i].bankTypeText = (that.data.bankTypeOptions.filter(function (e) { return e.dictValue == array[i].bankType; }))[0].dictLabel;
+ }
+ that.setData({
+ list:array,
+ })
+ }
+ })
},
goAdd(){
wx.navigateTo({
@@ -82,43 +117,7 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow() {
- var that = this;
- setTimeout(function(){
- // 获取收款账号列表
- let prames = {
- pageNum:1,
- pageSize:999,
- orderByColumn:'id',
- isAsc:'asc',
- isPeers:that.data.isPeers,//是否同行
- bankType:that.data.bankType,//所属银行
- accountType:that.data.accountType,//账户类型
- payeeType:that.data.payeeType,//申请转帐类型
- status:'0',
- method:'GET'
- }
- console.log(prames);
- UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bank_type', {method:'GET'}, {
- success: (res) => {
- that.setData({
- bankTypeOptions:res.data,
- })
- }
- })
- UTIL.httpRequest(API.URL_GET_SELECTLIST , prames, {
- success: (res) => {
- let array = res.rows ;
- for (let i = 0; i < array.length; i++) {
- array[i].payeeAccountText = array[i].payeeAccount.replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2");
- console.log(that.data.bankTypeOptions.filter(function (e) { return e.dictValue == array[i].bankType; }));
- array[i].bankTypeText = (that.data.bankTypeOptions.filter(function (e) { return e.dictValue == array[i].bankType; }))[0].dictLabel;
- }
- that.setData({
- list:array,
- })
- }
- })
- },1000)
+
},
onChange(event) {
console.log(event);
diff --git a/utils/API.js b/utils/API.js
index ea3243a..9f74c64 100644
--- a/utils/API.js
+++ b/utils/API.js
@@ -42,7 +42,7 @@ const URL_GET_TRANSFERLIST = `${URL_PREFIX}/yinnong/approvalItems/list`;
// 修改密码
const URL_POST_UPDATEPWD = `${URL_PREFIX}/system/user/profile/updatePwd`;
// 上传图片
-const URL_POST_UPLOADFILE = `${URL_PREFIX}/system/user/profile/electronicSignature`;
+const URL_POST_UPLOADFILE = `${URL_PREFIX}/system/user/profile/electronicSignatureWX`;
// 保存电子签名
const URL_POST_USEREDIT = `${URL_PREFIX}/system/user/edit`;
//当前账套付款账户列表
@@ -137,6 +137,12 @@ const URL_GET_TOREVIEWSUBMIT = `${URL_PREFIX}/yinnong/approvalItems/toReviewSubm
//复核
const URL_GET_REVIEWPROCESS = `${URL_PREFIX}/yinnong/approvalItems/getToReviewProcessSchedule/`;
+//关联项目工程接口
+const URL_GET_ADDPROJECTTO = `${URL_PREFIX}/yinnong/project/addProjectto`;
+
+//根据申请转账id获取关联的项目工程信息
+const URL_GET_GETPROJECTTO = `${URL_PREFIX}/yinnong/project/getProjectto`;
+
/****************接口地址end****************/
@@ -197,5 +203,7 @@ export {
URL_GET_GETPROCESS,
URL_GET_PROCESSCOMPLETE,
URL_GET_TOREVIEWSUBMIT,
- URL_GET_REVIEWPROCESS
+ URL_GET_REVIEWPROCESS,
+ URL_GET_ADDPROJECTTO,
+ URL_GET_GETPROJECTTO
}
\ No newline at end of file