Merge branch 'master' of http://192.168.0.110:11080/fukai/vue-gjjs

src/mixin/commonApi.js

@@ -40,6 +40,10 @@ export default {
                 return
             let data =await Api.post("display/"+inr)
             Utils.copyValueFromVO(this.model,JSON.parse(data.data))
-        }
+        },
+        executeNotify(params)
+        {
+            return Api.post(this.declareParams.trnName+"/executeNotify", Utils.getRequestDataFn.call(this, params))
+        },
     }
 } 
\ No newline at end of file

src/model/Cptadv/index.js

@@ -217,6 +217,7 @@ export default class Cptadv{
 							libflg:"",			//  是否报送跨境人民币2106表		.cnybop.libflg
 							vouflg:"",			//  是否报送跨境人民币2122表		.cnybop.vouflg
 						},
+						pageId: ""			// ctx的key
 				}
     }
 }
\ No newline at end of file

src/model/Cptopn/Check.js

@@ -602,8 +602,12 @@ function checkFinmodAct3N1000()
 *   source:cptopn.@0023.script
 *   
 */
-function checkCpdgrpCbsNom1AmtN1000()
+function checkCpdgrpCbsNom1AmtN1000(rule, value, callback)
 {
+    const that = this;
+    that.exeuteCheck("cpdgrp.cbs.nom1.amt").then(res => {
+        callback()
+    })
 }
 /**
 *   source:finmod.@0024.script

src/model/Cptopn/Default.js

@@ -37,6 +37,7 @@ export default {
     "cptp.orcadr"                      :defaultCptpOrcadr,
     "trdgrp.rec.pntref"                      :defaultTrdgrpRecPntref,
     "cpdgrp.cbs.nom1.cur"                      :defaultCpdgrpCbsNom1Cur,
+    "cpdgrp.cbs.nom1.amt"                      :defaultCpdgrpCbsNom1Amt,
     "finmod.ovdintrat"                      :defaultFinmodOvdintrat,
     "cptp.evebch"                      :defaultCptpEvebch,
     "trdgrp.rec.pntnam"                      :defaultTrdgrpRecPntnam,
@@ -208,8 +209,28 @@ function defaultCptpOrcadr()
 function defaultTrdgrpRecPntref()
 {
 }
-function defaultCpdgrpCbsNom1Cur()
-{
+function defaultCpdgrpCbsNom1Cur(rule, value, callback)
+{
+    const that = this;
+    that.executeDefault("cpdgrp.rec.nam").then(res => {
+        that.model.cpdgrp.cbs.max.cur = value;
+        that.model.cpdgrp.rec.nam = res.data.cpdgrp_rec_nam;
+        callback()
+    })
+}
+function defaultCpdgrpCbsNom1Amt(rule, value, callback)
+{
+    const that = this;
+    that.executeDefault("cpdgrp.cbs.max.amt").then(res => {
+        that.model.cpdgrp.rec.nam = res.data.cpdgrp_rec_nam;
+        // // 信用证最大金额
+        // that.model.didgrp.cbs.max.amt = res.data.didgrp_cbs_max_amt;
+        callback()
+    })
+    that.executeDefault("cpdgrp.rec.nam").then(res => {
+        that.model.cpdgrp.rec.nam = res.data.cpdgrp_rec_nam;
+        callback()
+    })
 }
 function defaultFinmodOvdintrat()
 {

src/model/Cptopn/Pattern.js

@@ -29,7 +29,7 @@ export default {
 
 
     "cpdgrp.cbs.nom1.amt":[
-        {type: "number", required: false, message: "必输项"},
+        {required: false, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],

src/model/Cptopn/index.js

@@ -269,6 +269,7 @@ export default class Cptopn{
 							libflg:"",			//  是否报送跨境人民币2106表		.cnybop.libflg
 							vouflg:"",			//  是否报送跨境人民币2122表		.cnybop.vouflg
 						},
+						pageId: ""			// ctx的key
 				}
     }
 }
\ No newline at end of file

src/model/Ditame/index.js

@@ -322,6 +322,7 @@ export default class Ditame{
 								},
 							},
 						},
+						pageId: ""			// ctx的key
 				}
     }
 }
\ No newline at end of file

src/views/Business/Cptopn/Opnp1.vue

@@ -24,7 +24,7 @@
       <el-col :span="11">
         <el-form-item label="Name" prop="cpdgrp.rec.ownref">
           <c-input
-            v-model="model.cpdgrp.rec.ownref"
+            v-model="model.cpdgrp.rec.nam"
             maxlength="16"
             placeholder=""
             readonly
@@ -278,7 +278,9 @@
 
           <el-col :span="10">
             <el-form-item label="报文类型" label-width="120px">
-              <c-input style="width: 100%" placeholder="" readonly> </c-input>
+              <c-select style="width: 100%" placeholder="" v-model="model.cpdgrp.rec.swftyp">
+                <el-option v-for="item in codes.swftyp" :label="item.label" :value="item.value" :key="item.value"></el-option>
+              </c-select>
             </el-form-item>
           </el-col>
         </el-col>
@@ -1374,20 +1376,20 @@ export default {
         {value:'8',label:'大豆'},
       ],
       options6:[
-        {value:'1',label:'贸易'},
-        {value:'2',label:'非贸易'},
-        {value:'3',label:'资本'},
-        {value:'4',label:'其他'},
+        {value:'0',label:'贸易'},
+        {value:'1',label:'非贸易'},
+        {value:'2',label:'资本'},
+        {value:'3',label:'其他'},
       ],
       options7:[
-        {value:'1',label:'电汇'},
-        {value:'2',label:'票汇'},
-        {value:'3',label:'信汇'},
-        {value:'4',label:'其他'},
+        {value:'0',label:'电汇'},
+        {value:'1',label:'票汇'},
+        {value:'2',label:'信汇'},
+        {value:'3',label:'其他'},
       ],
       options8:[
-        {value:'1',label:'对公'},
-        {value:'2',label:'对私'},
+        {value:'0',label:'对公'},
+        {value:'1',label:'对私'},
       ],
       options9:[
         {value:'1',label:'跨境收支'},

src/views/Business/Cptopn/index.vue

@@ -7,6 +7,7 @@
         ref="modelForm"
         label-width="200px"
         size="small"
+        :validate-on-rule-change="false"
       >
         <el-tabs ref="elment" type="card" @tab-click="tabClick">
           <el-tab-pane label="Overview">
@@ -71,10 +72,13 @@
 </template>
 <script>
 import Api from "~/service/Api";
+import Utils from "~/utils/index"
 import CodeTable from "~/config/CodeTable";
 import Cptopn from "~/model/Cptopn";
 import CommonProcess from "~/mixin/CommonProcess";
 import Pattern from "~/model/Cptopn/Pattern";
+import Default from "~/model/Cptopn/Default";
+import Check from "~/model/Cptopn/Check";
 import Opnp1 from "./Opnp1";
 import Setpan from "./Setpan";
 import Glepan from "./Glepan";
@@ -106,11 +110,13 @@ export default {
   mixins: [CommonProcess], // 里面包含了Default、Check等的公共处理
   data() {
     return {
+      trnName:"cptopn",
       model: new Cptopn().data,
-      // defaultRule:Default,
-      // rules:this.mergeRules(Pattern,Check),
-      rules: Pattern,
-      codes: {},
+      checkRules: Check,
+      defaultRules: Default,
+      pattern: Pattern,
+      rules:null,
+      codes: {...CodeTable},
       // init: {
       //   uri: "/cptopn/init",
       //   fileName: "cptopn.json",
@@ -1339,8 +1345,8 @@ export default {
   created: async function () {
     console.log("进入cptopn交易");
     let rtnmsg = await Api.post("cptopn/init", { params: {} });
-    if (rtnmsg.retcod == SUCCESS) {
-      //TODO 处理数据逻辑
+    if (rtnmsg.respCode == SUCCESS) {
+      Utils.copyValueFromVO(this.model,rtnmsg.data)
     } else {
       this.$notify.error({ title: "错误", message: "服务请求失败！" });
     }