diff --git a/src/components/dialog/index.vue b/src/components/dialog/index.vue
index 75e3659..dc7839c 100644
--- a/src/components/dialog/index.vue
+++ b/src/components/dialog/index.vue
@@ -96,6 +96,8 @@ const obj = {
'business/deposit': '存款',
'business/withdrawal': '取款',
'onlineBank/openAccount': '网上银行开户',
+ 'foreignExchange/puchasing': '外汇业务购汇',
+ 'foreignExchange/settlement': '外汇业务结汇',
'spacial': '提交'
}
diff --git a/src/pages/manage/list/foreignExchange/puchasing.vue b/src/pages/manage/list/foreignExchange/puchasing.vue
index 34c2021..a2fb947 100644
--- a/src/pages/manage/list/foreignExchange/puchasing.vue
+++ b/src/pages/manage/list/foreignExchange/puchasing.vue
@@ -30,9 +30,8 @@
-
-
@@ -78,7 +77,7 @@ import { addOperation, getOperation } from '@/api/http';
import { mapMutations, mapGetters } from 'vuex'
import TipsBefore from '@/mixins/tipsBefore'
-const moduleName = 'currentAccount/withdrawal'
+const moduleName = 'foreignExchange/puchasing'
import MyDialog from '@/components/dialog'
import NeedBefore from '@/components/needBefore'
export default {
@@ -112,7 +111,7 @@ export default {
},
data () {
return {
- moduleName: 'foreignExchange/puchasing',
+ moduleName,
visible: false,
cardNumberJudge: false,
form: {
@@ -191,7 +190,6 @@ export default {
else if (list[i].answerId == '88') { this.form.goldLogo = +list[i].emptyTwo } //钞汇标识
else if (list[i].answerId == '89') { this.form.money = list[i].emptyTwo } //金额
else if (list[i].answerId == '90') { this.form.drawWay = +list[i].emptyTwo } //支取方式
- // if (list[i].answerId == '91') {sessionStorage.setItem('nomCurrentWithdrawalPassword', list[i].emptyTwo)} //支取密码
else if (list[i].answerId == '91') {
if (sessionStorage.getItem('nomCurrentWithdrawalPassword')) {
this.form.drawPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword')
@@ -223,47 +221,33 @@ export default {
let startTime = sessionStorage.getItem('startTime')
let nomCurrentWithdrawalCard = sessionStorage.getItem('nomCurrentWithdrawalCard')
let nomCurrentWithdrawalCards = nomCurrentWithdrawalCard // JSON.parse(nomCurrentWithdrawalCard);
- let nomCurrentWithdrawalPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword')
- let nomCurrentWithdrawalPasswords = nomCurrentWithdrawalPassword // JSON.parse(nomCurrentWithdrawalPassword);
let formList = [];
- // 验证通过逻辑写在这
- // if (nomCurrentWithdrawalCards && nomCurrentWithdrawalCards.length > 0 && nomCurrentWithdrawalPasswords){
- if (this.cardNumberJudge) {
- // formList.push({"answerId":85,"emptyOne": "", "emptyTwo": nomCurrentWithdrawalCards, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,26,57,64,85","type": ""})// 卡号
- // formList.push({"answerId":91,"emptyOne": "", "emptyTwo": nomCurrentWithdrawalPassword, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,26,57,64,91","type": ""})
- formList.push({ "answerId": 91, "emptyOne": "17", "emptyTwo": this.form.drawPassword, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,64,91", "type": "3" })
- if (this.form.currency) { formList.push({ "answerId": '87', "emptyOne": "8", "emptyTwo": this.form.currency, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,64,87", "type": "1" }) }//币种
- if (this.form.money) { formList.push({ "answerId": '89', "emptyOne": "14", "emptyTwo": this.form.money, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,64,89", "type": "3" }) }//金额
- formList.push(
- { "answerId": '88', "emptyOne": "9", "emptyTwo": this.form.goldLogo, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,64,88", "type": "1" },//钞汇标识
- { "answerId": '90', "emptyOne": "13", "emptyTwo": this.form.drawWay, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,64,90", "type": "1" },//支取方式
- // {"answerId":91,"emptyOne": "", "emptyTwo": "", "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,26,57,64,91","type": ""}// 密码框
- )
- console.log(formList)
- let params = {
- parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,26,57,64',
- lcJudgmentRuleReq: formList,
- projectId: +projectId,
- startTime: startTime,
- }
- addOperation(params).then((data) => {
- // this.$message({
- // message: '提交成功',
- // type: 'success'
- // });
- this.setDataFlow({ ...this.form })
- this.setNeedsModule(moduleName)
- this.submited = 1
- }).catch((error) => {
- this.$message({
- message: '服务器繁忙，提交失败。',
- center: true,
- type: 'info'
- });
- })
- } else {
- this.setTipsOperate('有必填项未填~');
+ const { form } = this
+ const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,708,753'
+ formList.push(
+ { answerId: 755, emptyOne: '', emptyTwo: '', operationIds: preId + ',755', type: '' },
+ { answerId: 756, emptyOne: 8, emptyTwo: form.currency, operationIds: preId + ',756', type: 1 },
+ { answerId: 757, emptyOne: 119, emptyTwo: form.goldLogo, operationIds: preId + ',757', type: 1 },
+ { answerId: 759, emptyOne: 117, emptyTwo: form.drawWay, operationIds: preId + ',759', type: 1 },
+ { answerId: 760, emptyOne: 17, emptyTwo: form.drawPassword, operationIds: preId + ',760', type: 3 },
+ )
+ let params = {
+ parentId: preId,
+ lcJudgmentRuleReq: formList,
+ projectId: +projectId,
+ startTime: startTime,
}
+ addOperation(params).then((data) => {
+ this.setDataFlow({ ...this.form })
+ this.setNeedsModule(moduleName)
+ this.submited = 1
+ }).catch((error) => {
+ this.$message({
+ message: '服务器繁忙，提交失败。',
+ center: true,
+ type: 'info'
+ });
+ })
},
popUp1 (text) {
this.setTipsOperate('请刷银行卡');
diff --git a/src/pages/manage/list/foreignExchange/settlement.vue b/src/pages/manage/list/foreignExchange/settlement.vue
index fd6003d..58b4237 100644
--- a/src/pages/manage/list/foreignExchange/settlement.vue
+++ b/src/pages/manage/list/foreignExchange/settlement.vue
@@ -38,15 +38,14 @@
-
-
-
+
+
-
-
-
+
+
+
@@ -67,7 +66,7 @@ import { addOperation, getOperation } from '@/api/http';
import { mapMutations, mapGetters } from 'vuex'
import TipsBefore from '@/mixins/tipsBefore'
-const moduleName = 'currentAccount/withdrawal'
+const moduleName = 'foreignExchange/settlement'
import MyDialog from '@/components/dialog'
import NeedBefore from '@/components/needBefore'
export default {
@@ -86,13 +85,9 @@ export default {
}
if (sessionStorage.getItem('nomCurrentWithdrawalCard')) {
this.cardNumberJudge = true
- const { currency, userName, goldLogo, serviceCharge, drawWay, voucherNumber } = this.dataFlow
+ const { currency, voucherNumber } = this.dataFlow
this.form.currency = currency
- this.form.userName = userName
- this.form.goldLogo = goldLogo
- this.form.serviceCharge = serviceCharge
- this.form.drawWay = drawWay
- this.form.cardNumber = voucherNumber
+ this.form.voucherNumber = voucherNumber
}
@@ -101,21 +96,21 @@ export default {
},
data () {
return {
- moduleName: 'currentAccount/withdrawal',
+ moduleName,
visible: false,
cardNumberJudge: false,
form: {
voucherNumber: '', // 凭证号码
currency: '',
money: '',
- drawWay: '',
+ fundingSource: '',
drawPassword: '',
},
formName: {
voucherNumber: '凭证号码',
currency: '币种',
money: '外币金额',
- drawWay: '资金来源',
+ fundingSource: '资金来源',
drawPassword: '支取密码',
},
rules: {
@@ -133,7 +128,7 @@ export default {
trigger: 'blur'
}
],
- drawWay: [
+ fundingSource: [
{
required: true,
message: '请选择资金来源',
@@ -215,50 +210,34 @@ export default {
let nomCurrentWithdrawalPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword')
let nomCurrentWithdrawalPasswords = nomCurrentWithdrawalPassword // JSON.parse(nomCurrentWithdrawalPassword);
let formList = [];
- // 验证通过逻辑写在这
- // if (nomCurrentWithdrawalCards && nomCurrentWithdrawalCards.length > 0 && nomCurrentWithdrawalPasswords){
- if (this.cardNumberJudge && this.form.cardNumber) {
- // formList.push({"answerId":85,"emptyOne": "", "emptyTwo": nomCurrentWithdrawalCards, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,26,57,64,85","type": ""})// 卡号
- formList.push({ "answerId": 85, "emptyOne": "", "emptyTwo": this.form.cardNumber, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,64,85", "type": "" })
- // formList.push({"answerId":91,"emptyOne": "", "emptyTwo": nomCurrentWithdrawalPassword, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,26,57,64,91","type": ""})
- formList.push({ "answerId": 91, "emptyOne": "17", "emptyTwo": this.form.drawPassword, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,64,91", "type": "3" })
- if (this.form.currency) { formList.push({ "answerId": '87', "emptyOne": "8", "emptyTwo": this.form.currency, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,64,87", "type": "1" }) }//币种
- if (this.form.money) { formList.push({ "answerId": '89', "emptyOne": "14", "emptyTwo": this.form.money, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,64,89", "type": "3" }) }//金额
- if (this.form.remark) { formList.push({ "answerId": '93', "emptyOne": "16", "emptyTwo": this.form.remark, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,64,93", "type": "3" }) }//摘要
- formList.push(
- { "answerId": '86', "emptyOne": "7", "emptyTwo": this.form.userName, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,64,86", "type": "3" },//客户姓名
- { "answerId": '88', "emptyOne": "9", "emptyTwo": this.form.goldLogo, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,64,88", "type": "1" },//钞汇标识
- { "answerId": '90', "emptyOne": "13", "emptyTwo": this.form.drawWay, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,64,90", "type": "1" },//支取方式
- { "answerId": '92', "emptyOne": "46", "emptyTwo": this.form.serviceCharge, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,26,57,64,92", "type": "3" },//手续费
- // {"answerId":91,"emptyOne": "", "emptyTwo": "", "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,26,57,64,91","type": ""}// 密码框
- )
- console.log(formList)
- let params = {
- parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,26,57,64',
- lcJudgmentRuleReq: formList,
- projectId: +projectId,
- startTime: startTime,
- }
- addOperation(params).then((data) => {
- // this.$message({
- // message: '提交成功',
- // type: 'success'
- // });
- this.setDataFlow({ ...this.form })
- this.setNeedsModule(moduleName)
- this.submited = 1
- }).catch((error) => {
- this.$message({
- message: '服务器繁忙，提交失败。',
- center: true,
- type: 'info'
- });
- })
- } else {
- this.setTipsOperate('有必填项未填~');
+
+ const { form } = this
+ const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,708,754'
+ formList.push(
+ { answerId: 761, emptyOne: '', emptyTwo: '', operationIds: preId + ',761', type: '' },
+ { answerId: 762, emptyOne: 8, emptyTwo: form.currency, operationIds: preId + ',762', type: 1 },
+ { answerId: 763, emptyOne: 121, emptyTwo: form.money, operationIds: preId + ',763', type: 3 },
+ { answerId: 764, emptyOne: 122, emptyTwo: form.drawWay, operationIds: preId + ',764', type: 1 },
+ { answerId: 765, emptyOne: 17, emptyTwo: form.drawPassword, operationIds: preId + ',765', type: 3 },
+ )
+ let params = {
+ parentId: preId,
+ lcJudgmentRuleReq: formList,
+ projectId: +projectId,
+ startTime: startTime,
}
+ addOperation(params).then((data) => {
+ this.setDataFlow({ ...this.form })
+ this.submited = 1
+ }).catch((error) => {
+ this.$message({
+ message: '服务器繁忙，提交失败。',
+ center: true,
+ type: 'info'
+ });
+ })
},
- popUp (text) {
+ popUp1 (text) {
this.setTipsOperate('请刷银行卡');
this.setPopId('64')
sessionStorage.setItem('computerPath', this.$route.fullPath)
diff --git a/src/pages/manage/list/onlineBank/openAccount.vue b/src/pages/manage/list/onlineBank/openAccount.vue
index 9449c01..b7cd6f6 100644
--- a/src/pages/manage/list/onlineBank/openAccount.vue
+++ b/src/pages/manage/list/onlineBank/openAccount.vue
@@ -200,7 +200,6 @@ export default {
}
if (sessionStorage.getItem('nomUsefulPhrasesOpenCard2')) {
this.idNumberJudge = true
- // 身份证号码、客户姓名、币种（人民币）、钞汇标识（钞户）
const { idNumber, userName, peopleNumber, currency, goldLogo } = this.dataFlow
this.form.clientNumber = peopleNumber
this.form.idNumber = idNumber
diff --git a/src/store/modules/system.js b/src/store/modules/system.js
index 7f30906..b71cb73 100644
--- a/src/store/modules/system.js
+++ b/src/store/modules/system.js
@@ -1380,6 +1380,39 @@ const myInitState = {
expireDate: '2022-12-29', // 到期日期
}
},
+ '业务三十五': {
+ id: 704,
+ name: '外汇业务',
+ data: [13, 16, 407],
+ needs: [],
+ isStamp: {
+ // '业务专用章': [ 411 ]
+ },
+ backPeople: [],
+ // backPeople: [ ],
+ cultureArr: [],
+
+ moneyBox: [], // 钱箱
+ needBackMoney: false, // 需要钱箱取钱
+ peopleSign: [], // 客户签字
+ cultureIn: [], // 传票栏
+ sealBox: [], // 印章盒
+ currencyDetector: [], // 验钞机
+ printer: [], // 打印机
+ resource: [], // 资料
+
+ importanceArr: [], // 重要空白凭证箱
+ commonArr: [], // 普通凭证箱
+ dataFlow: {
+ currency: 153,
+ voucherNumber,
+ transMoney: 200000,
+ assignDate: '2022-12-29',
+ ticketNumber: '00242930',
+ drawDate: '2022-06-30', // 出票日期
+ expireDate: '2022-12-29', // 到期日期
+ }
+ },
}
@@ -1407,6 +1440,7 @@ export default {
// 下拉框的数据,在电脑中的下拉框有许多相同的，不用每次都请求服务器，可以在这里拿数据:
selectList: {
+ banknoteRemittanceList: [],
currencySelectList: [],
goldLogoSelectList: [],
accountQualitySelectList: [],
@@ -1418,7 +1452,8 @@ export default {
idTypeList: [], // 身份证选项
accountManagementList: [],
outAccountWayList: [],
- calculateWayList: []
+ calculateWayList: [],
+ fundingSourceList: [],
},
// （要保存的业务数据）:
@@ -2608,6 +2643,39 @@ export default {
expireDate: '2022-12-29', // 到期日期
}
},
+ '业务三十五': {
+ id: 704,
+ name: '外汇业务',
+ data: [13, 16, 407],
+ needs: [],
+ isStamp: {
+ // '业务专用章': [ 411 ]
+ },
+ backPeople: [],
+ // backPeople: [ ],
+ cultureArr: [],
+
+ moneyBox: [], // 钱箱
+ needBackMoney: false, // 需要钱箱取钱
+ peopleSign: [], // 客户签字
+ cultureIn: [], // 传票栏
+ sealBox: [], // 印章盒
+ currencyDetector: [], // 验钞机
+ printer: [], // 打印机
+ resource: [], // 资料
+
+ importanceArr: [], // 重要空白凭证箱
+ commonArr: [], // 普通凭证箱
+ dataFlow: {
+ currency: 153,
+ voucherNumber,
+ transMoney: 200000,
+ assignDate: '2022-12-29',
+ ticketNumber: '00242930',
+ drawDate: '2022-06-30', // 出票日期
+ expireDate: '2022-12-29', // 到期日期
+ }
+ },
},
// 初始化公共数据
allDataFlow: { ...allDataFlow },
@@ -2621,8 +2689,6 @@ export default {
// 页面开始的时候请求电脑录入的下拉框的数据 以供电脑中的下拉框使用
startPlay (state) {
- // 开始时调用，获取下拉框的东西。
-
// 38
// accountManagementList
@@ -2639,7 +2705,8 @@ export default {
76: 'isTranslate',
40: 'outAccountWayList',
39: 'calculateWayList',
-
+ 119: 'banknoteRemittanceList',
+ 122: 'fundingSourceList',
}
for (const key in mapObj) {
@@ -2647,7 +2714,9 @@ export default {
subject_id: key
}).then((data) => {
const name = mapObj[key]
- if (data.status == 200 && state.selectList[name].length === 0) {
+ if (!state.selectList[name]) state.selectList[name] = []
+ console.log(333, name, data, state.selectList)
+ if (data.status == 200 && !state.selectList[name].length) {
state.selectList[name].push(...data.data.items);
}
}).catch((error) => { })
@@ -3086,6 +3155,7 @@ export default {
},
// 获取页面中的下拉框的选项
getSelectList (state) {
+ console.log("🚀 ~ getSelectList ~ state:", state)
return state.selectList
},
popId (state) {