Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206

src/views/Statics/Dbifec/index.vue

@@ -11,7 +11,7 @@
         :validate-on-rule-change="false"
         :disabled="isDisabled"
       >
-        <c-tabs v-model="tabVal" ref="elment" type="card">
+        <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="changePosition">
           <el-tab-pane label="费率信息" name="fec">
             <c-content>
               <m-fec-info :model="model" />
@@ -59,7 +59,7 @@ import Fec, { Pattern } from "./Fec.js";
 import FecInfo from "./FecInfo.vue";
 import FeeInfo from "./FeeInfo.vue";
 
-import { queryDetailById, add, edit, deleteById } from "~/service/test/fec.js";
+import { queryDetailById, add, edit, deleteById,editFeeData,deleteFeeData } from "~/service/test/fec.js";
 
 export default {
   name: "StaticsDbifec",
@@ -87,6 +87,7 @@ export default {
       model: new Fec().data,
       tabVal: "fec",
       rules: Pattern,
+      tabPosition:"tab-fec",
     };
   },
   computed: {
@@ -126,14 +127,24 @@ export default {
     commitEdit() {
       this.$refs.modelForm.validate((validated) => {
         if (validated) {
+          if(this.tabPosition===`tab-fec`){
           edit(this.model)
             .then((res) => {
-              this.$message.success("保存成功！");
+              this.$message.success("费率修改保存成功！");
               this.goBack()
             })
             .catch((err) => {
-              this.$message.error("保存失败！");
+              this.$message.error("费率修改保存失败！");
+            });}else{
+              editFeeData(this.model.inr,this.model)
+            .then((res) => {
+              this.$message.success("费用代码修改保存成功！");
+              this.goBack()
+            })
+            .catch((err) => {
+              this.$message.error("费用代码修改保存失败！");
             });
+            }
         } else {
           Utils.formValidateTips(this.$refs.modelForm.fields)
         }
@@ -146,14 +157,24 @@ export default {
         type: "warning",
       })
         .then(() => {
+          if(this.tabPosition===`tab-fec`){
           deleteById(this.model.inr)
             .then((res) => {
-              this.$message.success("删除成功！");
+              this.$message.success("费率信息删除成功！");
               this.goBack(true)
             })
             .catch((err) => {
-              this.$message.error("删除失败！");
-            });
+              this.$message.error("费率信息删除失败！");
+            })}else{
+              deleteFeeData(this.model)
+            .then((res) => {
+              this.$message.success("费用代码删除成功！");
+              this.goBack(true)
+            })
+            .catch((err) => {
+              this.$message.error("费用代码删除失败！");
+            })
+            };
         })
         .catch(() => {
           this.$message({
@@ -169,7 +190,10 @@ export default {
       this.$store.dispatch("TagsView/delView", this.$route);
       this.$router.push({ name: "StaticsInffec", params: { update } });
     },
-
+    changePosition(tab,event){
+      this.tabPosition=event.target.getAttribute('id');
+      console.log(this.tabPosition)
+    },
   },
 };
 </script>

src/views/Statics/Dbitrl/TrlInfo.vue

@@ -9,7 +9,7 @@
       </c-col>
       <c-col :span="24">
         <el-form-item label="授权货币" prop="relcur">
-          <c-select v-model="model.relcur" placeholder="请输入授权货币" :code="relcur">
+          <c-select v-model="model.relcur" placeholder="请选择授权货币" :code="relcur" style="width:100%">
           </c-select>
         </el-form-item>
       </c-col>
@@ -87,7 +87,7 @@ export default {
         { label: "THB 泰国铢", value: "FRF" },
         { label: "TWD 新台湾元", value: "FRF" },
         { label: "USD 美元", value: "FRF" },
-    ],
+      ],
     };
     
   },

src/views/Statics/Inftrl/Infsea.vue

@@ -8,7 +8,8 @@
       </c-col>    
       <c-col :span="24">
         <el-form-item label="授权货币" prop="relcur">
-          <c-input v-model="model.relcur" placeholder="请输入授权货币"> </c-input>
+          <c-select v-model="model.relcur" placeholder="请选择授权货币" :code="relcur" style="width:100%">
+          </c-select>
         </el-form-item>
       </c-col>
       <c-col :span="24">
@@ -119,6 +120,28 @@ export default {
         { label: "授权金额", prop: "relamt", width: "auto" },
         { label: "交易属性", prop: "relflg", width: "auto" },
       ],
+      relcur: [
+        { label: "AUD 澳大利亚元", value: "AUD" },
+        { label: "CAD 加拿大元", value: "CAD" },
+        { label: "CHF 瑞士法郎", value: "CHF" },
+        { label: "CNY 人民币", value: "CNY" },
+        { label: "DKK 丹麦克朗", value: "DKK" },
+        { label: "EUR 欧元", value: "EUR" },
+        { label: "FIM 芬兰马克", value: "FIM" },
+        { label: "FRF 法国法郎", value: "FRF" },
+        { label: "GBP 英镑", value: "FRF" },
+        { label: "HKD 港币", value: "FRF" },
+        { label: "JPY 日元", value: "FRF" },
+        { label: "KRW 韩圆", value: "FRF" },
+        { label: "MOP 澳门元", value: "FRF" },
+        { label: "NOK 挪威克朗", value: "FRF" },
+        { label: "NZD 新西兰元", value: "FRF" },
+        { label: "SEK 瑞典克朗", value: "FRF" },
+        { label: "SGD 新加坡元", value: "FRF" },
+        { label: "THB 泰国铢", value: "FRF" },
+        { label: "TWD 新台湾元", value: "FRF" },
+        { label: "USD 美元", value: "FRF" },
+      ],
     };
   },
   computed: {