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

src/config/CodeTable/index.js

@@ -5884,5 +5884,24 @@ const CodeTable = {
     atptxt: [
 		{ label: "开立信用证", value: "DITOPN" },
 	],
+	sptrelstatus:[
+		{label:'Incoming',value:'INC'},
+		{label:'Automatic',value:'AUT'},
+		{label:'To Correct',value:'COR'},
+		{label:'Manual',value:'MAN'},
+		{label:'Registered',value:'RIM'},
+		{label:'Pending',value:'PEN'},
+		{label:'Rejected',value:'REJ'},
+		{label:'Straight Through',value:'STP'},
+		{label:'Processing Pending',value:'PUP'},
+		{label:'Release Pending',value:'PUR'},
+		{label:'Branch Confirm',value:'CMC'},
+		{label:'Branch Register',value:'CMP'},
+		{label:'To Correct',value:'CMR'},
+		{label:'Branch Pending',value:'CMB'},
+		{label:'To Correct',value:'CTR'},
+		{label:'Done',value:'CAN'},
+		{label:'E Trade',value:'EJS'},
+	]
 }
 export default CodeTable;
\ No newline at end of file

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/model/Trnrel/Event.js

@@ -407,7 +407,6 @@ export default {
         const res = await this.executeRule("searow")
         that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
         this.model.trncorco.trnstm = res.data.trncorco_trnstm;
-        this.$store.commit("setTaskList", {key: "trnfnd", val: this.stmData.data.length});
  
         this.$refs.paramsForm.clearValidate();
         Utils.positioningErrorMsg(res.fieldErrors, this.$refs.paramsForm.fields)

src/store/Status.js

@@ -26,7 +26,6 @@ const Status = {
 		taskList: {
 			sptsel: 0,
 			trnrel: 0,
-			trnfnd: 0,
 			bopsel: 0,
 			sptbrk: 0,
 			diasel: 0,

src/views/Business/BusRouter.js

@@ -103,8 +103,6 @@ import Sptpopup from "./Sptsel/Sptpopup"
  * 带有name的才会被添加进顶部的标签页里
  */
 const BusRouter = [
-  { path: 'sptpopup', component: Sptpopup, name: 'Sptpopup', meta: { title: '详情' } },
-  // { path: 'inftrnpsDetail', component: InftrnpsDetail, name: 'InftrnpsDetail', meta: { title: '详情' } },
   { path: 'sptpopup', component: Sptpopup, name: 'Sptpopup', meta: { title: '待经办详情' } },
   { path: 'trnfndsDetail', component: TrnfndsDetail, name: 'TrnfndsDetail', meta: { title: '已完成详情' } },
   { path: 'inftrnpsDetail', component: InftrnpsDetail, name: 'InftrnpsDetail', meta: { title: '待复核详情' } },

src/views/Business/Ditdck/index.vue

@@ -151,7 +151,6 @@ export default {
     if (rtnmsg.respCode == SUCCESS) {
       //TODO 处理数据逻辑
       console.log(rtnmsg);
-      debugger;
       Utils.copyValueFromVO(this.model, rtnmsg.data);
       console.log(this.model);
       if (this.isInDisplay) {

src/views/Business/Infbdd/BusNavbar.vue

@@ -23,7 +23,7 @@ export default {
             trnName:'ditsel',
             model:new Litsel().data,
             navcode:[
-               {code:"",label:"",isDis:"",title:""},            
+               // {code:"",label:"",isDis:"",title:""},            
             ],
         }
     },
@@ -34,9 +34,10 @@ export default {
             let rtnmsg = await this.executeRule("cfgfil.hotsub3")
             console.log("cfgfil.code:" +  this.model.cfgfil.subtrn1);
             if(rtnmsg.respCode = SUCCESS){
+               this.navcode = []
                this.$emit("onChoose",code.toLowerCase());
             }else{
-
+               this.$notify.error({ title: "错误", message: "服务请求失败！" });
             }
             
         },
@@ -66,6 +67,7 @@ export default {
     mounted(){
          this.$nextTick(function(){
               this.$on('childmethods',async function(){
+                   this.navcode = []
                   //请求按钮数据
                   //this.model.didgrp.rec.ownref = 'KZ3500210540AA'  
                   this.model.bddgrp.rec.ownref = this.ownref  

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/BusNavbar.vue

@@ -23,7 +23,7 @@ export default {
             trnName:'ditsel',
             model:new Litsel().data,
             navcode:[
-               {code:"",label:"",isDis:"",title:""},            
+               // {code:"",label:"",isDis:"",title:""},            
             ],
         }
     },
@@ -34,9 +34,10 @@ export default {
             let rtnmsg = await this.executeRule("cfgfil.hotsub1")
             console.log("cfgfil.code:" +  this.model.cfgfil.subtrn1);
             if(rtnmsg.respCode = SUCCESS){
+               this.navcode = []
                this.$emit("onChoose",code.toLowerCase());
             }else{
-
+               this.$notify.error({ title: "错误", message: "服务请求失败！" });
             }
             
         },
@@ -66,9 +67,11 @@ export default {
     mounted(){
          this.$nextTick(function(){
               this.$on('childmethods',async function(){
+                   this.navcode = []
                   //请求按钮数据
                   this.model.didgrp.rec.ownref = this.ownref  
                   console.log("ownref:" + this.ownref  );
+                  
                     let rtnmsg = await this.executeRule("didgrp.rec.ownref");//didgrp_rec_ownref
                     if(rtnmsg.respCode = SUCCESS){
                               //重置数组
@@ -96,6 +99,7 @@ export default {
                                    
                                }
 
+                        
                          }
                         
                     })

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") 
     }

src/views/Business/Sptsel/Menu.vue

@@ -433,7 +433,8 @@ export default {
           '4 1 "交易代码" 70 ',
           '5 2 "业务编号" 300',
           '6 3 "交易名称" 140',
-          '1 4 "状态" 60 1 tdViewTypeEdit:0 1 SPT:STA',
+          //'1 4 "状态" 60 1 tdViewTypeEdit:0 1 SPT:STA',
+          {index:1,position:4,width:100,pattern:'code',label:'状态',code:this.codes.sptrelstatus},
           '17 5 "报文类型" 100',
           '18 6 "对方银行BIC" 110',
           '7 7 "创建时间" 160 20 DateTime 1',

src/views/Business/Sptsel/index.vue

@@ -48,7 +48,8 @@ export default {
             rules:null,
             codes:{
                flt:CodeTable.flt,
-               dflg:CodeTable.dflg
+               dflg:CodeTable.dflg,
+               sptrelstatus:CodeTable.sptrelstatus,
             },
         }
     },

src/views/Business/Trnrel/Trnfnd/TrnfndsDetail.vue

@@ -253,7 +253,7 @@
 
                         <!-- -------------------document------------------- -->
                         <c-col :span="24" style="height:24px">
-                            <el-form-item label="面函" class="messageLabel">
+                            <el-form-item label="面函/报文" class="messageLabel">
                             </el-form-item>
                         </c-col>
                         <c-col :span="23" style="height: 10px">

src/views/Business/Trnrel/Trnfnd/index.vue

@@ -90,7 +90,7 @@ export default {
 
       that.model = Utils.copyValueFromVO(that.model, res.data);
       //  that.$refs.inftrnps.stmData.columns=res.data.trncorco_trnstm.rows
-      this.$refs.inftrnps.handleSearch();
+      this.$refs.inftrnps.trnfndhandleSearch();
     });
   },
 };

src/views/TaskList/index.vue

@@ -23,10 +23,6 @@
       </el-tab-pane>
       
        <el-tab-pane label="已完成列表" name="trnfnd">
-         <span slot="label">
-          已完成列表
-          <el-badge v-if="$store.state.Status.taskList.trnfnd>0" :value="$store.state.Status.taskList.trnfnd" :max="99"/>
-        </span>
         <c-content :height="160">
           <t-trnfnd  />
         </c-content>