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/gitame/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,
+      liaall: model.liaall,
+      liaccv: model.liaccv,
+    };
+    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
+  },
+  buildDocpan (model, trnName) {
+    let params = {
+      ...this.buildCommonData(model, trnName),
+    };
+    return params
+  },
+  buildCcvpan (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
+  },
+  buildLimitbody (model, trnName) {
+    let params = {
+      ...this.buildCommonData(model, trnName),
+      rec: {
+        objtyp: 'GID',
+        objinr: model.gidgrp.rec.objinr,
+        ownref: model.gidgrp.rec.ownref,
+      },
+    };
+    return params
+  },
+  buildDoctre (model, trnName) {
+    let params = {
+      ...this.buildCommonData(model, trnName),
+      rec: {
+        objtyp: 'GID',
+        objinr: model.gidgrp.rec.objinr,
+        ownref: model.gidgrp.rec.ownref,
+        swiftflg: model.gitp.swiftflg,
+      },
+    };
+    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/gitame/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';
+import limitbody from '~/components/business/limitbody/event';
+import doctre from '~/components/business/doctre/event';
 import Utils from "~/utils"
 
 export default {
+  mixins: [commonFunctions],
   methods: {
+    ...setmod,
+    ...glentry,
+    ...engp,
+    ...docpan,
+    ...ccvpan,
+    ...limitbody,
+    ...doctre,
     // 获取gitopn弹框表格数据
+    // async init () {
+    //   const params = {
+    //     spt: JSON.parse(localStorage.getItem('row_' + this.trnName))
+    //   }
+    //   const res = await Api.post('/service/gitame/init', {
+    //     ...params,
+    //     transName: this.trnName,
+    //     userId: window.sessionStorage.userId || 'ZL',
+    //   });
+    //   if (!res.data) {
+    //     return
+    //   }
+    //   this.copyValueFromVoData(this.model, res.data)
+    //   this.copyValueFromVoData(this.model.setmod.setfeg, res.data.setfeg)
+    //   this.copyValueFromVoData(this.model.setmod.setfog, res.data.setfog)
+    //   this.copyValueFromVoData(this.model.setmod.setglg, res.data.setglg)
+    // },
+    async init () {
+      const res = await Api.post('/service/gitame/init', {
+        transName: this.trnName,
+        userId: window.sessionStorage.userId || 'ZL',
+        // gidInr: this.$route.query.inr
+        gidInr:'00000661'
+      });
+      if (!res.data) {
+        return
+      }
+      this.copyValueFromVoData(this.model, res.data)
+      this.copyValueFromVoData(this.model.setmod.setfeg, res.data.setfeg)
+      this.copyValueFromVoData(this.model.setmod.setfog, res.data.setfog)
+      this.copyValueFromVoData(this.model.setmod.setglg, res.data.setglg)
+    },
+    // 兼容处理在前端model中定义了字段，后端返回的数据中不存在字段的问题
+    copyValueFromVoData (model, data) {
+      let keysList = Object.keys(model)
+      keysList.map((key) => {
+        if (data[key]) {
+          if (Utils.typeOf(model[key]) === 'Object') {
+            this.copyValueFromVoData(model[key], data[key])
+          } else {
+            this.$set(model, key, data[key])
+          }
+        }
+      })
+    },
+    async tabClick(tab) {
+      if (this.isInDisplay) {
+        return;
+      }
+      let name = tab.name;
+      switch (name) {
+        case 'ccvpan':
+          let ccvpanRequest = buildFn.buildCcvpan(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);
+          // 此处利用回调是为了等setfeg的接口调用完成后才去获取setglg参数，由于setglg参数依赖于setfeg函数的返回值
+          this.processSetpan(setfegRequest, () => {
+            return buildFn.buildSetglg(this.model, this.trnName);
+          });
+          break;
+        case 'docpan':
+          let docpanRequest = buildFn.buildDocpan(this.model, this.trnName);
+          this.processTrndoc(docpanRequest);
+          break;
+        case 'glepan':
+          let glentryRequest = buildFn.buildGlentry(this.model, this.trnName);
+          this.processGlentry(glentryRequest);
+          break;
+        case 'limitbody':
+          let limitbodyRequest = buildFn.buildLimitbody(this.model, this.trnName);
+          this.processLimitbody(limitbodyRequest);
+          break;
+        case 'doctre':
+          let doctreRequest = buildFn.buildDoctre(this.model, this.trnName);
+          this.processDoctre(doctreRequest);
+          break;
+        default:
+          return;
+      }
+    },
+    // 点击获取按钮拉取当前key字段下的表单数据
+    queryFormData(key) {
+      console.log(key);
+    },
+    // 业务信息=》基本信息=》保函编号-----获取保函编号
+    async queryOwnref() {
+      let params = {
+        ptainr: this.model.gidgrp.apl.pts.ptainr,
+        businessType: 'LG',
+        tbl: 'LG',
+      };
+      const loading = this.loading();
+      let res = await Api.post('/service/gitopn/getOwnRef', params);
+      if (res.respCode == SUCCESS) {
+        loading.close();
+        this.model.gidgrp.rec.ownref = res.data;
+      }
+    },
     async queryGridEtyPromptDialogData(type, ptytyp) {
       let params = {
         userId: window.sessionStorage.userId || 'ZL',
@@ -27,5 +148,42 @@ export default {
         this.$set(this.model.gidgrp, row.role.toLowerCase(), res.data);
       }
     },
+      // 是否SWIFT格式修改--联动保函开立类型
+      handleChangeSwiftflg() {
+        this.queryHndtypCodeTableList(this.root.trnName);
+      },
+      // 支出目的修改--联动保函开立类型
+      handleChangePurpos() {
+        this.queryHndtypCodeTableList(this.root.trnName);
+      },
+      buildLiaccv () {
+        let params = {
+          ...buildFn.buildCommonData(this.model, this.trnName),
+          liaccvg: this.model.liaccv.liaccvg,
+          oldamt: this.model.liaccv.oldamt,
+          chgamt: this.model.liaccv.chgamt,
+          concur: this.model.liaccv.concur,
+        };
+        
+        return params
+      },
+      // 公共组件setmod处理方式改变触发联动
+      changeSetmodModel (emitParams) {
+        let reqParams = {}
+        switch (emitParams.code) {
+          case 'processMethods':
+            reqParams = buildFn.buildSetglg(this.model, this.trnName);
+            this.calcPayDetail(reqParams)
+            break
+          case 'changeDsp':
+            let index = emitParams.index;
+            let setglgRequest = buildFn.buildSetglg(this.model, this.trnName);
+            setglgRequest.setglg = {setgll:  emitParams.list};
+            this.setgllAccts(setglgRequest, index);
+            break
+          default:
+            return
+        }
+      }
   }
 }

src/business/gitame/model/index.js

@@ -125,6 +125,10 @@ export default class Gitame {
             cur: '',
             amt: '',
           },
+          max2: {
+            cur: '',
+            amt: '',
+          },
           opc2: {
             cur: '',
             amt: '',
@@ -161,9 +165,6 @@ export default class Gitame {
           benefi: '',
         },
       },
-      gitamep: {
-        prtflg: '',
-      },
       gitp: {
         dzbhflg: '',
         swiftflg: '',
@@ -226,9 +227,10 @@ export default class Gitame {
         gitamecho: '',
       },
       gitamep: {
-        amebutc: {
+        amebut: {
           chkast: '',
         },
+        prtflg: '',
         ametxtflgc: '',
         oldmaccur: '',
         ametxtc: '',
@@ -243,8 +245,13 @@ export default class Gitame {
           exptyp:'',
           liatypc:'',
           liadat:'',
-          
-        }
+        },
+        cbs: {
+          max: {
+            cur: '',
+            amt: '',
+          },
+        },
       },
       setmod: new Pub().data.Setmod,
       mtabut: new Pub().data.Mtabut,

src/business/gitame/views/index.vue

@@ -179,6 +179,9 @@ export default {
     };
   },
   methods: { },
+ mounted () {
+    this.init()
+  },
 };
 </script>
 <style>

src/business/gitcan/event/index.js

@@ -73,5 +73,106 @@ export default {
           return;
       }
     },
