进口融资还款交易修改

src/model/Trtset/Check.js

@@ -19,6 +19,9 @@ let checkObj = {
     "liaall.limmod.limpts.nonrevflg1"                      :null,
     "setmod.docamt"                      :null,
     "mtabut.clsflg"                      :null,
+    "pager.liaall_limmod_limpfp_clmcbe.total"                          :null,
+    "pager.liaall_limmod_limpfp_clmpty.total"                          :null,
+    "pager.liaall_limmod_limpfp_clmcbb.total"                          :null,  
 }
 
 for (const key in checkObj) {

src/model/Trtset/index.js

 import Api from "~/service/Api"
 import Pts from "../Common/Pts"
+import Pub from "../Public"
+
 
 export default class Trtset{
     constructor () {
-        this.data = {
+        this.data = {	
 						trdgrp:{
 							rec:{
 								pntref:"",			//  父交易参考号		.trdgrp.rec.pntref
@@ -64,29 +66,7 @@ export default class Trtset{
 								},
 							},
 						},
-						mtabut:{
-							clsflg:"",			//  Close Flag		.mtabut.clsflg
-							coninf:{
-								oitinf:{
-									labinftxt:"",			//  Label for INFTXT		.mtabut.coninf.oitinf.labinftxt
-									oit:{
-										inftxt:"",			//  Infotext		.mtabut.coninf.oitinf.oit.inftxt
-										inflev:"",			//  Infotext Level		.mtabut.coninf.oitinf.oit.inflev
-									},
-								},
-								oitset:{
-									labinftxt:"",			//  Label for INFTXT		.mtabut.coninf.oitset.labinftxt
-									oit:{
-										inftxt:"",			//  Infotext		.mtabut.coninf.oitset.oit.inftxt
-										inflev:"",			//  Infotext Level		.mtabut.coninf.oitset.oit.inflev
-									},
-								},
-								conexedat:"",			//  执行日期		.mtabut.coninf.conexedat
-								usr:{
-									extkey:"",			//  User ID		.mtabut.coninf.usr.extkey
-								},
-							},
-						},
+						mtabut: new Pub().data.Mtabut,
 						trtmod:{
 							finmod:{
 								setlab:"",			//  Settlement Label		.trtmod.finmod.setlab
@@ -116,94 +96,26 @@ export default class Trtset{
 								intprd:"",			//  计息周期		.trtmod.finmod.intprd
 							},
 						},
-						setmod:{
-							doccur:"",			//  document currency		.setmod.doccur
-							docamttyplab:"",			//  settled amount description as label		.setmod.docamttyplab
-							retmsg:"",			//  Label showing Retry overflow condition		.setmod.retmsg
-							ref:"",			//  our reference		.setmod.ref
-							docamt:"",			//  document amount		.setmod.docamt
-							dspflg:"",			//  Type of settlement		.setmod.dspflg
-							xreflg:"",			//  Recalculate Rates		.setmod.xreflg
-							setglg:{
-								labdspflg:"",			//  Label for Type of Settlement		.setmod.setglg.labdspflg
-							},
-							zmqacclab:"",			//  主�'�号LABEL		.setmod.zmqacclab
-							zmqacc:"",			//  自�'�区主�'�号		.setmod.zmqacc
-						},
+						setmod:new Pub().data.Setmod,
 						setamt:"",			//  Settlement Amount		.setamt
 						setact:"",			//  Settlement Account		.setact
 						clsflg:"",			//  抹�'�		.clsflg
 						setact1:"",			//  我行借记�'�户		.setact1
-						liaall:{
-							misamt:"",			//  Amount not yet assigned		.liaall.misamt
-							concur:"",			//  External Booking Amount		.liaall.concur
-							outpct:"",			//  Sight Amount Percentage		.liaall.outpct
-							outamt:"",			//  Sight Amount		.liaall.outamt
-							exttotoldamt:"",			//  Old Amount booked externally		.liaall.exttotoldamt
-							exttotamt:"",			//  Total booking amount external assinged		.liaall.exttotamt
-							limmod:{
-								limpfp:{
-									clmcbe:[],			//  		.liaall.limmod.limpfp.clmcbe
-									clmcbb:[],			//  		.liaall.limmod.limpfp.clmcbb
-									clmpty:[],			//  		.liaall.limmod.limpfp.clmpty
-								},
-								limpts:{
-									wrklab:"",			//  Label		.liaall.limmod.limpts.wrklab
-									othlab:"",			//  Label		.liaall.limmod.limpts.othlab
-									othlabss:"",			//  Label		.liaall.limmod.limpts.othlabss
-									wrk:{
-										pts:new Pts().data,
-									},
-									oth:{
-										pts:new Pts().data,
-									},
-									lsh:"",			//  合同流�'号		.liaall.limmod.limpts.lsh
-									nonrevflg1:"",			//  Flag to Mark Non-revolving Limits		.liaall.limmod.limpts.nonrevflg1
-									pfcod1:"",			//  合同流�'号		.liaall.limmod.limpts.pfcod1
-									nonrevflg2:"",			//  Flag to Mark Non-revolving Limits		.liaall.limmod.limpts.nonrevflg2
-									pfcod2:"",			//  合同流�'号		.liaall.limmod.limpts.pfcod2
-								},
-								wrkp:{
-									ptsget:{
-										sdamod:{
-											dadsnd:"",			//  Drag  Drop Sender		.liaall.limmod.wrkp.ptsget.sdamod.dadsnd
-											seainf:"",			//  		.liaall.limmod.wrkp.ptsget.sdamod.seainf
-										},
-									},
-								},
-								othp:{
-									ptsget:{
-										sdamod:{
-											dadsnd:"",			//  Drag  Drop Sender		.liaall.limmod.othp.ptsget.sdamod.dadsnd
-											seainf:"",			//  		.liaall.limmod.othp.ptsget.sdamod.seainf
-										},
-									},
-								},
-								ownref:"",			//  国结业务编号		.liaall.limmod.ownref
-								comamt:"",			//  业务余额		.liaall.limmod.comamt
-								ccvamt:"",			//  保证金余额		.liaall.limmod.ccvamt
-								ecifno:"",			//  ECIFNO		.liaall.limmod.ecifno
-							},
-						},
-						trnmod:{
-							trndoc:{
-								advlabel:"",			//  ADVLABEL		.trnmod.trndoc.advlabel
-								amdnam:"",			//  AMDNAM		.trnmod.trndoc.amdnam
-								advdoc:"",			//  国内证通知书		.trnmod.trndoc.advdoc
-								advnam:"",			//  国内证落款		.trnmod.trndoc.advnam
-								amdapl:"",			//  修改申请人名称		.trnmod.trndoc.amdapl
-								doclbl:"",			//  Lable for CONDOCSTM		.trnmod.trndoc.doclbl
-								doctrestm:"",			//  Document tree		.trnmod.trndoc.doctrestm
-								shwinc:"",			//  Show Incoming Messages		.trnmod.trndoc.shwinc
-								shwout:"",			//  Show Outgoing Messages		.trnmod.trndoc.shwout
-								condocstm:"",			//  Connected Documents		.trnmod.trndoc.condocstm
-								rcvatt:{
-									seainf:"",			//  		.trnmod.trndoc.rcvatt.seainf
-								},
-								filrecv:"",			//  File Receiver		.trnmod.trndoc.filrecv
-							},
-						},
-						pageId: ""			// ctx的key
+						liaall:new Pub().data.Liaall,
+						trnmod:new Pub().data.Trnmod,
+						pageId: "",			// ctx的key
+						
+						// pager:{
+						// 	liaall_limmod_limpfp_clmcbe:{
+						// 		total:"",
+						// 	},
+						// 	liaall_limmod_limpfp_clmpty:{
+						// 		total:"",
+						// 	},
+						// 	liaall_limmod_limpfp_clmcbb:{
+						// 		total:"",
+						// 	}
+						// },
 				}
     }
 }
\ No newline at end of file

src/views/Business/Trtset/Shisuan.vue

@@ -94,7 +94,7 @@
               </el-table>
               <el-pagination
                  layout="prev, pager, next"
-                 :total="pager.liaall_limmod_limpfp_clmcbe.total">
+                 :total="1">
               </el-pagination>
        </div>
        </c-col>
@@ -162,7 +162,7 @@
               </el-table>
               <el-pagination
                  layout="prev, pager, next"
-                 :total="pager.liaall_limmod_limpfp_clmcbb.total">
+                 :total="1">
               </el-pagination>
        </div>
        </c-col>
@@ -254,7 +254,7 @@
               </el-table>
               <el-pagination
                  layout="prev, pager, next"
-                 :total="pager.liaall_limmod_limpfp_clmpty.total">
+                 :total="1">
               </el-pagination>
        </div>
        </c-col>

src/views/Business/Trtset/index.vue

@@ -4,18 +4,18 @@
        <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
                    <!--trtset PD000015 Settle -->
            <el-tab-pane label="Settle" name="ovwp">
-                <m-Ovwp :model="model" :codes="codes"/>
+                <m-ovwp :model="model" :codes="codes"/>
            </el-tab-pane>
             <!--liaall PD000027 Liability -->
-           <el-tab-pane label="Liability" name="engp">
+           <el-tab-pane label="或有" name="engp">
                 <m-engp :model="model" :codes="codes"/>
            </el-tab-pane>
             <!--setmod PD000000 Settlement -->
-           <el-tab-pane label="Settlement" name="setpan">
+           <el-tab-pane label="账务" name="setpan">
                 <m-setpan :model="model" :codes="codes"/>
            </el-tab-pane>
             <!--coninf PD000000 Completion -->
-           <el-tab-pane label="Completion" name="coninfp">
+           <el-tab-pane label="附言" name="coninfp">
                 <m-coninfp :model="model" :codes="codes"/>
            </el-tab-pane>
             <!--trndoc PD000529 &Messages -->
@@ -23,7 +23,7 @@
                 <m-docpan :model="model" :codes="codes"/>
            </el-tab-pane>
             <!--trndoc PD000546 Attachments -->
-           <el-tab-pane label="Attachments" name="doctre">
+           <el-tab-pane label="附件" name="doctre">
                 <m-doctre :model="model" :codes="codes"/>
            </el-tab-pane>
             <!--limmod PD001139 试算结果 -->
@@ -43,17 +43,20 @@ import Api from "~/service/Api"
 import CodeTable from "~/config/CodeTable"
 import Trtset from "~/model/Trtset"
 import commonProcess from "~/mixin/commonProcess"
+import commonFuncs from "~/mixin/commonFuncs";
 import Check from "~/model/Trtset/Check"
 import Default from "~/model/Trtset/Default"
 import Pattern from "~/model/Trtset/Pattern"
+
 import Ovwp from "./Ovwp"
-import Engp from "./Engp"
-import Setpan from "./Setpan"
-import Coninfp from "./Coninfp"
-import Docpan from "./Docpan"
-import Doctre from "./Doctre"
-import Shisuan from "./Shisuan"
-import Limitbody from "./Limitbody"
+import Shisuan from "./Shisuan";
+import Engp from "~/views/Public/Engp";
+import Setpan from "~/views/Public/Setpan";
+import Coninfp from "~/views/Public/Coninfp";
+import Docpan from "~/views/Public/Docpan";
+import Doctre from "~/views/Public/Doctre";
+import Limitbody from "~/views/Public/Limitbody";
+
 
 
 export default {
@@ -73,19 +76,17 @@ export default {
             root: this
         }
     },
-    mixins: [commonProcess],    // 里面包含了Default、Check等的公共处理
+    mixins: [commonProcess, commonFuncs],    // 里面包含了Default、Check等的公共处理
     data(){
         return {
-            tabVal: "Ovwp",
+            tabVal: "ovwp",
             trnName: "trtset",
-            trnType: "",
             model: new Trtset().data,
             checkRules: Check,
             defaultRules: Default,
             pattern: Pattern,
             rules: null,
-            codes: {
-            },
+            codes: {...CodeTable},
         }
     },
     methods:{
@@ -103,6 +104,9 @@ export default {
         {
            this.updateModel(rtnmsg.data)
            //TODO 处理数据逻辑
+           if(this.isInDisplay){
+                this.restoreDisplay();
+           }
 
         }
         else