Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs into settle-test-20230110

src/business/gitopn/model/index.js

@@ -330,6 +330,9 @@ export default class Gitopn{
 								cnfdat:"",			//  Confirmation Date		.gidgrp.rec.cnfdat
 								reccnfdet:"",			//  Confirm. Instr.		.gidgrp.rec.reccnfdet
 								cnfdet:"",			//  Confirm. Instr.		.gidgrp.rec.cnfdet
+								branchinr:"",
+								fromflg:"",			//来源系统
+								othersno:""			//第三方系统编号
 							},
 							blk:{
 								covgodsrv:"",			//  Object of Contract		.gidgrp.blk.covgodsrv

src/business/gitopn/views/index.vue

@@ -48,7 +48,7 @@
             </el-tab-pane>
 
             <!--PD000027 -->
-            <el-tab-pane label="会计分录" name="glentry">
+            <el-tab-pane label="会计分录" name="glepan">
               <c-content>
                   <m-glentry :model="model" :codes="codes" />
               </c-content>

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;
+        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;
+    },
+    buildTrndocRequest() {
+        let trndocRequest = new TrndocRequest().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;
+            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;
+        } 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;
+            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;
+        }
+        trndocRequest.transName = this.trnName;
+        if (!!window.sessionStorage.userId) {
+            trndocRequest.userId = window.sessionStorage.userId;
+        } else {
+            trndocRequest.userId = "ZL";
+        }
+        return trndocRequest;
+    },
+
+    async processTrndoc() {
+        //组数据，发post请求
+        const loading = this.loading("正在请求数据")
+        let rulePath = "/service/docpan/assertTrndoc";
+        let trndocRequest = this.buildTrndocRequest();
+        let rtnmsg = await Api.post(rulePath, trndocRequest);
+        if (rtnmsg.respCode == SUCCESS) {
+            Utils.copyValueFromVO(this.model.docpan, rtnmsg.data);
+        }
+        loading.close();
+    }
+}
\ No newline at end of file

src/components/business/docpan/model/TrndocRequest.js

+export default class TrndocRequest {
+    constructor() {
+        this.data = {
+            transName: "",
+            userId: "",
+            rec: {},
+            amdRec: {},
+            ptsList: []
+        }
+    }
+}
\ No newline at end of file

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

