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

src/model/Cptadv/Pattern.js

@@ -197,7 +197,7 @@ export default {
 
 
     "cpdgrp.blk.contag70":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
     "cpdgrp.ori.adrelc":[
@@ -333,13 +333,13 @@ export default {
     ],
 
     "mtabut.coninf.oitinf.oit.inftxt":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 60,message:"长度不能超过60"}
     ],
 
 
     "mtabut.coninf.oitset.oit.inftxt":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 60,message:"长度不能超过60"}
     ],
 

src/views/Business/Cptadv/Opnp1.vue

@@ -357,6 +357,31 @@
 
     <CptOpnp1Common :model="model" :codes="codes" v-on:onSndpDet="onSndpDet"></CptOpnp1Common>
 
+<c-col :span="24">
+<c-col :span="11"  v-if="model.cpdgrp.rec.swftyp === '103' || model.cpdgrp.rec.swftyp === '202' || model.cpdgrp.rec.swftyp === '200'">
+        <el-form-item label="汇款人名称" prop="orcnam">
+          <c-input
+              v-model="model.orcnam"
+              maxlength="100"
+              placeholder="请输入汇款人名称"
+              style="width:100%"
+            ></c-input>
+        </el-form-item>
+      </c-col>
+
+      <c-col :span="11" :offset="1" v-if="model.cpdgrp.rec.swftyp === '103'">
+        <el-form-item label="Remittance Information(Tag 70)" prop="cpdgrp.blk.contag70">
+           <c-input
+                        type="textarea"
+                        :rows="4"
+                        maxlength="200"
+                        v-model="model.cpdgrp.blk.contag70"
+                        show-word-limit
+                        placeholder="请输入Remittance Information"
+                    ></c-input>
+        </el-form-item>
+      </c-col>
+</c-col>
     <!-- <c-col :span="12">
         <el-form-item label="Drag  Drop Sender">
             <c-input  v-model="model.cptp.recget.sdamod.dadsnd"  placeholder="请输入Drag  Drop Sender"></c-input>

src/views/Business/Cptadv/Sbxx.vue

@@ -102,10 +102,10 @@
 
     <c-col :span="12" style="margin-top: 20px;">
       <c-col :span="24">
-        <el-form-item label="是否报送跨境人民币2101表" label-width="160px" prop="cnybop.cnyflg">
+        <el-form-item label="是否报送跨境人民币2101表" label-width="180px" prop="cnybop.cnyflg">
           <c-select
             v-model="model.cnybop.cnyflg"
-            style="width: 100%"
+            style="width: 95%"
             placeholder="请选择是否报送跨境人民币2101表"
           >
             <el-option
@@ -119,10 +119,10 @@
         </el-form-item>
       </c-col>
       <c-col :span="24">
-        <el-form-item label="是否报送跨境人民币2107表" label-width="160px">
+        <el-form-item label="是否报送跨境人民币2107表" label-width="180px">
           <c-select
             v-model="model.cnybop.traflg"
-            style="width: 100%"
+            style="width: 95%"
             placeholder="请选择是否报送跨境人民币2107表"
             disabled
           >
@@ -138,10 +138,10 @@
       </c-col>
 
       <c-col :span="24">
-        <el-form-item label="是否报送跨境人民币2111表" label-width="160px">
+        <el-form-item label="是否报送跨境人民币2111表" label-width="180px">
           <c-select
             v-model="model.cnybop.outflg"
-            style="width: 100%"
+            style="width: 95%"
             placeholder="请选择是否报送跨境人民币2111表"
             disabled
           >
@@ -156,10 +156,10 @@
         </el-form-item>
       </c-col>
       <c-col :span="24">
-        <el-form-item label="是否报送跨境人民币2106表" label-width="160px">
+        <el-form-item label="是否报送跨境人民币2106表" label-width="180px">
           <c-select
             v-model="model.cnybop.libflg"
-            style="width: 100%"
+            style="width: 95%"
             placeholder="请选择是否报送跨境人民币2106表"
             disabled
           >
@@ -174,10 +174,10 @@
         </el-form-item>
       </c-col>
       <c-col :span="24">
-        <el-form-item label="是否报送跨境人民币2122表" label-width="160px">
+        <el-form-item label="是否报送跨境人民币2122表" label-width="180px">
           <c-select
             v-model="model.cnybop.vouflg"
-            style="width: 100%"
+            style="width: 95%"
             placeholder="请选择是否报送跨境人民币2122表"
             disabled
           >

src/views/Business/Cptadv/index.vue

@@ -31,7 +31,9 @@
           </el-tab-pane>
            <el-tab-pane label="费用及账务" name="setpan">
             <!--PD000006 -->
+            <c-content>
             <m-setpan :model="model" :codes="codes" />
+            </c-content>
           </el-tab-pane>
            <el-tab-pane label="分录" name="glepan">
             <m-glepan :model="model" :codes="codes" ref="glepan" />