diff --git a/src/components/case/index.vue b/src/components/case/index.vue index b13e06f..6fa6757 100644 --- a/src/components/case/index.vue +++ b/src/components/case/index.vue @@ -63,7 +63,7 @@ - + diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index cea0e6b..de40aa6 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -1040,7 +1040,7 @@ export default { setTimeout(() => { loading.close(); sessionStorage.setItem('firstLoad', true) - }, 3000); + }, 1000); } diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue index 2440c0f..e9dbe41 100644 --- a/src/pages/index/list/index.vue +++ b/src/pages/index/list/index.vue @@ -59,7 +59,7 @@ export default { setTimeout(() => { loading.close(); sessionStorage.setItem('firstLoad2', true) - }, 3000); + }, 1000); } if(!this.businessKey) { diff --git a/src/pages/manage/list/personal/callDeposits/accountClosed.vue b/src/pages/manage/list/personal/callDeposits/accountClosed.vue index 4648001..edc84aa 100644 --- a/src/pages/manage/list/personal/callDeposits/accountClosed.vue +++ b/src/pages/manage/list/personal/callDeposits/accountClosed.vue @@ -192,7 +192,8 @@ export default{ myTable: { 302: { prop: 'voucherNumber', - type: '3' + type: '3', + "subjectId": 44, }, 303: { prop: 'voucherType', @@ -265,7 +266,8 @@ export default{ }, 394: { prop: 'drawPassword', - type: '3' + type: '3', + "subjectId": 17, } }, myTable2: { diff --git a/src/pages/manage/list/personal/callDeposits/openAccount.vue b/src/pages/manage/list/personal/callDeposits/openAccount.vue index f53c04b..e55b84f 100644 --- a/src/pages/manage/list/personal/callDeposits/openAccount.vue +++ b/src/pages/manage/list/personal/callDeposits/openAccount.vue @@ -201,7 +201,8 @@ export default{ }, 297: { prop: 'voucherNumber', // 银行卡号 - type: '3' + type: '3', + "subjectId": 44, }, 293: { prop: 'customerName',//客户姓名 @@ -240,7 +241,8 @@ export default{ }, 301: { prop: 'drawPassword', - type: '3' + type: '3', + "subjectId": 17, }, // : { // prop: 'noticeType',//通知类型 后台没有这个 diff --git a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue index 1dddd74..93dac9e 100644 --- a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue +++ b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue @@ -93,6 +93,7 @@ export default{ 113: { prop: 'cardNumber', type: '3', + "subjectId": 44, }, 114: { prop: 'userName', @@ -106,6 +107,7 @@ export default{ 117: { prop: 'drawPassword', type: '3', + "subjectId": 17, }, // cardNumber } diff --git a/src/pages/manage/list/personal/currentAccount/settle.vue b/src/pages/manage/list/personal/currentAccount/settle.vue index bd6b031..de81b31 100644 --- a/src/pages/manage/list/personal/currentAccount/settle.vue +++ b/src/pages/manage/list/personal/currentAccount/settle.vue @@ -123,6 +123,7 @@ export default{ 103: { prop: 'cardNumber', type: '3', + "subjectId": 44, }, 105: { prop: 'currency', @@ -151,7 +152,8 @@ export default{ }, 111: { prop: 'drawPassword', - type: '3' + type: '3', + "subjectId": 17, }, 112: { prop: 'remark', diff --git a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue index 884e4d2..69776d5 100644 --- a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue +++ b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue @@ -140,7 +140,8 @@ export default{ myTable2: { 94: { prop: 'cardNumber', - type: '3' + type: '3', + "subjectId": 44, }, 96: { prop: 'currency', @@ -150,6 +151,7 @@ export default{ 99: { prop: 'drawPassword', type: '3', + "subjectId": 17, }, 100: { prop: 'shroffAccount', diff --git a/src/pages/manage/list/personal/timeDeposit/deposit.vue b/src/pages/manage/list/personal/timeDeposit/deposit.vue index 6ce6604..edd3df1 100644 --- a/src/pages/manage/list/personal/timeDeposit/deposit.vue +++ b/src/pages/manage/list/personal/timeDeposit/deposit.vue @@ -218,7 +218,8 @@ export default{ myTable2: { 131: { prop: 'voucherNumber', // 凭证号码 - type: '3' + type: '3', + "subjectId": 44, }, 132: { prop: 'customerName',//客户姓名 @@ -252,7 +253,8 @@ export default{ }, 140: { prop: 'drawPassword', - type: '3' + type: '3', + "subjectId": 17, }, 141: { prop: 'certificateDeposit',//存款类别 diff --git a/src/pages/manage/list/personal/timeDeposit/openAccount.vue b/src/pages/manage/list/personal/timeDeposit/openAccount.vue index 2b750b1..fcc163d 100644 --- a/src/pages/manage/list/personal/timeDeposit/openAccount.vue +++ b/src/pages/manage/list/personal/timeDeposit/openAccount.vue @@ -187,10 +187,12 @@ export default{ 128: { // subjectId漏了? prop: 'voucherNumber',// 凭证号码 type: '3', + "subjectId": 44, }, 129: { prop: 'drawPassword', - type: '3' + type: '3', + "subjectId": 17, }, 130: { prop: 'drawWay', //支取方式 diff --git a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue index 9de5159..3b4532b 100644 --- a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue +++ b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue @@ -228,7 +228,8 @@ export default{ // voucherNumber 144: { prop: 'voucherNumber', - type: '3' + type: '3', + "subjectId": 44, }, 146: { prop: 'currency',//币种 @@ -268,6 +269,7 @@ export default{ 154: { prop: 'drawPassword',//支取密码 type: '3', + "subjectId": 17, } }, myTable2: { diff --git a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue index 4e22f00..a072f50 100644 --- a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue +++ b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue @@ -279,11 +279,12 @@ export default{ 181: { prop: 'voucherNumber', type: '3', - // "subjectId": 44, + "subjectId": 44, }, 192: { prop: 'drawPassword', type: '3', + "subjectId": 17, }, 182: { prop: 'customerName',//客户姓名 diff --git a/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue b/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue index a28f11a..48c734a 100644 --- a/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue +++ b/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue @@ -171,6 +171,7 @@ export default{ 171: { prop: 'voucherNumber', type: '3', + "subjectId": 44, }, 172: { prop: 'customerName',//客户姓名 @@ -189,7 +190,8 @@ export default{ }, 178: { prop: 'drawPassword', - type: '3' + type: '3', + "subjectId": 17, } }, } diff --git a/src/pages/manage/list/personal/usefulPhrases/openAccount.vue b/src/pages/manage/list/personal/usefulPhrases/openAccount.vue index 2a644e2..9d94b06 100644 --- a/src/pages/manage/list/personal/usefulPhrases/openAccount.vue +++ b/src/pages/manage/list/personal/usefulPhrases/openAccount.vue @@ -243,7 +243,6 @@ export default{ type: '3', "subjectId": 6, } - }, myTable: { 159: { @@ -273,10 +272,12 @@ export default{ 166: { prop: 'voucherNumber',//凭证号码 type: '3', + "subjectId": 44, }, 167: { prop: 'drawPassword', - type: '3' + type: '3', + "subjectId": 17, }, 168: { prop: 'monthDeposit',//月存金额 diff --git a/src/utils/utilFunction.js b/src/utils/utilFunction.js index 2b6bdff..8204284 100644 --- a/src/utils/utilFunction.js +++ b/src/utils/utilFunction.js @@ -157,7 +157,6 @@ const autoPlay = (parentId, form, myTable2, myTable, cards=[]) => { const { prop, type, subjectId='' } = myTable[key] formList.push({ "answerId": key + '', "emptyOne": '' + subjectId, "emptyTwo": form[prop], "operationIds": parentId + ',' + key, "type":type }) } - // for(let i=0; i console.log('---拿到的data') console.log(data) if(data.status == 200) { - + var list = data.data.judgmentRuleReqs - const tmpObj = Object.assign(myTable, myTable2) + // const tmpObj = Object.assign(myTable, myTable2) ...巨坑,把后面的属性给到前面了 + const tmpObj = {...myTable, ...myTable2} for (var i = 0; i < list.length; i++) { const { answerId, emptyTwo } = list[i] if(!cardArr) {