From 8b5481c17593efe9aaf983ef8da7fa29b224e4c3 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 26 Sep 2024 11:02:34 +0800
Subject: [PATCH] fix

---
 src/api/api.js                                |   2 +-
 src/components/dialog/index.vue               | 134 ++++++++++++------
 .../manage/list/foreignExchange/puchasing.vue |  12 +-
 .../list/foreignExchange/settlement.vue       |  16 +--
 .../manage/list/onlineBank/openAccount.vue    |  13 +-
 src/pages/report/index.vue                    |   8 +-
 src/store/modules/system.js                   |  26 ++--
 7 files changed, 125 insertions(+), 86 deletions(-)

diff --git a/src/api/api.js b/src/api/api.js
index 1d502fc..ceef618 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -10,7 +10,7 @@ if (dev) {
   // 本地
   host = 'http://121.37.12.51/' // 中台测试服
   // host = 'https://www.occupationlab.com/' // 正式服
-  host = 'http://192.168.31.51:9000/'
+  // host = 'http://192.168.31.51:9000/'
   const ip = localStorage.getItem('localIp')
   const ips = ['http://192.168.31.217:9000/', 'http://192.168.31.51:9000/', 'http://121.37.12.51/']
   host = ips[+ip]
diff --git a/src/components/dialog/index.vue b/src/components/dialog/index.vue
index 9639b39..4f9d2b5 100644
--- a/src/components/dialog/index.vue
+++ b/src/components/dialog/index.vue
@@ -65,6 +65,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 
 // 这个obj用来识别父组件的业务名字，也就是父组件的moduleName,这样展示提交信息的框中就可以展示父组件的名字。这个组件被下列组件复用着。
 const obj = {
@@ -121,7 +122,32 @@ const nameMap = {
     116: '现金支票'
   },
   currency: {
-    12: 'CNY人民币'
+    12: 'CNY人民币',
+    153: '美元 现汇',
+    163: '美元',
+    164: '澳大利亚元',
+    165: '加拿大元',
+    166: '港币',
+    167: '英镑',
+    168: '欧元',
+    169: '日元',
+    170: '新西兰元',
+    171: '新加坡元',
+    172: '泰国铢',
+    173: '韩元',
+    174: '新台币(不支持跨进汇款)',
+    175: '瑞土法郎',
+    176: '瑞典克朗',
+    177: '丹麦克朗',
+    178: '卢布',
+    179: '挪威克朗',
+    180: '菲律宾比索(不支持跨进汇款)',
+    181: '澳门元',
+    182: '印尼卢比 (不支持跨进汇款)',
+    183: '巴西里亚尔(不支持跨进汇款)',
+    184: '阿联酋迪拉姆(不支持跨进汇款)',
+    185: '印度卢比(不支持跨进汇款)',
+    186: '印度卢比(南非兰特)',
   },
   goldLogo: {
     13: '钞户',
@@ -309,6 +335,17 @@ const nameMap = {
     201: '其他服务',
     202: '其他经常转移',
   },
+  fundingSource: {
+    154: '职工报酬和赡家款',
+    155: '旅游',
+    156: '金融和保险服务',
+    157: '专有权利使用费和特许费',
+    158: '咨询服务',
+    159: '其他服务',
+    160: '投资收益',
+    161: '其他经常转移',
+    162: '运输',
+  },
 }
 export default {
   props: {
@@ -335,14 +372,30 @@ export default {
     moduleName: {
       type: String,
       default: 'spacial'
+    },
+    spare: {
+      type: Boolean,
+      default: true
+    },
+  },
+  data () {
+    return {
+      flow: 1, // 影响页面展示授权或者不授权页面
+      disForm: {      // 展示授权柜员号和密码
+        name: '002288',
+        pass: '123456'
+      },
+      leftObj: {},    // 左边展示的项目列表
+      rightObj: {}    // 右边展示的项目列表
     }
+
   },
   created () {
     // 如果不需要授权，flow就是4，页面展示那个不需要授权的界面。
     if (!this.needAuth) {
       this.flow = 4
     }
-    let num = 0;
+    let num = 0
     // 这个遍历可以让表单左右两边的展示的数量相差不大于1 
     for (const key in this.showForm) {
       if (!this.showForm[key]) {
@@ -383,51 +436,39 @@ export default {
       return str;
     }
 
-
-    if (num % 2 === 1) {
-      // 如果左边的项目数量和右边的一样，则每边加多两个
-      this.leftObj['流水号'] = tmpFunc2()
-      this.leftObj['经办机构'] = '国税支行营业部'
-      this.rightObj['经办柜员'] = '002110'
-      if (this.depositNumber) {
-        this.rightObj['定存编号'] = this.depositNumber
-      }
-    } else {
-      // 如果左边的项目数量比右边少，则左边加3个右边加1个
-      this.leftObj['流水号'] = tmpFunc2()
-      this.leftObj['经办机构'] = '国税支行营业部'
-      this.rightObj['经办柜员'] = '002110'
-      if (this.depositNumber) {
-        this.leftObj['定存编号'] = this.depositNumber
+    if (this.spare) {
+      if (num % 2 === 1) {
+        // 如果左边的项目数量和右边的一样，则每边加多两个
+        this.leftObj['流水号'] = tmpFunc2()
+        this.leftObj['经办机构'] = '国税支行营业部'
+        this.rightObj['经办柜员'] = '002110'
+        if (this.depositNumber) {
+          this.rightObj['定存编号'] = this.depositNumber
+        }
+      } else {
+        // 如果左边的项目数量比右边少，则左边加3个右边加1个
+        this.leftObj['流水号'] = tmpFunc2()
+        this.leftObj['经办机构'] = '国税支行营业部'
+        this.rightObj['经办柜员'] = '002110'
+        if (this.depositNumber) {
+          this.leftObj['定存编号'] = this.depositNumber
+        }
       }
-    }
 
-    // 拿到当天日期
-    const tmpFunc = () => {
-      const date = new Date()
-      var y = date.getFullYear();
-      var m = date.getMonth() + 1;
-      m = m < 10 ? '0' + m : m;
-      var d = date.getDate();
-      d = d < 10 ? ('0' + d) : d;
-      return y + '-' + m + '-' + d;
-    }
-    this.rightObj['会计时间'] = tmpFunc()
-    if (this.leftObj['支取方式'] == 114) this.leftObj['支取方式'] = '印鉴'
-    console.log("🚀 ~ file: index.vue ~ line 393 ~ created ~ this.rightObj", this.leftObj, this.rightObj, this.showForm, this.formName)
-    // 流水号（研发自定义号码生成规则）、经办柜员（002110）、经办机构：国税支行营业部、会计时间：展示操作当日日期
-  },
-  data () {
-    return {
-      flow: 1, // 影响页面展示授权或者不授权页面
-      disForm: {      // 展示授权柜员号和密码
-        name: '002288',
-        pass: '123456'
-      },
-      leftObj: {},    // 左边展示的项目列表
-      rightObj: {}    // 右边展示的项目列表
+      // 拿到当天日期
+      const tmpFunc = () => {
+        const date = new Date()
+        var y = date.getFullYear();
+        var m = date.getMonth() + 1;
+        m = m < 10 ? '0' + m : m;
+        var d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        return y + '-' + m + '-' + d;
+      }
+      this.rightObj['会计时间'] = tmpFunc()
+      if (this.leftObj['支取方式'] == 114) this.leftObj['支取方式'] = '印鉴'
+      // 流水号（研发自定义号码生成规则）、经办柜员（002110）、经办机构：国税支行营业部、会计时间：展示操作当日日期
     }
-
   },
   methods: {
     cancel () {
@@ -464,7 +505,10 @@ export default {
     // 展示父组件名字+成功
     successName () {
       return obj[this.moduleName] + '成功'
-    }
+    },
+    ...mapGetters({
+      getSelectList: 'system/getSelectList'
+    }),
   }
 }
 </script>
diff --git a/src/pages/manage/list/foreignExchange/puchasing.vue b/src/pages/manage/list/foreignExchange/puchasing.vue
index 59fb672..e38dbe9 100644
--- a/src/pages/manage/list/foreignExchange/puchasing.vue
+++ b/src/pages/manage/list/foreignExchange/puchasing.vue
@@ -23,7 +23,7 @@
               <p>请刷卡</p>
             </div>
             <div v-else>
-              <el-input maxlength="20" ref="voucherNumber" disabled :value="form.voucherNumber"
+              <el-input maxlength="20" ref="voucherNumber" disabled v-model="form.voucherNumber"
                 @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
               <p style="color: #8f8f8f;">可用余额：人民币 3,200,000.00</p>
             </div>
@@ -48,15 +48,15 @@
                 :key="item.itemId"> </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="外汇金额" prop="money">
-            <el-input :value="form.money" maxlength="15" @input="val => ismoney(val, form, 'money')"></el-input>
+          <el-form-item label="外币" prop="money">
+            <el-input v-model="form.money" maxlength="15" @input="val => ismoney(val, form, 'money')"></el-input>
           </el-form-item>
           <el-form-item label="支取密码" required>
             <div v-if='!form.drawPassword' class="idCard" @click="popUp2('密码器')">
               <p>请输入密码</p>
             </div>
             <div v-else @click="popUp2('密码器')">
-              <el-input :value="form.drawPassword" ref="drawPassword" type="password"></el-input>
+              <el-input v-model="form.drawPassword" ref="drawPassword" type="password"></el-input>
             </div>
           </el-form-item>
         </el-col>
@@ -64,7 +64,7 @@
     </el-row>
     <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
     <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName"
-      @submitIt="submitForm2" :needAuth="needAuth" />
+      :spare="false" @submitIt="submitForm2" :needAuth="needAuth" />
   </div>
 </template>
 <script>
@@ -115,7 +115,7 @@ export default {
         voucherNumber: '凭证号码',
         currency: '币种',
         goldLogo: '钞汇',
-        money: '外汇金额',
+        money: '外币',
         buyForeignPurpose: '购汇用途',
         drawPassword: '支取密码',
       },
diff --git a/src/pages/manage/list/foreignExchange/settlement.vue b/src/pages/manage/list/foreignExchange/settlement.vue
index bc7b59e..cadec47 100644
--- a/src/pages/manage/list/foreignExchange/settlement.vue
+++ b/src/pages/manage/list/foreignExchange/settlement.vue
@@ -19,20 +19,21 @@
               <p>请刷卡</p>
             </div>
             <div v-else>
-              <el-input maxlength="20" ref="voucherNumber" disabled :value="form.voucherNumber"
+              <el-input maxlength="20" ref="voucherNumber" disabled v-model="form.voucherNumber"
                 @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
-              <p style="color: #8f8f8f;">可用余额：人民币 3,200,000.00</p>
+              <p style="color: #8f8f8f;">可用余额：美元 现汇 5000.00</p>
             </div>
           </el-form-item>
           <el-form-item label="外币金额" prop="money">
-            <el-input :value="form.money" maxlength="15" @input="val => ismoney(val, form, 'money')"></el-input>
+            <el-input v-model="form.money" placeholder="最多可结汇5,000.00" maxlength="15"
+              @input="val => ismoney(val, form, 'money')"></el-input>
           </el-form-item>
           <el-form-item label="支取密码" required>
             <div v-if='!form.drawPassword' class="idCard" @click="popUp2('密码器')">
               <p>请输入密码</p>
             </div>
             <div v-else @click="popUp2('密码器')">
-              <el-input :value="form.drawPassword" ref="drawPassword" type="password"></el-input>
+              <el-input v-model="form.drawPassword" ref="drawPassword" type="password"></el-input>
             </div>
           </el-form-item>
         </el-col>
@@ -53,7 +54,7 @@
     </el-row>
     <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
     <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName"
-      @submitIt="submitForm2" :needAuth="needAuth" />
+      :spare="false" @submitIt="submitForm2" :needAuth="needAuth" />
   </div>
 </template>
 <script>
@@ -82,8 +83,7 @@ export default {
     }
     if (sessionStorage.getItem('foreignExchangeSettleBankCard')) {
       this.cardNumberJudge = true
-      const { currency, voucherNumber } = this.dataFlow
-      this.form.currency = currency
+      const { voucherNumber } = this.dataFlow
       this.form.voucherNumber = voucherNumber
     }
     // this.getFormData()
@@ -95,7 +95,7 @@ export default {
       cardNumberJudge: false,
       form: {
         voucherNumber: '', // 凭证号码
-        currency: '',
+        currency: 153,
         money: '',
         fundingSource: '',
         drawPassword: '',
diff --git a/src/pages/manage/list/onlineBank/openAccount.vue b/src/pages/manage/list/onlineBank/openAccount.vue
index 78cc60b..485a655 100644
--- a/src/pages/manage/list/onlineBank/openAccount.vue
+++ b/src/pages/manage/list/onlineBank/openAccount.vue
@@ -78,14 +78,14 @@
             </el-form-item>
           </el-col>
           <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form"
-            :formName="formName" @submitIt="submitForm2" depositNumber='0816' />
+            :formName="formName" :spare="false" @submitIt="submitForm2" depositNumber='0816' />
         </el-form>
       </el-row>
       <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
     </div>
 
     <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName"
-      @submitIt="submitForm2()" />
+      :spare="false" @submitIt="submitForm2()" />
   </div>
 </template>
 
@@ -114,8 +114,8 @@ export default {
         idNumber: '',//证件号码
         clientNumber: '', // 客户号
         customerName: '', // 客户姓名
-        currency: '', // 币种
-        goldLogo: '', // 钞汇标识
+        currency: 12, // 币种
+        goldLogo: 13, // 钞汇标识
         voucherType: 15, // 凭证类型
         voucherNumber: '', // 凭证号码
         openOnlineBanking: '',
@@ -194,13 +194,10 @@ export default {
 
     if (sessionStorage.getItem('onlineBankIdCard')) {
       this.idNumberJudge = true
-      const { idNumber, userName, peopleNumber, currency, goldLogo } = this.dataFlow
+      const { idNumber, userName, peopleNumber } = this.dataFlow
       this.form.clientNumber = peopleNumber
       this.form.idNumber = idNumber
       this.form.customerName = userName
-      this.form.currency = currency
-      this.form.goldLogo = goldLogo
-      this.form.voucherType = 15
     }
     if (sessionStorage.getItem('onlineBankBankCard')) {
       this.cardNumberJudge = true
diff --git a/src/pages/report/index.vue b/src/pages/report/index.vue
index 73cb483..5805939 100644
--- a/src/pages/report/index.vue
+++ b/src/pages/report/index.vue
@@ -187,16 +187,12 @@ export default {
           summarize: form.summarize
         }
         const expData = report.data
-        this.userScores = userScores
         // 如果没有data，则添加，否则，直接使用
         if (!expData) {
+          this.userScores = userScores
           this.handleList(userScores)
-          // this.$post(this.api.editExperimentalData, {
-          //   reportId,
-          //   data: JSON.stringify(userScores)
-          // }).then(res => { }).catch(err => { })
         } else {
-          this.handleList(userScores)
+          this.handleList(JSON.parse(expData))
         }
 
         this.loading = false
diff --git a/src/store/modules/system.js b/src/store/modules/system.js
index 73e7365..fd6b8bb 100644
--- a/src/store/modules/system.js
+++ b/src/store/modules/system.js
@@ -201,7 +201,7 @@ const allDataFlow = {
   isSettle: false,
   // 票据号码
   ticketNumber: '00242986',
-  'corporateClient': false,
+  corporateClient: false,
   nowDepositNumber
 
 }
@@ -1396,7 +1396,7 @@ const myInitState = {
   '业务三十四': {
     id: 704,
     name: '网上银行',
-    data: [13, 16, 407],
+    data: [13, 16],
     needs: [],
     isStamp: {
       // '业务专用章': [ 411 ]
@@ -2716,7 +2716,7 @@ export default {
       '业务三十四': {
         id: 704,
         name: '网上银行',
-        data: [13, 16, 407],
+        data: [13, 16],
         needs: [],
         isStamp: {
           // '业务专用章': [ 411 ]
@@ -2842,15 +2842,17 @@ export default {
       }
 
       for (const key in mapObj) {
-        getSubjectInfo({
-          subject_id: key
-        }).then((data) => {
-          const name = mapObj[key]
-          if (!state.selectList[name]) state.selectList[name] = []
-          if (data.status == 200 && !state.selectList[name].length) {
-            state.selectList[name].push(...data.data.items);
-          }
-        }).catch((error) => { })
+        const name = mapObj[key]
+        if (!state.selectList[name] || !state.selectList[name].length) {
+          getSubjectInfo({
+            subject_id: key
+          }).then((data) => {
+            if (!state.selectList[name]) state.selectList[name] = []
+            if (data.status == 200 && !state.selectList[name].length) {
+              state.selectList[name].push(...data.data.items);
+            }
+          }).catch((error) => { })
+        }
       }