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

# Conflicts:
#	src/views/Business/Cptadv/Opnp1.vue

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/Cptopn/Pattern.js

@@ -286,7 +286,7 @@ export default {
         {max: 16,message:"长度不能超过16"}
     ],
     "cpdgrp.pye.pts.extkey":[
-        {type: "string", required: false, message: "必输项"},
+        {type: "string", required: true, message: "必输项"},
         {max: 16,message:"长度不能超过16"}
     ],
     "cptp.pyep.ptsget.sdamod.seainf":[
@@ -312,8 +312,8 @@ export default {
         {max: 35,message:"长度不能超过35"}
     ],
     "cpdgrp.pye.pts.adrblk":[
-        {type: "string", required: true, message: "必输项"},
-        {max: 140,message:"长度不能超过140"}
+        {type: "string", required: false, message: "必输项"},
+        {max: 35,message:"长度不能超过35"}
     ],
     "cpdgrp.pye.dbfadrblkcn":[
         {type: "string", required: true, message: "必输项"},

src/views/Business/Cptadv/Opnp1.vue

@@ -348,17 +348,23 @@
         </el-form-item>
       </c-col>
 
-      <c-col :span="13" style="text-align:right">
-        <el-form-item label=""   label-width="0" prop="cpdgrp.rec.feeamt">
-          <c-input
-            class="m-input-currency"
+      <c-col :span="13">
+        <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: 63%"
+            style="width: 90%"
           ></c-input>
+
+          <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>
@@ -369,7 +375,9 @@
         <c-col :span="24" style="height: 0px">
             <el-divider></el-divider>
         </c-col>
-    <CptOpnp1Common :model="model" :codes="codes" v-on:onSndpDet="onSndpDet"></CptOpnp1Common>
+    /*<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'">
@@ -1061,12 +1069,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

@@ -203,7 +203,7 @@
                                 value-format="yyyy-MM-dd"
                                 style="width: 100%"
                                 placeholder=""
-                                :disabled="model.cpdgrp.rec.ischktyp"
+                                :disabled="!model.cpdgrp.rec.ischktyp || model.cpdgrp.rec.ischktyp == 'N'"
                             ></c-date-picker>
                         </el-form-item>
                     </c-col>
@@ -269,10 +269,10 @@
 
                 <c-col :span="24">
                     <c-col :span="12">
-                        <el-form-item label="收款对象" prop="cpdgrp.rec.gors">
+                        <el-form-item label="汇款对象" prop="cpdgrp.rec.gors">
                             <c-select
                                 v-model="model.cpdgrp.rec.gors"
-                                placeholder="请选择收款对象"
+                                placeholder="请选择汇款对象"
                                 style="width:100%"
                             >
                                 <el-option
@@ -441,7 +441,7 @@ import Event from "~/model/Cptopn/Event";
 import Utils from "~/utils";
 import Infpta from "~/views/Business/Infpta";
 
-import CptOpnp1Common from "~/views/Public/CptOpnp1Common";
+import CptOpnp1Common from "./CptOpnp1Common";
 
 export default {
     inject: ["root"],

src/views/Business/Cptopn/index.vue

@@ -32,17 +32,16 @@
             </c-content>
           </el-tab-pane>
 
-          <el-tab-pane label="Additional Info" name="AdditionalInfo">
-            <!--PD000020 -->
+          <!-- <el-tab-pane label="Additional Info" name="AdditionalInfo">
             <m-AdditionalInfo :model="model" :codes="codes" />
-          </el-tab-pane>
+          </el-tab-pane> -->
 
           <el-tab-pane label="费用及账务" name="setpan">
             <!--PD000000 -->
             <m-setpan :model="model" :codes="codes" />
           </el-tab-pane>
 
-          <el-tab-pane label="Bookings" name="glepan">
+          <el-tab-pane label="分录" name="glepan">
             <!--PD000001 -->
             <m-glepan :model="model" :codes="codes" ref="glepan"/>
           </el-tab-pane>