@@ -18,17 +18,8 @@ export default {
         ptspta.dftact=pts.dftact;
         ptspta.dftfeecur=pts.dftfeecur;
         ptspta.dftactptainr=pts.dftactptainr;
-        //ptspta.dftselrol=
         ptspta.glggrpflg=pts.glggrpflg;
-        //ptspta.pansta=
-        //ptspta.ptytyp=
-        //ptspta.ptyextkey=
         ptspta.adrblk=pts.adrblk;
-        //ptspta.rolsetflg=
-        if (adr !== null && adr !== undefined) {
-            ptspta.adrbic=adr.bic;
-            ptspta.adrLoccty=adr.loccty;
-        }
         return ptspta;
     },
     buildLiaallRequest() {
@@ -77,6 +68,45 @@ export default {
                 ptsptaList.push(this.buildPtspta(this.model.lidgrp.ben));
             }
             liaallRequest.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;
+            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;
         }
         liaallRequest.transName = this.trnName;
         if (!!window.sessionStorage.userId) {

src/components/business/engp/model/LiaallRequest.js

@@ -3,15 +3,7 @@ export default class LiaallRequest {
         this.data = {
             transName: "",
             userId: "",
-            rec: {
-                inr: "",
-                objtyp: "",
-                ownref: "",
-                opndat: "",
-                branchInr: "",
-                swftyp: "",
-                fintyp: ""
-            },
+            rec: {},
             amdRec: {
                 engamt: "",
                 amecur: ""

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

@@ -18,17 +18,8 @@ export default {
         ptspta.dftact=pts.dftact;
         ptspta.dftfeecur=pts.dftfeecur;
         ptspta.dftactptainr=pts.dftactptainr;
-        //ptspta.dftselrol=
         ptspta.glggrpflg=pts.glggrpflg;
-        //ptspta.pansta=
-        //ptspta.ptytyp=
-        //ptspta.ptyextkey=
         ptspta.adrblk=pts.adrblk;
-        //ptspta.rolsetflg=
-        if (adr !== null && adr !== undefined) {
-            ptspta.adrbic=adr.bic;
-            ptspta.adrLoccty=adr.loccty;
-        }
         return ptspta;
     },
     buildGlentryRequest() {
@@ -78,6 +69,46 @@ export default {
             }
             glentryRequest.ptsList = ptsptaList;
             glentryRequest.liaallg = this.model.liaall.liaallg;
+        } 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;
+            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;
+            glentryRequest.liaallg = this.model.liaall.liaallg;
         }
         glentryRequest.setfog = this.model.setmod.setfog;
         glentryRequest.setfeg = this.model.setmod.setfeg;

src/components/business/glentry/model/GlentryRequest.js

@@ -4,14 +4,7 @@ export default class GlentryRequest {
             transName: "",
             userId: "",
             rec: {
-                inr: "",
-                objtyp: "",
-                ownref: "",
-                opndat: "",
-                expdat: "",
-                branchInr: "",
-                swftyp: "",
-                fintyp: ""
+                
             },
             cbsMap: {
                 OPN2: {

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

@@ -80,6 +80,46 @@ export default {
             }
             setfegRequest.ptsList = ptsptaList;
             setfegRequest.liaall = this.model.liaall;
+        } 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;
+            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;
+            setfegRequest.liaall = this.model.liaall;
         }
         //setfegRequest.ptydet = ptydetList;
         setfegRequest.doceot=this.model.trnmod.trndoc.doceot;
@@ -139,7 +179,45 @@ export default {
                 ptsptaList.push(this.buildPtspta(this.model.lidgrp.ben));
             }
             setglgRequest.ptsList = ptsptaList;
-            setglgRequest.liaall = this.model.liaall;
+        } 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;
+            setglgRequest.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;
+            setglgRequest.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));
+            }
+            setglgRequest.ptsList = ptsptaList;
         }
         setglgRequest.transName = this.trnName;
         if (!!window.sessionStorage.userId) {

src/components/business/setmod/model/SetfegRequest.js

@@ -4,13 +4,7 @@ export default class SetfegRequest {
             transName: "",
             userId: "",
             rec: {
-                inr: "",
-                objtyp: "",
-                ownref: "",
-                opndat: "",
-                branchInr: "",
-                swftyp: "",
-                fintyp: ""
+                
             },
             amdRec: {
                 maxamt: "",

src/components/business/setmod/model/SetglgRequest.js

@@ -4,14 +4,7 @@ export default class SetglgRequest {
             transName: "",
             userId: "",
             rec: {
-                inr: "",
-                objtyp: "",
-                ownref: "",
-                opndat: "",
-                expdat: "",
-                branchInr: "",
-                swftyp: "",
-                fintyp: ""
+               
             },
             amdRec: {
                 maxamt: "",

src/mixin/commonProcess.js

@@ -3,6 +3,7 @@ import commonApi from "./commonApi"
 import SettleEvent from "~/components/business/setmod/event"
 import LiaallEvent from "~/components/business/engp/event"
 import GletnryEvent from "~/components/business/glentry/event"
+import DocpanEvent from "~/components/business/docpan/event"
 import commonGlobalSearch from "./commonGlobalSearch";
 import Utils from "~/utils"
 import _ from "~/utils/Lodash.js";
@@ -59,6 +60,7 @@ export default {
     ...SettleEvent,
     ...LiaallEvent,
     ...GletnryEvent,
+    ...DocpanEvent,
     /**
      * 表单校验 rules 的赋值
      * @returns void
@@ -170,6 +172,10 @@ export default {
          this.processSetpan();
          return;
       }
+      if (name === "docpan") {
+        this.processTrndoc();
+        return;
+     }
       if (name === "glepan") {
         this.processGlentry();
         return;

src/model/Gitopn/index.js

@@ -331,6 +331,9 @@ export default class Gitopn{
 								cnfdat:"",			//  Confirmation Date		.gidgrp.rec.cnfdat
 								reccnfdet:"",			//  Confirm. Instr.		.gidgrp.rec.reccnfdet
 								cnfdet:"",			//  Confirm. Instr.		.gidgrp.rec.cnfdet
+								branchinr:"",
+								fromflg:"",			//来源系统
+								othersno:""			//第三方系统编号
 							},
 							blk:{
 								covgodsrv:"",			//  Object of Contract		.gidgrp.blk.covgodsrv