Merge branch 'master' of http://192.168.0.110:11080/fukai/vue-gjjs

src/config/CodeTable/index.js

@@ -6494,11 +6494,18 @@ const CodeTable = {
         { label: "CONFIRM", value: "C" },
         { label: "MAY ADD", value: "A" },
     ],
-
-    invtyp:[
-        {label:"type1", value:"1"}
+    invtyp: [
+        { label: "type1", value: "1" }
     ],
 
+    furide: [
+        { label: "Accept", value: "ACC" },
+        { label: "Debit", value: "DEB" },
+        { label: "Negotiate", value: "NEG" },
+        { label: "Reimburse", value: "REI" },
+        { label: "Remitted", value: "REM" },
+        { label: "See72", value: "SEE" },
+    ],
     purpos:[
         {label:"Advice and confirmation of the credit amendment", value:"ACNF"},
         {label:"Advice of the credit amendment", value:"ADVI"},

src/model/Brtacp/Pattern.js

@@ -19,7 +19,7 @@ export default {
         {max: 3,message:"长度不能超过3"}
     ],
     "lidgrp.cbs.opn1.amt":[
-        {type: "number", required: false, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
@@ -41,7 +41,7 @@ export default {
     ],
 
     "brdgrp.cbs.max.amt":[
-        {type: "number", required: false, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
@@ -54,7 +54,7 @@ export default {
         {max: 3,message:"长度不能超过3"}
     ],
     "brdgrp.cbs.opn1.amt":[
-        {type: "number", required: false, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
@@ -84,10 +84,10 @@ export default {
         {max: 40,message:"长度不能超过40"}
     ],
 
-    "brdgrp.rec.tenmaxday":[
-        {type: "string", required: false, message: "必输项"},
-        {max: 3,message:"长度不能超过3"}
-    ],
+    // "brdgrp.rec.tenmaxday":[
+    //     {type: "number", required: false, message: "必输项"},
+    //     {max: 3,message:"长度不能超过3"}
+    // ],
     "brdgrp.prb.pts.ref":[
         {type: "string", required: false, message: "必输项"},
         {max: 16,message:"长度不能超过16"}
@@ -104,7 +104,7 @@ export default {
         {max: 16,message:"长度不能超过16"}
     ],
     "brdgrp.rec.disdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        {type: "date", required: true, message: "输入正确的日期"}
     ],
     "brdgrp.prb.pts.extkey":[
         {type: "string", required: false, message: "必输项"},
@@ -116,7 +116,7 @@ export default {
     ],
 
     "brdgrp.prb.namelc":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
     "brdgrp.rec.totcur":[
@@ -124,45 +124,40 @@ export default {
         {max: 3,message:"长度不能超过3"}
     ],
     "brdgrp.rec.totamt":[
-        {type: "number", required: false, message: "必输项"},
+        {type: "string", required: true, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
     "brdgrp.prb.pts.adrblk":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
     "brdgrp.prb.dbfadrblkcn":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
     "brdgrp.prb.adrelc":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
 
     "brdgrp.cbs.max2.amt":[
-        {type: "number", required: false, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
     "brdgrp.blk.chaded":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
     "brdgrp.blk.chaadd":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
     "brdgrp.rec.totcur":[
         {type: "string", required: false, message: "必输项"},
         {max: 3,message:"长度不能超过3"}
     ],
-    "brdgrp.rec.totamt":[
-        {type: "number", required: false, message: "必输项"},
-        {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
-    ],
     "brtp.acbp.ptsget.sdamod.dadsnd":[
         {type: "string", required: false, message: "必输项"},
         {max: 16,message:"长度不能超过16"}
@@ -177,23 +172,23 @@ export default {
     ],
 
     "brdgrp.acb.namelc":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
     "brdgrp.acb.pts.adrblk":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
     "brdgrp.acb.dbfadrblkcn":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
     "brdgrp.acb.adrelc":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
     "brdgrp.blk.docdis":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 50,message:"长度不能超过50"}
     ],
 
@@ -204,7 +199,7 @@ export default {
 
 
     "setmod.docamt":[
-        {type: "number", required: false, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
@@ -220,13 +215,13 @@ export default {
 
 
     "mtabut.coninf.oitinf.oit.inftxt":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 60,message:"长度不能超过60"}
     ],
 
 
     "mtabut.coninf.oitset.oit.inftxt":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 60,message:"长度不能超过60"}
     ],
 
@@ -243,7 +238,7 @@ export default {
         {max: 50,message:"长度不能超过50"}
     ],
     "trnmod.trndoc.amdapl":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 50,message:"长度不能超过50"}
     ],
 
@@ -260,14 +255,6 @@ export default {
         {max: 1,message:"长度不能超过1"}
     ],
 
-
-
-
-
-
-
-
-
     "trnmod.trndoc.condocstm":[
         {type: "string", required: false, message: "必输项"},
         {max: 1,message:"长度不能超过1"}
@@ -276,4 +263,8 @@ export default {
         {type: "string", required: false, message: "必输项"},
         {max: 3,message:"长度不能超过3"}
     ],
+    "brtp.furide":[
+        {type: "string", required: true, message: "必输项"},
+        {max: 3,message:"长度不能超过3"}
+    ],
 }
\ No newline at end of file

src/model/Brtacp/index.js

 import Api from "~/service/Api"
 import Pts from "../Common/Pts"
+import Pub from "../Public"
 
 export default class Brtacp{
     constructor () {
@@ -107,60 +108,10 @@ export default class Brtacp{
 								},
 							},
 						},
-						setmod:{
-							docamttyplab:"",			//  settled amount description as label		.setmod.docamttyplab
-							retmsg:"",			//  Label showing Retry overflow condition		.setmod.retmsg
-							ref:"",			//  our reference		.setmod.ref
-							doccur:"",			//  document currency		.setmod.doccur
-							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
-						},
-						mtabut:{
-							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
-								},
-							},
-						},
-						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
-							},
-						},
+						setmod: new Pub().data.Setmod,
+						mtabut: new Pub().data.Mtabut,
+						trnmod: new Pub().data.Trnmod,
+                        brtprbl1blk: "",
 						pageId: ""			// ctx的key
 				}
     }

src/views/Business/Brtacp/index.vue

 <template>
   <div class="eContainer">
+    <c-function-btn
+        :handleSubmit="handleSubmit"
+        :handleCheck="handleCheck"
+        :handleStash="handleStash"
+      >
+        <el-button size="small">备忘录</el-button>
+        <el-button size="small" @click="setDraggableContent('cms', '影像信息')">影像信息</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>
+      </c-function-btn>
     <el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" size="small" :validate-on-rule-change="false">
        <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
         
             <!--PD000048 -->
-           <el-tab-pane label="PD000048" name="acpp">
+           <el-tab-pane label="Accept Disrepancies" name="acpp">
                 <m-acpp :model="model" :codes="codes"/>
            </el-tab-pane>
  
             <!--PD000139 -->
-           <el-tab-pane label="PD000139" name="mt750p">
+           <el-tab-pane label="Advice of Discrepancy" name="mt750p">
                 <m-mt750p :model="model" :codes="codes"/>
            </el-tab-pane>
  
             <!--PD000000 -->
-           <el-tab-pane label="PD000000" name="setpan">
+           <el-tab-pane label="账务" name="setpan">
                 <m-setpan :model="model" :codes="codes"/>
            </el-tab-pane>
  
             <!--PD000000 -->
-           <el-tab-pane label="PD000000" name="coninfp">
+           <el-tab-pane label="附言" name="coninfp">
                 <m-coninfp :model="model" :codes="codes"/>
            </el-tab-pane>
  
             <!--PD000529 -->
-           <el-tab-pane label="PD000529" name="docpan">
+           <el-tab-pane label="面函" name="docpan">
                 <m-docpan :model="model" :codes="codes"/>
            </el-tab-pane>
  
             <!--PD000546 -->
-           <el-tab-pane label="PD000546" name="doctre">
+           <el-tab-pane label="附件" name="doctre">
                 <m-doctre :model="model" :codes="codes"/>
            </el-tab-pane>
        </c-tabs>
@@ -41,15 +54,18 @@ import Api from "~/service/Api"
 import CodeTable from "~/config/CodeTable"
 import Brtacp from "~/model/Brtacp"
 import commonProcess from "~/mixin/commonProcess"
+import commonFuncs from "~/mixin/commonFuncs";
 import Check from "~/model/Brtacp/Check"
 import Default from "~/model/Brtacp/Default"
 import Pattern from "~/model/Brtacp/Pattern"
 import Acpp from "./Acpp"
 import Mt750p from "./Mt750p"
-import Setpan from "./Setpan"
-import Coninfp from "./Coninfp"
-import Docpan from "./Docpan"
-import Doctre from "./Doctre"
+
+
+import Setpan from "~/views/Public/Setpan";
+import Coninfp from "~/views/Public/Coninfp";
+import Docpan from "~/views/Public/Docpan";
+import Doctre from "~/views/Public/Doctre"
 
 
 export default {
@@ -67,10 +83,10 @@ export default {
             root: this
         }
     },
-    mixins: [commonProcess],    // 里面包含了Default、Check等的公共处理
+    mixins: [commonProcess,commonFuncs],    // 里面包含了Default、Check等的公共处理
     data(){
         return {
-            tabVal: "",
+            tabVal: "acpp",
             trnName: "brtacp",
             model: new Brtacp().data,
             checkRules: Check,
@@ -78,6 +94,7 @@ export default {
             pattern: Pattern,
             rules: null,
             codes: {
+                ...CodeTable
             },
         }
     },

src/views/Business/Litsel/Sel.vue

@@ -3,20 +3,20 @@
     <!-- 左 -->
     <el-col :span="11">
       <c-col :span="24">
-        <c-form-item label="L/C Reference" prop="lidget.lid.ownref">
+        <c-form-item label="L/C Reference" prop="lidgrp.rec.ownref">
           <c-fullbox>
             <c-input
-              v-model="model.lidget.lid.ownref"
+              v-model="model.lidgrp.rec.ownref"
               maxlength="16"
               style="width: 100%"
-              @keyup.enter.native="showGridPromptDialog('lidget.lid.ownref')"
+              @keyup.enter.native="showGridPromptDialog('lidgrp.rec.ownref')"
             ></c-input>
             <template slot="footer">
               <c-button
                 style="margin: 0 10px 0 10px; padding: 0 12px"
                 size="small"
                 type="primary"
-                @click=""
+                @click="onSeainf('lidget.sdamod.seainf')"
               >
                 <span style="font-family: '宋体'; font-weight: bold">i</span>
               </c-button>
@@ -549,7 +549,7 @@
     <!-- 右 -->
     <el-col :span="11" :offset="1">
       <c-col :span="24">
-        <c-form-item label="Name " prop="lidget.lid.nam">
+        <c-form-item label="Name " prop="lidgrp.rec.nam">
           <c-input
             v-model="model.lidgrp.rec.nam"
             maxlength="40"