+     // 点击获取按钮拉取当前key字段下的表单数据
+     queryFormData(key) {
+      console.log(key);
+    },
+    // 业务信息=》基本信息=》保函编号-----获取保函编号
+    async queryOwnref() {
+      let params = {
+        ptainr: this.model.gidgrp.apl.pts.ptainr,
+        businessType: 'LG',
+        tbl: 'LG',
+      };
+      const loading = this.loading();
+      let res = await Api.post('/service/gitopn/getOwnRef', params);
+      if (res.respCode == SUCCESS) {
+        loading.close();
+        this.model.gidgrp.rec.ownref = res.data;
+      }
+    },
+    // 获取gitopn弹框表格数据
+    async queryGridEtyPromptDialogData(type, ptytyp) {
+      let params = {
+        userId: window.sessionStorage.userId || 'ZL',
+        ptytyp: ptytyp,
+        extkey: this.model.gidgrp[type.toLowerCase()].pts.extkey,
+      };
+      let res = await Api.post('/service/ptspta/list', params);
+      if (res.respCode == SUCCESS) {
+        this.root.$refs['etyDialog'].show = true;
+        this.root.promptData.data = res.data.ptaInfos;
+        this.root.promptData.type = type;
+      }
+    },
+    // 选中gitopn弹框表格的行数据
+    async selectGridEtyPromptData(row) {
+      let params = {
+        ...row,
+      };
+      let res = await Api.post('/service/ptspta/fetch', params);
+      if (res.respCode == SUCCESS) {
+        this.$set(this.model.gidgrp, row.role.toLowerCase(), res.data);
+      }
+    },
+    // 业务信息=》基本信息=》支出目的
+    purposChange(key, value) {
+      this.handleChangeForm(key, value);
+    },
+    // 初始化保函开立类型码表下拉列表
+    async queryHndtypCodeTableList(trnName) {
+      let params = {
+        gitp: {
+          swiftflg: this.model.gitp.swiftflg,
+        },
+        gidgrp: {
+          rec: {
+            purpos: this.model.gidgrp.rec.purpos,
+          },
+        },
+        transName: trnName.toUpperCase(),
+      };
+      let res = await Api.post('/service/gitopn/initHndtyp', params);
+      if (res.respCode == SUCCESS) {
+        this.$set(this.codes, 'voHndtyp', res.data);
+      }
+    },
+    // 是否SWIFT格式修改--联动保函开立类型
+    handleChangeSwiftflg() {
+      this.queryHndtypCodeTableList(this.root.trnName);
+    },
+    // 支出目的修改--联动保函开立类型
+    handleChangePurpos() {
+      this.queryHndtypCodeTableList(this.root.trnName);
+    },
+    buildLiaccv () {
+      let params = {
+        ...buildFn.buildCommonData(this.model, this.trnName),
+        liaccvg: this.model.liaccv.liaccvg,
+        oldamt: this.model.liaccv.oldamt,
+        chgamt: this.model.liaccv.chgamt,
+        concur: this.model.liaccv.concur,
+      };
+      
+      return params
+    },
+    // 公共组件setmod处理方式改变触发联动
+    changeSetmodModel (emitParams) {
+      let reqParams = {}
+      switch (emitParams.code) {
+        case 'processMethods':
+          reqParams = buildFn.buildSetglg(this.model, this.trnName);
+          this.calcPayDetail(reqParams)
+          break
+        case 'changeDsp':
+          let index = emitParams.index;
+          let setglgRequest = buildFn.buildSetglg(this.model, this.trnName);
+          setglgRequest.setglg = {setgll:  emitParams.list};
+          this.setgllAccts(setglgRequest, index);
+          break
+        default:
+          return
+      }
+    }
   }
 }
