lttopn前后联动优化

76827186 · Wuyuqiu · f95fd3b4 · 76827186 · 76827186 · 76827186
Commit 76827186 authored Sep 06, 2022 by Wuyuqiu
6 changed files
--- a/src/model/Bftsnd/Default.js
+++ b/src/model/Bftsnd/Default.js
@@ -59,5 +59,6 @@ export default {
    "mtabut.coninf.oitinf.oit.inflev": Utils.defaultFunction,
    "mtabut.coninf.conexedat": Utils.defaultFunction,
    "bftp.docgrdm.docgrd": Utils.defaultFunction,
+    "bfdgrp.blk.prsdoc": Utils.defaultFunction,
 }
 //你可以添加自动default处理
\ No newline at end of file
--- a/src/model/Lttopn/Pattern.js
+++ b/src/model/Lttopn/Pattern.js
@@ -60,9 +60,9 @@ export default {


    "ltdgrp.cbs.nom1.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位" }
+        { pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
    ],

    "ltdgrp.be1.pts.nam":[
@@ -190,7 +190,7 @@ export default {
    "ledgrp.cbs.nom1.amt":[
        { type: "string", required: false, message: "必输项" },
        { max: 18, message: "整数位不能超过14位" },
-        { pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+        { pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
    ],

    "ledgrp.apl.pts.ref":[
@@ -204,7 +204,7 @@ export default {
    "ledgrp.cbs.opn1.amt":[
        {type: "number", required: false, message: "必输项"},
        {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+        { pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
    ],

    "ledgrp.apl.pts.nam":[
@@ -256,14 +256,14 @@ export default {
        {max: 1,message:"长度不能超过1"}
    ],
    "ltdgrp.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位" }
+        { pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
    ],
    "lttp.totamt":[
-        {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位" }
+        { pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
    ],
    "ltdgrp.a2t.pts.ref":[
        {type: "string", required: false, message: "必输项"},
@@ -399,8 +399,8 @@ export default {
    ],

    "ltdgrp.blk.lcrgod":[
-        {type: "string", required: true, message: "必输项"},
-        {max: 65,message:"长度不能超过65"}
+        {type: "string", required: false, message: "必输项"},
+        {type: "string",max: 999,message:"长度不能超过65"}
    ],

    "ltdgrp.blk.lcrdoc":[
@@ -417,7 +417,7 @@ export default {
    "setmod.docamt":[
        {type: "number", required: false, message: "必输项"},
        {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+        { pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
    ],


@@ -509,7 +509,7 @@ export default {
    "liaall.outamt":[
        {type: "number", required: false, message: "必输项"},
        {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+        { pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
    ],
    "liaall.outpct":[
        {type: "string", required: false, message: "必输项"},
@@ -522,19 +522,19 @@ export default {
    "liaall.misamt":[
        {type: "number", required: false, message: "必输项"},
        {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+        { pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
    ],


    "liaall.exttotoldamt":[
        {type: "number", required: false, message: "必输项"},
        {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+        { pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
    ],
    "liaall.exttotamt":[
        {type: "number", required: false, message: "必输项"},
        {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+        { pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
    ],
    "ltdgrp.blk.adlcnd":[
        {type: "string", required: true, message: "必输项"},
@@ -623,8 +623,8 @@ export default {
        {max: 65,message:"长度不能超过65"}
    ],
    "ltdgrp.rec.tenmaxday":[
-        {type: "string", required: false, message: "必输项"},
-        {max: 3,message:"长度不能超过3"}
+        {type: "number", required: false, message: "必输项"},
+        {type: "number",max: 999,message:"长度不能超过3"}
    ],
    "ltdgrp.rec.porloa":[
        {type: "string", required: false, message: "必输项"},

--- a/src/model/Lttopn/index.js
+++ b/src/model/Lttopn/index.js
@@ -259,63 +259,63 @@ export default class Lttopn {
 					dbfadrblkcn: "",			//  Chinese address		.ltdgrp.drw.dbfadrblkcn
 				},
 			},
-			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
-				glemod: {
-					gleshwstm: "",			//  Booking stream to Display		.setmod.glemod.gleshwstm
-				},
-			},
-			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: {
+			// 	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
+			// 	glemod: {
+			// 		gleshwstm: "",			//  Booking stream to Display		.setmod.glemod.gleshwstm
+			// 	},
+			// },
+			// 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
+			// 	},
+			// },
 			cnybop: {
 				cnyflg: "",			//  是否报送跨境人民币2101表		.cnybop.cnyflg
 				traflg: "",			//  是否报送跨境人民币2107表		.cnybop.traflg
@@ -323,14 +323,14 @@ export default class Lttopn {
 				libflg: "",			//  是否报送跨境人民币2106表		.cnybop.libflg
 				vouflg: "",			//  是否报送跨境人民币2122表		.cnybop.vouflg
 			},
-			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
-			},
+			// 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
+			// },
 			pageId: "",			// ctx的key
 			trnmod: new Pub().data.Trnmod,
 			setmod: new Pub().data.Setmod,

--- a/src/views/Business/Lttopn/Dogp.vue
+++ b/src/views/Business/Lttopn/Dogp.vue
 <template>
  <div class="eibs-tab">
-                             <!-- SF000249 : Description of Goods -->
-                  
-       <c-col :span="12">
-        <c-form-item :label="$t('lttp.SF000249')" prop="ltdgrp.blk.lcrgod">
-            <c-input type="textarea" v-model="model.ltdgrp.blk.lcrgod" maxlength="65" show-word-limit :placeholder="$t('other.please_enter')+$t('lttp.SF000249')" ></c-input>
-        </c-form-item>
-        </c-col>
-                  
-       <c-col :span="12">
-        <c-button size="small" type="primary" icon="el-icon-search" @click="onLcrgodButtxmsel">
+    <!-- SF000249 : Description of Goods -->
+
+    <c-col :span="20">
+      <c-form-item label="Description of Goods" prop="ltdgrp.blk.lcrgod">
+        <c-input
+          type="textarea"
+          style="width: 100%;"
+          v-model="model.ltdgrp.blk.lcrgod"
+          show-word-limit
+          placeholder="Please input Description of Goods"
+        ></c-input>
+      </c-form-item>
+    </c-col>
+
+    <c-col :span="4">
+      <!-- <c-button size="small" type="primary" icon="el-icon-search" @click="onLcrgodButtxmsel">
             {{$t('lttp.CF000248')}}
-        </c-button>
-       </c-col>
+        </c-button> -->
+      <c-button
+        size="small"
+        type="primary"
+        @click="
+          showGridPromptDialog(
+            'lttp.lcrgod.buttxmsel',
+            null,
+            null,
+            { TXT: 'ltdgrp.blk.lcrgod' },
+            { TXT: false },
+            'doxpDialog'
+          )
+        "
+      >
+        ...
+      </c-button>
+    </c-col>
  </div>
 </template>
 <script>
-import Api from "~/service/Api"
+import Api from "~/service/Api";
 import commonProcess from "~/mixin/commonProcess";
-import CodeTable from "~/config/CodeTable"
-import Event from "~/model/Lttopn/Event"
+import CodeTable from "~/config/CodeTable";
+import Event from "~/model/Lttopn/Event";

 export default {
-    inject: ['root'],
-    props:["model","codes"],
-    mixins: [commonProcess],
-    data(){
-        return {
-
-        }
-    },
-    methods:{...Event},
-    created:function(){
-
-    }
-}
+  inject: ["root"],
+  props: ["model", "codes"],
+  mixins: [commonProcess],
+  data() {
+    return {};
+  },
+  methods: { ...Event },
+  created: function () {},
+};
 </script>
 <style>
-
 </style>
--- a/src/views/Business/Lttopn/Lttinf.vue
+++ b/src/views/Business/Lttopn/Lttinf.vue
@@ -236,9 +236,9 @@
        ></c-ptsmsg>
      </c-col>
      <c-col :span="24">
-        <el-form-item label="" prop="cnftxt">
+        <el-form-item label="" prop="lttp.letp0.cnftxt">
          <c-input
-            v-model="model.cnftxt"
+            v-model="model.lttp.letp0.cnftxt"
            style="width: 100%"
            placeholder="Please select Form of L/C"
            disabled

--- a/src/views/Business/Lttopn/index.vue
+++ b/src/views/Business/Lttopn/index.vue
@@ -42,7 +42,7 @@
        </el-tab-pane>
        <!--lttp PD000057 Goods --> 
        <el-tab-pane label="Goods" name="dogp"> 
-          <m-doxp :model="model" :codes="codes" :dtyp="'dogp'" :rec="'led'" />
+          <m-dogp :model="model" :codes="codes" /> 
        </el-tab-pane>
        <!--lttp PD000060 Documents -->
        <el-tab-pane label="Documents" name="dorp">
@@ -139,7 +139,7 @@ import Pattern from "~/model/Lttopn/Pattern";
 import Ovwp from "./Ovwp";
 import Lttinf from "./Lttinf";
 import Ptyp from "./Ptyp";
-// import Dogp from "./Dogp";
+import Dogp from "./Dogp";
 // import Dorp from "./Dorp";
 import Cnyp from "./Cnyp";
 // import Spcbenp from "./Spcbenp";
@@ -169,6 +169,7 @@ export default {
    "m-engp": Engp,
    "m-detp": Detp,
    'm-doxp': Doxp,
+    'm-dogp': Dogp,
  },
  provide() {
    return {