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

src/model/Cptadv/Pattern.js

@@ -228,7 +228,7 @@ export default {
         {max: 35,message:"长度不能超过35"}
     ],
     "cpdgrp.orc.pts.ref":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 16,message:"长度不能超过16"}
     ],
     "cpdgrp.pye.pts.ref":[
@@ -252,7 +252,7 @@ export default {
         {max: 16,message:"长度不能超过16"}
     ],
     "cpdgrp.orc.pts.extkey":[
-        {type: "string", required: false, message: "必输项"},
+        {type: "string", required: true, message: "必输项"},
         {max: 16,message:"长度不能超过16"}
     ],
     "cptp.orcp.ptsget.sdamod.seainf":[

src/views/Business/Cptadv/Sbxx.vue

@@ -10,7 +10,7 @@
 
     <c-col :span="24" style="margin-top: 20px;">
       <c-col :span="12">
-        <el-form-item label="申报类型">
+        <el-form-item label="申报类型" label-width="30%">
             <c-select v-model="model.bopmod.szflg" 
             style="width:100%" 
             placeholder="请选择申报类型"
@@ -45,7 +45,7 @@
                                    
     <c-col :span="12">
       <c-col :span="24">
-      <el-form-item label="款项来源">
+      <el-form-item label="款项来源" label-width="30%">
           <c-select v-model="model.bopmod.acttyp" 
             style="width:100%" 
             placeholder="请选择款项来源"
@@ -62,15 +62,15 @@
       </c-col>
 
       <c-col :span="24">
-        <el-form-item label="地区机构号">
+        <el-form-item label="地区机构号" label-width="30%">
             <c-select v-model="model.bopmod.ownextkey" style="width:100%" placeholder="请选择地区机构号" :disabled="model.bopmod.szflg == 3">
             </c-select>
         </el-form-item>
       </c-col>
 
       <c-col :span="24">
-        <c-col :span="10">
-          <el-form-item label="国外银行扣费（涉外收入申报专用）">
+        <c-col :span="12">
+          <el-form-item label="国外银行扣费（涉外收入申报专用）" label-width="60%">
               <c-select v-model="model.bopmod.outchargeccy" style="width:95%" placeholder="请选择国外银行扣费（涉外收入申报专用）" :disabled="true">
                 <el-option
                   v-for="item in outchargeccy"
@@ -82,7 +82,7 @@
           </el-form-item>
         </c-col>
         
-        <c-col :span="14">
+        <c-col :span="12">
           <c-input-currency v-model="model.bopmod.outchargeamt"  
             style="text-align: right;" 
             placeholder="请输入国外银行扣费（涉外收入申报专用）" 
@@ -102,10 +102,10 @@
 
     <c-col :span="12" style="margin-top: 20px;">
       <c-col :span="24">
-        <el-form-item label="是否报送跨境人民币2101表" label-width="180px" prop="cnybop.cnyflg">
+        <el-form-item label="是否报送跨境人民币2101表" label-width="30%" prop="cnybop.cnyflg">
           <c-select
             v-model="model.cnybop.cnyflg"
-            style="width: 95%"
+            style="width: 100%"
             placeholder="请选择是否报送跨境人民币2101表"
           >
             <el-option
@@ -119,10 +119,10 @@
         </el-form-item>
       </c-col>
       <c-col :span="24">
-        <el-form-item label="是否报送跨境人民币2107表" label-width="180px">
+        <el-form-item label="是否报送跨境人民币2107表" label-width="30%">
           <c-select
             v-model="model.cnybop.traflg"
-            style="width: 95%"
+            style="width: 100%"
             placeholder="请选择是否报送跨境人民币2107表"
             disabled
           >
@@ -138,10 +138,10 @@
       </c-col>
 
       <c-col :span="24">
-        <el-form-item label="是否报送跨境人民币2111表" label-width="180px">
+        <el-form-item label="是否报送跨境人民币2111表" label-width="30%">
           <c-select
             v-model="model.cnybop.outflg"
-            style="width: 95%"
+            style="width: 100%"
             placeholder="请选择是否报送跨境人民币2111表"
             disabled
           >
@@ -156,10 +156,10 @@
         </el-form-item>
       </c-col>
       <c-col :span="24">
-        <el-form-item label="是否报送跨境人民币2106表" label-width="180px">
+        <el-form-item label="是否报送跨境人民币2106表" label-width="30%">
           <c-select
             v-model="model.cnybop.libflg"
-            style="width: 95%"
+            style="width: 100%"
             placeholder="请选择是否报送跨境人民币2106表"
             disabled
           >
@@ -174,10 +174,10 @@
         </el-form-item>
       </c-col>
       <c-col :span="24">
-        <el-form-item label="是否报送跨境人民币2122表" label-width="180px">
+        <el-form-item label="是否报送跨境人民币2122表" label-width="30%">
           <c-select
             v-model="model.cnybop.vouflg"
-            style="width: 95%"
+            style="width: 100%"
             placeholder="请选择是否报送跨境人民币2122表"
             disabled
           >