diff --git a/src/api/api.js b/src/api/api.js index 5cd8341..769cc47 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -2,7 +2,7 @@ import axios from 'axios'; import router from '../router'; // 创建axios实例 const service = axios.create({ - baseURL: 'http://192.168.31.125:9000', + baseURL: 'http://39.108.250.202:9000', timeout: 30000 // 请求超时时间 }) // 添加request拦截器 @@ -28,14 +28,14 @@ service.interceptors.response.use( return Promise.reject(error.response) } ) - +let token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjM1MzE1Nzc2LCJleHAiOjE2MzUzNTg5NzYsImFjY291bnRJZCI6IjEifQ.8K5ySMaieffu79LZjJPfA7u_OfMRo6JfiarCJGdoCiE' export function get(url, params = {}) { // params.t = new Date().getTime(); //get方法加一个时间参数,解决ie下可能缓存问题. return service({ url: url, method: 'get', headers: { - token:'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjM1MjEyMTYyLCJleHAiOjE2MzUyNTUzNjIsImFjY291bnRJZCI6IjIifQ.KjuoWp27gQwILUl0KsfxiyOwO45lADTS6ODO-x2KdJI' + token:token }, params }) @@ -50,7 +50,7 @@ export function post(url, data = {}) { method: 'post', headers: { 'Content-Type':'application/json;charset=UTF-8', - token:'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjM1MjEyMTYyLCJleHAiOjE2MzUyNTUzNjIsImFjY291bnRJZCI6IjIifQ.KjuoWp27gQwILUl0KsfxiyOwO45lADTS6ODO-x2KdJI' + token:token }, data:data }; @@ -65,7 +65,7 @@ export function put(url,data = {}){ method: 'put', headers: { 'Content-Type':'application/json;charset=UTF-8', - token:'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjM1MjEyMTYyLCJleHAiOjE2MzUyNTUzNjIsImFjY291bnRJZCI6IjIifQ.KjuoWp27gQwILUl0KsfxiyOwO45lADTS6ODO-x2KdJI' + token:token }, data:JSON.stringify(data) }) @@ -76,7 +76,7 @@ export function deletes(url){ url: url, method: 'delete', headers: { - token:'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjM1MjEyMTYyLCJleHAiOjE2MzUyNTUzNjIsImFjY291bnRJZCI6IjIifQ.KjuoWp27gQwILUl0KsfxiyOwO45lADTS6ODO-x2KdJI' + token:token } }) } diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index 1e58114..45a9f51 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -160,7 +160,7 @@
-
+

{{item.name}}

