trtopn的初始化、pattern

src/model/Trtopn/Default.js

@@ -7,15 +7,15 @@ import Utils from "~/utils/index"
 
 export default {
     "trdgrp.fip.pts.extkey"                      :Utils.defaultFunction,
-    "trtmod.finmod.accbch":defaultTrtmodFinmodAccbch,
+    "trtmod.finmod.accbch":Utils.defaultFunction,
     "trtmod.finmod.dinjdm"                      :Utils.defaultFunction,
     "trdgrp.cbs.max.amt"                      :Utils.defaultFunction,
     "trdgrp.rec.fintyp"                      :Utils.defaultFunction,
     "trdgrp.cbs.max.cur"                      :Utils.defaultFunction,
-    "trtmod.finmod.act1":defaultTrtmodFinmodAct1,
+    "trtmod.finmod.act1":Utils.defaultFunction,
     "trdgrp.rec.pntref"                      :Utils.defaultFunction,
     "trtmod.finmod.acttyp"                      :Utils.defaultFunction,
-    "trtmod.finmod.act3":defaultTrtmodFinmodAct3,
+    "trtmod.finmod.act3":Utils.defaultFunction,
     "trtmod.finmod.inttyp"                      :Utils.defaultFunction,
     "setmod.doccur"                      :Utils.defaultFunction,
     "setmod.dspflg"                      :Utils.defaultFunction,
@@ -52,7 +52,7 @@ export default {
     "trdgrp.rec.reccountrycode"                      :Utils.defaultFunction,
     "ledgrp.apl.pts.nam"                      :Utils.defaultFunction,
     "trtmod.finmod.intdat"                      :Utils.defaultFunction,
-    "trtp.act"                      :defaultTrtpAct,
+    "trtp.act"                      :Utils.defaultFunction,
     "trtmod.finmod.flttyp"                      :Utils.defaultFunction,
     "trtmod.finmod.dinmod.jzllgz"                      :Utils.defaultFunction,
 }

src/model/Trtopn/Pattern.js

@@ -65,7 +65,7 @@ export default {
         {max: 40,message:"长度不能超过40"}
     ],
     "trdgrp.fip.pts.ref":[
-        {type: "string", required: false, message: "必输项"},
+        {type: "string", required: true, message: "必输项"},
         {max: 16,message:"长度不能超过16"}
     ],
     "trtp.usr.extkey":[
@@ -81,7 +81,7 @@ export default {
         {max: 16,message:"长度不能超过16"}
     ],
     "trdgrp.fip.pts.extkey":[
-        {type: "string", required: false, message: "必输项"},
+        {type: "string", required: true, message: "必输项"},
         {max: 16,message:"长度不能超过16"}
     ],
     "trtp.fipp.ptsget.sdamod.seainf":[
@@ -114,7 +114,7 @@ export default {
 
 
     "trdgrp.cbs.max.amt":[
-        {type: "number", required: false, message: "必输项"},
+        {required: true, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
@@ -139,10 +139,10 @@ export default {
         {max: 4,message:"长度不能超过4"}
     ],
     "trdgrp.rec.matdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        {type: "date", required: true, message: "输入正确的日期"}
     ],
     "trdgrp.rec.tenday":[
-        {type: "string", required: false, message: "必输项"},
+        {required: false, message: "必输项"},
         {max: 10,message:"长度不能超过10"}
     ],
     "trtmod.finmod.graday":[
@@ -166,11 +166,11 @@ export default {
 
 
     "trtmod.finmod.ovdintrat":[
-        {type: "string", required: false, message: "必输项"},
+        {type: "string", required: true, message: "必输项"},
         {max: 8,message:"长度不能超过8"}
     ],
     "trdgrp.rec.actrat":[
-        {type: "string", required: false, message: "必输项"},
+        {type: "string", required: true, message: "必输项"},
         {max: 12,message:"长度不能超过12"}
     ],
 
@@ -203,12 +203,16 @@ export default {
         {max: 35,message:"长度不能超过35"}
     ],
     "trtmod.finmod.dinjdm":[
-        {type: "string", required: false, message: "必输项"},
+        {type: "string", required: true, message: "必输项"},
         {max: 20,message:"长度不能超过20"}
     ],
 
     "trdgrp.rec.mycontno":[
-        {type: "string", required: false, message: "必输项"},
+        {type: "string", required: true, message: "必输项"},
+        {max: 35,message:"长度不能超过35"}
+    ],
+    "trdgrp.rec.invtyp":[
+        {type: "string", required: true, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
 
@@ -523,4 +527,16 @@ export default {
         {type: "string", required: false, message: "必输项"},
         {max: 26,message:"长度不能超过26"}
     ],
+    "trdgrp.cbs.max.cur": [
+        {type: "string", required: true, message: "必选项"}
+    ],
+    "trtmod.finmod.flttyp": [
+        {type: "string", required: true, message: "必选项"}
+    ],
+    "cfatrt.cfaflg": [
+        {type: "string", required: true, message: "必选项"}
+    ],
+    "trdgrp.rec.stagod": [
+        {type: "string", required: true, message: "必选项"}
+    ]
 }
\ No newline at end of file

src/model/Trtopn/index.js

 import Api from "~/service/Api"
 import Pts from "../Common/Pts"
+import Trnmod from "../Public/Trnmod"
+import Setmod from "../Public/Setmod"
 
 export default class Trtopn{
     constructor () {
@@ -239,29 +241,8 @@ export default class Trtopn{
 							rzkx5:"",			//  融资款项		.financ.rzkx5
 							ref5:"",			//  业务编号		.financ.ref5
 						},
-						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
-						},
-						trnmod:{
-							trndoc:{
-								advlabel:"",			//  ADVLABEL		.trnmod.trndoc.advlabel
-								amdnam:"",			//  AMDNAM		.trnmod.trndoc.amdnam
-								advdoc:"",			//  国内证通知书		.trnmod.trndoc.advdoc
-								advnam:"",			//  国内证落款		.trnmod.trndoc.advnam
-								amdapl:"",			//  修改申请人名称		.trnmod.trndoc.amdapl
-							},
-						},
+						setmod:new Setmod().data,
+						trnmod:new Trnmod().data,
 						pageId: ""			// ctx的key
 				}
     }

src/views/Business/BusRouter.js

@@ -54,7 +54,9 @@ import Litdav from "./Litdav"
 import Litdck from "./Litdck"
 import Inflid from "./Inflid"
 import Inftrd from "./Inftrd"
+import Trtopn from "./Trtopn"
 import Trtame from "./Trtame"
+import Trtsel from "./Trtsel"
 import Lttcan from "./Lttcan"
 // import Infdet from "./Infdet"
 import Botdav from "./Botdav"
@@ -234,7 +236,9 @@ const BusRouter = [
     { path: 'litdck', component: Litdck, name: 'Litdck', meta: { title: '进口信用证到单' } },
     { path: 'inflid', component: Inflid, name: 'Inflid', meta: { title: '进口信用证查询' } },
     { path: 'inftrd', component: Inftrd, name: 'Inftrd', meta: { title: '进口押汇查询' } },
+    { path: 'trtopn', component: Trtopn, name: 'Trtopn', meta: { title: '进口融资开立' } },
     { path: 'trtame', component: Trtame, name: 'Trtame', meta: { title: '进口融资修改' } },
+    { path: 'trtsel', component: Trtsel, name: 'Trtsel', meta: { title: '进口融资入口交易' } },
     { path: 'brtdck', component: Brtdck, name: 'Brtdck', meta: { title: '进口信用证单据改单/二次到单' } },
 
     { path: 'inftxm', component: Inftxm, name: 'Inftxm', meta: { title: '条式语句查询' } },

src/views/Business/Trtopn/Ovwp.vue

@@ -427,7 +427,9 @@
       props: ["model", "codes"],
       mixins: [commonProcess],
       data() {
-        return {};
+        return {
+            flag: false
+        };
       },
       methods: { ...Event },
       created: function() {}

src/views/Business/Trtopn/index.vue

@@ -73,6 +73,13 @@
             </c-content>
           </el-tab-pane>
         </c-tabs>
+
+        <c-grid-ety-prompt-dialog
+          ref="etyDialog"
+          :promptData="promptData"
+          v-on:select-ety="selectEty"
+        >
+        </c-grid-ety-prompt-dialog>
       </el-form>
     </div>
   </c-page>
@@ -83,6 +90,7 @@
   import CodeTable from "~/config/CodeTable";
   import Trtopn from "~/model/Trtopn";
   import commonProcess from "~/mixin/commonProcess";
+  import commonFuncs from "~/mixin/commonFuncs";
   import Check from "~/model/Trtopn/Check";
   import Default from "~/model/Trtopn/Default";
   import Pattern from "~/model/Trtopn/Pattern";
@@ -101,6 +109,7 @@
   import Dinpan from "./Dinpan";
 
   export default {
+    name: 'Trtopn',
     components: {
       "m-ovwp": Ovwp,
       "m-letinf": Letinf,
@@ -120,7 +129,7 @@
         root: this
       };
     },
-    mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
+    mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
     data() {
       return {
         tabVal: "ovwp",
@@ -141,6 +150,7 @@
       let rtnmsg = await this.init({});
       if (rtnmsg.respCode == SUCCESS) {
         //TODO 处理数据逻辑
+        this.updateModel(rtnmsg.data);
       } else {
         this.$notify.error({ title: "错误", message: "服务请求失败！" });
       }

src/views/Login/index.vue

@@ -23,6 +23,7 @@
 </template>
 
 <script>
+import Utils from "~/utils";
 import { createNamespacedHelpers } from 'vuex'
 
 const { mapState, mapMutations, mapActions } = createNamespacedHelpers('UserContext')
@@ -49,7 +50,7 @@ const { setLoginInfo } = mapMutations(["setLoginInfo"])
       submitForm(formName) {
         this.$refs[formName].validate((valid) => {
           if (valid) {
-            this.setLoginInfo({userId:this.loginForm.username})
+            this.setLoginInfo({userId:this.loginForm.username, token: Utils.generateUUID()})
             this.$router.push("/home");
           } else {
             console.log('error submit!!');