Gctcan UI改造以及UI bug解决

src/components/index.js

@@ -14,6 +14,7 @@ import Table from "./Table"
 import Tabs from "./Tabs.vue"
 import IStreamTable from "./IStreamTable.vue"
 import IStreamTableDocpan from "./IStreamTableDocpan.vue"
+import IStreamTableNoPag from "./IStreamTableNoPag.vue"
 import GridEtyPromptDialog from "./GridEtyPromptDialog.vue"
 import Radio from "./Radio"
 import InputNumber from "./InputNumber"
@@ -70,6 +71,7 @@ export default {
         Vue.component("c-tabs", Tabs)
         Vue.component("c-istream-table", IStreamTable)
         Vue.component("c-istream-table-docpan", IStreamTableDocpan)
+        Vue.component("c-istream-table-noPag", IStreamTableNoPag)
         Vue.component("c-grid-ety-prompt-dialog", GridEtyPromptDialog)
         Vue.component("c-radio", Radio)
         Vue.component("c-input-number", InputNumber)

src/views/Business/Brtset/Utlp.vue

@@ -208,7 +208,7 @@
         </c-col>
         <c-col :span="24">
           <el-form-item label="待付款单据" style="margin-bottom: 0">
-            <c-istream-table
+            <c-istream-table-noPag
               ref="table"
               :list="model.liaall.tenstm.rows || []"
               :columns="columns"
@@ -216,7 +216,7 @@
               v-on:multipleSelect="multipleSelect"
               prop="liaall.tenstm"
             >
-            </c-istream-table>
+            </c-istream-table-noPag>
           </el-form-item>
         </c-col>
         <c-col :span="24">

src/views/Business/Gctcan/Addbcb.vue

 <template>
-<div class="eibs">
-    <el-collapse v-model="activeNames" @change="handleChange">
-        
-        <el-collapse-item title="附言" name="coninfp">
-            <m-coninfp :model="model" :codes="codes" />
-        </el-collapse-item>
+    <div class="eibs-tab">
+        <el-collapse v-model="activeNames" @change="handleChange">
+            <!--el-collapse-item title="备查表" name="addbcb">
+                <m-addbcb :model="model" :codes="codes" />
+            </el-collapse-item-->
 
-    </el-collapse>
-
-</div>
+            <el-collapse-item title="附言" name="coninfp">
+                <m-coninfp :model="model" :codes="codes" />
+            </el-collapse-item>
+        </el-collapse>
+    </div>
 </template>
-
+    
 <script>
 import Api from "~/service/Api";
 import commonProcess from "~/mixin/commonProcess";
 import Utils from "~/utils";
 import Event from "~/model/Gctcan/Event";
+
 import Coninfp from "~/views/Public/Coninfp";
 
+
 export default {
     components: {
-    "m-coninfp": Coninfp,
-  },
+        "m-coninfp": Coninfp,
+    },
     inject: ["root"],
     props: ["model", "codes"],
     mixins: [commonProcess],
     data() {
         return {
-
             activeNames: ["coninfp"],
         };
 
     },
     methods: {
-    ...Event,
-    handleChange(val) {
-      console.log(val);
+        ...Event,
+        handleChange(val) {
+            console.log(val);
+        },
     },
-  },
-      created: function () {},
+    created: function () { },
 };
 </script>
-
+    
 <style>
+
 </style>
+    
\ No newline at end of file

src/views/Business/Gctcan/Ovwp.vue

 <template>
-<div class="eibs">
- <el-collapse v-model="activeNames" @change="handleChange">
-  <el-collapse-item title="关闭索赔" name="gitsetp1">
-      <m-gitsetp1 :model="model" :codes="codes" />
-     </el-collapse-item>
-</el-collapse>
-</div>
+    <div class="eibs">
+        <el-collapse v-model="activeNames" @change="handleChange">
+            <el-collapse-item title="关闭索赔" name="gitsetp1">
+                <m-gitsetp1 :model="model" :codes="codes" />
+            </el-collapse-item>
+        </el-collapse>
+    </div>
 </template>
 <script>
 
