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/Dbigtx/index.vue

@@ -14,7 +14,7 @@
         <c-tabs v-model="tabVal" ref="elment" type="card">
           <el-tab-pane label="基本信息" name="gtx">
             <c-content>
-              <!-- <m-pty-info :model="model" /> -->
+              <m-gtx-info :model="model" />
             </c-content>
           </el-tab-pane>
         </c-tabs>
@@ -51,7 +51,7 @@
 import Utils from "~/utils";
 import Gtx, { Pattern } from "./Gtx.js";
 
-// import PtyInfo from "./PtyInfo.vue";
+import GtxInfo from "./GtxInfo.vue";
 // import AdrList from "./AdrList.vue";
 // import ActInfo from "./ActInfo.vue";
 // import PtcInfo from "./PtcInfo.vue";
@@ -62,7 +62,7 @@ import { queryDetailById, add, edit, deleteById } from "~/service/test/pty.js";
 export default {
   name: "StaticsDbigtx",
   components: {
-    // "m-pty-info": PtyInfo,
+    "m-gtx-info": GtxInfo,
     // "m-adr-list": AdrList,
     // "m-act-info": ActInfo,
     // "m-ptc-info": PtcInfo,

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/Infgtx/Infsea.vue

@@ -2,7 +2,7 @@
   <div class="eibs-tab">
     <!-- ----------左 ---------->
     <c-col :span="12" class="col-left">
-      <c-col :span="24">
+      <!-- <c-col :span="24">
             <el-form-item label="inr" prop="inr">
                 <c-input
                     v-model="model.inr"
@@ -10,7 +10,7 @@
                 >
                 </c-input>
             </el-form-item>
-        </c-col>
+        </c-col> -->
       <c-col :span="24">
             <el-form-item label="extkey" prop="extkey">
                 <c-input
@@ -29,7 +29,7 @@
                 </c-input>
             </el-form-item>
         </c-col>
-      <c-col :span="24">
+      <!-- <c-col :span="24">
             <el-form-item label="ver" prop="ver">
                 <c-input
                     v-model="model.ver"
@@ -37,7 +37,7 @@
                 >
                 </c-input>
             </el-form-item>
-        </c-col>
+        </c-col> -->
       <c-col :span="24">
             <el-form-item label="gidtxt" prop="gidtxt">
                 <c-input
@@ -74,7 +74,7 @@
                 </c-input>
             </el-form-item>
         </c-col>
-      <c-col :span="24">
+      <!-- <c-col :span="24">
             <el-form-item label="objinr" prop="objinr">
                 <c-input
                     v-model="model.objinr"
@@ -82,7 +82,7 @@
                 >
                 </c-input>
             </el-form-item>
-        </c-col>
+        </c-col> -->
     </c-col>
     <!------------- 右 ---------->
     <c-col :span="12" class="col-right">
@@ -149,7 +149,7 @@
                 </c-input>
             </el-form-item>
         </c-col>
-      <c-col :span="24">
+      <!-- <c-col :span="24">
             <el-form-item label="etgextkey" prop="etgextkey">
                 <c-input
                     v-model="model.etgextkey"
@@ -157,7 +157,7 @@
                 >
                 </c-input>
             </el-form-item>
-        </c-col>
+        </c-col> -->
     </c-col>
 
     <c-col :span="24">
@@ -223,20 +223,20 @@
             <c-button
               style="margin-left: 0"
               size="small"
-              @click="ptyInfo(scope.$index, scope.row)"
+              @click="gtxInfo(scope.$index, scope.row)"
               >详情</c-button
             >
             <c-button
               style="margin-left: 5px"
               size="small"
               type="primary"
-              @click="ptyEdit(scope.$index, scope.row)"
+              @click="gtxEdit(scope.$index, scope.row)"
               >修改</c-button
             >
             <c-button
               size="small"
               style="margin-left: 5px"
-              @click="ptyDelete(scope.$index, scope.row)"
+              @click="gtxDelete(scope.$index, scope.row)"
               >删除</c-button
             >
             <el-popover placement="top-start" width="50" trigger="click">
@@ -276,15 +276,15 @@ export default {
     return {
       gtxData: [],
       gtxColumns: [
-      { label: 'inr', prop: 'inr', width: 'auto' },
+      // { label: 'inr', prop: 'inr', width: 'auto' },
       { label: 'extkey', prop: 'extkey', width: 'auto' },
       { label: 'nam', prop: 'nam', width: 'auto' },
-      { label: 'ver', prop: 'ver', width: 'auto' },
+      // { label: 'ver', prop: 'ver', width: 'auto' },
       { label: 'gidtxt', prop: 'gidtxt', width: 'auto' },
       { label: 'gartyp', prop: 'gartyp', width: 'auto' },
       { label: 'hndtyp', prop: 'hndtyp', width: 'auto' },
       { label: 'objtyp', prop: 'objtyp', width: 'auto' },
-      { label: 'objinr', prop: 'objinr', width: 'auto' },
+      // { label: 'objinr', prop: 'objinr', width: 'auto' },
       { label: 'gtxpri', prop: 'gtxpri', width: 'auto' },
       { label: 'expflg', prop: 'expflg', width: 'auto' },
       { label: 'uil', prop: 'uil', width: 'auto' },
@@ -292,7 +292,7 @@ export default {
       { label: 'labaddinf', prop: 'labaddinf', width: 'auto' },
       { label: 'legfrm', prop: 'legfrm', width: 'auto' },
       { label: 'covgodsrvdft', prop: 'covgodsrvdft', width: 'auto' },
-      { label: 'etgextkey', prop: 'etgextkey', width: 'auto' },
+      // { label: 'etgextkey', prop: 'etgextkey', width: 'auto' },
 			],
     };
   },

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: {