bctacc、inflid、litame、litdav交易bug修改

src/mixin/commonProcess.js

@@ -320,7 +320,7 @@ export default {
 
     /**
         * 货物条款等非机构栏位回填
-        * @param {Object} val 选种行的值
+        * @param {Object} val 选种行的值,按钮的值
         * @param {Object} url 字段路劲 需要回填的字段路劲
         *  @param {Object} url 对应字段值是否覆盖 ，需要为true,否则合并叠加
         * @param {String} rulePath 路径

src/model/Inflid/Event.js

@@ -311,6 +311,7 @@ export default {
                 this.model.jyqflg="";
                 this.model.mylx="";
                 this.model.elcflg="";
+                this.model.seagodcod="";
               },
 
             async handleSearch() {

src/model/Litdav/Pattern.js

@@ -29,10 +29,10 @@ export default {
         {type: "string", required: false, message: "必输项"},
         {max: 3,message:"长度不能超过3"}
     ],
-    "lidgrp.cbs.opn1.amt":[
-        {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
-    ],
+    // "lidgrp.cbs.opn1.amt":[
+    //     {max: 18,message:"整数位不能超过14位"},
+    //     {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+    // ],
 
     "brdgrp.apl.pts.nam":[
         {type: "string", required: false, message: "必输项"},
@@ -284,17 +284,17 @@ export default {
         {type: "string", required: false, message: "必输项"},
         {max: 3,message:"长度不能超过3"}
     ],
-    "brdgrp.cbs.max.amt":[
-        {type: "number", required: false, message: "必输项"},
-        {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
-    ],
+    // "brdgrp.cbs.max.amt":[
+    //     {type: "number", required: false, message: "必输项"},
+    //     {max: 18,message:"整数位不能超过14位"},
+    //     {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+    // ],
 
-    "brdgrp.cbs.max2.amt":[
-        {type: "number", required: false, message: "必输项"},
-        {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
-    ],
+    // "brdgrp.cbs.max2.amt":[
+    //     {type: "number", 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: "必输项"},
         {max: 35,message:"长度不能超过35"}
@@ -307,11 +307,11 @@ export default {
         {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位" }
-    ],
+    // "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"}

src/views/Business/Bctacc/Bctset.vue

@@ -142,7 +142,7 @@
         <el-form-item label="Document Set Status" prop="bcdgrp.rec.docsta">
           <c-select
             v-model="model.bcdgrp.rec.docsta"
-            :code="codes.docsta"
+            :code="codes.docstabot"
             style="width: 100%"
             placeholder="请输入Document Set Status"
             disabled

src/views/Business/Inflid/Infsea.vue

@@ -254,7 +254,7 @@
             </c-col>
             <c-col :span="8">
               <el-form-item
-                label="信用证类型"
+                label="Form of L/C"
                 prop="sealcrtyp"
                 style="width: 100%"
               >
@@ -269,6 +269,27 @@
             </c-col>
             <c-col :span="8">
               <el-form-item
+                label="Goods Code"
+                prop="seagodcod"
+                style="width: 100%"
+              >
+                <c-select
+                  v-model="model.seagodcod"
+                  style="width: 100%"
+                  placeholder="请选择Goods Code"
+                >
+                  <el-option
+                    v-for="item in codes.godcod"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </c-select>
+              </el-form-item>
+            </c-col>
+            <!-- <c-col :span="8">
+              <el-form-item
                 label="假远期信用证"
                 prop="jyqflg"
                 style="width: 100%"
@@ -307,7 +328,7 @@
                 >
                 </c-select>
               </el-form-item>
-            </c-col>
+            </c-col> -->
 
             <!-- <c-col :span="8">
               <el-form-item
@@ -417,27 +438,7 @@
               </el-form-item>
             </c-col> -->
 
-            <!-- <c-col :span="8">
-              <el-form-item
-                label="货物种类"
-                prop="seagodcod"
-                style="width: 100%"
-              >
-                <c-select
-                  v-model="model.seagodcod"
-                  style="width: 100%"
-                  placeholder="请选择Goods Code"
-                >
-                  <el-option
-                    v-for="item in codes.godcod"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </c-select>
-              </el-form-item>
-            </c-col> -->
+            
           </el-row>
         </el-form>
       </template>

src/views/Business/Litame/Spbpame.vue

@@ -24,7 +24,7 @@
         <c-col :span="2">
         <c-button size="small" type="primary" icon="el-icon-search" 
         :disabled="this.flag2"
-       @click="showGridPromptDialog('litamep.spcbename.buttxmsel',null,null,{TXT: 'litamep.spcbenamep.usrblk'}, {TXT: false},'doxpDialog')"
+       @click="showGridPromptDialog('litamep.spcbenamep.buttxmsel',null,null,{TXT: 'litamep.spcbenamep.usrblk'}, {TXT: false},'doxpDialog')"
         > 
         </c-button>
         </c-col>

src/views/Business/Litame/Sprpame.vue

@@ -25,7 +25,7 @@
         <c-col :span="2">
         <c-button size="small" type="primary" icon="el-icon-search" 
         :disabled="this.flag2"
-        @click="showGridPromptDialog('litamep.spcrcbame.buttxmsel',null,null,{TXT: 'litamep.spcrcbamep.usrblk'}, {TXT: false},'doxpDialog')"
+        @click="showGridPromptDialog('litamep.spcrcbamep.buttxmsel',null,null,{TXT: 'litamep.spcrcbamep.usrblk'}, {TXT: false},'doxpDialog')"
         >
         </c-button>
         </c-col>

src/views/Business/Litdav/Othadvtypp.vue

 <template>
   <div class="eibs-tab">
-    <c-col>                                           
+    <c-col :span="11">                                           
        <c-col :span="12">
         <el-form-item label="Document Amount" prop="brdgrp.cbs.max.cur">
             <c-input  
@@ -10,11 +10,11 @@
        </c-col>
                   
        <c-col :span="12">
-        <el-form-item label="Balance" prop="brdgrp.cbs.max.amt">
+        <el-form-item label="" label-width="10px" prop="brdgrp.cbs.max.amt">
             <c-input  v-model="model.brdgrp.cbs.max.amt"  placeholder="请输入Balance"></c-input>
         </el-form-item>
        </c-col>
-    </c-col>
+    
 
     <c-col>
        <c-col :span="12">
@@ -27,16 +27,18 @@
        </c-col>
                   
        <c-col :span="12">
-        <el-form-item label="附加金额" prop="brdgrp.cbs.max2.amt">
+        <el-form-item label="" label-width="10px" prop="brdgrp.cbs.max2.amt">
             <c-input  v-model="model.brdgrp.cbs.max2.amt"  placeholder="请输入附加金额"></c-input>
         </el-form-item>
        </c-col>
     </c-col>                
 
     <c-col>               
-       <c-col :span="12">
+       <c-col :span="24">
         <el-form-item label="Charges" prop="brdgrp.blk.chaadd">
-            <c-input type="textarea" v-model="model.brdgrp.blk.chaadd" maxlength="35" show-word-limit placeholder="请输入Charges" ></c-input>
+            <c-input 
+            :rows="4"
+            type="textarea" v-model="model.brdgrp.blk.chaadd" maxlength="35" show-word-limit placeholder="请输入Charges" ></c-input>
         </el-form-item>
         </c-col>
     </c-col>
@@ -51,17 +53,21 @@
        </c-col>
                   
        <c-col :span="12">
-        <el-form-item label="Total Amount to be Paid" prop="brdgrp.rec.totamt">
+        <el-form-item label="" label-width="10px" prop="brdgrp.rec.totamt">
             <c-input  v-model="model.brdgrp.rec.totamt"  placeholder="请输入Total Amount to be Paid"></c-input>
         </el-form-item>
        </c-col>
     </c-col>
 
                
-       <c-col :span="12">
+       <c-col :span="24">
         <el-form-item label="Account with Bank" prop="brdgrp.acb.pts.extkey">
             <c-fullbox>
-            <c-input  v-model="model.brdgrp.acb.pts.extkey" maxlength="16"  placeholder="请输入External Key of Address"></c-input>
+            <c-input  v-model="model.brdgrp.acb.pts.extkey" 
+            maxlength="16"  
+            placeholder="请输入External Key of Address"
+            @keyup.enter.native="showGridPromptDialog('brdgrp.acb.pts.extkey')"
+            ></c-input>
             
             <template slot="footer">
             <c-button size="small" type="primary"  @click="onAcbpDet">
@@ -75,22 +81,24 @@
        
     
 
-     <c-col :span="24">        
-       <c-col :span="12">
+         
+       <!-- <c-col :span="12">
         <el-form-item label="名称" prop="brdgrp.acb.namelc">
             <c-input type="textarea" v-model="model.brdgrp.acb.namelc" maxlength="35" show-word-limit placeholder="请输入名称" ></c-input>
         </el-form-item>
-        </c-col>
+        </c-col> -->
     
 
                  
-       <c-col :span="12">
+       <c-col :span="24">
         <el-form-item label="Address Block" prop="brdgrp.acb.pts.adrblk">
-            <c-input type="textarea" v-model="model.brdgrp.acb.pts.adrblk" maxlength="35" show-word-limit placeholder="请输入Address Block" ></c-input>
+            <c-input 
+            :rows="4"
+            type="textarea" v-model="model.brdgrp.acb.pts.adrblk" maxlength="135" show-word-limit placeholder="请输入Address Block" ></c-input>
         </el-form-item>
         </c-col>
-    </c-col>             
-       <c-col :span="12">
+                
+       <!-- <c-col :span="12">
         <el-form-item label="Chinese address" prop="brdgrp.acb.dbfadrblkcn">
             <c-input type="textarea" v-model="model.brdgrp.acb.dbfadrblkcn" maxlength="35" show-word-limit placeholder="请输入Chinese address" ></c-input>
         </el-form-item>
@@ -100,15 +108,15 @@
         <el-form-item label="地址" prop="brdgrp.acb.adrelc">
             <c-input type="textarea" v-model="model.brdgrp.acb.adrelc" maxlength="35" show-word-limit placeholder="请输入地址" ></c-input>
         </el-form-item>
-        </c-col>
-    </c-col>
+        </c-col> -->
+    
 
                  
-       <c-col :span="12">
+       <c-col :span="24">
         <el-form-item label="Beneficiary's Bank" prop="brdgrp.beb.pts.extkey">
             <c-fullbox>
             <c-input  
-            disabled
+             @keyup.enter.native="showGridPromptDialog('brdgrp.beb.pts.extkey')"
             v-model="model.brdgrp.beb.pts.extkey" maxlength="16"  placeholder="请输入External Key of Address"></c-input>
 
             <template slot="footer">
@@ -122,20 +130,22 @@
                            
       
 
-    <c-col>              
-       <c-col :span="12">
+                 
+       <!-- <c-col :span="12">
         <el-form-item label="名称" prop="brdgrp.beb.namelc">
             <c-input type="textarea" v-model="model.brdgrp.beb.namelc" maxlength="35" show-word-limit placeholder="请输入名称" ></c-input>
         </el-form-item>
-        </c-col>
+        </c-col> -->
                   
-       <c-col :span="12">
+       <c-col :span="24">
         <el-form-item label="Address Block" prop="brdgrp.beb.pts.adrblk">
-            <c-input type="textarea" v-model="model.brdgrp.beb.pts.adrblk" maxlength="35" show-word-limit placeholder="请输入Address Block" ></c-input>
+            <c-input 
+            :rows="4"
+            type="textarea" v-model="model.brdgrp.beb.pts.adrblk" maxlength="135" show-word-limit placeholder="请输入Address Block" ></c-input>
         </el-form-item>
         </c-col>
                   
-       <c-col :span="12">
+       <!-- <c-col :span="12">
         <el-form-item label="Chinese address" prop="brdgrp.beb.dbfadrblkcn">
             <c-input type="textarea" v-model="model.brdgrp.beb.dbfadrblkcn" maxlength="35" show-word-limit placeholder="请输入Chinese address" ></c-input>
         </el-form-item>
@@ -145,8 +155,9 @@
         <el-form-item label="地址" prop="brdgrp.beb.adrelc">
             <c-input type="textarea" v-model="model.brdgrp.beb.adrelc" maxlength="35" show-word-limit placeholder="请输入地址" ></c-input>
         </el-form-item>
+        </c-col> -->
         </c-col>
-    </c-col>
+    
   </div>
 </template>
 <script>

src/views/Business/Litdav/index.vue

@@ -18,19 +18,19 @@
            </el-tab-pane>
  
              <!--PD000139 -->
-           <el-tab-pane v-if="model.brdgrp.rec.advtyp=='750'" label="Advice of Discrepancy" name="mt750p">
+           <el-tab-pane v-if=" this.model.brdgrp.rec.advtyp == '750' " label="Advice of Discrepancy" name="mt750p">
                 <m-mt750p :model="model" :codes="codes"/>
            </el-tab-pane>
  
             <!--PD000147 -->
-           <el-tab-pane v-if="model.brdgrp.rec.advtyp=='754'" label="Advice of Payment" name="mt754p">
+           <el-tab-pane v-if=" this.model.brdgrp.rec.advtyp == '754' " label="Advice of Payment" name="mt754p">
                 <c-content>
                 <m-mt754p :model="model" :codes="codes"/>
                 </c-content>
            </el-tab-pane>
  
             <!--PD000213 -->
-           <el-tab-pane  v-if="model.brdgrp.rec.advtyp=='oth'" label="Advice Details" name="othadvtypp">
+           <el-tab-pane  v-if=" this.model.brdgrp.rec.advtyp == 'OTH' " label="Advice Details" name="othadvtypp">
                 <c-content>
                 <m-othadvtypp :model="model" :codes="codes"/>
                 </c-content>