From 1cc5ac52bc5b7e2fb0388b162def539290f1756b Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 13 Jun 2024 14:10:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E6=B1=87=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dialog/index.vue               | 22 +++++++++++++-
 src/pages/counter/list/index.vue              | 25 ++++++++--------
 .../manage/list/foreignExchange/puchasing.vue | 29 ++++++++-----------
 .../list/foreignExchange/settlement.vue       | 17 ++---------
 src/store/modules/system.js                   |  5 ++--
 5 files changed, 51 insertions(+), 47 deletions(-)

diff --git a/src/components/dialog/index.vue b/src/components/dialog/index.vue
index dc7839c..81ce5ee 100644
--- a/src/components/dialog/index.vue
+++ b/src/components/dialog/index.vue
@@ -120,7 +120,9 @@ const nameMap = {
     12: 'CNY人民币'
   },
   goldLogo: {
-    13: '钞户'
+    13: '钞户',
+    150: '现汇（参考牌价712.34）',
+    151: '现钞（参考牌价712.34）',
   },
   accountQuality: {
     14: '个人结算户',
@@ -285,6 +287,24 @@ const nameMap = {
     148: '是',
     149: '否'
   },
+  buyForeignPurpose: {
+    187: '因私旅游',
+    188: '境外留学',
+    189: '公务及商务出国',
+    190: '探亲',
+    191: '境外就医',
+    192: '海外购物',
+    193: '非投资类保险',
+    194: '咨询服务',
+    195: '境内外汇储蓄存款',
+    196: '购买境内外汇理财产品',
+    197: '职工报酬和婚家款',
+    198: '专有权利使用费和特许费',
+    199: '投资收益',
+    200: '运输',
+    201: '其他服务',
+    202: '其他经常转移',
+  },
 }
 export default {
   props: {
diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index 8783c4f..2b853b6 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -1613,35 +1613,30 @@ export default {
 
       if (this.popText === '身份证扫描仪' || this.popText === '刷卡器' || this.popText === '密码器') {
         if (this.$store.state.system.id == '33' && this.popText === '身份证扫描仪') {
-
           this.nbm = 33
           if (this.receptionList.length > 0) {
             sessionStorage.setItem('nomClientIdentity', JSON.stringify("getIt"))
           }
           this.showManage()
         } else if (this.$store.state.system.id == '34' && this.popText === '身份证扫描仪') {
-
           this.nbm = 34
           if (this.receptionList.length > 0) {
             sessionStorage.setItem('firmClientIdentity', JSON.stringify("getIt"))
           }
           this.showManage()
         } else if (this.$store.state.system.id == '63' && this.popText === '刷卡器') {
-
           this.nbm = 63
           if (this.receptionList.length > 0) {
             sessionStorage.setItem('nomBusinessDepositCard', JSON.stringify("getIt"))
           }
           this.showManage()
         } else if (this.$store.state.system.id == '64' && this.popText === '刷卡器') {
-
           this.nbm = 64
           if (this.receptionList.length > 0) {
             sessionStorage.setItem('nomCurrentWithdrawalCard', JSON.stringify("getIt"))
           }
           this.showManage()
         } else if (this.$store.state.system.id == '64,2' && this.popText === '密码器') {
-
           this.nbm = 64
           if (this.passwordForm.passwordAgain) {
             let accountPassword = '';
@@ -1650,7 +1645,6 @@ export default {
           }
           this.showManage()
         } else if (this.$store.state.system.id == '65' && this.popText === '刷卡器') {
-
           this.nbm = 65
           if (this.receptionList.length > 0) {
             sessionStorage.setItem('nomCurrentTransferCard', JSON.stringify("getIt"))
@@ -1770,6 +1764,18 @@ 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) {
@@ -2017,12 +2023,7 @@ export default {
               projectId: +projectId,
               startTime: startTime,
             }
-            addOperation(params).then((data) => {
-              console.log('我靠取钱')
-              // this.setTipsOperate('取钱成功!')
-            }).catch((error) => {
-            })
-            // console.log(this.)
+            addOperation(params).then((data) => { }).catch((error) => { })
             // 如果需要钱箱取钱并且满足了
 
           } else {
diff --git a/src/pages/manage/list/foreignExchange/puchasing.vue b/src/pages/manage/list/foreignExchange/puchasing.vue
index a2fb947..a0e4e52 100644
--- a/src/pages/manage/list/foreignExchange/puchasing.vue
+++ b/src/pages/manage/list/foreignExchange/puchasing.vue
@@ -34,9 +34,10 @@
                 :key="item.itemId"> </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="购汇用途" prop="drawWay">
-            <el-select v-model.trim="form.drawWay" placeholder="请选择" ref="drawWay">
-              <el-option label="密码" :value="18"> </el-option>
+          <el-form-item label="购汇用途" prop="buyForeignPurpose">
+            <el-select v-model.trim="form.buyForeignPurpose" placeholder="请选择">
+              <el-option v-for="item in getSelectList.buyForeignPurposeList" :label="item.options" :value="item.itemId"
+                :key="item.itemId"> </el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -45,7 +46,6 @@
             <el-select v-model.trim="form.currency" placeholder="请选择" ref="currency">
               <el-option v-for="item in getSelectList.currencySelectList" :label="item.options" :value="item.itemId"
                 :key="item.itemId"> </el-option>
-              <!-- <el-option value="CNY人民币">CNY人民币</el-option> -->
             </el-select>
           </el-form-item>
           <el-form-item label="外汇金额" prop="money">
@@ -66,9 +66,6 @@
     <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName"
       @submitIt="submitForm2" :needAuth="needAuth" />
   </div>
-
-  <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
-
 </template>
 <script>
 import { mobPattern, namePattern, ratePattern, vercustomer } from '@/utils/verify.js'
@@ -99,12 +96,11 @@ export default {
     if (sessionStorage.getItem('nomUsefulPhrasesOpenPassword')) {
       this.form.drawPassword = sessionStorage.getItem('nomUsefulPhrasesOpenPassword')
     }
-    if (sessionStorage.getItem('nomCurrentWithdrawalCard')) {
+    if (sessionStorage.getItem('foreignExchangePuchasingVoucher')) {
       this.cardNumberJudge = true
-      const { currency, goldLogo, drawWay, voucherNumber } = this.dataFlow
+      const { currency, goldLogo } = this.dataFlow
       this.form.currency = currency
       this.form.goldLogo = goldLogo
-      this.form.drawWay = drawWay
     }
 
     this.getFormData()
@@ -119,7 +115,7 @@ export default {
         currency: '',
         goldLogo: '',
         money: '',
-        drawWay: '',
+        buyForeignPurpose: '',
         drawPassword: '',
       },
       formName: {
@@ -127,7 +123,7 @@ export default {
         currency: '币种',
         goldLogo: '钞汇',
         money: '外汇金额',
-        drawWay: '购汇用途',
+        buyForeignPurpose: '购汇用途',
         drawPassword: '支取密码',
       },
       rules: {
@@ -152,7 +148,7 @@ export default {
             trigger: 'blur'
           }
         ],
-        drawWay: [
+        buyForeignPurpose: [
           {
             required: true,
             message: '请选择购汇用途',
@@ -189,7 +185,7 @@ export default {
             else if (list[i].answerId == '87') { this.form.currency = +list[i].emptyTwo } //币种
             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 } //支取方式
+            else if (list[i].answerId == '90') { this.form.buyForeignPurpose = +list[i].emptyTwo } //支取方式
             else if (list[i].answerId == '91') {
               if (sessionStorage.getItem('nomCurrentWithdrawalPassword')) {
                 this.form.drawPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword')
@@ -228,7 +224,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: 759, emptyOne: 117, emptyTwo: form.drawWay, operationIds: preId + ',759', type: 1 },
+        { answerId: 759, emptyOne: 117, emptyTwo: form.buyForeignPurpose, operationIds: preId + ',759', type: 1 },
         { answerId: 760, emptyOne: 17, emptyTwo: form.drawPassword, operationIds: preId + ',760', type: 3 },
       )
       let params = {
@@ -239,7 +235,6 @@ export default {
       }
       addOperation(params).then((data) => {
         this.setDataFlow({ ...this.form })
-        this.setNeedsModule(moduleName)
         this.submited = 1
       }).catch((error) => {
         this.$message({
@@ -257,7 +252,7 @@ export default {
     },
     popUp2 (text) {
       this.setTipsOperate('请在密码器输入密码');
-      this.setPopId('167')
+      this.setPopId('64,2')
       sessionStorage.setItem('computerPath', this.$route.fullPath)
       this.$router.push('/counter/list/')
     },
diff --git a/src/pages/manage/list/foreignExchange/settlement.vue b/src/pages/manage/list/foreignExchange/settlement.vue
index 58b4237..dfc4544 100644
--- a/src/pages/manage/list/foreignExchange/settlement.vue
+++ b/src/pages/manage/list/foreignExchange/settlement.vue
@@ -55,9 +55,6 @@
     <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName"
       @submitIt="submitForm2" :needAuth="needAuth" />
   </div>
-
-  <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
-
 </template>
 <script>
 import { mobPattern, namePattern, ratePattern, vercustomer } from '@/utils/verify.js'
@@ -83,16 +80,13 @@ export default {
     if (sessionStorage.getItem('nomCurrentWithdrawalPassword')) {
       this.form.drawPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword')
     }
-    if (sessionStorage.getItem('nomCurrentWithdrawalCard')) {
+    if (sessionStorage.getItem('foreignExchangeSettlementVoucher')) {
       this.cardNumberJudge = true
       const { currency, voucherNumber } = this.dataFlow
       this.form.currency = currency
       this.form.voucherNumber = voucherNumber
     }
-
-
     this.getFormData()
-
   },
   data () {
     return {
@@ -181,12 +175,7 @@ export default {
             else if (list[i].answerId == '93') { this.form.remark = list[i].emptyTwo } //摘要
           }
         }
-        console.log('fffs')
-
-        console.log('issue')
-        console.log(sessionStorage.getItem('nomCurrentWithdrawalPassword'))
-      }).catch((error) => {
-      })
+      }).catch(() => { })
     },
     submitForm () {
       if (this.submited) return this.$message.error('已提交！')
@@ -239,7 +228,7 @@ export default {
     },
     popUp1 (text) {
       this.setTipsOperate('请刷银行卡');
-      this.setPopId('64')
+      this.setPopId('68')
       sessionStorage.setItem('computerPath', this.$route.fullPath)
       this.$router.push('/counter/list/')
     },
diff --git a/src/store/modules/system.js b/src/store/modules/system.js
index b71cb73..6315098 100644
--- a/src/store/modules/system.js
+++ b/src/store/modules/system.js
@@ -164,7 +164,6 @@ const allDataFlow = {
   capital, // 不知道是多少
   withdrawType: 124, // 支取类别
   withdrawWay: 125, // 支取方式
-  withdrawType: 124, // 支取类别
   withdrawWay: 126, // 支取方式
   depositTerm: 86,
   monthDeposit: 100,
@@ -1454,6 +1453,7 @@ export default {
       outAccountWayList: [],
       calculateWayList: [],
       fundingSourceList: [],
+      buyForeignPurposeList: [],
     },
 
     // （要保存的业务数据）:
@@ -2707,6 +2707,7 @@ export default {
         39: 'calculateWayList',
         119: 'banknoteRemittanceList',
         122: 'fundingSourceList',
+        124: 'buyForeignPurposeList',
       }
 
       for (const key in mapObj) {
@@ -2715,7 +2716,6 @@ export default {
         }).then((data) => {
           const name = mapObj[key]
           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);
           }
@@ -3155,7 +3155,6 @@ export default {
     },
     // 获取页面中的下拉框的选项
     getSelectList (state) {
-      console.log("🚀 ~ getSelectList ~ state:", state)
       return state.selectList
     },
     popId (state) {