|
@@ -1,6 +1,6 @@
|
|
const _Http = getApp().globalData.http,
|
|
const _Http = getApp().globalData.http,
|
|
getTime = require("../../utils/getTime");
|
|
getTime = require("../../utils/getTime");
|
|
-
|
|
|
|
|
|
+let sa_paybilldetailid = 0;
|
|
Page({
|
|
Page({
|
|
data: {
|
|
data: {
|
|
showAll: false,
|
|
showAll: false,
|
|
@@ -11,56 +11,46 @@ Page({
|
|
period: ""
|
|
period: ""
|
|
},
|
|
},
|
|
form: [{
|
|
form: [{
|
|
- label: "银行账号",
|
|
|
|
|
|
+ label: "转出账号",
|
|
error: false,
|
|
error: false,
|
|
errMsg: "",
|
|
errMsg: "",
|
|
type: "route",
|
|
type: "route",
|
|
url: "/pages/bankAccount/index",
|
|
url: "/pages/bankAccount/index",
|
|
params: {},
|
|
params: {},
|
|
value: "",
|
|
value: "",
|
|
- placeholder: "银行账号",
|
|
|
|
|
|
+ placeholder: "转出账号",
|
|
valueName: "bankcardno",
|
|
valueName: "bankcardno",
|
|
interrupt: true,
|
|
interrupt: true,
|
|
required: true
|
|
required: true
|
|
}, {
|
|
}, {
|
|
- label: "付款人",
|
|
|
|
|
|
+ label: "打款人",
|
|
error: false,
|
|
error: false,
|
|
errMsg: "",
|
|
errMsg: "",
|
|
type: "text",
|
|
type: "text",
|
|
value: "",
|
|
value: "",
|
|
- placeholder: "付款人",
|
|
|
|
|
|
+ placeholder: "打款人",
|
|
disabled: true,
|
|
disabled: true,
|
|
valueName: "payer",
|
|
valueName: "payer",
|
|
required: true
|
|
required: true
|
|
}, {
|
|
}, {
|
|
- label: "银行",
|
|
|
|
|
|
+ label: "转出银行",
|
|
error: false,
|
|
error: false,
|
|
errMsg: "",
|
|
errMsg: "",
|
|
type: "text",
|
|
type: "text",
|
|
value: "",
|
|
value: "",
|
|
- placeholder: "银行",
|
|
|
|
|
|
+ placeholder: "转出银行",
|
|
disabled: true,
|
|
disabled: true,
|
|
valueName: "bank",
|
|
valueName: "bank",
|
|
required: true
|
|
required: true
|
|
}, {
|
|
}, {
|
|
- label: "付款时间",
|
|
|
|
|
|
+ label: "打款时间",
|
|
error: false,
|
|
error: false,
|
|
errMsg: "",
|
|
errMsg: "",
|
|
type: "date",
|
|
type: "date",
|
|
value: getTime.formatTime(new Date(), '-').split(' ')[0],
|
|
value: getTime.formatTime(new Date(), '-').split(' ')[0],
|
|
- placeholder: "请选择付款时间",
|
|
|
|
|
|
+ placeholder: "选择打款时间",
|
|
valueName: "paydate",
|
|
valueName: "paydate",
|
|
required: true,
|
|
required: true,
|
|
- }, {
|
|
|
|
- label: "打款总金额",
|
|
|
|
- error: false,
|
|
|
|
- errMsg: "",
|
|
|
|
- type: "digit",
|
|
|
|
- value: "",
|
|
|
|
- placeholder: "请输入打款总金额",
|
|
|
|
- valueName: "amount",
|
|
|
|
- required: true,
|
|
|
|
-
|
|
|
|
}, {
|
|
}, {
|
|
label: "转入银行",
|
|
label: "转入银行",
|
|
error: false,
|
|
error: false,
|
|
@@ -70,39 +60,70 @@ Page({
|
|
value: "",
|
|
value: "",
|
|
rangeKey: "remarks",
|
|
rangeKey: "remarks",
|
|
rangeIndex: "",
|
|
rangeIndex: "",
|
|
- placeholder: "请选择转入银行",
|
|
|
|
|
|
+ placeholder: "选择转入银行",
|
|
valueName: "inbank",
|
|
valueName: "inbank",
|
|
- required: false,
|
|
|
|
|
|
+ required: true,
|
|
interrupt: true
|
|
interrupt: true
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- label: "转入账户",
|
|
|
|
|
|
+ label: "银行账号",
|
|
error: false,
|
|
error: false,
|
|
errMsg: "",
|
|
errMsg: "",
|
|
type: "text",
|
|
type: "text",
|
|
value: "",
|
|
value: "",
|
|
- placeholder: "请选择转入银行后自动带入",
|
|
|
|
|
|
+ placeholder: "选择转入银行后自动带入",
|
|
valueName: "inbankcardno",
|
|
valueName: "inbankcardno",
|
|
- required: false,
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
|
|
+ required: true,
|
|
|
|
+ }, {
|
|
|
|
+ label: "转入账户",
|
|
|
|
+ error: false,
|
|
|
|
+ errMsg: "",
|
|
|
|
+ type: "selector",
|
|
|
|
+ range: [],
|
|
|
|
+ value: "",
|
|
|
|
+ rangeKey: "accountname",
|
|
|
|
+ rangeIndex: "",
|
|
|
|
+ placeholder: "选择转入账户",
|
|
|
|
+ valueName: "sa_accountclassid",
|
|
|
|
+ required: true,
|
|
|
|
+ interrupt: true
|
|
|
|
+ }, {
|
|
|
|
+ label: "转入金额",
|
|
|
|
+ error: false,
|
|
|
|
+ errMsg: "",
|
|
|
|
+ type: "digit",
|
|
|
|
+ value: "",
|
|
|
|
+ placeholder: "转入金额",
|
|
|
|
+ valueName: "amount",
|
|
|
|
+ required: true,
|
|
|
|
+ }, {
|
|
label: "备注",
|
|
label: "备注",
|
|
error: false,
|
|
error: false,
|
|
errMsg: "",
|
|
errMsg: "",
|
|
type: "text",
|
|
type: "text",
|
|
value: "",
|
|
value: "",
|
|
- placeholder: "请输入备注",
|
|
|
|
|
|
+ placeholder: "输入备注",
|
|
valueName: "remarks",
|
|
valueName: "remarks",
|
|
required: false,
|
|
required: false,
|
|
},
|
|
},
|
|
]
|
|
]
|
|
},
|
|
},
|
|
onLoad(options) {
|
|
onLoad(options) {
|
|
|
|
+ let sa_paybillid = 0;
|
|
if (options.rowData) {
|
|
if (options.rowData) {
|
|
let data = JSON.parse(options.rowData);
|
|
let data = JSON.parse(options.rowData);
|
|
|
|
+ sa_paybillid = data.sa_paybillid;
|
|
|
|
+ sa_paybilldetailid = data.sa_paybilldetailid;
|
|
this.setData({
|
|
this.setData({
|
|
form: this.data.form.map(v => {
|
|
form: this.data.form.map(v => {
|
|
- v.value = data[v.valueName];
|
|
|
|
|
|
+ if (v.valueName == 'bankcardno') {
|
|
|
|
+ v.value = [data[v.valueName], data[v.valueName]];
|
|
|
|
+ } else if (v.valueName == "sa_accountclassid") {
|
|
|
|
+ v.id = data[v.valueName];
|
|
|
|
+ v.value = data.accountname;
|
|
|
|
+ } else {
|
|
|
|
+ v.value = data[v.valueName];
|
|
|
|
+ }
|
|
return v
|
|
return v
|
|
}),
|
|
}),
|
|
'content.sa_paybillid': data.sa_paybillid
|
|
'content.sa_paybillid': data.sa_paybillid
|
|
@@ -128,26 +149,48 @@ Page({
|
|
})
|
|
})
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
+
|
|
|
|
+ _Http.basic({
|
|
|
|
+ "id": 20221228085004,
|
|
|
|
+ "content": {
|
|
|
|
+ "pageNumber": 1,
|
|
|
|
+ "pageSize": 9999,
|
|
|
|
+ sa_paybillid,
|
|
|
|
+ "where": {
|
|
|
|
+ "ispay": 1
|
|
|
|
+ }
|
|
|
|
+ },
|
|
|
|
+ }).then(res => {
|
|
|
|
+ console.log("获取可选择账户", res)
|
|
|
|
+ if (res.msg == '成功') {
|
|
|
|
+ let item = this.data.form.find(v => v.label == '转入账户')
|
|
|
|
+ item.range = res.data;
|
|
|
|
+ if (sa_paybillid) item.disabled = true;
|
|
|
|
+ this.setData({
|
|
|
|
+ form: this.data.form
|
|
|
|
+ })
|
|
|
|
+ }
|
|
|
|
+ })
|
|
},
|
|
},
|
|
/* 打断处理form */
|
|
/* 打断处理form */
|
|
interrupt({
|
|
interrupt({
|
|
detail
|
|
detail
|
|
}) {
|
|
}) {
|
|
if (detail.data.label == '转入银行') {
|
|
if (detail.data.label == '转入银行') {
|
|
- detail.form[5] = detail.data;
|
|
|
|
- detail.form[6].value = detail.result.value;
|
|
|
|
- this.setData({
|
|
|
|
- form: detail.form
|
|
|
|
- })
|
|
|
|
- } else if (detail.temporary.item.label == '银行账号') {
|
|
|
|
|
|
+ detail.form[4] = detail.data;
|
|
|
|
+ detail.form[5].value = detail.result.value;
|
|
|
|
+ } else if (detail.temporary.item.label == '转出账号') {
|
|
detail.form[0].value = [detail.data.bankcardno, detail.data.bankcardno];
|
|
detail.form[0].value = [detail.data.bankcardno, detail.data.bankcardno];
|
|
detail.form[1].value = detail.data.name;
|
|
detail.form[1].value = detail.data.name;
|
|
detail.form[2].value = detail.data.bank;
|
|
detail.form[2].value = detail.data.bank;
|
|
- this.setData({
|
|
|
|
- form: detail.form
|
|
|
|
- })
|
|
|
|
wx.navigateBack()
|
|
wx.navigateBack()
|
|
|
|
+ } else if (detail.temporary.item.label == '转入账户') {
|
|
|
|
+ detail.form[6].value = detail.result.accountname;
|
|
|
|
+ detail.form[6].id = detail.result.sa_accountclassid;
|
|
}
|
|
}
|
|
|
|
+ this.setData({
|
|
|
|
+ form: detail.form
|
|
|
|
+ })
|
|
this.selectComponent('#Form').confirm()
|
|
this.selectComponent('#Form').confirm()
|
|
},
|
|
},
|
|
async submit() {
|
|
async submit() {
|
|
@@ -155,7 +198,9 @@ Page({
|
|
...this.data.content,
|
|
...this.data.content,
|
|
...this.selectComponent("#Form").submit()
|
|
...this.selectComponent("#Form").submit()
|
|
}
|
|
}
|
|
|
|
+ content.sa_accountclassid = this.data.form.find(v => v.label == '转入账户').id;
|
|
content.bankcardno = content.bankcardno[0]
|
|
content.bankcardno = content.bankcardno[0]
|
|
|
|
+ console.log(content)
|
|
let res = await _Http.basic({
|
|
let res = await _Http.basic({
|
|
"id": "20221226153004",
|
|
"id": "20221226153004",
|
|
content,
|
|
content,
|
|
@@ -163,15 +208,37 @@ Page({
|
|
})
|
|
})
|
|
console.log("创建打款凭证", res);
|
|
console.log("创建打款凭证", res);
|
|
if (res.msg == '成功') {
|
|
if (res.msg == '成功') {
|
|
- let page = getCurrentPages()[getCurrentPages().length - 2];
|
|
|
|
- if (page.__route__ == 'packageA/remitVoucher/index') {
|
|
|
|
- wx.redirectTo({
|
|
|
|
- url: '/packageA/remitVoucher/detail?id=' + res.data.sa_paybillid,
|
|
|
|
- })
|
|
|
|
- } else if (page.__route__ == 'packageA/remitVoucher/detail') {
|
|
|
|
- wx.navigateBack();
|
|
|
|
- page.getDetail(true)
|
|
|
|
- }
|
|
|
|
|
|
+ _Http.basic({
|
|
|
|
+ "id": 20221227092904,
|
|
|
|
+ "content": {
|
|
|
|
+ "paybilldetails": [{
|
|
|
|
+ "amount": content.amount,
|
|
|
|
+ "sa_accountclassid": content.sa_accountclassid,
|
|
|
|
+ sa_paybilldetailid
|
|
|
|
+ }],
|
|
|
|
+ "sa_paybillid": res.data.sa_paybillid
|
|
|
|
+ }
|
|
|
|
+ }).then(s => {
|
|
|
|
+ console.log("修改明细", s)
|
|
|
|
+ if (s.msg == '成功') {
|
|
|
|
+ let page = getCurrentPages()[getCurrentPages().length - 2];
|
|
|
|
+ if (page.__route__ == 'packageA/remitVoucher/index') {
|
|
|
|
+ wx.redirectTo({
|
|
|
|
+ url: '/packageA/remitVoucher/detail?id=' + res.data.sa_paybillid,
|
|
|
|
+ })
|
|
|
|
+ } else if (page.__route__ == 'packageA/remitVoucher/detail') {
|
|
|
|
+ wx.navigateBack();
|
|
|
|
+ page.getDetail(true)
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ wx.showToast({
|
|
|
|
+ title: res.msg,
|
|
|
|
+ icon: "none",
|
|
|
|
+ mask: true
|
|
|
|
+ })
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ })
|
|
} else {
|
|
} else {
|
|
wx.showToast({
|
|
wx.showToast({
|
|
title: res.msg,
|
|
title: res.msg,
|
|
@@ -179,6 +246,7 @@ Page({
|
|
mask: true
|
|
mask: true
|
|
})
|
|
})
|
|
}
|
|
}
|
|
|
|
+
|
|
},
|
|
},
|
|
// 是否显示全部
|
|
// 是否显示全部
|
|
onChange({
|
|
onChange({
|