外汇等联调

src/pages/counter/list/index.vue

@@ -1764,18 +1764,6 @@ export default {
             }
           }
           this.showManage()
-        } else if (this.$store.state.system.id == '68' && this.popText === '刷卡器') {
-          this.nbm = 68
-          if (this.receptionList.length > 0) {
-            sessionStorage.setItem('foreignExchangeSettlementVoucher', JSON.stringify("getIt"))
-          }
-          this.showManage()
-        } else if (this.$store.state.system.id == '69' && this.popText === '刷卡器') {
-          this.nbm = 69
-          if (this.receptionList.length > 0) {
-            sessionStorage.setItem('foreignExchangePuchasingVoucher', JSON.stringify("getIt"))
-          }
-          this.showManage()
         } else if (this.$store.state.system.id == '62,3' && this.popText === '密码器') {
           this.nbm = 62
           if (this.passwordForm.passwordAgain) {

src/pages/counter/list/myConfig.js

@@ -413,6 +413,55 @@ const myConfig = {
     parentId: '5,706,711',
     isPassword: true
   },
+
+  '743': {
+    nbm: 743,
+    name: 'onlineBankIdCard',
+    parentId: '5,707,741',
+    isPassword: false,
+    machine: '身份证扫描仪'
+  },
+  '749': {
+    nbm: 749,
+    name: 'onlineBankBankCard',
+    parentId: '5,707,741',
+    isPassword: false,
+    machine: '刷卡器'
+  },
+  '752': {
+    nbm: 752,
+    name: 'onlineBankPassword',
+    parentId: '5,707,741',
+    isPassword: true
+  },
+
+  '755': {
+    nbm: 755,
+    name: 'foreignExchangePuchasingBankCard',
+    parentId: '5,708,753',
+    isPassword: false,
+    machine: '刷卡器'
+  },
+  '760': {
+    nbm: 760,
+    name: 'foreignExchangePuchasingPassword',
+    parentId: '5,708,753',
+    isPassword: true
+  },
+
+  '761': {
+    nbm: 761,
+    name: 'foreignExchangeSettleBankCard',
+    parentId: '5,708,754',
+    isPassword: false,
+    machine: '刷卡器'
+  },
+  '765': {
+    nbm: 765,
+    name: 'foreignExchangSettlePassword',
+    parentId: '5,708,754',
+    isPassword: true
+  },
 }
 
 export {

src/pages/manage/list/foreignExchange/puchasing.vue

@@ -88,22 +88,17 @@ export default {
     NeedBefore
   },
   created () {
-    if (sessionStorage.getItem('nomUsefulPhrasesOpenCard')) {
-      this.cardNumberJudge = true
-      const { voucherNumber } = this.dataFlow
-      this.form.voucherNumber = voucherNumber
-    }
-    if (sessionStorage.getItem('nomCurrentTransferPassword')) {
-      this.form.drawPassword = sessionStorage.getItem('nomCurrentTransferPassword')
+    if (sessionStorage.getItem('foreignExchangePuchasingPassword')) {
+      this.form.drawPassword = sessionStorage.getItem('foreignExchangePuchasingPassword')
     }
-    if (sessionStorage.getItem('foreignExchangePuchasingVoucher')) {
+    if (sessionStorage.getItem('foreignExchangePuchasingBankCard')) {
       this.cardNumberJudge = true
       const { voucherNumber, goldLogo } = this.dataFlow
       this.form.goldLogo = goldLogo
       this.form.voucherNumber = voucherNumber
     }
 
-    this.getFormData()
+    // this.getFormData()
   },
   data () {
     return {
@@ -179,7 +174,6 @@ export default {
           var list = data.data.judgmentRuleReqs
           for (var i = 0; i < list.length; i++) {
             if (list[i].answerId == '85') {
-              // sessionStorage.setItem('nomCurrentWithdrawalCard', list[i].emptyTwo)
               this.cardNumberJudge = true
             } //卡号
             else if (list[i].answerId == '87') { this.form.currency = +list[i].emptyTwo } //币种
@@ -215,8 +209,6 @@ export default {
     submitForm2 () {
       let projectId = sessionStorage.getItem('projectId')
       let startTime = sessionStorage.getItem('startTime')
-      let nomCurrentWithdrawalCard = sessionStorage.getItem('nomCurrentWithdrawalCard')
-      let nomCurrentWithdrawalCards = nomCurrentWithdrawalCard // JSON.parse(nomCurrentWithdrawalCard);
       let formList = [];
       const { form } = this
       const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,708,753'
@@ -224,6 +216,7 @@ export default {
         { 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: 758, emptyOne: 120, emptyTwo: form.money, operationIds: preId + ',758', type: 3 },
         { answerId: 759, emptyOne: 117, emptyTwo: form.buyForeignPurpose, operationIds: preId + ',759', type: 1 },
         { answerId: 760, emptyOne: 17, emptyTwo: form.drawPassword, operationIds: preId + ',760', type: 3 },
       )
@@ -246,13 +239,13 @@ export default {
     },
     popUp1 (text) {
       this.setTipsOperate('请刷银行卡');
-      this.setPopId('69')
+      this.setPopId('755')
       sessionStorage.setItem('computerPath', this.$route.fullPath)
       this.$router.push('/counter/list/')
     },
     popUp2 (text) {
       this.setTipsOperate('请在密码器输入密码');
-      this.setPopId('99')
+      this.setPopId('760')
       sessionStorage.setItem('computerPath', this.$route.fullPath)
       this.$router.push('/counter/list/')
     },

src/pages/manage/list/foreignExchange/settlement.vue

@@ -77,16 +77,16 @@ export default {
     NeedBefore
   },
   created () {
-    if (sessionStorage.getItem('nomCurrentWithdrawalPassword')) {
-      this.form.drawPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword')
+    if (sessionStorage.getItem('foreignExchangSettlePassword')) {
+      this.form.drawPassword = sessionStorage.getItem('foreignExchangSettlePassword')
     }
-    if (sessionStorage.getItem('foreignExchangeSettlementVoucher')) {
+    if (sessionStorage.getItem('foreignExchangeSettleBankCard')) {
       this.cardNumberJudge = true
       const { currency, voucherNumber } = this.dataFlow
       this.form.currency = currency
       this.form.voucherNumber = voucherNumber
     }
-    this.getFormData()
+    // this.getFormData()
   },
   data () {
     return {
@@ -194,10 +194,6 @@ export default {
     submitForm2 () {
       let projectId = sessionStorage.getItem('projectId')
       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 = [];
 
       const { form } = this
@@ -228,19 +224,19 @@ export default {
     },
     popUp1 (text) {
       this.setTipsOperate('请刷银行卡');
-      this.setPopId('68')
+      this.setPopId('761')
       sessionStorage.setItem('computerPath', this.$route.fullPath)
       this.$router.push('/counter/list/')
     },
     popUp2 (text) {
       this.setTipsOperate('请在密码器输入密码');
-      this.setPopId('64,2')
+      this.setPopId('765')
       sessionStorage.setItem('computerPath', this.$route.fullPath)
       this.$router.push('/counter/list/')
     },
-    ismoney: ismoney,
-    checkName: checkName,
-    checkHanzi: checkHanzi
+    ismoney,
+    checkName,
+    checkHanzi,
   },
   computed: {
     ...mapGetters({

src/pages/manage/list/onlineBank/openAccount.vue

@@ -188,17 +188,11 @@ export default {
     NeedBefore
   },
   created () {
-    if (sessionStorage.getItem('nomUsefulPhrasesOpenPassword')) {
-      this.form.drawPassword = sessionStorage.getItem('nomUsefulPhrasesOpenPassword')
+    if (sessionStorage.getItem('onlineBankPassword')) {
+      this.form.drawPassword = sessionStorage.getItem('onlineBankPassword')
     }
 
-    if (sessionStorage.getItem('nomClientIdentity')) {
-      this.idNumberJudge = true
-      const { idNumber } = this.dataFlow
-      this.form.idNumber = idNumber
-      this.form.certificateType = 83
-    }
-    if (sessionStorage.getItem('nomUsefulPhrasesOpenCard2')) {
+    if (sessionStorage.getItem('onlineBankIdCard')) {
       this.idNumberJudge = true
       const { idNumber, userName, peopleNumber, currency, goldLogo } = this.dataFlow
       this.form.clientNumber = peopleNumber
@@ -208,13 +202,12 @@ export default {
       this.form.goldLogo = goldLogo
       this.form.voucherType = 15
     }
-    if (sessionStorage.getItem('nomUsefulPhrasesOpenCard')) {
+    if (sessionStorage.getItem('onlineBankBankCard')) {
       this.cardNumberJudge = true
       const { voucherNumber } = this.dataFlow
       this.form.voucherNumber = voucherNumber
     }
-    this.getFormData()
-
+    // this.getFormData()
   },
   mixins: [TipsBefore],
   mounted () {
@@ -251,27 +244,21 @@ export default {
       setPopId: 'system/setPopId',
       setTipsOperate: 'system/setTipsOperate'
     }),
-    popUp () {// 唤起弹窗
-      this.setTipsOperate('请刷身份证');
-      this.setPopId('33')
-      sessionStorage.setItem('computerPath', this.$route.fullPath)
-      this.$router.push('/counter/list/')
-    },
     popUp1 (text) { // 身份证扫描仪
       this.setTipsOperate('请刷身份证');
-      this.setPopId('1399')
+      this.setPopId('743')
       sessionStorage.setItem('computerPath', this.$route.fullPath)
       this.$router.push('/counter/list/')
     },
     popUp2 (text) {
       this.setTipsOperate('请刷银行卡');
-      this.setPopId('166')
+      this.setPopId('749')
       sessionStorage.setItem('computerPath', this.$route.fullPath)
       this.$router.push('/counter/list/')
     },
     popUp3 (text) {
       this.setTipsOperate('请在密码器输入密码');
-      this.setPopId('167')
+      this.setPopId('752')
       sessionStorage.setItem('computerPath', this.$route.fullPath)
       this.$router.push('/counter/list/')
     },
@@ -307,6 +294,12 @@ export default {
       const preId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,707,741'
       formList.push(
         { answerId: 742, emptyOne: 19, emptyTwo: form.certificateType, operationIds: preId + ',742', type: 1 },
+        { answerId: 743, emptyOne: '', emptyTwo: '', operationIds: preId + ',743', type: '' },
+        { answerId: 744, emptyOne: 6, emptyTwo: form.clientNumber, operationIds: preId + ',744', type: 3 },
+        { answerId: 745, emptyOne: 7, emptyTwo: form.customerName, operationIds: preId + ',745', type: 3 },
+        { answerId: 746, emptyOne: 8, emptyTwo: form.currency, operationIds: preId + ',746', type: 1 },
+        { answerId: 747, emptyOne: 9, emptyTwo: form.goldLogo, operationIds: preId + ',747', type: 1 },
+        { answerId: 748, emptyOne: 11, emptyTwo: form.voucherType, operationIds: preId + ',748', type: 1 },
         { answerId: 750, emptyOne: 117, emptyTwo: form.openOnlineBanking, operationIds: preId + ',750', type: 1 },
         { answerId: 749, emptyOne: 44, emptyTwo: form.voucherNumber, operationIds: preId + ',749', type: 3 },
         { answerId: 751, emptyOne: 117, emptyTwo: form.openPhoneBanking, operationIds: preId + ',751', type: 1 },