\ No newline at end of file

src/business/gitcan/model/index.js

@@ -35,19 +35,20 @@ export default class Gitcan {
           gartyp: '',
           purposin: '',
           reddat: '',
-          redamt: '',
+          redamt: '0',
           outcur: '',
           redcur: '',
-          outamt: '',
+          outamt: '0',
+          branchinr: '',
         },
         cbs: {
           opn1: {
             cur: '',
-            amt: '',
+            amt: '0',
           },
           max: {
             cur: '',
-            amt: '',
+            amt: '0',
           },
         },
       },

src/business/gitcan/views/Canp.vue

@@ -61,12 +61,7 @@
           <c-checkbox
             v-model="model.gitp0.gitp0s20"
             disabled
-            style="
-              margin-left: 18px;
-              height: 32px;
-              line-height: 32px;
-              padding-bottom: 2px;
-            "
+            style="margin-left: 18px;height: 32px;line-height: 32px;padding-bottom: 2px;"
             >附加金额</c-checkbox
           >
         </c-col>
@@ -138,7 +133,7 @@
             v-model="model.gidgrp.rec.gartyp"
             style="width: 100%"
             placeholder="请选择保函种类"
-            :code="codes.typgar2"
+            :code="codes.typgar"
           >
           </c-select>
         </el-form-item>

