gitcan，gitopn公共页面修改，

src/business/gitcan/event/buildCommons.js

 export default {
-  buildPtspta (ptsptaObj) {
+  buildPtspta(ptsptaObj) {
     let pts = ptsptaObj.pts;
     let ptspta = {
       rol: pts.rol,
@@ -13,36 +13,27 @@ export default {
       dftfeecur: pts.dftfeecur,
       dftactptainr: pts.dftactptainr,
       glggrpflg: pts.glggrpflg,
-      adrblk: pts.adrblk
+      adrblk: pts.adrblk,
     };
     return ptspta;
   },
-  buildCommonData (model, trnName) {
+  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',
+        objinr: model.gidgrp.rec.objinr,
         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,
+        segtyp: model.gidgrp.rec.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,
@@ -58,65 +49,104 @@ export default {
       },
       ptsList: ptsptaList,
       transName: trnName,
-      userId: window.sessionStorage.userId ? window.sessionStorage.userId : 'ZL'
+      userId: window.sessionStorage.userId
+        ? window.sessionStorage.userId
+        : 'ZL',
     };
-    return dataObj
+    return dataObj;
   },
-  buildSetfeg (model, trnName) {
+  buildSetfeg(model, trnName) {
     let params = {
       ...this.buildCommonData(model, trnName),
       liaall: model.liaall,
       liaccv: model.liaccv,
       doceot: model.trnmod.trndoc.doceot,
     };
-    return params
+    return params;
   },
-  buildSetglg (model, trnName) {
+  buildSetglg(model, trnName) {
     let params = {
       ...this.buildCommonData(model, trnName),
       setfeg: model.setmod.setfeg,
     };
-    return params
+    return params;
   },
-  buildGlentry (model, trnName) {
+  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,
+      rec: {
+        objtyp: 'GID',
+        segtyp: model.gidgrp.rec.segtyp,
+        fromflg: model.gidgrp.rec.fromflg,
+        othersno: model.gidgrp.rec.othersno,
+        sndto: model.gidgrp.rec.sndto,
+        giduil: model.gidgrp.rec.giduil,
+        purpos: model.gidgrp.rec.purpos,
+        revflg: model.gidgrp.rec.revflg,
+        cnfsta: model.gidgrp.rec.cnfsta,
+      },
+      liaccv: model.liaccv,
+      doceot: model.trnmod.trndoc.doceot,
+      transName: trnName,
     };
-    return params
+    return params;
   },
-  builDengp (model, trnName) {
+  buildEngp(model, trnName) {
     let params = {
       ...this.buildCommonData(model, trnName),
-      liaallg: model.liaall.liaallg,
+      cbsMap: {
+        CNF: model.gidgrp.cbs.cnf,
+      },
+      liaccv: model.liaccv,
+      doceot: model.trnmod.trndoc.doceot,
+      transName: trnName,
+    };
+    params.rec = {
+      ...params.rec,
+      opndat: model.gidgrp.rec.opndat,
+      branchInr: model.gidgrp.rec.branchInr,
+      hndtyp: model.gidgrp.rec.hndtyp,
+      gartyp: model.gidgrp.rec.gartyp,
+      fingua: model.gidgrp.rec.fingua,
     };
-    return params
+    return params;
   },
-  builDocpan (model, trnName) {
+  buildDocpan(model, trnName) {
     let params = {
       ...this.buildCommonData(model, trnName),
+      rec: {
+        objtyp: 'GID',
+        fromflg: model.gidgrp.rec.fromflg,
+        othersno: model.gidgrp.rec.othersno,
+        sndto: model.gidgrp.rec.sndto,
+        giduil: model.gidgrp.rec.giduil,
+        purpos: model.gidgrp.rec.purpos,
+        cnfsta: model.gidgrp.rec.cnfsta,
+        revflg: model.gidgrp.rec.revflg,
+      },
+      liaccv: model.liaccv,
+      doceot: model.trnmod.trndoc.doceot,
+      transName: trnName,
     };
-    return params
+    return params;
   },
-  builCcvpan (model, trnName) {
+  buildCcvpan(model, trnName) {
     let params = {
       ...this.buildCommonData(model, trnName),
+    };
+    params.rec = {
+      ...params.rec,
+      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,
       liaccvg: model.liaccv.liaccvg,
       oldamt: model.liaccv.oldamt,
       chgamt: model.liaccv.chgamt,
       concur: model.liaccv.concur,
     };
-    return params
+    return params;
   },
-  // 公共组件setmod中dsp字段改变，触发联动时候的入参
-  buildSetgllAccts (model, trnName, setglg) {
-    let params = {
-      ...this.buildCommonData(model, trnName),
-      setglg
-    };
-    return params
-  }
-}
\ No newline at end of file
+};

src/business/gitcan/event/index.js

@@ -17,26 +17,32 @@ export default {
     ...ccvpan,
     async init () {
       const params = {
-        spt: {
-          bchname:  "中国光大银行北京分行",
-          cxmflg: "N",
-          expdat: null,
-          fromflg: "",
-          gartyp: "A",
-          grtnam: "",
-          hndtyp: "OL",
-          inr: "00000582",
-          iscrotra: "",
-          liadat: null,
-          opndat: 1680537600000,
-          othersno: "",
-          ownref: "LG3500231016AA",
-          ownusr: "ZL",
-          segtyp: "01"
-        }
+        // spt: {
+        //   bchname:  "中国光大银行北京分行",
+        //   cxmflg: "N",
+        //   expdat: null,
+        //   fromflg: "",
+        //   gartyp: "A",
+        //   grtnam: "",
+        //   hndtyp: "OL",
+        //   inr: "00000582",
+        //   iscrotra: "",
+        //   liadat: null,
+        //   opndat: 1680537600000,
+        //   othersno: "",
+        //   ownref: "LG3500231016AA",
+        //   ownusr: "ZL",
+        //   segtyp: "01",
+        //   sta:"111"
+        // }
+        
+          "transName":"gitcan",
+          "userId":"ZL",
+          "gidInr":"00000582"
       }
       const res = await Api.post('/service/gitcan/init', {
         ...params, 
+        sta:1122,
         transName: this.trnName,
         userId: window.sessionStorage.userId || 'ZL',
       });
@@ -62,17 +68,15 @@ export default {
       })
     },
     async tabClick(tab) {
-      if (this.isInDisplay) {
-        return;
-      }
+      console.log(tab)
       let name = tab.name;
       switch (name) {
         case 'ccvpan':
-          let ccvpanRequest = buildFn.builCcvpan(this.model, this.trnName);
+          let ccvpanRequest = buildFn.buildCcvpan(this.model, this.trnName);
           this.processLiaccv(ccvpanRequest);
           break;
         case 'engp':
-          let engpRequest = buildFn.builDengp(this.model, this.trnName);
+          let engpRequest = buildFn.buildEngp(this.model, this.trnName);
           this.processLiaall(engpRequest);
           break;
         case 'setpan':
@@ -83,7 +87,7 @@ export default {
           });
           break;
         case 'docpan':
-          let docpanRequest = buildFn.builDocpan(this.model, this.trnName);
+          let docpanRequest = buildFn.buildDocpan(this.model, this.trnName);
           this.processTrndoc(docpanRequest);
           break;
         case 'glepan':

src/business/gitcan/views/index.vue

@@ -34,22 +34,26 @@
           <m-mt769p :model="model" :codes="codes" />
         </el-tab-pane>
         <!--PD000027 -->
-         <el-tab-pane label="费用/账务" name="engp,setpan,glepan">
-         <c-content>
-           <div class="eibs-tab">
-             <el-collapse v-model="activeNames">
-               <el-collapse-item title="表外记账" name="engp">
-                 <!-- 表外记账 -->
-                 <m-engp :model="model" :codes="codes" />
-               </el-collapse-item>
-               <el-collapse-item title="结算" name="setpan">
-                 <!-- 结算 -->
-                 <m-setpan :model="model" :codes="codes" />
-               </el-collapse-item>
-             </el-collapse>
-           </div>
-         </c-content>
-       </el-tab-pane>
+        <el-tab-pane label="表外记账" name="engp">
+          <c-content>
+              <!-- 表外记账 -->
+              <m-engp :model="model" :codes="codes" />
+          </c-content>
+        </el-tab-pane>
+
+        <!--PD000027 -->
+        <el-tab-pane label="费用/账务" name="setpan">
+          <c-content>
+            <m-setpan :model="model" :codes="codes" />
+          </c-content>
+        </el-tab-pane>
+        
+        <!--PD000027 -->
+        <el-tab-pane label="会计分录" name="glepan">
+          <c-content>
+              <m-glentry :model="model" :codes="codes" />
+          </c-content>
+        </el-tab-pane>
        
         <!--PD000000 -->
         <el-tab-pane label="备查/附言" name="coninfp">
@@ -93,6 +97,8 @@ import Doctre from "~/views/Public/Doctre";
 import Ccvpan from "~/components/business/ccvpan/views";
 import Docpan from "~/components/business/docpan/views";
 import Setpan from "~/components/business/setmod/views";
+import Setmod from "~/components/business/setmod/views";
+import Glentry from "~/components/business/glentry/views";
 import Coninfp from "~/views/Public/Coninfp";
 import Mt769p from "./Mt769p";
 import Ovwp from "./Ovwp";
@@ -108,7 +114,9 @@ export default {
     "m-limitbody": Limitbody,
     "m-mt769p": Mt769p,
     "m-ovwp": Ovwp,
-    "m-ccvpan":Ccvpan
+    "m-ccvpan":Ccvpan,
+    "m-setmod":Setmod,
+    "m-glentry":Glentry
   },
   provide() {
     return {

src/business/gitopn/event/buildCommons.js

@@ -88,20 +88,20 @@ export default {
     };
     return params
   },
-  builDengp (model, trnName) {
+  buildEngp (model, trnName) {
     let params = {
       ...this.buildCommonData(model, trnName),
       liaallg: model.liaall.liaallg,
     };
     return params
   },
-  builDocpan (model, trnName) {
+  buildDocpan (model, trnName) {
     let params = {
       ...this.buildCommonData(model, trnName),
     };
     return params
   },
-  builCcvpan (model, trnName) {
+  buildCcvpan (model, trnName) {
     let params = {
       ...this.buildCommonData(model, trnName),
       liaccvg: model.liaccv.liaccvg,
@@ -119,4 +119,4 @@ export default {
     };
     return params
   }
-}
\ No newline at end of file
+}      
\ No newline at end of file

src/business/gitopn/event/index.js

@@ -53,11 +53,11 @@ export default {
       let name = tab.name;
       switch (name) {
         case 'ccvpan':
-          let ccvpanRequest = buildFn.builCcvpan(this.model, this.trnName);
+          let ccvpanRequest = buildFn.buildCcvpan(this.model, this.trnName);
           this.processLiaccv(ccvpanRequest);
           break;
         case 'engp':
-          let engpRequest = buildFn.builDengp(this.model, this.trnName);
+          let engpRequest = buildFn.buildEngp(this.model, this.trnName);
           this.processLiaall(engpRequest);
           break;
         case 'setpan':
@@ -68,7 +68,7 @@ export default {
           });
           break;
         case 'docpan':
-          let docpanRequest = buildFn.builDocpan(this.model, this.trnName);
+          let docpanRequest = buildFn.buildDocpan(this.model, this.trnName);
           this.processTrndoc(docpanRequest);
           break;
         case 'glepan':

src/business/gitopn/views/index.vue

@@ -138,7 +138,6 @@ import Engp from "~/components/business/engp/views";
 import Ccvpan from "~/components/business/ccvpan/views";
 import Setmod from "~/components/business/setmod/views";
 import Glentry from "~/components/business/glentry/views";
-import Coninfp from "~/views/Public/Coninfp";
 import Docpan from "~/components/business/docpan/views";
 import Doctre from "~/views/Public/Doctre";
 import Limitbody from "~/views/Public/Limitbody";
@@ -171,7 +170,6 @@ export default {
     "m-ccvpan": Ccvpan,
     "m-setmod": Setmod,
     "m-glentry": Glentry,
-    "m-coninfp": Coninfp,
     "m-docpan": Docpan,
     "m-doctre": Doctre,
     "m-limitbody": Limitbody,

src/components/business/docpan/views/index.vue

 <template>
   <div class="eibs-tab">
     <c-col :span="24" style="">
-      <c-istream-table-docpan :list="stmData.data" :columns="stmData.columns">
+      <el-table :data="stmData.data" :columns="stmData.columns">
         <el-table-column label="介质" width="110px">
           <template slot-scope="scope">
             <el-form-item
@@ -157,7 +157,7 @@
             >
           </template>
         </el-table-column>
-      </c-istream-table-docpan>
+      </el-table>
     </c-col>
     <c-col :span="12" style="margin-top: 20px">
       <c-col :span="24">
@@ -528,14 +528,7 @@ export default {
   watch: {
     'model.docpan.doceot': {
       handler(val, oldVal) {
-        var stm = [];
-        for (let i = 0; i < val.length; i++) {
-          if (val[i].role != '') {
-            val[i]['idx'] = i;
-            stm.push(val[i]);
-          }
-        }
-        this.stmData.data = stm;
+        this.stmData.data = val;
       },
       immediate: true,
     },

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

 import Api from '~/service/Api';
-import Utils from '~/utils';
 
 export default {
   async processLiaall(liaallRequest) {
@@ -7,7 +6,7 @@ export default {
       let objtyp = liaallRequest.rec.objtyp;
       let rtnmsg = await Api.post(`/service/${ objtyp.toLowerCase() }/liaall/assertLiaall`, liaallRequest);
       if (rtnmsg.respCode == SUCCESS) {
-        Utils.copyValueFromVO(this.model.liaall, rtnmsg.data);
+        this.model.liaall.liaallg = rtnmsg.data.liaallg
       }
       loading.close();
   }

src/components/business/glentry/views/index.vue

 <template>
   <div class="eibs">
     <c-col :span="24" style="">
-      <c-istream-table :list="data" :columns="columns"></c-istream-table>
+      <el-table
+          :data="data"
+          :columns="columns"
+          :showButtonFlg="true"
+        >
+          <el-table-column
+            v-for="(item, key) in columns"
+            :key="key"
+            :label="item.label"
+            :prop="item.prop"
+          ></el-table-column>
+      </el-table>
     </c-col>
   </div>
 </template>
@@ -17,15 +28,38 @@ export default {
   data() {
     return {
       columns: [
-        '2 1 "借/贷" 80 1 0',
-        '6 2  "账号" 200',
-        '3 3 "币种" 70',
-        '4 4 "金额" 150 2 8:1 2 5',
-        '5 5 "起息日" 150',
-        '7 6 "牌价类型" 100',
-        '8 7 "牌价" 100 2 0 1 0',
-        '9 8 "会计科目" 100',
-        '0 9 "分录序号" 100 1 0',
+        {
+          label: '借/贷',
+          prop: 'dbtcdt'
+        },
+        {
+          label: '账号',
+          prop: 'act'
+        },
+        {
+          label:'币种',
+          prop:'cur'
+        },
+        {
+          label:'金额',
+          prop:'amt'
+        },
+        {
+          label:'起息日',
+          prop:'valdat'
+        },
+        {
+          label:'牌价类型',
+          prop:'trmtyp'
+        },
+        {
+          label:'牌价',
+          prop:'sysamt'
+        },
+        {
+          label:'会计科目',
+          prop:'trnman'
+        },
       ],
       data: [],
     };
@@ -33,12 +67,10 @@ export default {
   watch: {
     //this.$refs.glepan.stmData.data = res.data.setmod_glemod_gleshwstm.rows;
     'model.setmod.glemod.gleshwstm': {
-      handler(val, oldVal) {
-        if (val.rows) {
-          this.data = val.rows;
-        }
+      handler(val) {
+        this.data = val;
       },
-      immediate: true,
+      deep: true,
     },
   },
   methods: {},