@@ -13,23 +13,23 @@ import commonProcess from "~/mixin/commonProcess";
 import Event from "~/model/Gctcan/Event"
 import Gitsetp1 from "./Gitsetp1";
 export default {
-      components: {
-      "m-gitsetp1": Gitsetp1,
-  },
-      inject: ['root'],
-      props:["model","codes"],
-      mixins: [commonProcess],
-      data(){
-          return {
-              activeNames: ["gitsetp1"],
-          }
-      },
-      methods:{...Event},
-      created:function(){
-  
-      }
-  }
-  </script>
-  <style>
-  
-  </style>
\ No newline at end of file
+    components: {
+        "m-gitsetp1": Gitsetp1,
+    },
+    inject: ['root'],
+    props: ["model", "codes"],
+    mixins: [commonProcess],
+    data() {
+        return {
+            activeNames: ["gitsetp1"],
+        }
+    },
+    methods: { ...Event },
+    created: function () {
+
+    }
+}
+</script>
+<style>
+
+</style>
\ No newline at end of file

src/views/Business/Gctcan/index.vue

@@ -2,86 +2,64 @@
   <div class="eContainer">
     <c-page title="保函索赔注销">
 
-<!--       <el-button size="small">备忘录</el-button>
+      <!--       <el-button size="small">备忘录</el-button>
       <el-button size="small">影像信息</el-button>
        <el-button size="small">保存模板</el-button> 
       <el-button size="small">使用模板</el-button> 
       <el-button size="small">制裁信息</el-button>
       <el-button size="small">拆分报文</el-button> 
       <el-button size="small">智能提示</el-button> -->
-    <el-form
-      :model="model"
-      :rules="rules"
-      ref="modelForm"
-      label-width="120px"
-      label-position="right"
-      size="small"
-      :validate-on-rule-change="false"
-    >
-      <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
-        <!--PD000031 -->
-             <el-tab-pane label="业务信息" name="ovwp">
+      <el-form :model="model" :rules="rules" ref="modelForm" label-width="120px" label-position="right" size="small"
+        :validate-on-rule-change="false">
+        <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
+          <!--PD000031 -->
+          <el-tab-pane label="业务信息" name="ovwp">
             <c-content>
               <m-ovwp :model="model" :codes="codes" />
             </c-content>
           </el-tab-pane>
-<!--          <el-tab-pane label="关闭索赔" name="gitsetp1">
-          <m-gitsetp1 :model="model" :codes="codes" />
-        </el-tab-pane>  -->
+          <el-tab-pane label="费用/账务" name="engp,setpan,glepan">
+            <c-content>
+              <div class="eibs-tab">
+                <el-collapse v-model="activeNames">
+                  <el-collapse-item title="表外记账" name="engp">
+                    <!-- 表外记账 -->
+                    <m-engp :model="model" :codes="codes" />
+                  </el-collapse-item>
+                  <el-collapse-item title="结算" name="setpan">
+                    <!-- 结算 -->
+                    <m-setpan :model="model" :codes="codes" />
+                  </el-collapse-item>
+                </el-collapse>
+              </div>
+            </c-content>
+          </el-tab-pane>
 
-        <!--PD000027 -->
-<!--         <el-tab-pane label="表外记账" name="engp">
-          <m-engp :model="model" :codes="codes" />
-        </el-tab-pane> -->
+          <!--PD000510 -->
+          <el-tab-pane label="备查/附言" name="addbcb">
+            <c-content>
+              <m-addbcb :model="model" :codes="codes" />
+            </c-content>
+          </el-tab-pane>
 
-        <!--PD000000 -->
-<!--         <el-tab-pane label="费用及账务" name="setpan">
-          <m-setpan :model="model" :codes="codes" />
-        </el-tab-pane> -->
-               <el-tab-pane label="费用/账务" name="engp,setpan">
-         <c-content>
-           <div class="eibs-tab">
-             <el-collapse v-model="activeNames">
-               <el-collapse-item title="表外记账" name="engp">
-                 <!-- 表外记账 -->
-                 <m-engp :model="model" :codes="codes" />
-               </el-collapse-item>
-               <el-collapse-item title="结算" name="setpan">
-                 <!-- 结算 -->
-                 <m-setpan :model="model" :codes="codes" />
-               </el-collapse-item>
-             </el-collapse>
-           </div>
-         </c-content>
-       </el-tab-pane>
-<el-tab-pane label="备查/附言" name="addbcb">
-         <c-content>
-           <m-addbcb :model="model" :codes="codes" />
-         </c-content>
-       </el-tab-pane>
-        <!--PD000000 -->
-<!--         <el-tab-pane label="备查/附言" name="coninfp">
-          <m-coninfp :model="model" :codes="codes" />
-        </el-tab-pane>
- -->
-        <!--PD000529 -->
-       <el-tab-pane label="报文/面函" name="docpan">
-  <c-content>
-    <m-docpan :model="model" :codes="codes" />
-  </c-content>
-</el-tab-pane>
+          <el-tab-pane label="报文/面函" name="docpan">
+            <c-content>
+              <m-docpan :model="model" :codes="codes" />
+            </c-content>
+          </el-tab-pane>
 
