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

src/views/Business/Ditame/Addbcb.vue

@@ -34,7 +34,7 @@
         <c-col :span="24">
             <el-form-item label="" prop="ameadvrmk">
                 <c-input
-                    :disabled="model.litameadv == '无特殊规定'"
+                    :disabled="model.litameadv === '无特殊规定'"
                     type="textarea"
                     v-model="model.ameadvrmk"
                     :rows="4"
@@ -46,15 +46,57 @@
         </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: 81.2%"
+                    style="width: 50%"
                     placeholder="请输入branch  name"
                 ></c-input>
             </el-form-item>
         </c-col>
+        <c-col :span="24">
+            <el-form-item label="开证行地址" prop="issadr">
+                <c-input
+                    v-model="model.issadr"
+                    type="textarea"
+                    :rows="4"
+                    maxlength="40"
+                    style="width: 50%"
+                    show-word-limit
+                ></c-input>
+            </el-form-item>
+        </c-col>
+        <c-col :span="24">
+            <el-form-item label="开证行邮编" prop="pobzip">
+                <c-input
+                    v-model="model.pobzip"
+                    maxlength="10"
+                    style="width: 50%"
+                    placeholder="请输入pobzip"
+                ></c-input>
+            </el-form-item>
+        </c-col>
+        <c-col :span="24">
+            <el-form-item label="开证行电话" prop="tel">
+                <c-input
+                    v-model="model.tel"
+                    maxlength="16"
+                    style="width: 50%"
+                    placeholder="请输入tel"
+                ></c-input>
+            </el-form-item>
+        </c-col>
+        <c-col :span="24">
+            <el-form-item label="开证行传真" prop="fax">
+                <c-input
+                    v-model="model.fax"
+                    maxlength="16"
+                    style="width: 50%"
+                    placeholder="请输入fax"
+                ></c-input>
+            </el-form-item>
+        </c-col>
     </div>
 </template>
 <script>

src/views/Business/Ditame/Amep.vue

@@ -44,7 +44,7 @@
       </c-col>
     </c-col>
     <c-col :span="11">
-      <el-form-item label="修改日期">
+      <el-form-item label="修改日期" prop="trnmod.swiadd.amedat">
         <c-date-picker
           type="date"
           v-model="model.trnmod.swiadd.amedat"
@@ -109,14 +109,14 @@
         <el-form-item label="溢短装" prop="olddidgrp.rec.nomtop">
           <c-input
             v-model="model.olddidgrp.rec.nomtop"
-            style="width: 46.9%"
+            style="width: 48%"
             disabled
           ></c-input>
-          <label style="display: inline-block; width: 28px; text-align: center"
+          <label style="display: inline-block; width: 2%; text-align: center"
             >-</label>
           <c-input
             v-model="model.olddidgrp.rec.nomton"
-            style="width: 47%"
+            style="width: 48%"
             disabled
           ></c-input>
         </el-form-item>
@@ -133,7 +133,7 @@
           </el-form-item>
         </c-col>
         <c-col :span="11">
-          <el-form-item label="" label-width="0" prop="trnmod.swiadd.ameamt">
+          <el-form-item label="" label-width="0">
             <c-input
               v-model="model.trnmod.swiadd.ameamt"
               style="width: 100%"
@@ -233,12 +233,12 @@
       <el-form-item prop="trnmod.swiadd.newnomtopame">
         <c-input
           v-model="model.trnmod.swiadd.newnomtopame"
-          style="width: 46.9%"
+          style="width: 48%"
         ></c-input>
-        <label style="display: inline-block; width: 28px; text-align: center">-</label>
+        <label style="display: inline-block; width: 2%; text-align: center">-</label>
         <c-input
           v-model="model.trnmod.swiadd.newnomtoname"
-          style="width: 47%"
+          style="width: 48%"
         ></c-input>
       </el-form-item>
     </c-col>

src/views/Business/Ditame/Detp.vue

@@ -65,7 +65,7 @@
 
             <el-form-item label="合同金额" prop="didgrp.rec.conamt">
                 <c-col :span="10">
-                    <c-select v-model="model.didgrp.rec.concur" style="width:90%" placeholder="请选择">
+                    <c-select v-model="model.didgrp.rec.concur" style="width:95%" placeholder="请选择">
                         <el-option label="CNY 人民币" value="CNY"></el-option>
                     </c-select>   
                 </c-col>

src/views/Business/Ditame/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/Ditame/Ovwp.vue

@@ -141,15 +141,15 @@
           <c-input
             v-model="model.didgrp.rec.nomtop"
             maxlength="9"
-            style="width: 44.3%"
+            style="width: 48%"
             disabled
             placeholder="请输入Amount Tolerance - Positive"
           ></c-input>
-          <label style="display:inline-block;width:10%;text-align:center;">-</label>
+          <label style="display:inline-block;width:2%;text-align:center;">-</label>
           <c-input
             v-model="model.didgrp.rec.nomton"
             maxlength="9"
-            style="width: 44.3%"
+            style="width: 48%"
             disabled
             placeholder="请输入Amount Tolerance - Negative"
           ></c-input>
@@ -808,7 +808,7 @@ export default {
   mixins: [CommonProcess],
   data() {
     return {
-      jigomcFlag: false,
+      jigomcFlag: true,
       trade: "",
     };
   },