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/betset/event/index.js

@@ -165,6 +165,7 @@ export default {
     businessType: 'LC',
     tbl: 'LC',
   }
-}
+},
+
   },
 };

src/business/brtset/event/buildCommons.js

@@ -56,9 +56,7 @@ export default {
         cur:model.brdgrp.cbs.opn1.cur,
         ptytyp:model.brdgrp.prb.ptytyp,
         frepayflg:model.brdgrp.rec.frepayflg,
-        payrol:model.brdgrp.rec.payrol,
         dscbckamt:model.brdgrp.rec.dscbckamt,
-        pclbckamt:model.brdgrp.rec.pclbckamt,
         totdat:model.brdgrp.rec.totdat,
         // negate:model.brdgrp.rec.dscbckamt.negate,
         pclbckamt:model.brdgrp.rec.pclbckamt,

src/business/brtset/event/index.js

@@ -106,18 +106,18 @@ export default {
     queryFormData(key) {
       console.log(key);
     },
-    // 业务信息=》基本信息=》保函编号-----获取保函编号
-    async queryOwnref() {
+   // 业务信息=》基本信息=》融资编号-----获取融资编号
+   async getTrdgrpOwnRef() {
     let params = {
-        ptainr: this.model.gidgrp.apl.pts.ptainr,
-        businessType: 'LG',
-        tbl: 'LG',
+      trdgrp:{
+        rec: this.model.trtcre.trdgrp.rec,
+      }
     };
     const loading = this.loading();
-      let res = await Api.post('/service/brtset/getOwnRef', params);
+    let res = await Api.post('/service/brtset/getTrdgrpOwnRef', params);
     if (res.respCode == SUCCESS) {
       loading.close();
-        this.model.gidgrp.rec.ownref = res.data;
+      this.model.trtcre.trdgrp.rec.ownref = res.data;
     }
   },
     // 获取brtset弹框表格数据

src/business/brtset/model/index.js

@@ -192,6 +192,9 @@ export default class Bctset {
         trntyp: '',
         trdgrp: {
           rec: {
+            fincod:'',
+            ovdflg: '',
+            ownusr: window.sessionStorage.userId ? window.sessionStorage.userId : 'ZL',
             stttendat: new Date(),
             recaccount: '',
             pctfin: '100',
@@ -211,6 +214,8 @@ export default class Bctset {
             actrat: '0.000000',
             pntref: '',
             reccountrycode: '',
+            opndat: new Date(),
+            branchinr: ''
           },
           cbs: {
             max: {
@@ -340,11 +345,6 @@ export default class Bctset {
         basflg: '',
       },
       nar754: '',
-      trdgrp: {
-        rec: {
-         
-        },
-      },
       paypsb: '',
       dftcre: {
         dftp: {

src/business/brtset/views/Trtcrep.vue

@@ -61,12 +61,7 @@
                 <c-button
                   size="small"
                   type="primary"
-                  :disabled="
-                    model.trtcre.trdgrp.rec.fintyp == '' ||
-                    model.trtcre.trdgrp.fip.pts.adrblk == '' ||
-                    // model.trdgrp.rec.branchinr == ''||
-                    model.trtcre.trdgrp.rec.ownref != ''
-                  "
+                 @click="getTrdgrpOwnRef"
                 >
                   获取
                 </c-button>
@@ -847,6 +842,7 @@ export default {
   computed:{
     trtcretrdgrprecpntref(){
       this.model.trtcre.trtmod.finmod.fincod = this.model.brdgrp.rec.ownref
+      this.model.trtcre.trdgrp.rec.fincod = this.model.brdgrp.rec.ownref
       this.model.trtcre.trdgrp.rec.pntref = this.model.brdgrp.rec.ownref
       return this.model.trtcre.trdgrp.rec.pntref
     },

src/business/inftrd/model/index.js

@@ -13,8 +13,8 @@ export default class Inftrd {
             },
             infcon: {
                 chksubcon: '',
-                opndatfrom: '',
-                opndatto: '',
+                opndatfrom: new Date(),
+                opndatto: new Date(),
                 seaownref: '',
                 seaamtfr: '',
                 seasta: '',

src/business/inftrd/views/Infsea.vue

@@ -307,17 +307,17 @@
       </template>
     </c-list-search>
 
-    <c-col :span="24" style="margin-top: 10px">
-      <c-button
-          class="medium_bcs"
-          size="medium"
-          type="primary"
-          style="margin-left: 0px"
-          @click="toTrtopn"
-      >进口融资开立
-      </c-button
-      >
-    </c-col>
+<!--    <c-col :span="24" style="margin-top: 10px">-->
+<!--      <c-button-->
+<!--          class="medium_bcs"-->
+<!--          size="medium"-->
+<!--          type="primary"-->
+<!--          style="margin-left: 0px"-->
+<!--          @click="toTrtopn"-->
+<!--      >进口融资开立-->
+<!--      </c-button-->
+<!--      >-->
+<!--    </c-col>-->
     <div style="height: 90%">
       <c-col :span="24">
         <el-table

src/business/litame/model/check.js

@@ -230,7 +230,7 @@ export default {
     {type: 'string', required: false, message: '输入正确的日期'}
   ],
   'lidgrp.rec.expplc':[
-    {type: 'string', required: false, message: '必输项'},
+    {type: 'string', required: true, message: '必输项'},
     {max: 29,message:'长度不能超过29'}
   ],
   'lidgrp.ben.pts.ref':[
@@ -383,7 +383,7 @@ export default {
   ],
   'lidgrp.rec.tenmaxday':[
     { required: false, message: '必输项'},
-    {type: 'string', max: 999,message:'只能输入数字,长度不能超过3'}
+    // {type: 'string', max: 999,message:'只能输入数字,长度不能超过3'}
   ],
   'lidgrp.rec.porloa':[
     {type: 'string', required: false, message: '必输项'},
@@ -793,12 +793,16 @@ export default {
     {type: 'string', required: false, message: '必输项'},
     {max: 14,message:'长度不能超过14'}
   ],
+  'lidgrp.rec.stacty':[
+    {type: 'string', required: true, message: '必输项'},
+    {max: 2,message:'长度不能超过2'}
+  ],
   /**
   * Litame Check规则
   */
   'lidgrp.rec.lcrtyp': null,
   'lidgrp.rec.apprul': null,
-  'lidgrp.rec.stacty': null,
+  // 'lidgrp.rec.stacty': null,
   'setmod.dspflg': null,
   'lidgrp.rec.shptrss18': null,
   'lidgrp.rec.cnfdet': null,

src/business/litame/views/Detp.vue

@@ -377,8 +377,6 @@ export default {
           this.flag4 = true;
           this.flag5 = true;
           this.flag6 = true;
-          // this.model.lidgrp.avb.pts.adrblk = null
-          // this.model.lidgrp.avb.pts.extkey = null
         } //Specified Bank 指定银行
         else if (val == 'S') {
           this.flag4 = true;

src/business/litame/views/Ptyp.vue

@@ -104,7 +104,9 @@
              v-model="model.lidgrp.con.pts.extkey"
               maxlength="16"
               placeholder="请输入编号"
-              @keyup.enter.native="showGridPromptDialog('lidgrp.con.pts.extkey')"
+              @keyup.enter.native="
+                queryGridEtyPromptDialogData('CON', 'B')
+              "
             ></c-input>
             <template slot="footer">
               <c-button
@@ -161,7 +163,9 @@
             <c-input
               v-model="model.lidgrp.a2b.pts.extkey"
               maxlength="16"
-              @keyup.enter.native="showGridPromptDialog('lidgrp.a2b.pts.extkey')"
+              @keyup.enter.native="
+                queryGridEtyPromptDialogData('A2B', 'B')
+              "
               placeholder=""
             ></c-input>
             <template slot="footer">

src/business/trtset/event/buildCommons.js

 export default {
-  buildPtspta (ptsptaObj) {
+  buildPtspta(ptsptaObj) {
     let pts = ptsptaObj.pts;
     let ptspta = {
       rol: pts.rol,
@@ -17,7 +17,7 @@ export default {
     };
     return ptspta;
   },
-  buildCommonData (model, trnName) {
+  buildCommonData(model, trnName) {
     let ptsptaList = [];
     if (model.trdgrp.fip.pts.extkey) {
       ptsptaList.push(this.buildPtspta(model.trdgrp.fip));
@@ -31,6 +31,18 @@ export default {
         opndat: model.trdgrp.rec.opndat,
         expdat: model.trdgrp.rec.expdat,
         branchInr: model.trdgrp.rec.branchinr,
+        cbeAmt: model.trtmod.finmod.cbs.cbe.amt,
+        cbbAmt: model.trtmod.finmod.cbs.cbb.amt,
+        cbeIntamt1: model.trtmod.finmod.cbs.cbe.intamt1,
+        cbeIntamt2: model.trtmod.finmod.cbs.cbe.intamt2,
+        cbeIntamty1: model.trtmod.finmod.cbs.cbe.intamty1,
+        cbeIntamty2: model.trtmod.finmod.cbs.cbe.intamty2,
+        cbeIntamt: model.trtmod.finmod.cbs.cbe.intamt,
+        actflg: model.actflg,
+        clsflg: model.clsflg,
+        setact: model.setact,
+        cbsCalflg: model.trtmod.finmod.cbs.calflg,
+        doccur: model.setmod.doccur,
       },
       cbsMap: {
         MAX: model.trdgrp.cbs.max,
@@ -47,7 +59,7 @@ export default {
     };
     return dataObj
   },
-  buildSetfeg (model, trnName) {
+  buildSetfeg(model, trnName) {
     let params = {
       ...this.buildCommonData(model, trnName),
       liaall: model.liaall,
@@ -56,7 +68,7 @@ export default {
     };
     return params
   },
-  buildSetglg (model, trnName) {
+  buildSetglg(model, trnName) {
     let params = {
       ...this.buildCommonData(model, trnName),
       setfeg: model.setmod.setfeg,
@@ -65,7 +77,7 @@ export default {
     };
     return params
   },
-  buildGlentry (model, trnName) {
+  buildGlentry(model, trnName) {
     let params = {
       ...this.buildCommonData(model, trnName),
       liaallg: model.liaall.liaallg,
@@ -75,20 +87,20 @@ export default {
     };
     return params
   },
-  buildEngp (model, trnName) {
+  buildEngp(model, trnName) {
     let params = {
       ...this.buildCommonData(model, trnName),
       liaallg: model.liaall.liaallg,
     };
     return params
   },
-  buildDocpan (model, trnName) {
+  buildDocpan(model, trnName) {
     let params = {
       ...this.buildCommonData(model, trnName),
     };
     return params
   },
-  buildCcvpan (model, trnName) {
+  buildCcvpan(model, trnName) {
     let params = {
       ...this.buildCommonData(model, trnName),
       liaccvg: model.liaccv.liaccvg,
@@ -98,7 +110,7 @@ export default {
     };
     return params
   },
-  buildLimitbody (model, trnName) {
+  buildLimitbody(model, trnName) {
     let params = {
       ...this.buildCommonData(model, trnName),
       rec: {
@@ -109,7 +121,7 @@ export default {
     };
     return params
   },
-  buildDoctre (model, trnName) {
+  buildDoctre(model, trnName) {
     let params = {
       ...this.buildCommonData(model, trnName),
       rec: {
@@ -122,7 +134,7 @@ export default {
     return params
   },
   // 公共组件setmod中dsp字段改变，触发联动时候的入参
-  buildSetgllAccts (model, trnName, setglg) {
+  buildSetgllAccts(model, trnName, setglg) {
     let params = {
       ...this.buildCommonData(model, trnName),
       setglg

src/business/trtset/model/index.js

@@ -98,6 +98,7 @@ export default class Trtset {
                     intprd: "",			//  计息周期		.trtmod.finmod.intprd
                 },
             },
+            actflg: "",
             setamt: "",			//  Settlement Amount		.setamt
             setact: "",			//  Settlement Account		.setact
             clsflg: "",			//  抹�'�		.clsflg