-        <!--PD000546 -->
-       <el-tab-pane label="附件信息" name="doctre">
+          <!--trndoc PD000546 Attachments -->
+          <el-tab-pane label="附件" name="doctre">
             <c-content>
               <m-doctre :model="model" :codes="codes" />
             </c-content>
           </el-tab-pane>
+
           <c-function-btn :handleSubmit="handleSubmit" :handleCheck="handleCheck" :handleStash="handleStash">
-        </c-function-btn>
-      </c-tabs>
-    </el-form>
-     </c-page>
+          </c-function-btn>
+        </c-tabs>
+      </el-form>
+    </c-page>
   </div>
 </template>
 <script>
@@ -94,28 +72,24 @@ import commonFuncs from "~/mixin/commonFuncs";
 import Check from "~/model/Gctcan/Check";
 import Default from "~/model/Gctcan/Default";
 import Pattern from "~/model/Gctcan/Pattern";
-import Gitsetp1 from "./Gitsetp1";
 import Ovwp from "./Ovwp";
 import Addbcb from "./Addbcb";
 import Engp from "~/views/Public/Engp";
 import Doctre from "~/views/Public/Doctre";
 import Docpan from "~/views/Public/Docpan";
 import Setpan from "~/views/Public/Setpan";
-import Coninfp from "~/views/Public/Coninfp";
+import Addbcb from "./Addbcb";
 
 
 export default {
   name: "Gctcan",
   components: {
-    "m-gitsetp1": Gitsetp1,
+    "m-ovwp": Ovwp,
     "m-engp": Engp,
     "m-setpan": Setpan,
-    "m-coninfp": Coninfp,
+    "m-addbcb": Addbcb,
     "m-docpan": Docpan,
     "m-doctre": Doctre,
-    "m-ovwp": Ovwp,
-    "m-addbcb": Addbcb,
-    
   },
   provide() {
     return {
@@ -126,6 +100,7 @@ export default {
   data() {
     return {
       tabVal: "ovwp",
+      activeNames: ["engp"],
       trnName: "gctcan",
       model: new Gctcan().data,
       checkRules: Check,
@@ -133,7 +108,6 @@ export default {
       pattern: Pattern,
       rules: null,
       codes: { ...CodeTable },
-       activeNames: ["engp"],
     };
   },
   methods: {
@@ -153,11 +127,12 @@ export default {
       if (this.isInDisplay) {
         this.restoreDisplay();
       }
-    } else {  
+    } else {
       this.$notify.error({ title: "错误", message: "服务请求失败！" });
     }
   },
 };
 </script>
 <style>
+
 </style>

src/views/Business/Gitcrq/index.vue

 <template>
   <c-page title="进口保函索赔登记">
     <div class="eContainer">
-      <!-- <c-function-btn
-        :handleSubmit="handleSubmit"
-        :handleCheck="handleCheck"
-        :handleStash="handleStash"
-      >
-        <el-button size="small">备忘录</el-button>
-        <el-button size="small">影像信息</el-button>
-        <el-button size="small">制裁信息</el-button>
-        <el-button size="small">智能提示</el-button>
-      </c-function-btn> -->
       <el-form :model="model" :rules="rules" ref="modelForm" label-width="120px" label-position="right" size="small"
         :validate-on-rule-change="false">
         <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
@@ -65,6 +55,12 @@
       </el-form>
       <c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty">
       </c-grid-ety-prompt-dialog>
+      <c-function-btn :handleSubmit="handleSubmit" :handleCheck="handleCheck" :handleStash="handleStash">
+        <!-- <el-button size="small">备忘录</el-button>
+        <el-button size="small">影像信息</el-button>
+        <el-button size="small">制裁信息</el-button>
+        <el-button size="small">智能提示</el-button> -->
+      </c-function-btn>
     </div>
   </c-page>
 </template>

src/views/Business/Sptsel/Sptbrk/Menu.vue

@@ -246,8 +246,8 @@ export default {
       stmData: {
         columns: [
           '4 1 "交易代码" 100 ',
-          '5 2 "业务编号" 300',
-          '6 3 "交易名称" 180',
+          '5 3 "业务编号" 300',
+          '6 2 "交易名称" 180',
           // '1 4 "状态" 60 1 tdViewTypeEdit:0 1 SPT:STA',
           {index:1,position:4,width:100,pattern:'code',label:'状态',code:[{label:"Pending",value:"PEN"}]},
           '17 5 "报文类型" 100',