修改公共组件的组数方法

src/business/gitopn/event/buildCommons.js

+export default {
+  buildPtspta (ptsptaObj) {
+    let pts = ptsptaObj.pts;
+    let ptspta = {
+      rol: pts.rol,
+      name: pts.nam,
+      ptyinr: pts.ptyinr,
+      ptainr: pts.ptainr,
+      extkey: pts.extkey,
+      dftdsp: pts.dftdsp,
+      dftcur: pts.dftcur,
+      dftact: pts.dftact,
+      dftfeecur: pts.dftfeecur,
+      dftactptainr: pts.dftactptainr,
+      glggrpflg: pts.glggrpflg,
+      adrblk: pts.adrblk
+    };
+    return ptspta;
+  },
+  buildCommonData (model, trnName) {
+    let ptsptaList = [];
+    if (model.gidgrp.apl.pts.extkey) {
+      ptsptaList.push(this.buildPtspta(model.gidgrp.apl));
+    }
+    if (model.gidgrp.adv.pts.extkey) {
+      ptsptaList.push(this.buildPtspta(model.gidgrp.adv));
+    }
+    if (model.gidgrp.ben.pts.extkey) {
+      ptsptaList.push(this.buildPtspta(model.gidgrp.ben));
+    }
+    let dataObj = {
+      rec: {
+        objtyp: 'GID',
+        ownref: model.gidgrp.rec.ownref,
+        opndat: model.gidgrp.rec.opndat,
+        expdat: model.gidgrp.rec.expdat,
+        branchInr: model.gidgrp.rec.branchInr,
+        hndtyp: model.gidgrp.rec.hndtyp,
+        gartyp: model.gidgrp.rec.gartyp,
+        fingua: model.gidgrp.rec.fingua,
+        segtyp: model.gidgrp.ghd.segtyp,
+        fromflg: model.gidgrp.rec.fromflg,
+        othersno: model.gidgrp.rec.othersno,
+        sndto: model.gidgrp.rec.sndto,
+        swiftflg: model.gitp.swiftflg,
+        giduil: model.gidgrp.rec.giduil,
+        purpos: model.gidgrp.rec.purpos,
+        revflg: model.gidgrp.rec.revflg,
+        cnfsta: model.gidgrp.rec.cnfsta,
+      },
+      cbsMap: {
+        MAX: model.gidgrp.cbs.max,
+        OPN1: model.gidgrp.cbs.opn1,
+        MAC: model.gidgrp.cbs.mac,
+        MAC2: model.gidgrp.cbs.mac2,
+        OPC2: model.gidgrp.cbs.opc2,
+        CNF: model.gidgrp.cbs.cnf,
+      },
+      ptsList: ptsptaList,
+      transName: trnName,
+      userId: window.sessionStorage.userId ? window.sessionStorage.userId : 'ZL'
+    };
+    return dataObj
+  },
+  buildSetfeg (model, trnName) {
+    let params = {
+      ...this.buildCommonData(model, trnName),
+      liaall: model.liaall,
+      liaccv: model.liaccv,
+      doceot: model.trnmod.trndoc.doceot,
+    };
+    return params
+  },
+  buildSetglg (model, trnName) {
+    let params = {
+      ...this.buildCommonData(model, trnName),
+      setfeg: model.setmod.setfeg,
+    };
+    return params
+  },
+  buildGlentry (model, trnName) {
+    let params = {
+      ...this.buildCommonData(model, trnName),
+      liaallg: model.liaall.liaallg,
+      setfog: model.setmod.setfog,
+      setfeg: model.setmod.setfeg,
+      setglg: model.setmod.setglg,
+    };
+    return params
+  },
+  builDengp (model, trnName) {
+    let params = {
+      ...this.buildCommonData(model, trnName),
+      liaallg: model.liaall.liaallg,
+    };
+    return params
+  },
+  builDocpan (model, trnName) {
+    let params = {
+      ...this.buildCommonData(model, trnName),
+    };
+    return params
+  },
+  builCcvpan (model, trnName) {
+    let params = {
+      ...this.buildCommonData(model, trnName),
+      liaccvg: model.liaccv.liaccvg,
+      oldamt: model.liaccv.oldamt,
+      chgamt: model.liaccv.chgamt,
+      concur: model.liaccv.concur,
+    };
+    return params
+  }
+}
\ No newline at end of file

src/business/gitopn/event/index.js

 import Api from '~/service/Api';
