Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

src/model/Ditdck/Pattern.js

@@ -108,8 +108,8 @@ export default {
         {max: 20,message:"长度不能超过20"}
     ],
     "didgrp.rec.utlnbr":[
-        {type: "string", required: false, message: "必输项"},
-        {max: 3,message:"长度不能超过3"}
+        {type: "number", required: false, message: "必输项"},
+        // {max: 3,message:"长度不能超过3"}
     ],
     "bddgrp.prb.pts.extkey":[
         {type: "string", required: false, message: "必输项"},
@@ -194,8 +194,8 @@ export default {
         {type: "date", required: false, message: "输入正确的日期"}
     ],
     "bddgrp.rec.tenmaxday":[
-        {type: "string", required: false, message: "必输项"},
-        {max: 3,message:"长度不能超过3"}
+        {type: "number", required: false, message: "必输项"},
+        // {max: 3,message:"长度不能超过3"}
     ],
 
 

src/views/Business/Infbdd/Infsea.vue

@@ -251,7 +251,11 @@
                 title="历史信息"
                 width="800"
                 trigger="click"
+                :ref="'popover_' + scope.row.IDX"
               >
+              <div style="text-align: right; margin-top: -30px; margin-right: 5px; font-size: 16px;">
+               <span class="el-icon-close" @click="closeTrn('popover_' + scope.row.IDX)"/>
+              </div>
                 <c-istream-table
                   :list="trnData.data"
                   :columns="trnData.columns"
@@ -346,8 +350,10 @@ export default {
           '8 6 "Beneficiary" 150',
           '9 7 "Party Number" 140',
           '10 8 "Presenting Bank" 220',
-          '3 9 "Opened" 150',
-          '4 10 "Closed" 80',
+          // '3 9 "Opened" 150',
+          // '4 10 "Closed" 80',
+          {index:3,position:9,width:100,pattern:'date',label:'Opened'},
+          {index:4,position:10,width:100,pattern:'date',label:'Closed'},
           '11 11 "Doc Amount Cur" 120',
           '12 12 "Doc Amount" 120',
           '13 13 "Open Amount Cur" 130',
@@ -377,8 +383,11 @@ export default {
           this.$router.history.push("/business/" + code) 
           this.initdialog = false                    
         },
+        closeTrn(refId){
+          this.$refs[refId].doClose();
+        },
         async getTrnInfo(idx, row) {
-          debugger;
+
 
       this.model.infcon.objinr = row["INR"];
       this.model.didgrp.rec.inr = row["INR"];

src/views/Business/Infdid/Infsea.vue

@@ -317,7 +317,11 @@
                 title="历史信息"
                 width="800"
                 trigger="click"
+                :ref="'popover_' + scope.row.IDX"
               >
+              <div style="text-align: right; margin-top: -30px; margin-right: 5px; font-size: 16px;">
+               <span class="el-icon-close" @click="closeTrn('popover_' + scope.row.IDX)"/>
+              </div>
                 <c-istream-table
                   :list="trnData.data"
                   :columns="trnData.columns"
@@ -342,6 +346,13 @@
                 >
                   详情
                 </c-button>
+                <!-- <c-button
+                  style="margin-left: 0"
+                  size="small"
+                 
+                >
+                  关闭
+                </c-button> -->
               </el-popover>
 
               <!-- <c-button
@@ -670,6 +681,9 @@ export default {
         this.trnData.data = rtnmsg.data.infcon_trnstm.rows;
       }
     },
+    closeTrn(refId){
+       this.$refs[refId].doClose();
+    },
     toDitopn(){
       this.$router.history.push("/business/ditopn") 
     }