@@ -192,7 +192,6 @@ diff --git a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue index e3c419a..126dc09 100644 --- a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue +++ b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue @@ -10,7 +10,7 @@
- + @@ -22,7 +22,7 @@ - +
@@ -41,7 +41,10 @@ export default{ props:{}, data(){ return{ - form:{} + form:{ + idType:'', + userName:'', + } } }, created() { diff --git a/src/pages/manage/list/personal/currentAccount/deposit.vue b/src/pages/manage/list/personal/currentAccount/deposit.vue index f3ba772..bf9c967 100644 --- a/src/pages/manage/list/personal/currentAccount/deposit.vue +++ b/src/pages/manage/list/personal/currentAccount/deposit.vue @@ -10,30 +10,30 @@
- + - + - + - + - + - + @@ -47,7 +47,14 @@ export default{ props:{}, data(){ return{ - form:{} + form:{ + currency:'', + money:'', + userName:'', + goldLogo:'', + annualInterest:'', + remark:'', + } } } } diff --git a/src/pages/manage/list/personal/currentAccount/openAccount.vue b/src/pages/manage/list/personal/currentAccount/openAccount.vue index 028b2cf..da36113 100644 --- a/src/pages/manage/list/personal/currentAccount/openAccount.vue +++ b/src/pages/manage/list/personal/currentAccount/openAccount.vue @@ -68,30 +68,30 @@
-
+
- + - + - + - + @@ -107,10 +107,52 @@ - +
- 提交 +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

请刷卡

+
+ + +
+

请输入密码

+
+ + + + + +
+ 提交 2){ + this.count = 2 + } + if(this.count == 1){ + this.formTwo = true + } + if (this.count == 2){ + this.formThree = true + } + // if(this.second.length){/* 检测已有二级卡是否填写完整 */ + // return this.$message('请把已有的二级卡填写完整再执行新增操作！') + // for (let i= 0; i< this.second.length; i++) { + // if(!this.detectionObjKeys(e,[])){/* 写入定义的二级卡字段 */ + // return this.$message('请把已有的二级卡填写完整再执行新增操作！') + // } + // } + // } + // let obj = {}/* 二级卡定义空属性 */ // this.second.push(obj)`` }, @@ -187,25 +256,42 @@ export default { popSure(){ this.visible = false let formList = []; - if(this.form.userNumber){ - formList.push({ - "emptyOne": "6", - "emptyTwo": this.form.userNumber, - "operationIds": "26,57,62,68", - "type": "3" - }) + if(this.form.userName && this.form.currency && this.form.goldLogo && this.form.accountType && this.form.drawWay && this.form.voucherType || + (this.formTwo == true && this.form.accountTypesTwo && this.form.drawWaysTwo && this.form.voucherTypesTwo) || + (this.formThree == true && this.form.accountTypesThree && this.form.drawWaysThree && this.form.voucherTypesThree)){ + if (this.form.userNumber){formList.push({"emptyOne": "6", "emptyTwo": this.form.userNumber, "operationIds": "26,57,62,68","type": "3"})}//客户号 + if (this.form.accountQuality){formList.push({"emptyOne": "10", "emptyTwo": this.form.accountQuality, "operationIds": "26,57,62,72", "type": "3"})}//账户性质1 + if (this.form.accountQualitysTwo){formList.push({"emptyOne": "10", "emptyTwo": this.form.accountQualitysTwo, "operationIds": "26,57,62,270", "type": "3"})}//账户性质2 + if (this.form.accountTypesTwo){formList.push({"emptyOne": "12", "emptyTwo": this.form.accountTypesTwo, "operationIds": "26,57,62,272", "type": "3"})}//账户类型2 + if (this.form.drawWaysTwo){formList.push({"emptyOne": "13", "emptyTwo": this.form.drawWaysTwo, "operationIds": "26,57,62,274", "type": "3"})} //支取方式2 + if (this.form.voucherTypesTwo){formList.push({"emptyOne": "11", "emptyTwo": this.form.voucherTypesTwo, "operationIds": "26,57,62,271", "type": "3"})} //凭证类型2 + if (this.form.accountQualitysThree){formList.push({"emptyOne": "10", "emptyTwo": this.form.accountQualitysThree, "operationIds": "26,57,62,276", "type": "3"})}//账户性质3 + if (this.form.accountTypesThree){formList.push({"emptyOne": "12", "emptyTwo": this.form.accountTypesThree, "operationIds": "26,57,62,278", "type": "3"})}//账户类型3 + if (this.form.drawWaysThree){formList.push({"emptyOne": "13", "emptyTwo": this.form.drawWaysThree, "operationIds": "26,57,62,280", "type": "3"})}//支取方式3 + if (this.form.voucherTypesThree){formList.push({"emptyOne": "11", "emptyTwo": this.form.voucherTypesThree, "operationIds": "26,57,62,277", "type": "3"})}//凭证类型3 + formList.push( + {"emptyOne": "7", "emptyTwo": this.form.userName, "operationIds": "26,57,62,69", "type": "3"},//用户名称 + {"emptyOne": "8", "emptyTwo": this.form.currency, "operationIds": "26,57,62,70", "type": "3"},//币种 + {"emptyOne": "9", "emptyTwo": this.form.goldLogo, "operationIds": "26,57,62,73", "type": "3"},//钞汇标识 + {"emptyOne": "12", "emptyTwo": this.form.accountType, "operationIds": "26,57,62,74", "type": "3"}, //账户类型 + {"emptyOne": "13", "emptyTwo": this.form.drawWay, "operationIds": "26,57,62,76", "type": "3"}, //支取方式 + {"emptyOne": "11", "emptyTwo": this.form.voucherType, "operationIds": "26,57,62,73", "type": "3"} //凭证类型 + ) sessionStorage.setItem('ruleReqs', JSON.stringify(formList)) }else{ - this.$message.error('有必填项为填哦~'); + this.$message.error('有必填项未填哦~'); } }, - deleteSecond(index){ + deleteSecond(){ this.$confirm('此操作将删除该账户类型, 是否继续?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { - this.formto = false + this.count = this.count-1; + if (this.count < 1){this.count = 0} + if (this.count == 0){this.formTwo = false} + if (this.count == 1){this.formThree = false} // this.second.splice(index,1) this.$message({ type: 'success', @@ -219,7 +305,7 @@ export default { }); }, popUp(){ - this.$store.commit('system/changePop',{show:true,text:'凭证号码'}) + this.$store.commit('system/changePop',{show:true,text:'刷卡器'}) }, popUps(){ this.$store.commit('system/changePop',{show:true,text:'密码器'}) diff --git a/src/pages/manage/list/personal/currentAccount/settle.vue b/src/pages/manage/list/personal/currentAccount/settle.vue index 2a6e77b..37facfc 100644 --- a/src/pages/manage/list/personal/currentAccount/settle.vue +++ b/src/pages/manage/list/personal/currentAccount/settle.vue @@ -10,41 +10,43 @@
- + - + - + - +
+

请输入密码

+
- + - + - + - + - + @@ -58,7 +60,16 @@ export default{ props:{}, data(){ return{ - form:{} + form:{ + currency:'', + money:'', + totalMoney:'', + userName:'', + goldLogo:'', + interest:'', + chargeWay:'', + remark:'', + } } }, created() { diff --git a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue index c1a7ee3..0d8c858 100644 --- a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue +++ b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue @@ -10,23 +10,23 @@ - + - + - + - + - + @@ -36,12 +36,12 @@ - + - + @@ -55,7 +55,15 @@ export default{ props:{}, data(){ return{ - form:{} + form:{ + currency:'', + money:'', + shroffAccount:'', + userName:'', + goldLogo:'', + payeeName:'', + remark:'', + } } } } diff --git a/src/pages/manage/list/personal/currentAccount/withdrawal.vue b/src/pages/manage/list/personal/currentAccount/withdrawal.vue index 72d8a8b..2ba3c99 100644 --- a/src/pages/manage/list/personal/currentAccount/withdrawal.vue +++ b/src/pages/manage/list/personal/currentAccount/withdrawal.vue @@ -10,12 +10,12 @@ - + - +
@@ -25,25 +25,25 @@ - + - + - + - + - + @@ -57,7 +57,15 @@ export default{ props:{}, data(){ return{ - form:{} + form:{ + currency:'', + money:'', + userName:'', + goldLogo:'', + serviceCharge:'', + chargeWay:'', + remark:'', + } } } } diff --git a/src/store/modules/system.js b/src/store/modules/system.js index 007f708..140f86f 100644 --- a/src/store/modules/system.js +++ b/src/store/modules/system.js @@ -40,6 +40,7 @@ export default { changePop:(state,val)=>{ state.showPop = val.show state.popText = val.text + state.id = val.id }, changeGoods:(state,obj)=>{/* 赋值/push/删除 */ if(obj.goods&&obj.goods.length>0){