+import commonFunctions from '~/mixin/commonFunctions.js'
+import buildFn from './buildCommons.js'
+import setmod from '~/components/business/setmod/event'
+import glentry from '~/components/business/glentry/event'
+import engp from '~/components/business/engp/event'
+import docpan from '~/components/business/docpan/event'
+import ccvpan from '~/components/business/ccvpan/event'
 
 export default {
+  mixins: [commonFunctions],
   methods: {
+    ...setmod,
+    ...glentry,
+    ...engp,
+    ...docpan,
+    ...ccvpan,
     // 提交
     handleSubmit() {
       console.log('提交', this.model);
@@ -41,6 +54,38 @@ export default {
     handleStash() {
       console.log('暂存');
     },
+    async tabClick(tab) {
+      if (this.isInDisplay) {
+        return
+      }
+      let name = tab.name;
+      switch (name) {
+        case 'ccvpan':
+          let ccvpanRequest = buildFn.builCcvpan(this.model, this.trnName);
+          this.processLiaccv(ccvpanRequest);
+          break;
+        case 'engp':
+          let engpRequest = buildFn.builDengp(this.model, this.trnName);
+          this.processLiaall(engpRequest);
+          break;
+        case 'setpan':
+          let setfegRequest = buildFn.buildSetfeg(this.model, this.trnName);
+          let setglgRequest = buildFn.buildSetglg(this.model, this.trnName);
+          this.processSetpan(setfegRequest, setglgRequest);
+          break;
+        case 'docpan':
+          let docpanRequest = buildFn.builDocpan(this.model, this.trnName);
+          this.processTrndoc(docpanRequest);
+          break;
+        case 'glepan':
+          let glentryRequest = buildFn.buildGlentry(this.model, this.trnName);
+          this.processGlentry(glentryRequest);
+          break;
+        default:
+          return;
+      }
+      
+    },
     // 点击获取按钮拉取当前key字段下的表单数据
     queryFormData(key) {
       console.log(key);

src/business/gitopn/views/Ovwp1.vue

@@ -302,7 +302,7 @@
               v-model="model.gidgrp.rec.gtxinr"
               style="width: 100%"
               placeholder="请选择保函文本格式"
-              :code="getValues('gidgrp.rec.gtxinr','gtxinr')"
+              :code="codes.gtxinr"
             >
             </c-select>
           </el-form-item>
@@ -371,7 +371,7 @@
               v-model="model.gidgrp.rec.atxinr"
               style="width: 100%"
               placeholder="请选择保函文本格式"
-              :code="getValues('gidgrp.rec.atxinr')"
+              :code="codes.gtxinr"
               @change="executeNotify(null, true)"
             >
             </c-select>

src/business/gitopn/views/index.vue

@@ -105,7 +105,6 @@
 </template>
 <script>
 import event from '../event'
-import commonProcess from "~/mixin/commonProcess";
 import formRules from '../model/check'
 import CodeTable from "~/config/CodeTable";
 import Gitopn from "../model";
@@ -179,8 +178,7 @@ export default {
       activeNames: ["ovwp"],
     };
   },
-  // 里面包含了Default、Check等的公共处理
-  mixins: [commonProcess, event],
+  mixins: [event],
   data() {
     return {
       tabVal: "ovwp",

src/components/FunctionBtn.vue

@@ -6,9 +6,9 @@
   <div class="m-Btn-eContainer" v-if="!buttonHide && ((!isReview && !funcBtnHide) || showSetBtn)">
     <div class="m-funcBtn-eContainer" v-if="!isReview && !buttonHide && !funcBtnHide">
       <!-- 确认按钮暂时隐藏 -->
-      <!-- <el-button type="primary" v-show="root.judgeVisiableInfo('mtabut.usrcon')" size="small" @click="confirm" :loading="$store.state.Status.loading.confirm">{{ $t('buttons.confirm') }}</el-button> -->
-      <el-button type="primary" v-show="root.judgeVisiableInfo('mtabut.sav')" size="small" @click="start" :loading="$store.state.Status.loading.submit">{{ $t('buttons.submit') }}</el-button>
-      <el-button size="small" v-show="root.judgeVisiableInfo('mtabut.chk')" @click="check" :loading="$store.state.Status.loading.check">{{ $t('buttons.check') }}</el-button>
+      <!-- <el-button type="primary" size="small" @click="confirm" :loading="$store.state.Status.loading.confirm">{{ $t('buttons.confirm') }}</el-button> -->
+      <el-button type="primary" size="small" @click="start" :loading="$store.state.Status.loading.submit">{{ $t('buttons.submit') }}</el-button>
+      <el-button size="small" @click="check" :loading="$store.state.Status.loading.check">{{ $t('buttons.check') }}</el-button>
       <el-button size="small" @click="save" :loading="$store.state.Status.loading.stash">{{ $t('buttons.stash') }}</el-button>
       <el-button size="small" @click="handleCancel">{{ $t('buttons.quit') }}</el-button>
     </div>

src/components/business/ccvpan/event/index.js

-import LiaccvRequest from "../model/LiaccvRequest.js";
-import Api from "~/service/Api";
-import Utils from "~/utils";
-
+import Api from '~/service/Api';
+import Utils from '~/utils';
 
 export default {
-    buildPtspta(ptsptaObj) {
-        let ptspta = {};
-        let pts = ptsptaObj.pts;
-        let adr = ptsptaObj.adr;
-        ptspta.rol=pts.rol;
-        ptspta.name=pts.nam;
-        ptspta.ptyinr=pts.ptyinr;
-        ptspta.ptainr=pts.ptainr;
-        ptspta.extkey=pts.extkey;
-        ptspta.dftdsp=pts.dftdsp;
-        ptspta.dftcur=pts.dftcur;
-        ptspta.dftact=pts.dftact;
-        ptspta.dftfeecur=pts.dftfeecur;
-        ptspta.dftactptainr=pts.dftactptainr;
-        ptspta.glggrpflg=pts.glggrpflg;
-        ptspta.adrblk=pts.adrblk;
-        return ptspta;
-    },
-    buildLiaccvRequest() {
-        let liaccvRequest = new LiaccvRequest().data;
-        let rec = {};
-        let cbsMap = {};
-        if (this.trnName === "litopn") {
-            rec.objtyp = "LID";
-            rec.ownref = this.model.lidgrp.rec.ownref;
-            rec.opndat = this.model.lidgrp.rec.opndat;
-            rec.branchInr = this.model.lidgrp.rec.branchinr;
-            liaccvRequest.rec = rec;
-
-            cbsMap.NOM1 = {
-                "cur":this.model.lidgrp.cbs.nom1.cur,
-                "amt":this.model.lidgrp.cbs.nom1.amt,
-            };
-
-            cbsMap.OPN1 = {};
-            
-            cbsMap.OPN2 = {
-                "cur":this.model.lidgrp.cbs.opn2.cur,
-                "amt":this.model.lidgrp.cbs.opn2.amt,
-            };
-
-            cbsMap.MAX = {
-                "cur":this.model.lidgrp.cbs.max.cur,
-                "amt":this.model.lidgrp.cbs.max.amt,
-            };
-
-            cbsMap.MAX2 = {
-                "cur":this.model.lidgrp.cbs.max2.cur,
-                "amt":this.model.lidgrp.cbs.max2.amt,
-            };
-
-            liaccvRequest.cbsMap = cbsMap;
-
-            let ptsptaList = [];
-            if (this.model.lidgrp.apl.pts.extkey !== "") {
-                ptsptaList.push(this.buildPtspta(this.model.lidgrp.apl));
-            }
-            if (this.model.lidgrp.adv.pts.extkey !== "") {
-                ptsptaList.push(this.buildPtspta(this.model.lidgrp.adv));
-            }
-            if (this.model.lidgrp.ben.pts.extkey !== "") {
-                ptsptaList.push(this.buildPtspta(this.model.lidgrp.ben));
-            }
-            liaccvRequest.ptsList = ptsptaList;
-        } else if (this.trnName === "gitopn") {
-            rec.objtyp = "GID";
-            rec.ownref = this.model.gidgrp.rec.ownref;
-            rec.opndat = this.model.gidgrp.rec.opndat;
-            rec.expdat = this.model.gidgrp.rec.expdat;
-            rec.branchInr = this.model.gidgrp.rec.branchinr;
-            rec.hndtyp = this.model.gidgrp.rec.hndtyp;
-            rec.gartyp = this.model.gidgrp.rec.gartyp;
-            rec.fingua = this.model.gidgrp.rec.fingua;
-            rec.segtyp = this.model.gidgrp.ghd.segtyp;
-            rec.fromflg = this.model.gidgrp.rec.fromflg;
-            rec.othersno= this.model.gidgrp.rec.othersno;
-            rec.sndto = this.model.gidgrp.rec.sndto;
-            rec.swiftflg = this.model.gitp.swiftflg;
-            rec.giduil = this.model.gidgrp.rec.giduil;
-            rec.purpos = this.model.gidgrp.rec.purpos;
-            rec.revflg = this.model.gidgrp.rec.revflg;
-            rec.cnfsta = this.model.gidgrp.rec.cnfsta;
-            liaccvRequest.rec = rec;
-
-            cbsMap.MAX = this.model.gidgrp.cbs.max;
-            cbsMap.OPN1 = this.model.gidgrp.cbs.opn1;
-            cbsMap.MAC = this.model.gidgrp.cbs.mac;
-            cbsMap.MAC2 = this.model.gidgrp.cbs.mac2;
-            cbsMap.OPC2 = this.model.gidgrp.cbs.opc2;
-            cbsMap.CNF = this.model.gidgrp.cbs.cnf;
-            liaccvRequest.cbsMap = cbsMap;
-
-            let ptsptaList = [];
-            if (this.model.gidgrp.apl.pts.extkey !== "") {
-                ptsptaList.push(this.buildPtspta(this.model.gidgrp.apl));
-            }
-            if (this.model.gidgrp.adv.pts.extkey !== "") {
-                ptsptaList.push(this.buildPtspta(this.model.gidgrp.adv));
-            }
-            if (this.model.gidgrp.ben.pts.extkey !== "") {
-                ptsptaList.push(this.buildPtspta(this.model.gidgrp.ben));
-            }
-            liaccvRequest.ptsList = ptsptaList;
-        }
-        liaccvRequest.transName = this.trnName;
-        if (!!window.sessionStorage.userId) {
-            liaccvRequest.userId = window.sessionStorage.userId;
-        } else {
-            liaccvRequest.userId = "ZL";
-        }
-        liaccvRequest.liaccvg = this.model.liaccv.liaccvg;
-        return liaccvRequest;
-    },
-
-    buildLiaccv(obj) {
-        let liaccvRequest = new LiaccvRequest().data;
-        let rec = {};
-        let cbsMap = {};
-        if (obj.trnName === "litopn") {
-            rec.objtyp = "LID";
-            rec.ownref = obj.model.lidgrp.rec.ownref;
-            rec.opndat = obj.model.lidgrp.rec.opndat;
-            rec.branchInr = obj.model.lidgrp.rec.branchinr;
-            liaccvRequest.rec = rec;
-
-            cbsMap.NOM1 = {
-                "cur":obj.model.lidgrp.cbs.nom1.cur,
-                "amt":obj.model.lidgrp.cbs.nom1.amt,
-            };
-
-            cbsMap.OPN1 = {};
-            
-            cbsMap.OPN2 = {
-                "cur":obj.model.lidgrp.cbs.opn2.cur,
-                "amt":obj.model.lidgrp.cbs.opn2.amt,
-            };
-
-            cbsMap.MAX = {
-                "cur":obj.model.lidgrp.cbs.max.cur,
-                "amt":obj.model.lidgrp.cbs.max.amt,
-            };
-
-            cbsMap.MAX2 = {
-                "cur":obj.model.lidgrp.cbs.max2.cur,
-                "amt":obj.model.lidgrp.cbs.max2.amt,
-            };
-
-            liaccvRequest.cbsMap = cbsMap;
-
-            let ptsptaList = [];
-            if (obj.model.lidgrp.apl.pts.extkey !== "") {
-                ptsptaList.push(obj.buildPtspta(obj.model.lidgrp.apl));
-            }
-            if (obj.model.lidgrp.adv.pts.extkey !== "") {
-                ptsptaList.push(obj.buildPtspta(obj.model.lidgrp.adv));
-            }
-            if (obj.model.lidgrp.ben.pts.extkey !== "") {
-                ptsptaList.push(obj.buildPtspta(obj.model.lidgrp.ben));
-            }
-            liaccvRequest.ptsList = ptsptaList;
-        } else if (obj.trnName === "gitopn") {
-            rec.objtyp = "GID";
-            rec.ownref = obj.model.gidgrp.rec.ownref;
-            rec.opndat = obj.model.gidgrp.rec.opndat;
-            rec.expdat = obj.model.gidgrp.rec.expdat;
-            rec.branchInr = obj.model.gidgrp.rec.branchinr;
-            rec.hndtyp = obj.model.gidgrp.rec.hndtyp;
-            rec.gartyp = obj.model.gidgrp.rec.gartyp;
-            rec.fingua = obj.model.gidgrp.rec.fingua;
-            rec.segtyp = obj.model.gidgrp.ghd.segtyp;
-            rec.fromflg = obj.model.gidgrp.rec.fromflg;
-            rec.othersno= obj.model.gidgrp.rec.othersno;
-            rec.sndto = obj.model.gidgrp.rec.sndto;
-            rec.swiftflg = obj.model.gitp.swiftflg;
-            rec.giduil = obj.model.gidgrp.rec.giduil;
-            rec.purpos = obj.model.gidgrp.rec.purpos;
-            rec.revflg = obj.model.gidgrp.rec.revflg;
-            rec.cnfsta = obj.model.gidgrp.rec.cnfsta;
-            liaccvRequest.rec = rec;
-
-            cbsMap.MAX = obj.model.gidgrp.cbs.max;
-            cbsMap.OPN1 = obj.model.gidgrp.cbs.opn1;
-            cbsMap.MAC = obj.model.gidgrp.cbs.mac;
-            cbsMap.MAC2 = obj.model.gidgrp.cbs.mac2;
-            cbsMap.OPC2 = obj.model.gidgrp.cbs.opc2;
-            cbsMap.CNF = obj.model.gidgrp.cbs.cnf;
-            liaccvRequest.cbsMap = cbsMap;
-
-            let ptsptaList = [];
-            if (obj.model.gidgrp.apl.pts.extkey !== "") {
-                ptsptaList.push(obj.buildPtspta(obj.model.gidgrp.apl));
-            }
-            if (obj.model.gidgrp.adv.pts.extkey !== "") {
-                ptsptaList.push(obj.buildPtspta(obj.model.gidgrp.adv));
-            }
-            if (obj.model.gidgrp.ben.pts.extkey !== "") {
-                ptsptaList.push(obj.buildPtspta(obj.model.gidgrp.ben));
-            }
-            liaccvRequest.ptsList = ptsptaList;
-        }
-        liaccvRequest.transName = obj.trnName;
-        if (!!window.sessionStorage.userId) {
-            liaccvRequest.userId = window.sessionStorage.userId;
-        } else {
-            liaccvRequest.userId = "ZL";
-        }
-        liaccvRequest.liaccvg = obj.model.liaccv.liaccvg;
-        liaccvRequest.oldamt = obj.model.liaccv.oldamt;
-        liaccvRequest.chgamt = obj.model.liaccv.chgamt;
-        liaccvRequest.concur = obj.model.liaccv.concur;
-        return liaccvRequest;
-    },
-
-    async processLiaccv() {
-        //组数据，发post请求
-        const loading = this.loading("正在请求数据")
-        let rulePath = "/service/liaccv/assertLiaccv";
-        let liaccvRequest = this.buildLiaccvRequest();
-        let rtnmsg = await Api.post(rulePath, liaccvRequest);
-        if (rtnmsg.respCode == SUCCESS) {
-            Utils.copyValueFromVO(this.model.liaccv, rtnmsg.data);
-        }
-        loading.close();
+  async processLiaccv(liaccvRequest) {
+    const loading = this.loading('正在请求数据');
+    let rtnmsg = await Api.post('/service/liaccv/assertLiaccv', liaccvRequest);
+    if (rtnmsg.respCode == SUCCESS) {
+      Utils.copyValueFromVO(this.model.liaccv, rtnmsg.data);
     }
-}
+    loading.close();
+  },
+};

src/components/business/docpan/event/index.js

-import TrndocRequest from '../model/TrndocRequest.js';
 import Api from '~/service/Api';
 import Utils from '~/utils';
 
-
 export default {
-  buildPtspta(ptsptaObj) {
-    let ptspta = {};
-    let pts = ptsptaObj.pts;
-    ptspta.rol = pts.rol;
-    ptspta.name = pts.nam;
-    ptspta.ptyinr = pts.ptyinr;
-    ptspta.ptainr = pts.ptainr;
-    ptspta.extkey = pts.extkey;
-    ptspta.dftdsp = pts.dftdsp;
-    ptspta.dftcur = pts.dftcur;
-    ptspta.dftact = pts.dftact;
-    ptspta.dftfeecur = pts.dftfeecur;
-    ptspta.dftactptainr = pts.dftactptainr;
-    ptspta.glggrpflg = pts.glggrpflg;
-    ptspta.adrblk = pts.adrblk;
-    return ptspta;
-  },
-  // 处理Litopn数据
-  buildTrndocLitopn () {
-    let trndocRequest = new TrndocRequest().data;
-    let rec = {};
-    let cbsMap = {};
-    rec.objtyp = 'LID';
-    rec.ownref = this.model.lidgrp.rec.ownref;
-    rec.opndat = this.model.lidgrp.rec.opndat;
-    rec.branchInr = this.model.lidgrp.rec.branchinr;
-    trndocRequest.rec = rec;
-
-    cbsMap.NOM1 = {
-      'cur':this.model.lidgrp.cbs.nom1.cur,
-      'amt':this.model.lidgrp.cbs.nom1.amt,
-    };
-
-    let ptsptaList = [];
-    if (this.model.lidgrp.apl.pts.extkey !== '') {
-      ptsptaList.push(this.buildPtspta(this.model.lidgrp.apl));
-    }
-    if (this.model.lidgrp.adv.pts.extkey !== '') {
-      ptsptaList.push(this.buildPtspta(this.model.lidgrp.adv));
-    }
-    if (this.model.lidgrp.ben.pts.extkey !== '') {
-      ptsptaList.push(this.buildPtspta(this.model.lidgrp.ben));
-    }
-    trndocRequest.ptsList = ptsptaList;
-    return trndocRequest
-  },
-  // 处理Gitopn数据
-  buildTrndocGitopn () {
-    let trndocRequest = new TrndocRequest().data;
-    let rec = {};
-    rec.objtyp = 'GID';
-    rec.ownref = this.model.gidgrp.rec.ownref;
-    rec.opndat = this.model.gidgrp.rec.opndat;
-    rec.expdat = this.model.gidgrp.rec.expdat;
-    rec.branchInr = this.model.gidgrp.rec.branchinr;
-    rec.hndtyp = this.model.gidgrp.rec.hndtyp;
-    rec.gartyp = this.model.gidgrp.rec.gartyp;
-    rec.fingua = this.model.gidgrp.rec.fingua;
-    rec.segtyp = this.model.gidgrp.ghd.segtyp;
-    rec.fromflg = this.model.gidgrp.rec.fromflg;
-    rec.othersno= this.model.gidgrp.rec.othersno;
-    rec.sndto = this.model.gidgrp.rec.sndto;
-    rec.swiftflg = this.model.gitp.swiftflg;
-    rec.giduil = this.model.gidgrp.rec.giduil;
-    rec.purpos = this.model.gidgrp.rec.purpos;
-    rec.revflg = this.model.gidgrp.rec.revflg;
-    rec.cnfsta = this.model.gidgrp.rec.cnfsta;
-    trndocRequest.rec = rec;
-
-    let ptsptaList = [];
-    if (this.model.gidgrp.apl.pts.extkey !== '') {
-        ptsptaList.push(this.buildPtspta(this.model.gidgrp.apl));
-    }
-    if (this.model.gidgrp.adv.pts.extkey !== '') {
-        ptsptaList.push(this.buildPtspta(this.model.gidgrp.adv));
-    }
-    if (this.model.gidgrp.ben.pts.extkey !== '') {
-        ptsptaList.push(this.buildPtspta(this.model.gidgrp.ben));
-    }
-    trndocRequest.ptsList = ptsptaList;
-    return trndocRequest
-  },
-  // 整合各交易的数据
-  buildTrndocRequest() {
-    let trndocRequest = new TrndocRequest().data;
-    switch (this.trnName) {
-      case 'litopn':
-        trndocRequest = this.buildTrndocLitopn()
-        break
-      case 'gitopn':
-        trndocRequest = this.buildTrndocGitopn()
-        break
-      default:
-        return
-    }
-    trndocRequest.transName = this.trnName;
-    
-    let userId = window.sessionStorage.userId
-    trndocRequest.userId = !!userId ? userId : 'ZL'
-    return trndocRequest;
-  },
-
-  async processTrndoc() {
-    //组数据，发post请求
+  async processTrndoc(trndocRequest) {
     const loading = this.loading('正在请求数据')
-    let rulePath = '/service/docpan/assertTrndoc';
-    let trndocRequest = this.buildTrndocRequest();
-    let rtnmsg = await Api.post(rulePath, trndocRequest);
+    let rtnmsg = await Api.post('/service/docpan/assertTrndoc', trndocRequest);
     if (rtnmsg.respCode == SUCCESS) {
         Utils.copyValueFromVO(this.model.docpan, rtnmsg.data);
     }

src/components/business/engp/event/index.js

-import LiaallRequest from '../model/LiaallRequest.js';
 import Api from '~/service/Api';
 import Utils from '~/utils';
 
-
 export default {
-  buildPtspta(ptsptaObj) {
-    let ptspta = {};
-    let pts = ptsptaObj.pts;
-    ptspta.rol = pts.rol;
-    ptspta.name = pts.nam;
-    ptspta.ptyinr = pts.ptyinr;
-    ptspta.ptainr = pts.ptainr;
-    ptspta.extkey = pts.extkey;
-    ptspta.dftdsp = pts.dftdsp;
-    ptspta.dftcur = pts.dftcur;
-    ptspta.dftact = pts.dftact;
-    ptspta.dftfeecur = pts.dftfeecur;
-    ptspta.dftactptainr = pts.dftactptainr;
-    ptspta.glggrpflg = pts.glggrpflg;
-    ptspta.adrblk = pts.adrblk;
-    return ptspta;
-  },
-  // 处理Litopn数据
-  buildLiaccvLitopn () {
-    let liaallRequest = new LiaallRequest().data;
-    let rec = {};
-    let cbsMap = {};
-    rec.objtyp = 'LID';
-    rec.ownref = this.model.lidgrp.rec.ownref;
-    rec.opndat = this.model.lidgrp.rec.opndat;
-    rec.branchInr = this.model.lidgrp.rec.branchinr;
-    liaallRequest.rec = rec;
-
-    cbsMap.NOM1 = {
-      'cur':this.model.lidgrp.cbs.nom1.cur,
-      'amt':this.model.lidgrp.cbs.nom1.amt,
-    };
-
-    cbsMap.OPN1 = {};
-    
-    cbsMap.OPN2 = {
-      'cur':this.model.lidgrp.cbs.opn2.cur,
-      'amt':this.model.lidgrp.cbs.opn2.amt,
-    };
-
-    cbsMap.MAX = {
-      'cur':this.model.lidgrp.cbs.max.cur,
-      'amt':this.model.lidgrp.cbs.max.amt,
-    };
-
-    cbsMap.MAX2 = {
-      'cur':this.model.lidgrp.cbs.max2.cur,
-      'amt':this.model.lidgrp.cbs.max2.amt,
-    };
-
-    liaallRequest.cbsMap = cbsMap;
-
-    let ptsptaList = [];
-    if (this.model.lidgrp.apl.pts.extkey !== '') {
-      ptsptaList.push(this.buildPtspta(this.model.lidgrp.apl));
-    }
-    if (this.model.lidgrp.adv.pts.extkey !== '') {
-      ptsptaList.push(this.buildPtspta(this.model.lidgrp.adv));
-    }
-    if (this.model.lidgrp.ben.pts.extkey !== '') {
-      ptsptaList.push(this.buildPtspta(this.model.lidgrp.ben));
-    }
-    liaallRequest.ptsList = ptsptaList;
-    return liaallRequest;
-  },
-  // 处理Gitopn数据
-  buildLiaccvGitopn () {
-    let liaallRequest = new LiaallRequest().data;
-    let rec = {};
-    let cbsMap = {};
-    rec.objtyp = 'GID';
-    rec.ownref = this.model.gidgrp.rec.ownref;
-    rec.opndat = this.model.gidgrp.rec.opndat;
-    rec.expdat = this.model.gidgrp.rec.expdat;
-    rec.branchInr = this.model.gidgrp.rec.branchinr;
-    rec.hndtyp = this.model.gidgrp.rec.hndtyp;
-    rec.gartyp = this.model.gidgrp.rec.gartyp;
-    rec.fingua = this.model.gidgrp.rec.fingua;
-    rec.segtyp = this.model.gidgrp.ghd.segtyp;
-    rec.fromflg = this.model.gidgrp.rec.fromflg;
-    rec.othersno= this.model.gidgrp.rec.othersno;
-    rec.sndto = this.model.gidgrp.rec.sndto;
-    rec.swiftflg = this.model.gitp.swiftflg;
-    rec.giduil = this.model.gidgrp.rec.giduil;
-    rec.purpos = this.model.gidgrp.rec.purpos;
-    rec.revflg = this.model.gidgrp.rec.revflg;
-    rec.cnfsta = this.model.gidgrp.rec.cnfsta;
-    liaallRequest.rec = rec;
-
-    cbsMap.MAX = this.model.gidgrp.cbs.max;
-    cbsMap.OPN1 = this.model.gidgrp.cbs.opn1;
-    cbsMap.MAC = this.model.gidgrp.cbs.mac;
-    cbsMap.MAC2 = this.model.gidgrp.cbs.mac2;
-    cbsMap.OPC2 = this.model.gidgrp.cbs.opc2;
-    cbsMap.CNF = this.model.gidgrp.cbs.cnf;
-    liaallRequest.cbsMap = cbsMap;
-
-    let ptsptaList = [];
-    if (this.model.gidgrp.apl.pts.extkey !== '') {
-      ptsptaList.push(this.buildPtspta(this.model.gidgrp.apl));
-    }
-    if (this.model.gidgrp.adv.pts.extkey !== '') {
-      ptsptaList.push(this.buildPtspta(this.model.gidgrp.adv));
-    }
-    if (this.model.gidgrp.ben.pts.extkey !== '') {
-      ptsptaList.push(this.buildPtspta(this.model.gidgrp.ben));
-    }
-    liaallRequest.ptsList = ptsptaList;
-    return liaallRequest
-  },
-  // 整合各交易的数据
-  buildLiaallRequest() {
-    let liaallRequest = new LiaallRequest().data;
-    switch (this.trnName) {
-      case 'litopn':
-        liaallRequest = this.buildLiaccvLitopn()
-        break
-      case 'gitopn':
-        liaallRequest = this.buildLiaccvGitopn()
-        break
-      default:
-        return
-    }
-    liaallRequest.liaallg = this.model.liaall.liaallg;
-    liaallRequest.transName = this.trnName;
-    
-    let userId = window.sessionStorage.userId
-    liaallRequest.userId = !!userId ? userId : 'ZL'
-    return liaallRequest;
-  },
-
-  async processLiaall() {
+  async processLiaall(liaallRequest) {
       //组数据，发post请求
       const loading = this.loading('正在请求数据')
-      let rulePath = '/service/liaall/assertLiaall';
-      let liaallRequest = this.buildLiaallRequest();
-      let rtnmsg = await Api.post(rulePath, liaallRequest);
+      let rtnmsg = await Api.post('/service/liaall/assertLiaall', liaallRequest);
       if (rtnmsg.respCode == SUCCESS) {
         Utils.copyValueFromVO(this.model.liaall, rtnmsg.data);
       }

src/components/business/glentry/event/index.js

-import GlentryRequest from '../model/GlentryRequest.js';
 import Api from '~/service/Api';
 
 export default {
-  buildPtspta(ptsptaObj) {
-    let ptspta = {};
-    let pts = ptsptaObj.pts;
-    ptspta.rol = pts.rol;
-    ptspta.name = pts.nam;
-    ptspta.ptyinr = pts.ptyinr;
-    ptspta.ptainr = pts.ptainr;
-    ptspta.extkey = pts.extkey;
-    ptspta.dftdsp = pts.dftdsp;
-    ptspta.dftcur = pts.dftcur;
-    ptspta.dftact = pts.dftact;
-    ptspta.dftfeecur = pts.dftfeecur;
-    ptspta.dftactptainr = pts.dftactptainr;
-    ptspta.glggrpflg = pts.glggrpflg;
-    ptspta.adrblk = pts.adrblk;
-    return ptspta;
-  },
-  // 处理Litopn数据
-  buildGlentryLitopn () {
-    let glentryRequest = new GlentryRequest().data;
-    let rec = {};
-    let cbsMap = {};
-    rec.objtyp = 'LID';
-    rec.ownref = this.model.lidgrp.rec.ownref;
-    rec.opndat = this.model.lidgrp.rec.opndat;
-    rec.branchInr = this.model.lidgrp.rec.branchinr;
-    glentryRequest.rec = rec;
-
-    cbsMap.NOM1 = {
-      'cur':this.model.lidgrp.cbs.nom1.cur,
-      'amt':this.model.lidgrp.cbs.nom1.amt,
-    };
-
-    cbsMap.OPN1 = {};
-    
-    cbsMap.OPN2 = {
-      'cur':this.model.lidgrp.cbs.opn2.cur,
-      'amt':this.model.lidgrp.cbs.opn2.amt,
-    };
-
-    cbsMap.MAX = {
-      'cur':this.model.lidgrp.cbs.max.cur,
-      'amt':this.model.lidgrp.cbs.max.amt,
-    };
-
-    cbsMap.MAX2 = {
-      'cur':this.model.lidgrp.cbs.max2.cur,
-      'amt':this.model.lidgrp.cbs.max2.amt,
-    };
-
-    glentryRequest.cbsMap = cbsMap;
-
-    let ptsptaList = [];
-    if (this.model.lidgrp.apl.pts.extkey !== '') {
-      ptsptaList.push(this.buildPtspta(this.model.lidgrp.apl));
-    }
-    if (this.model.lidgrp.adv.pts.extkey !== '') {
-      ptsptaList.push(this.buildPtspta(this.model.lidgrp.adv));
-    }
-    if (this.model.lidgrp.ben.pts.extkey !== '') {
-      ptsptaList.push(this.buildPtspta(this.model.lidgrp.ben));
-    }
-    glentryRequest.ptsList = ptsptaList;
-    return glentryRequest;
-  },
-  // 处理Gitopn数据
-  buildGlentryGitopn () {
-    let glentryRequest = new GlentryRequest().data;
-    let rec = {};
-    let cbsMap = {};
-    rec.objtyp = 'GID';
-    rec.ownref = this.model.gidgrp.rec.ownref;
-    rec.opndat = this.model.gidgrp.rec.opndat;
-    rec.expdat = this.model.gidgrp.rec.expdat;
-    rec.branchInr = this.model.gidgrp.rec.branchinr;
-    rec.hndtyp = this.model.gidgrp.rec.hndtyp;
-    rec.gartyp = this.model.gidgrp.rec.gartyp;
-    rec.fingua = this.model.gidgrp.rec.fingua;
-    rec.segtyp = this.model.gidgrp.ghd.segtyp;
-    rec.fromflg = this.model.gidgrp.rec.fromflg;
-    rec.othersno= this.model.gidgrp.rec.othersno;
-    rec.sndto = this.model.gidgrp.rec.sndto;
-    rec.swiftflg = this.model.gitp.swiftflg;
-    rec.giduil = this.model.gidgrp.rec.giduil;
-    rec.purpos = this.model.gidgrp.rec.purpos;
-    rec.revflg = this.model.gidgrp.rec.revflg;
-    rec.cnfsta = this.model.gidgrp.rec.cnfsta;
-    glentryRequest.rec = rec;
-
-    cbsMap.MAX = this.model.gidgrp.cbs.max;
-    cbsMap.OPN1 = this.model.gidgrp.cbs.opn1;
-    cbsMap.MAC = this.model.gidgrp.cbs.mac;
-    cbsMap.MAC2 = this.model.gidgrp.cbs.mac2;
-    cbsMap.OPC2 = this.model.gidgrp.cbs.opc2;
-    cbsMap.CNF = this.model.gidgrp.cbs.cnf;
-    glentryRequest.cbsMap = cbsMap;
-
-    let ptsptaList = [];
-    if (this.model.gidgrp.apl.pts.extkey !== '') {
-      ptsptaList.push(this.buildPtspta(this.model.gidgrp.apl));
-    }
-    if (this.model.gidgrp.adv.pts.extkey !== '') {
-      ptsptaList.push(this.buildPtspta(this.model.gidgrp.adv));
-    }
-    if (this.model.gidgrp.ben.pts.extkey !== '') {
-      ptsptaList.push(this.buildPtspta(this.model.gidgrp.ben));
-    }
-    glentryRequest.ptsList = ptsptaList;
-    return glentryRequest
-  },
-  // 整合各交易的数据
-  buildGlentryRequest() {
-    let glentryRequest = new GlentryRequest().data;
-    switch (this.trnName) {
-      case 'litopn':
-        glentryRequest = this.buildGlentryLitopn()
-        break
-      case 'gitopn':
-        glentryRequest = this.buildGlentryGitopn()
-        break
-      default:
-        return
-    }
-    glentryRequest.liaallg = this.model.liaall.liaallg;
-    glentryRequest.setfog = this.model.setmod.setfog;
-    glentryRequest.setfeg = this.model.setmod.setfeg;
-    glentryRequest.setglg = this.model.setmod.setglg;
-    glentryRequest.transName = this.trnName;
-
-    let userId = window.sessionStorage.userId
-    glentryRequest.userId = !!userId ? userId : 'ZL'
-    return glentryRequest;
-  },
-
-  async processGlentry() {
+  async processGlentry(glentryRequest) {
     //组数据，发post请求
     const loading = this.loading('正在请求数据')
-    let rulePath = '/service/gle/assertGle';
-    let glentryRequest = this.buildGlentryRequest();
-    let rtnmsg = await Api.post(rulePath, glentryRequest);
+    let rtnmsg = await Api.post('/service/gle/assertGle', glentryRequest);
     if (rtnmsg.respCode == SUCCESS) {
       this.model.setmod.glemod.gleshwstm = rtnmsg.data.gleshwstm;
     }
     loading.close();
   }
-}
+}
\ No newline at end of file

src/components/business/setmod/event/index.js

 import Api from '~/service/Api';
-import SetfegRequest from '../model/SetfegRequest.js';
-import SetglgRequest from '../model/SetglgRequest.js';
 
-export default {
-  buildPtspta (ptsptaObj) {
-    let ptspta = {};
-    let pts = ptsptaObj.pts;
-    ptspta.rol = pts.rol;
-    ptspta.name = pts.nam;
-    ptspta.ptyinr = pts.ptyinr;
-    ptspta.ptainr = pts.ptainr;
-    ptspta.extkey = pts.extkey;
-    ptspta.dftdsp = pts.dftdsp;
-    ptspta.dftcur = pts.dftcur;
-    ptspta.dftact = pts.dftact;
-    ptspta.dftfeecur = pts.dftfeecur;
-    ptspta.dftactptainr = pts.dftactptainr;
-    ptspta.glggrpflg = pts.glggrpflg;
-    ptspta.adrblk = pts.adrblk;
-    return ptspta;
-  },
-  // Setfeg关于Listopn的处理
-  buildSetfegLitopn () {
-    let setfegRequest = new SetfegRequest().data;
-    let rec = {};
-    let cbsMap = {};
-    rec.objtyp = 'LID';
-    rec.ownref = this.model.lidgrp.rec.ownref;
-    rec.opndat = this.model.lidgrp.rec.opndat;
-    rec.expdat = this.model.lidgrp.rec.expdat;
-    rec.branchInr = this.model.lidgrp.rec.branchinr;
-    setfegRequest.rec = rec;
-
-    cbsMap.NOM1 = {
-      'cur': this.model.lidgrp.cbs.nom1.cur,
-      'amt': this.model.lidgrp.cbs.nom1.amt,
-    };
-
-    cbsMap.OPN1 = {};
-    
-    cbsMap.OPN2 = {
-      'cur': this.model.lidgrp.cbs.opn2.cur,
-      'amt': this.model.lidgrp.cbs.opn2.amt,
-    };
-
-    cbsMap.MAX = {
-      'cur': this.model.lidgrp.cbs.max.cur,
-      'amt': this.model.lidgrp.cbs.max.amt,
-    };
-
-    cbsMap.MAX2 = {
-      'cur': this.model.lidgrp.cbs.max2.cur,
-      'amt': this.model.lidgrp.cbs.max2.amt,
-    };
-
-    setfegRequest.cbsMap = cbsMap;
-
-    let ptsptaList = [];
-    if (this.model.lidgrp.apl.pts.extkey !== '') {
-      ptsptaList.push(this.buildPtspta(this.model.lidgrp.apl));
-    }
-    if (this.model.lidgrp.adv.pts.extkey !== '') {
-      ptsptaList.push(this.buildPtspta(this.model.lidgrp.adv));
-    }
-    if (this.model.lidgrp.ben.pts.extkey !== '') {
-      ptsptaList.push(this.buildPtspta(this.model.lidgrp.ben));
-    }
-    setfegRequest.ptsList = ptsptaList;
-    return setfegRequest
-  },
-  // Setfeg关于Gitopn的处理
-  buildSetfegGitopn () {
-    let setfegRequest = new SetfegRequest().data;
-    let rec = {};
-    let cbsMap = {};
-    rec.objtyp = 'GID';
-    rec.ownref = this.model.gidgrp.rec.ownref;
-    rec.opndat = this.model.gidgrp.rec.opndat;
-    rec.expdat = this.model.gidgrp.rec.expdat;
-    rec.branchInr = this.model.gidgrp.rec.branchinr;
-    rec.hndtyp = this.model.gidgrp.rec.hndtyp;
-    rec.gartyp = this.model.gidgrp.rec.gartyp;
-    rec.fingua = this.model.gidgrp.rec.fingua;
-    rec.segtyp = this.model.gidgrp.ghd.segtyp;
-    rec.fromflg = this.model.gidgrp.rec.fromflg;
-    rec.othersno= this.model.gidgrp.rec.othersno;
-    rec.sndto = this.model.gidgrp.rec.sndto;
-    rec.swiftflg = this.model.gitp.swiftflg;
-    rec.giduil = this.model.gidgrp.rec.giduil;
-    rec.purpos = this.model.gidgrp.rec.purpos;
-    rec.revflg = this.model.gidgrp.rec.revflg;
-    rec.cnfsta = this.model.gidgrp.rec.cnfsta;
-    setfegRequest.rec = rec;
-
-    cbsMap.MAX = this.model.gidgrp.cbs.max;
-    cbsMap.OPN1 = this.model.gidgrp.cbs.opn1;
-    cbsMap.MAC = this.model.gidgrp.cbs.mac;
-    cbsMap.MAC2 = this.model.gidgrp.cbs.mac2;
-    cbsMap.OPC2 = this.model.gidgrp.cbs.opc2;
-    cbsMap.CNF = this.model.gidgrp.cbs.cnf;
-    setfegRequest.cbsMap = cbsMap;
-
-    let ptsptaList = [];
-    if (this.model.gidgrp.apl.pts.extkey !== '') {
-      ptsptaList.push(this.buildPtspta(this.model.gidgrp.apl));
-    }
-    if (this.model.gidgrp.adv.pts.extkey !== '') {
-      ptsptaList.push(this.buildPtspta(this.model.gidgrp.adv));
-    }
-    if (this.model.gidgrp.ben.pts.extkey !== '') {
-      ptsptaList.push(this.buildPtspta(this.model.gidgrp.ben));
-    }
-    setfegRequest.ptsList = ptsptaList;
-    return setfegRequest
-  },
-  // 处理Setfeg数据
-  buildSetfegRequest() {
-    let setfegRequest = new SetfegRequest().data;
-    switch (this.trnName) {
-      case 'litopn':
-        setfegRequest = this.buildSetfegLitopn()
-        setfegRequest.liaall = this.model.liaall;
-        setfegRequest.liaccv = this.model.liaccv;
-        break
-      case 'gitopn':
-        setfegRequest = this.buildSetfegGitopn()
-        setfegRequest.liaall = this.model.liaall;
-        setfegRequest.liaccv = this.model.liaccv;
-        break
-      default:
-        return
-    }
-    setfegRequest.doceot = this.model.trnmod.trndoc.doceot;
-    setfegRequest.transName = this.trnName;
-    let userId = window.sessionStorage.userId
-    setfegRequest.userId = !!userId ? userId : 'ZL'
-    return setfegRequest;
-  },
-  // 处理setglg数据
-  buildSetglgRequest() {
-    let setglgRequest = new SetglgRequest().data;
-    switch (this.trnName) {
-      case 'litopn':
-        setglgRequest = this.buildSetfegLitopn()
-        break
-      case 'gitopn':
-        setglgRequest = this.buildSetfegGitopn()
-        break
-      default:
-        return
-    }
-    setglgRequest.setfeg = this.model.setmod.setfeg;
-    setglgRequest.transName = this.trnName;
-    let userId = window.sessionStorage.userId
-    setglgRequest.userId = !!userId ? userId : 'ZL'
-    return setglgRequest;
-  },
-
-  async processSetpan() {
-    //组数据，发post请求
+export default { 
+  async processSetpan(setfegRequest, setglgRequest) {
     let loading = this.loading('正在请求试算费用');
-    let rulePath = '/service/setmod/calcSettleDetail';
-    let setfegRequest = this.buildSetfegRequest();
-    let rtnmsg = await Api.post(rulePath, setfegRequest);
+    let rtnmsg = await Api.post('/service/setmod/calcSettleDetail', setfegRequest);
     if (rtnmsg.respCode == SUCCESS) {
       this.model.setmod.setfeg = rtnmsg.data.setfeg;
       this.model.setmod.ref = rtnmsg.data.ref;
       this.model.setmod.doccur = rtnmsg.data.doccur;
       this.model.setmod.docamt = rtnmsg.data.docamt;
+      // 试算账务
       if (this.model.setmod.setfeg.setfel.length > 0) {
         loading = this.loading('正在请求试算账务');
-        rulePath = '/service/setmod/calcPayDetail';
-        let setglgRequest = this.buildSetglgRequest();
-        rtnmsg = await Api.post(rulePath, setglgRequest);
-        if (rtnmsg.respCode == SUCCESS) {
-          this.model.setmod.setglg = rtnmsg.data.setglg;
+        let res = await Api.post('/service/setmod/calcPayDetail', setglgRequest);
+        if (res.respCode == SUCCESS) {
+          this.model.setmod.setglg = res.data.setglg;
         }
       }
     }

src/mixin/commonFunctions.js

+export default {
+  methods: {
+    loading(text) {
+      const loading = this.$loading({
+        lock: true,
+        text,
+        spinner: 'el-icon-loading',
+        background: 'rgba(200, 200, 200, 0.3)',
+      });
+      return loading;
+    },
+  },
+};