Litopn交易Goods,Documents,Additional Conditions引用公共模块回填文本

src/config/CodeTable/index.js

@@ -6575,7 +6575,6 @@ const CodeTable = {
     ],
 
     label5: [
-        { label: "额度已切分,结算系统将自动扣除余额,保证金（如需）符合要求;", value: "A" },
         { label: "额度已切分,结算系统将自动扣减额度,保证金（如需）符合要求;", value: "A" },
         { label: "额度未切分,《信贷业务通知书》符合要求;", value: "B" },
     ],

src/mixin/commonProcess.js

@@ -300,12 +300,19 @@ export default {
      * @param {String} val 选种行的值（一般是首列）
      * @param {String} rulePath 路径
      */
-    selectEty(val, rulePath) {
-      const props = rulePath.replaceAll(".", "_")
-      const obj = {}
-      obj[props] = val;
-      Utils.copyValueFromVO(this.model, obj);
-      this.executeRule(rulePath).then((res) => {
+    selectEty(val, modelUrl, isCover, rulePath) {
+      let rule;
+      if (typeof modelUrl === 'string') {
+        const props = modelUrl.replaceAll(".", "_")
+        const obj = {}
+        obj[props] = val;
+        Utils.copyValueFromVO(this.model, obj);
+        rule = modelUrl;
+      } else {
+        this.selectMsg(val, modelUrl, isCover, rulePath)
+        rule = rulePath;
+      }
+      this.executeRule(rule).then((res) => {
         if (res.respCode == SUCCESS) {
           Utils.copyValueFromVO(this.model, res.data);
         }

src/model/Litopn/Default.js

@@ -65,7 +65,7 @@ export default {
     "lidgrp.rec.preadvdt"                      :Utils.defaultFunction,
     "lidgrp.rec.avbby"                      :Utils.defaultFunction,
     "lidgrp.blk.defdet"                      :Utils.defaultFunction,
-    "lidgrp.blk.lcrgod"                      :Utils.defaultFunction,
+    //"lidgrp.blk.lcrgod"                      :Utils.defaultFunction,
     "lidgrp.ben.pts.adrblk"                      :Utils.defaultFunction,
     "lidgrp.apl.pts.extkey"                      :Utils.defaultFunction,
     "lidgrp.apl.adrelc"                      :Utils.defaultFunction,

src/model/Litopn/Event.js

@@ -62,7 +62,7 @@ export default {
                 }
             },
         async onPreperButtxmsel(){
-                let rtnmsg = await this.executeRule("preper.buttxmsel")
+                let rtnmsg = await this.executeRule("litp.preper.buttxmsel")
                 if(rtnmsg.respCode == SUCCESS)
                 {
                 //TODO 处理数据逻辑
@@ -86,7 +86,7 @@ export default {
                 }
             },
         async onChariaButtxmsel(){
-                let rtnmsg = await this.executeRule("charia.buttxmsel")
+                let rtnmsg = await this.executeRule("litp.charia.buttxmsel")
                 if(rtnmsg.respCode == SUCCESS)
                 {
                 //TODO 处理数据逻辑
@@ -158,7 +158,7 @@ export default {
                 }
             },
         async onLcrgodButtxmsel(){
-                let rtnmsg = await this.executeRule("lcrgod.buttxmsel")
+                let rtnmsg = await this.executeRule("litp.lcrgod.buttxmsel")
                 if(rtnmsg.respCode == SUCCESS)
                 {
                 //TODO 处理数据逻辑
@@ -170,7 +170,7 @@ export default {
                 }
             },
         async onLcrdocButtxmsel(){
-                let rtnmsg = await this.executeRule("lcrdoc.buttxmsel")
+                let rtnmsg = await this.executeRule("litp.lcrdoc.buttxmsel")
                 if(rtnmsg.respCode == SUCCESS)
                 {
                 //TODO 处理数据逻辑
@@ -182,7 +182,7 @@ export default {
                 }
             },
         async onAdlcndButtxmsel(){
-                let rtnmsg = await this.executeRule("adlcnd.buttxmsel")
+                let rtnmsg = await this.executeRule("litp.adlcnd.buttxmsel")
                 if(rtnmsg.respCode == SUCCESS)
                 {
                 //TODO 处理数据逻辑
@@ -195,7 +195,7 @@ export default {
                 }
             },
         async onInsbnkButtxmsel(){
-                let rtnmsg = await this.executeRule("insbnk.buttxmsel")
+                let rtnmsg = await this.executeRule("litp.insbnk.buttxmsel")
                 if(rtnmsg.respCode == SUCCESS)
                 {
                 //TODO 处理数据逻辑
@@ -411,7 +411,7 @@ export default {
                 }
             },
         async onSpcrcbButtxmsel(){
-                let rtnmsg = await this.executeRule("spcrcb.buttxmsel")
+                let rtnmsg = await this.executeRule("litp.spcrcb.buttxmsel")
                 if(rtnmsg.respCode == SUCCESS)
                 {
                 //TODO 处理数据逻辑
@@ -423,7 +423,7 @@ export default {
                 }
             },
         async onSpcbenButtxmsel(){
-                let rtnmsg = await this.executeRule("spcben.buttxmsel")
+                let rtnmsg = await this.executeRule("litp.spcben.buttxmsel")
                 if(rtnmsg.respCode == SUCCESS)
                 {
                 //TODO 处理数据逻辑

src/model/Litopn/Pattern.js

@@ -466,18 +466,18 @@ export default {
     ],
     "lidgrp.blk.lcrgod":[
         {type: "string", required: true, message: "必输项"},
-        {max: 65,message:"长度不能超过65"}
+        {max: 52000,message:"长度不能超过52000"}
     ],
 
 
     "lidgrp.blk.lcrdoc":[
         {type: "string", required: true, message: "必输项"},
-        {max: 65,message:"长度不能超过65"}
+        {max: 52000,message:"长度不能超过52000"}
     ],
 
     "lidgrp.blk.adlcnd":[
         {type: "string", required: true, message: "必输项"},
-        {max: 65,message:"长度不能超过65"}
+        {max: 52000,message:"长度不能超过52000"}
     ],
 
 
@@ -485,7 +485,7 @@ export default {
 
     "lidgrp.blk.insbnk":[
         {type: "string", required: true, message: "必输项"},
-        {max: 1000,message:"长度不能超过1000"}
+        {max: 12000,message:"长度不能超过12000"}
     ],
 
     "liaall.outamt":[

src/model/Litopn/index.js

@@ -27,7 +27,7 @@ export default class Litopn{
 								cnfdet:"",			//  Confirm. Instructions		.lidgrp.rec.cnfdet
 								rmbflg:"",			//  Reimbursement Information		.lidgrp.rec.rmbflg
 								revflg:"",			//  Revolving Flag		.lidgrp.rec.revflg
-								nam:".0.00",			//  Name		.lidgrp.rec.nam
+								nam:"",			//  Name		.lidgrp.rec.nam
 								resflg:"",			//  Reserved Contract		.lidgrp.rec.resflg
 								shppars18:"",			//  Partial Shipment		.lidgrp.rec.shppars18
 								shptrss18:"",			//  Transhipment		.lidgrp.rec.shptrss18

src/model/Public/Setmod/index.js

 export default class Setmod {
     constructor() {
         this.data = {
+            ogiamt:"",
             docamttyplab: "",			//  settled amount description as label		.setmod.docamttyplab
             retmsg: "",			//  Label showing Retry overflow condition		.setmod.retmsg
             ref: "",			//  our reference		.setmod.ref

src/views/Business/Ditopn/index.vue

@@ -112,7 +112,10 @@
           </el-tab-pane>
         </c-tabs>
       </el-form>
-      <c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty">
+      <c-grid-ety-prompt-dialog 
+      ref="etyDialog" 
+      :promptData="promptData"
+       v-on:select-ety="selectEty">
       </c-grid-ety-prompt-dialog>
     </div>
   </c-page>

src/views/Business/Litopn/Adcp.vue

@@ -3,12 +3,13 @@
                                                
        <c-col :span="20">
         <el-form-item label="Additional Conditions" prop="lidgrp.blk.adlcnd">
-            <c-input type="textarea" v-model="model.lidgrp.blk.adlcnd" maxlength="52000" :rows="30" show-word-limit placeholder="请输入Additional Conditions" ></c-input>
+            <c-input type="textarea" v-model="model.lidgrp.blk.adlcnd" maxlength="52000" :rows="25" show-word-limit placeholder="请输入Additional Conditions" ></c-input>
         </el-form-item>
         </c-col>
                   
        <c-col :span="2">
-        <c-button size="small" type="primary" icon="el-icon-search" @click="onAdlcndButtxmsel">
+        <c-button size="small" type="primary" icon="el-icon-search" 
+        @click="showGridPromptDialog('litp.adlcnd.buttxmsel', null, null,{TXT: 'lidgrp.blk.adlcnd'}, {TXT: false})">
             
         </c-button>
        </c-col>
@@ -37,12 +38,13 @@
                                    
        <c-col :span="20">
         <el-form-item label="Instructions to Pay.,Accept., Negot. Bank" prop="lidgrp.blk.insbnk">
-            <c-input type="textarea" v-model="model.lidgrp.blk.insbnk" maxlength="780" :rows="6" show-word-limit placeholder="请输入Instructions to Pay.," ></c-input>
+            <c-input type="textarea" v-model="model.lidgrp.blk.insbnk" maxlength="12000" :rows="8" show-word-limit placeholder="请输入Instructions to Pay.," ></c-input>
         </el-form-item>
         </c-col>
                   
        <c-col :span="2">
-        <c-button size="small" type="primary" icon="el-icon-search" @click="onInsbnkButtxmsel">
+        <c-button size="small" type="primary" icon="el-icon-search" 
+        @click="showGridPromptDialog('litp.insbnk.buttxmsel', null, null,{TXT: 'lidgrp.blk.insbnk'}, {TXT: false})">  
             
         </c-button>
        </c-col>

src/views/Business/Litopn/Dogp.vue

@@ -8,8 +8,8 @@
         </c-col>
                   
        <c-col :span="2">
-        <c-button size="small" type="primary" icon="el-icon-search" @click="onLcrgodButtxmsel">
-            
+        <c-button size="small" type="primary" icon="el-icon-search" 
+        @click="showGridPromptDialog('litp.lcrgod.buttxmsel', null, null,{TXT: 'lidgrp.blk.lcrgod'}, {TXT: false})">  
         </c-button>
        </c-col>
                                    

src/views/Business/Litopn/Dorp.vue

@@ -8,7 +8,8 @@
         </c-col>
                   
        <c-col :span="2">
-        <c-button size="small" type="primary" icon="el-icon-search" @click="onLcrdocButtxmsel">
+        <c-button size="small" type="primary" icon="el-icon-search" 
+        @click="showGridPromptDialog('litp.lcrdoc.buttxmsel',null,null,{TXT:'lidgrp.blk.lcrdoc'},{TXT:false})">
            
         </c-button>
        </c-col>

src/views/Business/Litopn/Ovwp.vue

@@ -273,7 +273,7 @@
             v-model="model.lidgrp.rec.shppar"
             style="width: 100%"
             placeholder="请选择Partial Shipment"
-            :code="codes.shppars18"
+            :code="codes.shptrss18"
           >
           </c-select>
         </el-form-item>
@@ -285,7 +285,7 @@
             v-model="model.lidgrp.rec.shptrss18"
             style="width: 100%"
             placeholder="请选择Transhipment"
-            :code="codes.shppars18"
+            :code="codes.shptrss18"
           >
           </c-select>
         </el-form-item>

src/views/Business/Litopn/index.vue

@@ -50,21 +50,24 @@
           <!--PD000057 -->
           <el-tab-pane label="Goods" name="dogp">
             <c-content>
-              <m-dogp :model="model" :codes="codes" />
+              <m-doxp :model="model" :codes="codes" :dtyp="'dogp'"  :rec="'lid'"
+              />
             </c-content>
           </el-tab-pane>
 
           <!--PD000060 -->
           <el-tab-pane label="Documents" name="dorp">
             <c-content>
-              <m-dorp :model="model" :codes="codes" />
+              <m-doxp :model="model" :codes="codes" :dtyp="'dorp'"  :rec="'lid'"
+              />
             </c-content>
           </el-tab-pane>
 
           <!--PD000073 -->
           <el-tab-pane label="Additional Conditions" name="adcp">
             <c-content>
-              <m-adcp :model="model" :codes="codes" />
+             <m-doxp :model="model" :codes="codes" :dtyp="'adcp'"  :rec="'lid'"
+              />
             </c-content>
           </el-tab-pane>
 
@@ -168,10 +171,24 @@
                     -->
         </c-tabs>
       </el-form>
-      <c-grid-ety-prompt-dialog
+      <!-- <c-grid-ety-prompt-dialog
         ref="etyDialog"
         :promptData="promptData"
         v-on:select-ety="selectEty"
+        :isPty="false"
+      >
+      </c-grid-ety-prompt-dialog> -->
+      <c-grid-ety-prompt-dialog
+        ref="etyDialog"
+        :promptData="promptData"
+        @select-ety="selectEty"
+      >
+      </c-grid-ety-prompt-dialog>
+      <c-grid-ety-prompt-dialog
+        ref="doxpDialog"
+        :isPty="false"
+        :promptData="promptData"
+        @select-ety="selectMsg"
       >
       </c-grid-ety-prompt-dialog>
     </div>
@@ -218,6 +235,7 @@ import Docpan from "~/views/Public/Docpan";
 import Doctre from "~/views/Public/Doctre";
 import Glepan from "~/views/Public/Glepan";
 import Limitbody from "~/views/Public/Limitbody";
+import Doxp from '~/views/Public/Doxp'
 
 export default {
   name: "Litopn",
@@ -229,7 +247,7 @@ export default {
     "m-dogp": Dogp,
     "m-dorp": Dorp,
     "m-adcp": Adcp,
-
+    'm-doxp': Doxp,
     "m-engp": Engp,
     "m-ccvpan": Ccvpan,
     "m-setpan": Setpan,