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

src/model/Cptadv/Default.js

@@ -41,7 +41,7 @@ export default {
     "cpdgrp.pye.dbfadrblkcn"                      :Utils.defaultFunction,
     "cptp.payuil"                      :Utils.defaultFunction,
     "cnybop.traflg"                      :Utils.defaultFunction,
-    "cpdgrp.pye.pts.extkey"                      :Utils.defaultFunction,
+    // "cpdgrp.pye.pts.extkey"                      :Utils.defaultFunction,
     "cpdgrp.orc.pts.extkey"                      :Utils.defaultFunction,
     "cpdgrp.orc.adrelc"                      :Utils.defaultFunction,
     "cpdgrp.orc.namelc"                      :Utils.defaultFunction,
@@ -51,7 +51,7 @@ export default {
     "cpdgrp.rec.ownref"                      :Utils.defaultFunction,
     "cptp.comsystbl"                      :Utils.defaultFunction,
     "cpdgrp.rec.trntyp"                      :Utils.defaultFunction,
-    "cpdgrp.rec.orcact"                      :Utils.defaultFunction,
+    // "cpdgrp.rec.orcact"                      :Utils.defaultFunction,
     "cptp.resbch"                      :Utils.defaultFunction,
     "setmod.glemod.gleshwstm"                      :Utils.defaultFunction,
     "cpdgrp.rec.f23b"                      :Utils.defaultFunction,

src/model/Cptopn/Default.js

@@ -25,13 +25,13 @@ export default {
     "cptp.cleage"                      :Utils.defaultFunction,
     "cptp.evebch"                      :Utils.defaultFunction,
     "cptp.coract"                      :Utils.defaultFunction,
-    "cpdgrp.pye.pts.extkey"                      :Utils.defaultFunction,
+    // "cpdgrp.pye.pts.extkey"                      :Utils.defaultFunction,
     "cpdgrp.rec.trntyp"                      :Utils.defaultFunction,
     "cpdgrp.orc.pts.adrblk"                      :Utils.defaultFunction,
     "setmod.doccur"                      :Utils.defaultFunction,
     "setmod.dspflg"                      :Utils.defaultFunction,
     "setmod.docamt"                      :Utils.defaultFunction,
-    "cpdgrp.rec.orcact"                      :Utils.defaultFunction,
+    // "cpdgrp.rec.orcact"                      :Utils.defaultFunction,
     "cptp.resbch"                      :Utils.defaultFunction,
     "cptp.secmod"                      :Utils.defaultFunction,
     "trnmod.trndoc.condocstm"                      :Utils.defaultFunction,

src/views/Business/Cptadv/CptAdvChangePanel.vue

@@ -139,7 +139,6 @@
                         v-model="model.cpdgrp.orc.pts.adrblk"
                         show-word-limit
                         placeholder="请输入Address Block"
-                        disabled
                     ></c-input>
                 </el-form-item>
             </c-col>

src/views/Business/Cptadv/Opnp1.vue

@@ -330,7 +330,7 @@
         </c-form-item>
       </c-col>
 
-      <c-col :span="11">
+      <c-col :span="13">
         <el-form-item label="国外费用" prop="cpdgrp.rec.feecur">
           <c-select
             v-model="model.cpdgrp.rec.feecur"
@@ -348,13 +348,13 @@
         </el-form-item>
       </c-col>
 
-      <c-col :span="13">
+      <c-col :span="11">
         <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: 90%"
+            style="width: 95%"
           ></c-input>
 
           <template slot="footer">