Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs into settle-test-20230110

src/business/infled/event/index.js

@@ -143,9 +143,18 @@ export default {
       });
     },
     toLetopn() {
-      // 点击开立，清空从待经办进来的时候带的行参数
-      localStorage.setItem('row_getopn', null)
       this.$router.history.push('/business-new/letopn');
     },
+    toLetnot() {
+      this.$router.history.push('/business-new/letnot');
+    },
+
+    toLetdrw() {
+      this.$router.history.push('/business-new/letdrw');
+    },
+
+    toLetrsv() {
+      this.$router.history.push('/business-new/letrsv');
+    },
   },
 };

src/business/infled/views/Infsea.vue

@@ -254,6 +254,28 @@
       </template>
     </c-list-search>
 
+    <c-col :span="24" style="margin-top: 10px">
+      <c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 0px" title="LETNOT"
+                @click="toLetnot">
+        出口信用证预开立
+      </c-button>
+
+      <c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 10px" title="LETOPN"
+                @click="toLetopn">
+        出口信用证开立
+      </c-button>
+
+      <c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 10px" title="LETDRW"
+                @click="toLetdrw">
+        非我行通知及收单行登记
+      </c-button>
+
+      <c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 10px" title="LETRSV"
+                @click="toLetrsv">
+        出口信用证补通知
+      </c-button>
+    </c-col>
+
     <div style="height: 90%">
       <c-col :span="24">
         <el-table
@@ -261,6 +283,12 @@
             :columns="stmData.columns"
             :showButtonFlg="true"
         >
+          <el-table-column
+              v-for="(item, key) in stmData.columns"
+              :key="key"
+              :label="item.label"
+              :prop="item.prop"
+          ></el-table-column>
           <!-- 自定义组件里加了最右边的一列”操作“ -->
           <el-table-column fixed="right" prop="op" label="操作" width="140px">
             <template slot="header">
@@ -342,6 +370,18 @@
             </template>
           </el-table-column>
         </el-table>
+        <div class="pagination-box">
+          <el-pagination
+              style="margin-right: 30px;"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page.sync="pagination.pageIndex"
+              :page-sizes="[10, 20, 50, 100, 500]"
+              :page-size="pagination.pageSize"
+              layout="sizes, prev, pager, next"
+              :total="pagination.total">
+          </el-pagination>
+        </div>
       </c-col>
     </div>
 
@@ -421,77 +461,73 @@ export default {
           },
           {
             label: "期限日",
-            prop: "maxcur",
+            prop: "tenmaxday",
           },
           {
             label: "开立日期",
-            prop: "maxamt",
+            prop: "opndat",
           },
           {
             label: "生效日期",
-            prop: "opndat",
+            prop: "expdat",
           },
           {
             label: "关闭日期",
-            prop: "aplref",
+            prop: "clsdat",
           },
           {
             label: "分行名称",
-            prop: "aplnam",
+            prop: "bchname",
           },
           {
             label: "申请人编号",
-            prop: "benefi",
+            prop: "aplextkey",
           },
           {
             label: "申请人名称",
-            prop: "bankno",
+            prop: "aplnam",
           },
           {
             label: "PTA主键",
-            prop: "clsdat",
-          },
-          {
-            label: "受益人编号",
-            prop: "stagod",
-          },
-          {
-            label: "受益人编号",
-            prop: "stagod",
+            prop: "ptainr",
           },
+          // {
+          //   label: "受益人编号",
+          //   prop: "stagod",
+          // },
           {
             label: "受益人名称",
-            prop: "stagod",
-          },
-          {
-            label: "受益人名称（中文）",
-            prop: "stagod",
-          },
-          {
-            label: "开证行编号",
-            prop: "stagod",
+            prop: "benefi",
           },
+          // {
+          //   label: "受益人名称（中文）",
+          //   prop: "stagod",
+          // },
+          // {
+          //   label: "开证行编号",
+          //   prop: "stagod",
+          // },
 
-          {
-            label: "开证名称",
-            prop: "stagod",
-          },
+          // {
+          //   label: "开证名称",
+          //   prop: "stagod",
+          // },
           {
             label: "金额币种",
-            prop: "stagod",
+            prop: "seacur",
           },
           {
             label: "信用证金额",
-            prop: "stagod",
+            prop: "maxamt",
           },
 
           {
             label: "余额币种",
-            prop: "stagod",
+            prop: "seacur",
           },
           {
             label: "信用证余额",
-            prop: "stagod",
+            prop: "opnamt",
           },
         ],
         data: [],

src/business/inflid/views/Infsea.vue

@@ -387,7 +387,11 @@ export default {
         {
           label:'减额修改接收',
           route:'/business-new/litdla'
-        }
+        },
+        {
+          label:'通知到单',
+          route:'/business-new/litdav'
+        },
       ],
       currentHandleRow: {}
     };

src/business/litdav/event/index.js

@@ -31,7 +31,7 @@ export default {
 
         lidgrp:{
           rec:{
-            inr:'00000122',
+            inr: this.$route.query.inr
           }
         }
 

src/business/litdav/model/index.js

@@ -72,6 +72,7 @@ export default class Litdav {
                 },
                 rec: {
                     inr:'',
+                    branchinr:'',
                     cur:'',
                     totcur: '',
                     advtyp: '',
@@ -118,7 +119,7 @@ export default class Litdav {
             lidgrp: {
                 rec: {
                     inr:'',
-                    branchinr:'00000047',
+                    branchinr:'',
                     revflg: '',
                     expdat: '',
                     expplc: '',