Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

src/config/CodeTable/index.js

@@ -5665,6 +5665,7 @@ const CodeTable = {
 	],
 	dspflg:[
 		{label:"final",value:"CG" },
+		{label:"",value:"C" },
 	],
 	apftxt:[
 		{label:"BOL-Englisch",value:"BOL001" },

src/model/Ditopn/Pattern.js

@@ -526,7 +526,7 @@ export default {
     ],
 
     "ameadvrmk":[
-        {max: 68,message:"长度不能超过34"}
+        {max: 68,message:"长度不能超过68"}
     ],
     "bchname":[
         {type: "string", required: false, message: "必输项"},

src/views/Business/Ditopn/Addbcb.vue

@@ -26,7 +26,7 @@
                   
        <el-col :span="24">
         <el-form-item label="" prop="ameadvrmk">
-            <c-input type="textarea" v-model="model.ameadvrmk" maxlength="34" style="width:80%" show-word-limit   :readonly="true"></c-input>
+            <c-input type="textarea" v-model="model.ameadvrmk" maxlength="68" style="width:80%" show-word-limit   :readonly="true"></c-input>
         </el-form-item>
         </el-col>
 

src/views/Business/Ditopn/Ccvpan.vue

@@ -14,7 +14,7 @@
 <!--                    <c-input type="text" :readonly="true" value="CNY"></c-input>-->
 <!--                </el-col>-->
               <el-col :span="8">
-                  <c-select v-model="model.liaall.liaccv.concur"  style="width:100%" placeholder="请选择Type of settlement">
+                  <c-select v-model="model.liaall.liaccv.concur" disabled  style="width:100%" placeholder="请选择Type of settlement">
                     <el-option v-for="item in codes.curtxt" :key="item.value" :label="item.label"
                                :value="item.value">
                     </el-option>
@@ -66,7 +66,7 @@
 <!--                    <c-input type="text" :readonly="true" value="CNY"></c-input>-->
 <!--                </el-col>-->
               <el-col :span="8">
-                <c-select v-model="model.liaall.liaccv.concur"  style="width:100%" placeholder="请选择Type of settlement">
+                <c-select v-model="model.liaall.liaccv.concur" disabled style="width:100%" placeholder="请选择Type of settlement">
                   <el-option v-for="item in codes.curtxt" :key="item.value" :label="item.label"
                              :value="item.value">
                   </el-option>
@@ -121,7 +121,7 @@
 <!--                    <c-input type="text" :readonly="true" value="CNY"></c-input>-->
 <!--                </el-col>-->
               <el-col :span="8">
-                <c-select v-model="model.liaall.liaccv.concur"  style="width:100%" placeholder="请选择Type of settlement">
+                <c-select v-model="model.liaall.liaccv.concur" disabled style="width:100%" placeholder="请选择Type of settlement">
                   <el-option v-for="item in codes.curtxt" :key="item.value" :label="item.label"
                              :value="item.value">
                   </el-option>
@@ -216,10 +216,14 @@
         <el-form-item label="Amount Covered">
             <el-row>
                 <el-col :span="8">
-                    <c-input type="text" :disable="true" value="CNY"></c-input>
+                    <c-select v-model="model.liaall.liaccv.concur" disabled style="width:100%" placeholder="请选择Type of settlement">
+                        <el-option v-for="item in codes.curtxt" :key="item.value" :label="item.label"
+                            :value="item.value">
+                        </el-option>
+                    </c-select>
                 </el-col>
                 <el-col :span="14">
-                     <c-input v-model="model.liaall.liaccv.totcovamt" ></c-input>
+                     <c-input v-model="model.liaall.liaccv.totcovamt" :readonly="true" ></c-input>
                 </el-col>
             </el-row>
         </el-form-item>

src/views/Business/Ditopn/Coninfp.vue

@@ -15,7 +15,7 @@
                   
        <el-col :span="12">
         <el-form-item label="Display Type" prop="mtabut.coninf.oitinf.oit.inflev">
-            <c-select v-model="model.mtabut.coninf.oitinf.oit.inflev" style="width:50%" placeholder="请选择Infotext Level">
+            <c-select v-model="model.mtabut.coninf.oitinf.oit.inflev" style="width:50%" disabled placeholder="请选择Infotext Level">
                 <el-option v-for="item in codes.inflev" :key="item.value" :label="item.label"
                     :value="item.value">
                 </el-option>
@@ -33,7 +33,7 @@
                   
        <el-col :span="12">
         <el-form-item label="Display Type" prop="mtabut.coninf.oitset.oit.inflev">
-            <c-select v-model="model.mtabut.coninf.oitset.oit.inflev" style="width:50%" placeholder="请选择Infotext Level">
+            <c-select v-model="model.mtabut.coninf.oitset.oit.inflev" style="width:50%" disabled placeholder="请选择Infotext Level">
                 <el-option v-for="item in codes.inflev" :key="item.value" :label="item.label"
                     :value="item.value">
                 </el-option>

src/views/Business/Ditopn/Detp.vue

@@ -8,7 +8,7 @@
         <el-col :span="12">
             <el-form-item label="信用证兑付方式" prop="didgrp.rec.avbby">
                 <c-select v-model="model.didgrp.rec.avbby" style="width:100%" placeholder="请选择">
-                    <el-option v-for="item in codes.avbby" :key="item.value" :label="item.label" :value="item.value">
+                    <el-option v-for="item in codes.avbby0" :key="item.value" :label="item.label" :value="item.value">
                     </el-option>
                 </c-select>
             </el-form-item>

src/views/Business/Ditopn/Docpan.vue

@@ -9,7 +9,6 @@
         <c-istream-table-docpan :list="stmData.data" :columns="stmData.columns">
             <el-table-column label="传送方式">
                 <template slot-scope="scope">
-                    <!-- <c-select v-model="model.trnmod_trndoc_doceot[scope.$index]" style="width:100%" placeholder="请选择"> -->
                     <c-select v-model="model.trnmod.trndoc.doceot[scope.row.index].apf" style="width:100%" placeholder="请选择"> 
                         <el-option v-for="item in codes.apftxt" :key="item.value" :label="item.label"
                             :value="item.value">

src/views/Business/Ditopn/Limitbody.vue

@@ -34,14 +34,15 @@
         </el-col>
         -->
 
-        <el-col :span="10">
-            <el-form-item label="国内信用证项下开证授信额度主题:" prop="liaall.limmod.limpts.wrk.pts.extkey">
-                <c-input v-model="model.liaall.limmod.limpts.wrk.pts.extkey" maxlength="16"  placeholder="请输入External Key of Address"></c-input>
+        <el-col :span="8">
+            <el-form-item label="国内信用证项下开证授信额度:" prop="liaall.limmod.limpts.wrk.pts.extkey">
+                <c-input v-model="model.liaall.limmod.limpts.wrk.pts.extkey" :readonly="true" maxlength="16"  placeholder="请输入External Key of Address"></c-input>
             </el-form-item>
         </el-col>
 
-        <el-col :span="2">
+        <el-col :span="4">
             <el-form-item label="" label-width="20px">
+                <c-button size="small" type="primary;width:10%"  @click="onSeainf">i</c-button>
                 <c-button size="small" type="primary" icon="el-icon-search" @click="onPreperButtxmsel">
                     Details
                 </c-button>
@@ -76,7 +77,7 @@
 
       <el-col :span="6">
         <el-form-item label="额度类型" prop="liaall.limmod.limpts.nonrevflg1">
-          <c-select v-model="model.liaall.limmod.limpts.nonrevflg1" style="width:100%" :readonly="true" placeholder="请选择Flag to Mark Non-revolving Limits">
+          <c-select v-model="model.liaall.limmod.limpts.nonrevflg1" style="width:100%" disabled placeholder="请选择Flag to Mark Non-revolving Limits">
             <el-option v-for="item in codes.nonrevflg1" :key="item.value" :label="item.label"
                        :value="item.value">
             </el-option>

src/views/Business/Ditopn/Setpan.vue

@@ -27,7 +27,7 @@
 
         <el-col :span="8">
             <el-form-item label="类型">
-                <c-select v-model="model.setmod.dspflg" style="width:100%" placeholder="请选择Type of settlement">
+                <c-select v-model="model.setmod.dspflg" disabled style="width:100%" placeholder="请选择Type of settlement">
                     <el-option v-for="item in codes.dspflg" :key="item.value" :label="item.label"
                         :value="item.value">
                     </el-option>

src/views/Business/Ditopn/index.vue

@@ -47,7 +47,7 @@
             <m-litrmbl1 :model="model" :codes="codes"/>
         </el-tab-pane>
         -->
-        <el-tab-pane label="账务">
+        <el-tab-pane label="帐务">
             <!--PD000000 -->
             <m-setpan :model="model" :codes="codes"/>
         </el-tab-pane>
@@ -175,6 +175,7 @@ export default {
     },
     methods:{
         tabClick(vm){
+            this.changeFormValidateDisabled(true)
             // this.$refs.modelForm.validate(valid => {
             //     if (valid){
             //         console.log(1)
@@ -200,6 +201,7 @@ export default {
     },
     mounted:async function(){
         console.log("进入ditopn交易");
+        this.changeFormValidateDisabled(true);
         let rtnmsg = await this.init()
         // let rtnmsg = {respCode: ''}
         if(rtnmsg.respCode == SUCCESS)

src/views/Business/Sptsel/Menu.vue

 <template>
     <div class="eibs-tab">
 
-        <el-col :span="3" style="text-align:center;margin-bottom: 18px;">
+        <el-col :span="3" style="text-align:center;margin-bottom: 16px;">
             <el-form-item label="" prop="chkinc">
                     <c-checkbox v-model="model.chkinc">Incoming</c-checkbox>
             </el-form-item>
         </el-col>
-
-        <el-col :span="3" style="text-align:center;margin-bottom: 18px;">
-            <el-form-item label="" prop="chkinc">
+        <el-col :span="3" style="text-align:center;margin-bottom: 16px;">
+            <el-form-item label="" prop="chkdzt">
+                <c-checkbox v-model="model.chkdzt">E-Trade</c-checkbox>
+            </el-form-item>
+        </el-col>
+        <el-col :span="3" style="text-align:center;margin-bottom: 16px;">
+            <el-form-item label="" prop="chkpen">
                 <c-checkbox v-model="model.chkpen">Pending</c-checkbox>
             </el-form-item>
         </el-col>
 
-        <el-col :span="3" style="text-align:center;margin-bottom: 18px;">
-            <el-form-item label="" prop="chkinc">
+        <el-col :span="3" style="text-align:center;margin-bottom: 16px;">
+            <el-form-item label="" prop="chkcor">
                 <c-checkbox v-model="model.chkcor">Correction</c-checkbox>
             </el-form-item>
         </el-col>
        
-        <el-col :span="3" style="text-align:center;margin-bottom: 18px;">
-            <el-form-item label="" prop="chkinc">
+        <el-col :span="3" style="text-align:center;margin-bottom: 16px;">
+            <el-form-item label="" prop="chkaut">
                 <c-checkbox v-model="model.chkaut">Automatic</c-checkbox>
             </el-form-item>
         </el-col>
 
-        <el-col :span="3" style="text-align:center;margin-bottom: 18px;">
-            <el-form-item label="" prop="chkinc">
-                <c-checkbox v-model="model.chkdel">Deleted</c-checkbox>
+        <el-col :span="3" style="text-align:center;margin-bottom: 16px;">
+            <el-form-item label="" prop="chkdel">
+                <c-checkbox v-model="model.chkdel">Reject</c-checkbox>
             </el-form-item>
         </el-col>
         
-        <el-col :span="3" style="text-align:center;margin-bottom: 18px;">
-            <el-form-item label="" prop="chkinc">
+        <el-col :span="3" style="text-align:center;margin-bottom: 16px;">
+            <el-form-item label="" prop="chktco">
                 <c-checkbox v-model="model.chktco">网银</c-checkbox>
             </el-form-item>
         </el-col>
 
-        <el-col :span="3" style="text-align:center;margin-bottom: 18px;">
-            <el-form-item label="" prop="chkinc">
+        <el-col :span="3" style="text-align:center;margin-bottom: 16px;">
+            <el-form-item label="" prop="chkcan">
                 <c-checkbox v-model="model.chkcan">归档</c-checkbox>
             </el-form-item>
         </el-col>