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

src/model/Cptadv/Default.js

@@ -66,7 +66,7 @@ export default {
     "bopmod.dclflg"                      :Utils.defaultFunction,
     "cpdgrp.rec.detchgcod"                      :Utils.defaultFunction,
     "cnybop.cnyflg"                      :Utils.defaultFunction,
-    "cptp.draweecountcode"                      :Utils.defaultFunction,
+    //"cptp.draweecountcode"                      :Utils.defaultFunction,
     "cpdgrp.snd.pts.nam"                      :Utils.defaultFunction,
     "mtabut.coninf.oitinf.oit.inftxt"                      :Utils.defaultFunction,
     "mtabut.coninf.oitinf.oit.inflev"                      :Utils.defaultFunction,

src/model/Cptadv/Pattern.js

@@ -280,7 +280,7 @@ export default {
     ],
     "cpdgrp.orc.pts.adrblk":[
         {type: "string", required: true, message: "必输项"},
-        {max: 35,message:"长度不能超过35"}
+        {max: 140,message:"长度不能超过140"}
     ],
     "cpdgrp.orc.dbfadrblkcn":[
         {type: "string", required: true, message: "必输项"},
@@ -292,7 +292,7 @@ export default {
     ],
     "cpdgrp.pye.pts.adrblk":[
         {type: "string", required: true, message: "必输项"},
-        {max: 35,message:"长度不能超过35"}
+        {max: 140,message:"长度不能超过140"}
     ],
     "cpdgrp.pye.dbfadrblkcn":[
         {type: "string", required: true, message: "必输项"},

src/model/Cptopn/Pattern.js

@@ -301,7 +301,7 @@ export default {
     ],
     "cpdgrp.orc.pts.adrblk":[
         {type: "string", required: true, message: "必输项"},
-        {max: 35,message:"长度不能超过35"}
+        {max: 140,message:"长度不能超过140"}
     ],
     "cpdgrp.orc.dbfadrblkcn":[
         {type: "string", required: true, message: "必输项"},
@@ -354,13 +354,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

@@ -342,20 +342,27 @@
       </c-col>
 
       <c-col :span="13">
-        <el-form-item label=""   label-width="8px" prop="cpdgrp.rec.feeamt">
-          <c-input
+        <el-form-item label="" style="width: 100%"  label-width="8px" prop="cpdgrp.rec.feeamt">
+           <c-fullbox>
+           <c-input
             v-model="model.cpdgrp.rec.feeamt"
             placeholder="请输入国外费用金额"
-            style="width: 71%"
+            style="width: 90%"
           ></c-input>
-          <c-checkbox v-model="model.cpdgrp.rec.tsnflg"
+           
+          <template slot="footer">
+            <span>
+          <c-checkbox v-model="model.cpdgrp.rec.tsnflg"  
             >同名划转标志</c-checkbox
           >
+            </span>
+          </template>
+          </c-fullbox>
         </el-form-item>
       </c-col>
     </c-col>
 
-    <CptOpnp1Common :model="model" :codes="codes" v-on:onSndpDet="onSndpDet"></CptOpnp1Common>
+    <CptAdvChangePanel :model="model" :codes="codes" v-on:onSndpDet="onSndpDet"></CptAdvChangePanel>
 
 <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'">
@@ -1047,12 +1054,12 @@ import CodeTable from "~/config/CodeTable";
 import Event from "~/model/Cptadv/Event";
 import Ptap from "~/views/Public/Ptap";
 
-import CptOpnp1Common from "~/views/Public/CptOpnp1Common";
+import CptAdvChangePanel from "./CptAdvChangePanel";
 
 export default {
   inject: ["root"],
   props: ["model", "codes"],
-  components: { CptOpnp1Common },
+  components: { CptAdvChangePanel },
   mixins: [CommonProcess],
   data() {
     return {

src/views/Business/Cptopn/Opnp1.vue

@@ -201,7 +201,7 @@
                                 value-format="yyyy-MM-dd"
                                 style="width: 100%"
                                 placeholder=""
-                                disabled
+                                :disabled="!model.cpdgrp.rec.ischktyp || model.cpdgrp.rec.ischktyp == 'N'"
                             ></c-date-picker>
                         </el-form-item>
                     </c-col>

src/views/Business/Infcpd/BusNavbar.vue

@@ -115,6 +115,8 @@ export default {
                                    
                                }
                                this.navcode.push({code:"",label:"退汇",isDis:"N",title:""})
+                               //屏蔽cptsel sptcpt
+                               this.navcode.splice(5,2)   
 
                         
                          }else{

src/views/Public/CptOpnp1Common.vue

@@ -2363,14 +2363,13 @@
 
 <script>
 import CommonProcess from "~/mixin/CommonProcess";
-import Pattern from "~/model/Cptopn/Pattern";
+
 export default {
     inject: ["root"],
     props: ["model", "codes"],
     mixins: [CommonProcess],
     data() {
         return {
-            pattern: Pattern,
             infptaVisible: false,
         };
     },