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/Business/Bctdav/Ovwp1.vue

@@ -66,7 +66,7 @@
             v-model="model.bcdgrp.cbs.max.cur"
             style="width: 100%"
             placeholder="请选择代收币种"
-            :code="codes.curtxt1"
+            :code="codes.infled_Cur"
           >
           </c-select>
         </el-form-item>

src/views/Business/Dbcame/Selection.vue

@@ -14,7 +14,7 @@
         </el-form-item>
       </c-col>
        <c-col :span="24">
-        <el-form-item label="请选择接口数据" prop="bopbut.basflg" class="checkbox-left"> 
+        <el-form-item label="请选择需要修改的接口数据" prop="bopbut.basflg" class="checkbox-left"> 
           <c-checkbox
                 disabled :checked="true"
                 v-model="model.bopbut.basflg"

src/views/Business/Dbcame/index.vue

@@ -33,7 +33,6 @@
       <c-function-btn
         :handleSubmit="handleSubmit.bind(this,'bopbut.sav')"
         :handleCheck="handleCheck.bind(this,'bopbut.chk')"
-        :handleStash="handleStash"
       >
       </c-function-btn>
     </c-page>

src/views/Business/Dbcdel/Selection.vue

@@ -14,7 +14,7 @@
         </el-form-item>
       </c-col>
        <c-col :span="24">
-        <el-form-item label="请选择接口数据" prop="bopbut.basflg" class="checkbox-left"> 
+        <el-form-item label="请选择需要删除的接口数据" prop="bopbut.basflg" class="checkbox-left"> 
           <c-checkbox
                 disabled :checked="true"
                 v-model="model.bopbut.basflg"

src/views/Business/Dbcdel/index.vue

@@ -36,8 +36,6 @@
       </el-form>
       <c-function-btn
         :handleSubmit="handleSubmit.bind(this,'bopbut.sav')"
-        :handleCheck="handleCheck.bind(this,'bopbut.chk')"
-        :handleStash="handleStash"
       >
       </c-function-btn>
     </c-page>

src/views/Business/Dbcinf/index.vue

@@ -38,12 +38,12 @@
           </el-tab-pane> -->
         </c-tabs>
       </el-form>
-      <c-function-btn
+      <!-- <c-function-btn
         :handleSubmit="handleSubmit.bind(this,'bopbut.sav')"
         :handleCheck="handleCheck.bind(this,'bopbut.chk')"
         :handleStash="handleStash"
       >
-      </c-function-btn>
+      </c-function-btn> -->
     </c-page>
   </div>
 </template>

src/views/Business/Dbdame/index.vue

@@ -37,7 +37,6 @@
       <c-function-btn
         :handleSubmit="handleSubmit.bind(this,'bopbut.sav')"
         :handleCheck="handleCheck.bind(this,'bopbut.chk')"
-        :handleStash="handleStash"
       >
       </c-function-btn>
     </c-page>

src/views/Business/Dbddel/index.vue

@@ -36,8 +36,6 @@
       </el-form>
       <c-function-btn
         :handleSubmit="handleSubmit.bind(this,'bopbut.sav')"
-        :handleCheck="handleCheck.bind(this,'bopbut.chk')"
-        :handleStash="handleStash"
       >
       </c-function-btn>
     </c-page>

src/views/Business/Dbdinf/index.vue

@@ -21,12 +21,12 @@
            </el-tab-pane> -->
        </c-tabs>
     </el-form>
-    <c-function-btn
+    <!-- <c-function-btn
         :handleSubmit="handleSubmit"
         :handleCheck="handleCheck"
         :handleStash="handleStash"
       >
-      </c-function-btn>
+      </c-function-btn> -->
     </c-page>
   </div>
 </template>

src/views/Business/Eadinf/Dclpp.vue

@@ -43,7 +43,7 @@
             <!-- 变动日期 -->
             <c-col :span="24">
                 <el-form-item label="变动日期" prop="eblmod.ebl.reldat">
-                    <c-date-picker type="date" v-model="model.recp.dclp.chdate" style="width:100%" disabled
+                    <c-date-picker type="date" v-model="model.recp.dclp.chdate" style="width:100%"
                         placeholder="请选择变动日期"></c-date-picker>
                 </el-form-item>
             </c-col>

src/views/Business/Eadinf/Sel.vue

@@ -6,7 +6,7 @@
             <c-col :span="24">
                 <el-form-item label="发生日期" prop="cfabut.paydat">
                     <c-date-picker type="date" v-model="model.cfabut.paydat" style="width:100%"
-                        placeholder="请输入发生日期" disabled></c-date-picker>
+                        placeholder="请输入发生日期"></c-date-picker>
                 </el-form-item>
             </c-col>
             <c-col :span="24">
@@ -137,14 +137,14 @@ export default {
     methods: { 
         ...Event,
         toEadame () {
-            console.log('进入Eadame交易');
+            this.$router.history.push("/business/eadame");
         },
         toEaddel () {
-            console.log('进入Eaddel交易');
+            this.$router.history.push("/business/eaddel");
         }
      },
     created: function () {
-
+        this.model.cfabut.paydat = new Date();
     }
 }
 </script>

src/views/Business/Eadinf/index.vue

 <template>
     <div class="eContainer">
-        <el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" size="small"
-            :validate-on-rule-change="false">
+        <c-page tittle="查-外债海外代付">
+            <el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right"
+                size="small" :validate-on-rule-change="false">
                 <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
                     <!--cfabut PD000002 接口数据 -->
                     <el-tab-pane label="接口数据" name="sel">
@@ -23,7 +24,10 @@
                     </el-tab-pane>
                 </c-tabs>
             </el-form>
-        <c-function-btn :handleSubmit="handleSubmit" :handleCheck="handleCheck" :handleStash="handleStash"></c-function-btn>
+
+            <c-function-btn :handleSubmit="handleSubmit.bind(this, 'cfabut.sav')"
+                :handleCheck="handleCheck.bind(this, 'cfabut.chk')" :handleStash="handleStash"></c-function-btn>
+        </c-page>
     </div>
 </template>
 <script>
@@ -88,6 +92,9 @@ export default {
         else {
             this.$notify.error({ title: '错误', message: '服务请求失败！' });
         }
+    },
+    mounted() {
+        window.Vue = this;
     }
 }
 </script>

src/views/Business/Letcan/Ovwp.vue

@@ -4,8 +4,8 @@
           <el-collapse-item title="取消信息" name="canp">
             <m-canp :model="model" :codes="codes" />
           </el-collapse-item>
-
-          <el-collapse-item title="索偿(MT 742)" name="rcldetp" v-if="model.ledgrp.rmb.rolsetflg=='Y'">
+<!-- v-if="model.ledgrp.rmb.rolsetflg=='Y'" -->
+          <el-collapse-item title="索偿(MT 742)" name="rcldetp" >
             <m-rcldetp :model="model" :codes="codes" />
           </el-collapse-item>
       </el-collapse>

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/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' },
 			],
     };
   },