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

src/views/Business/Ditopn/Addbcb.vue

@@ -13,10 +13,9 @@
 
         <c-col :span="24">
             <el-form-item label="特殊规定" prop="litameadv">
-                <c-col :span="8">
                     <c-select
                         v-model="model.litameadv"
-                        style="width: 60%"
+                        style="width: 30%"
                         placeholder="请选择特殊规定"
                     >
                         <el-option
@@ -27,7 +26,6 @@
                         >
                         </el-option>
                     </c-select>
-                </c-col>
             </el-form-item>
         </c-col>
 
@@ -46,11 +44,11 @@
         </c-col>
 
         <c-col :span="24">
-            <el-form-item label="开证行" prop="bchname" style="width: 65%">
+            <el-form-item label="开证行" prop="bchname">
                 <c-input
                     v-model="model.bchname"
                     maxlength="40"
-                    style="width: 50%"
+                    style="width: 30%"
                     placeholder="请输入branch  name"
                 ></c-input>
             </el-form-item>

src/views/Business/Ditopn/Detp.vue

@@ -11,7 +11,7 @@
             </el-form-item>
 
             <c-col :span="24">
-            <c-col :span="11">
+            <c-col :span="24">
             <el-form-item label="付款期限" prop="didgrp.rec.tenmaxday" >
                 <c-input :disabled="model.didgrp.rec.avbby == 'P'" v-model.number="model.didgrp.rec.tenmaxday" placeholder="请输入" style="width:100%" maxlength="3"></c-input>
             </el-form-item>
@@ -43,7 +43,7 @@
             </el-form-item>
 
             <c-col :span="24">
-            <c-col :span="11">
+            <c-col :span="24">
             <el-form-item label="货物运输/交货/服务方式" prop="didgrp.rec.tratyp">
                 <c-select v-model="model.didgrp.rec.tratyp" style="width:100%" placeholder="请选择" @change="recTratypChange" :disabled="model.didgrp.rec.mytype == 'F'">
                     <el-option v-for="item in codes.tratyp" :key="item.value" :label="item.label"
@@ -88,14 +88,14 @@
         <!-- ========================= Right ========================= -->
         <c-col :span="11" :offset="1">
             <el-form-item label="分批装运货物" prop="didgrp.rec.shppar">
-                <c-select v-model="model.didgrp.rec.shppar" style="width:50%" placeholder="请选择">
+                <c-select v-model="model.didgrp.rec.shppar" style="width:100%" placeholder="请选择">
                     <el-option v-for="item in codes.shppar" :key="item.value" :label="item.label" :value="item.value">
                     </el-option>
                 </c-select>
             </el-form-item>
 
             <el-form-item label="分期装运/提供服务" prop="didgrp.rec.fqzytgfw">
-                <c-select v-model="model.didgrp.rec.fqzytgfw" placeholder="请选择" :disabled="model.didgrp.rec.shppar != 'Y'" style="width:50%">
+                <c-select v-model="model.didgrp.rec.fqzytgfw" placeholder="请选择" :disabled="model.didgrp.rec.shppar != 'Y'" style="width:100%">
                     <el-option v-for="item in codes.shppar" :key="item.value" :label="item.label" :value="item.value">
                     </el-option>
                 </c-select>
@@ -106,7 +106,7 @@
             </el-form-item>
 
             <el-form-item label="转运" prop="didgrp.rec.shptrs">
-                <c-select v-model="model.didgrp.rec.shptrs" style="width:50%" placeholder="请选择" :disabled="model.didgrp.rec.mytype == 'F'">
+                <c-select v-model="model.didgrp.rec.shptrs" style="width:100%" placeholder="请选择" :disabled="model.didgrp.rec.mytype == 'F'">
                   <el-option label="不允许" value="禁止"></el-option>
                   <el-option label="允许" value="允许"></el-option>
                 </c-select>

src/views/Business/Ditopn/Detp1.vue

@@ -86,7 +86,7 @@
         </el-form-item>
       </c-col>
       <!-- ============= 议付行 ========================= -->
-      <c-col :span="13">
+      <c-col :span="24">
         <el-form-item label="是否可议付" prop="didgrp.rec.fenctg">
           <c-select
             v-model="model.didgrp.rec.fenctg"
@@ -165,7 +165,7 @@
         }"
       ></c-ptapdome>
       <!-- ========================转让行 ======================== -->
-      <c-col :span="13">
+      <c-col :span="24">
         <el-form-item label="是否可以转让" prop="didgrp.rec.lcrtyp">
           <c-select
             v-model="model.didgrp.rec.lcrtyp"
@@ -302,7 +302,7 @@
         </el-form-item>
       </c-col>
       <!-- =========================保兑行========================= -->
-        <c-col :span="13">
+        <c-col :span="24">
           <el-form-item label="是否可保兑" prop="didgrp.rec.bdflg">
             <c-select
               v-model="model.didgrp.rec.bdflg"

src/views/Business/Ditopn/Mt799.vue

@@ -13,13 +13,13 @@
         </el-form-item>
        </c-col>             
                                    
-       <c-col :span="12">
+       <c-col :span="20">
         <el-form-item label="MT799(79)签名" prop="ditp.signam">
             <c-input  v-model="model.ditp.signam" maxlength="50" @blur="BlurSignam" ></c-input>
         </el-form-item>
        </c-col>             
                                    
-       <c-col :span="15">
+       <c-col :span="20">
         <el-form-item label="MT799(79)备注" prop="ditp.remark">
             <c-input type="textarea" v-model="model.ditp.remark" maxlength="800" :rows="10" ></c-input>
         </el-form-item>

src/views/Business/Ditopn/Ovwp.vue

@@ -295,6 +295,7 @@
           <c-select
             v-model="model.didgrp.rec.elcflg"
             placeholder="请选择是否通过电证系统"
+            style="width:100%"
           >
             <el-option
               v-for="item in codes.elcflg"
@@ -307,7 +308,7 @@
         </el-form-item>
       </c-col>
       <c-col :span="11">
-        <el-form-item label="报文类型" label-width="103px">
+        <el-form-item label="报文类型">
           <c-select v-model="model.ditp.msgtyp" placeholder="请选择报文类型"
            :code="getValues('ditp.msgtyp')"
            :disabled="model.didgrp.rec.elcflg!='Y'" />