Merge branch 'develop' of http://114.115.138.98:8900/isc-v3.1/isc-web-vue into develop

src/page/Frontend/Cpssxf/event/index.js

@@ -89,6 +89,24 @@ export default {
         },
         handleSelectionChange(val){
             this.multipleSelection = val;
+        },
+        addClick(){
+            this.addDialogVisiable = true;
+        },
+        handleClose(){
+            this.addDialogVisiable = false;
+        },
+        handleOn(){
+            this.addDialogVisiable = false;
+        },
+        fentanClick(){
+            this.dialogVisible = true;
+        },
+        closeDialogOpen(){
+            this.dialogVisible = false;
+        },
+        testClick(){
+         this.addDialogVisiable1=true
         }
     },
 };

src/page/Funds/Crtcbk/event/buildCommons.js

@@ -21,16 +21,13 @@ export default {
       };
     },
     buildCommonData(model, trnName) {
-      let ptsptaList = Utils.formatPtspta(model.fxtp.fxdgrp, this.buildPtspta);
+      let ptsptaList = Utils.formatPtspta(model.crdgrp, this.buildPtspta);
       return {
         rec: {
-          objtyp: "FXT",
-          objinr: model.fxtp.fxdgrp.rec.inr,
-          ownref: model.fxtp.fxdgrp.rec.ownref,
+          objtyp: "CRD",
         },
         cbsMap: {
-          MAX: model.fxtp.fxdgrp.cbs.max,
-          NOM1: model.fxtp.fxdgrp.cbs.nom1,
+          
         },
         ptsList: ptsptaList,
         transName: trnName,

src/page/Funds/Crtctf/event/buildCommons.js

@@ -21,16 +21,13 @@ export default {
       };
     },
     buildCommonData(model, trnName) {
-      let ptsptaList = Utils.formatPtspta(model.fxtp.fxdgrp, this.buildPtspta);
+      let ptsptaList = Utils.formatPtspta(model.crdgrp, this.buildPtspta);
       return {
         rec: {
-          objtyp: "FXT",
-          objinr: model.fxtp.fxdgrp.rec.inr,
-          ownref: model.fxtp.fxdgrp.rec.ownref,
+          objtyp: "CRD",
         },
         cbsMap: {
-          MAX: model.fxtp.fxdgrp.cbs.max,
-          NOM1: model.fxtp.fxdgrp.cbs.nom1,
+
         },
         ptsList: ptsptaList,
         transName: trnName,