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

src/views/Business/Letopn/Aamp.vue

 <template>
   <div class="eibs-tab">
-                                               
-       <c-col :span="12">
-        <el-form-item label="Additional Amount" prop="ledgrp.cbs.max2.cur">
-            <c-select v-model="model.ledgrp.cbs.max2.cur" style="width:100%" placeholder="请选择Additional Amount">
-              </c-select>
+    <c-col :span="12">
+      <c-col :span="13">
+        <el-form-item label="追加金额" prop="ledgrp.cbs.max2.cur">
+          <c-select
+            v-model="model.ledgrp.cbs.max2.cur"
+            style="width: 100%"
+            placeholder="请选择币种"
+            :disabled="true"
+          >
+          </c-select>
         </el-form-item>
-       </c-col>
-                  
-       <c-col :span="12">
-        <el-form-item label="Additional Amount" prop="ledgrp.cbs.max2.amt">
-            <c-input  v-model="model.ledgrp.cbs.max2.amt"  placeholder="请输入Additional Amount"></c-input>
+      </c-col>
+
+      <c-col :span="9">
+        <el-form-item label="" label-width="0px" prop="ledgrp.cbs.max2.amt">
+          <c-input
+            v-model="model.ledgrp.cbs.max2.amt"
+            placeholder="请输入Additional Amount"
+          ></c-input>
         </el-form-item>
-       </c-col>
-                                   
-       <c-col :span="12">
+      </c-col>
+    </c-col>
+
+    <c-col :span="12">
+      <c-col :span="13">
         <el-form-item label="Open Add. Amount" prop="ledgrp.cbs.opn2.cur">
-            <c-select v-model="model.ledgrp.cbs.opn2.cur" style="width:100%" placeholder="请选择Open Add. Amount">
-              </c-select>
+          <c-select
+            v-model="model.ledgrp.cbs.opn2.cur"
+            style="width: 100%"
+            placeholder="请选择Open Add. Amount"
+          >
+          </c-select>
         </el-form-item>
-       </c-col>
-                  
-       <c-col :span="12">
-        <el-form-item label="Open Add. Amount" prop="ledgrp.cbs.opn2.amt">
-            <c-input  v-model="model.ledgrp.cbs.opn2.amt"  placeholder="请输入Open Add. Amount"></c-input>
-        </el-form-item>
-       </c-col>
-                                   
-       <c-col :span="12">
-        <el-form-item label="Covered" prop="ledgrp.blk.addamtcov">
-            <c-input type="textarea" v-model="model.ledgrp.blk.addamtcov" maxlength="35" show-word-limit placeholder="请输入Covered" ></c-input>
+      </c-col>
+
+      <c-col :span="9">
+        <el-form-item label="" label-width="0px" prop="ledgrp.cbs.opn2.amt">
+          <c-input
+            v-model="model.ledgrp.cbs.opn2.amt"
+            placeholder="请输入Open Add. Amount"
+          ></c-input>
         </el-form-item>
-        </c-col>
+      </c-col>
+    </c-col>
+
+    <!-- Covered -->
+    <c-col :span="23">
+      <el-form-item label="Covered" prop="ledgrp.blk.addamtcov">
+        <c-input
+          type="textarea"
+          :rows="4"
+          v-model="model.ledgrp.blk.addamtcov"
+          maxlength="35"
+          show-word-limit
+          placeholder="请输入Covered"
+        ></c-input>
+      </el-form-item>
+    </c-col>
   </div>
 </template>
 <script>
-import Api from "~/service/Api"
+import Api from "~/service/Api";
 import CommonProcess from "~/mixin/CommonProcess";
-import CodeTable from "~/config/CodeTable"
-import Event from "~/model/Letopn/Event"
+import CodeTable from "~/config/CodeTable";
+import Event from "~/model/Letopn/Event";
 
 export default {
-    inject: ['root'],
-    props:["model","codes"],
-    mixins: [CommonProcess],
-    data(){
-        return {
-
-        }
-    },
-    methods:{...Event},
-    created:function(){
-
-    }
-}
+  inject: ["root"],
+  props: ["model", "codes"],
+  mixins: [CommonProcess],
+  data() {
+    return {};
+  },
+  methods: { ...Event },
+  created: function () {},
+};
 </script>
 <style>
-
 </style>

src/views/Public/Ptap.vue

@@ -38,31 +38,48 @@
       </el-form-item>
     </c-col>
 
-    <c-col :span="24">
+    <c-col v-if="isAdrblk" :span="24">
       <el-form-item
-        label="名称"
-        :prop="`${argadr.grp}.${argadr.rol}.pts.namelc`"
+        label="名称地址"
+        :prop="`${argadr.grp}.${argadr.rol}.pts.adrblk`"
       >
         <c-input
-          v-model="model[argadr.grp][argadr.rol].pts.namelc"
-          :placeholder="'请输入' + argadr.title + '名称'"
-          :disabled="disabled"
+          type="textarea"
+          :rows="3"
+          v-model="model[argadr.grp][argadr.rol].pts.adrblk"
+          maxlength="35"
+          show-word-limit
+          placeholder="请输入名称地址"
         ></c-input>
       </el-form-item>
     </c-col>
+    <template v-else>
+      <c-col :span="24">
+        <el-form-item
+          label="名称"
+          :prop="`${argadr.grp}.${argadr.rol}.pts.namelc`"
+        >
+          <c-input
+            v-model="model[argadr.grp][argadr.rol].pts.namelc"
+            :placeholder="'请输入' + argadr.title + '名称'"
+            :disabled="disabled"
+          ></c-input>
+        </el-form-item>
+      </c-col>
 
-    <c-col :span="24">
-      <el-form-item
-        label="地址"
-        :prop="`${argadr.grp}.${argadr.rol}.pts.adrelc`"
-      >
-        <c-input
-          v-model="model[argadr.grp][argadr.rol].pts.adrelc"
-          :placeholder="'请输入' + argadr.title + '地址'"
-          :disabled="disabled"
-        ></c-input>
-      </el-form-item>
-    </c-col>
+      <c-col :span="24">
+        <el-form-item
+          label="地址"
+          :prop="`${argadr.grp}.${argadr.rol}.pts.adrelc`"
+        >
+          <c-input
+            v-model="model[argadr.grp][argadr.rol].pts.adrelc"
+            :placeholder="'请输入' + argadr.title + '地址'"
+            :disabled="disabled"
+          ></c-input>
+        </el-form-item>
+      </c-col>
+    </template>
   </div>
 </template>
 <script>
@@ -93,6 +110,12 @@ export default {
       type: Boolean,
       default: false,
     },
+
+    isAdrblk: {
+      //名称地址是否为大字段
+      type: Boolean,
+      default: true,
+    },
   },
   data() {
     return {