src/business/gitcan/views/index.vue

@@ -76,21 +76,26 @@
   
       </c-tabs>
     </el-form>
+    <!-- <c-grid-ety-prompt-dialog
+        ref="etyDialog"
+        :promptData="promptData"
+        @select-ety="selectGridEtyPromptData"
+      >
+      </c-grid-ety-prompt-dialog> -->
+        <!-- 选择数据的表格弹框 -->
         <c-grid-ety-prompt-dialog
         ref="etyDialog"
         :promptData="promptData"
-      v-on:select-ety="selectEty"
+        @select-ety="selectGridEtyPromptData"
       >
       </c-grid-ety-prompt-dialog>
     </c-page>
   </div>
 </template>
 <script>
-import Api from "~/service/Api";
 import CodeTable from "~/config/CodeTable";
 import Gitcan from "../model";
-import commonProcess from "~/mixin/commonProcess";
-import commonFuncs from "~/mixin/commonFuncs";
+import operationFunc from "~/mixin/operationFunc";
 import Limitbody from "~/views/Public/Limitbody";
 import Engp from "~/components/business/engp/views";
 import Doctre from "~/views/Public/Doctre";
@@ -123,7 +128,7 @@ export default {
       root: this,
     };
   },
-  mixins: [commonProcess, commonFuncs,event], // 里面包含了Default、Check等的公共处理
+  mixins: [operationFunc, event], // 里面包含了Default、Check等的公共处理
   data() {
     return {
       tabVal: "ovwp",
@@ -132,6 +137,48 @@ export default {
       rules: null,
       codes: { ...CodeTable },
       activeNames: ["engp"],
+      promptData: {
+        title: 'Select a Party',
+        columns: [
+          {
+            prop: 'ptyInr',
+            label: 'Party Number'
+          },
+          {
+            prop: 'inr',
+            label: 'Address Number'
+          },
+          {
+            prop: 'branch',
+            label: 'Branch Code'
+          },
+          {
+            prop: 'bchName',
+            label: 'Branch Name'
+          },
+          {
+            prop: 'adrName',
+            label: 'Address Name'
+          },
+          {
+            prop: 'adr1',
+            label: 'Address1'
+          },
+          {
+            prop: 'locCty',
+            label: 'City'
+          },
+          {
+            prop: 'locZip',
+            label: 'Zip'
+          },
+          {
+            prop: 'bicCode',
+            label: 'BIC'
+          }
+        ],
+        data: []
+      }
     };
   },
   methods: {

src/mixin/operationFunc.js

@@ -165,6 +165,7 @@ export default {
         gidgrp: this.model.gidgrp,
         gitp: this.model.gitp,
         lidgrp: this.model.lidgrp,
+        branchinr:this.model.gidgrp.rec.branchinr,
       }
       const res = await Api.post(`/service/${this.trnName}/txnHold`, params);
       if (res.respCode === SUCCESS) {

src/views/Statics/cty/views/Infcty/Infsea.vue

@@ -39,7 +39,7 @@
       <c-paging-table 
         :data="ctyData"
         :columns="ctyColumns"
-        :pageNumber="model.pageNum"
+        :pageNumber="model.pageNumber"
         :pageSize="model.pageSize"
         :total="model.total"
         v-on:queryFunc="queryFunc"

vue.config.js

@@ -71,7 +71,14 @@ module.exports = {
         }
       },
       '/gjjs/service/': {
-        target: 'http://127.0.0.1:9999',
+        // target: 'http://192.168.0.134:9999',//钱煜
+        target: 'http://192.168.0.8:9999',//曹志寻
+        //target: 'http://192.168.0.146:9999',//张厚
+        // target: 'http://192.168.0.28:9999',//李少勇
+        //target: 'http://192.168.0.110:10025',//服务器
+        // target: 'http://192.168.0.29:9999',//万平
+        // target: 'http://192.168.0.42:9999',//胡希
+        // target: 'http://192.168.0.136:9999',//张立鼎
         changeOrigin: true,
         pathRewrite: {
           '^/gjjs/service': '/gjjs/service'