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/betcan/model/check.js

@@ -66,11 +66,11 @@ export default {
         { max: 18, message: '整数位不能超过14位' },
         { pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: '小数位不能超过3位' }
     ],
-    'bedgrp.cbs.opn2.amt': [
-        { type: 'string', required: false, message: '必输项' },
-        { max: 18, message: '整数位不能超过14位' },
-        { pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: '小数位不能超过3位' }
-    ],
+    // 'bedgrp.cbs.opn2.amt': [
+    //     { type: 'string', required: false, message: '必输项' },
+    //     { max: 18, message: '整数位不能超过14位' },
+    //     { pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: '小数位不能超过3位' }
+    // ],
     'bedgrp.ben.pts.nam': [
         { type: 'string', required: false, message: '必输项' },
         { max: 40, message: '长度不能超过40' }

src/business/betcan/model/index.js

@@ -6,124 +6,6 @@ export default class Betcan {
             betp:{
                 swiftflg:''
             },
-            brdgrp: {
-                adv: {
-                    pts: new Pts().data,
-                },
-                prb: {
-                    adrelc: '',
-                    dbfadrblkcn: '',
-                    namelc: '',
-                    pts: new Pts().data,
-                },
-                acb: {
-                    adrelc: '',
-                    dbfadrblkcn: '',
-                    namelc: '',
-                    pts: new Pts().data,
-                },
-                apl: {
-                    adrelc: '',
-                    dbfadrblkcn: '',
-                    namelc: '',
-                    pts: new Pts().data,
-                },
-                ben: {
-                    adrelc: '',
-                    dbfadrblkcn: '',
-                    namelc: '',
-                    pts: new Pts().data,
-                },
-                blk: {
-                    chaded: '',
-                    docdisflg: '',
-                    chaadd: '',
-                    docdis: '',
-                },
-                rec: {
-                    inr: '',
-                    branchinr: '',
-                    totcur: '',
-                    ownref: '',
-                    disdat: '',
-                    totamt: '',
-                    nam: '',
-                    docprbrol: ''
-                },
-                cbs: {
-                    opn1: {
-                        cur: ''
-                    },
-                    opn2: {
-                        cur: ''
-                    },
-                    max: {
-                        cur: '',
-                        amt: ''
-                    },
-                    max2: {
-                        amt: ''
-                    }
-                },
-                matp: {
-                    mattxtlab: ''
-                }
-            },
-            brtp: {
-                furide: '',
-                matp: {
-                    mattxtlab: ''
-                }
-            },
-            gidgrp: {
-                blk: {
-                    chaded: '',
-                    amtspc: '',
-                    accspc: '',
-                },
-                acb: {
-                    pts: new Pts().data,
-                },
-                apl: {
-                    pts: new Pts().data,
-                },
-                ben: {
-                    pts: new Pts().data,
-                },
-                ctr: {
-                    pts: new Pts().data,
-                },
-                iss: {
-                    pts: new Pts().data,
-                },
-                rec: {
-                    expdat: '',
-                    purpos: '',
-                    liadat: '',
-                    ownref: '',
-                    exptyp: '',
-                    purcan: '',
-                    nam: '',
-                    gartyp: '',
-                    purposin: '',
-                    reddat: '',
-                    redamt: '0',
-                    outcur: '',
-                    redcur: '',
-                    outamt: '0',
-                    branchinr: '',
-                },
-                cbs: {
-                    opn1: {
-                        cur: '',
-                        amt: '0',
-                    },
-                    max: {
-                        cur: '',
-                        amt: '0',
-                    },
-                },
-            },
             sndmsg: '',
             ledgrp: {
                 adv: {
@@ -148,7 +30,7 @@ export default class Betcan {
                 cbs: {
                     opn1: {
                         cur: '',
-                        amt: ''
+                        amt: '0.00'
                     }
                 }
             },
@@ -166,19 +48,20 @@ export default class Betcan {
                     matdat: '',
                     nam: '',
                     branchinr: '',
-                    clsdat: ''
+                    clsdat: '',
+                    ver: '',
                 },
                 cbs: {
                     opn1: {
                         cur: '',
-                        amt: ''
+                        amt: '0.00'
                     },
                     opn2: {
-                        amt: ''
+                        amt: '0.00'
                     },
                     max: {
                         cur: '',
-                        amt: ''
+                        amt: '0.00'
                     }
                 },
                 iss: {

src/business/betdrv/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.bedgrp.prb.pts.extkey) {
       ptsptaList.push(this.buildPtspta(model.bedgrp.prb));
@@ -64,7 +64,7 @@ export default {
     };
     return dataObj
   },
-  buildSetfeg (model, trnName) {
+  buildSetfeg(model, trnName) {
     let params = {
       ...this.buildCommonData(model, trnName),
       liaall: model.liaall,
@@ -73,7 +73,7 @@ export default {
     };
     return params
   },
-  buildSetglg (model, trnName) {
+  buildSetglg(model, trnName) {
     let params = {
       ...this.buildCommonData(model, trnName),
       setfeg: model.setmod.setfeg,
@@ -82,7 +82,7 @@ export default {
     };
     return params
   },
-  buildGlentry (model, trnName) {
+  buildGlentry(model, trnName) {
     let params = {
       ...this.buildCommonData(model, trnName),
       liaallg: model.liaall.liaallg,
@@ -92,20 +92,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,
@@ -115,7 +115,7 @@ export default {
     };
     return params
   },
-  buildLimitbody (model, trnName) {
+  buildLimitbody(model, trnName) {
     let params = {
       ...this.buildCommonData(model, trnName),
       rec: {
@@ -126,7 +126,7 @@ export default {
     };
     return params
   },
-  buildDoctre (model, trnName) {
+  buildDoctre(model, trnName) {
     let params = {
       ...this.buildCommonData(model, trnName),
       rec: {
@@ -138,7 +138,7 @@ export default {
     return params
   },
   // 公共组件setmod中dsp字段改变，触发联动时候的入参
-  buildSetgllAccts (model, trnName, setglg) {
+  buildSetgllAccts(model, trnName, setglg) {
     let params = {
       ...this.buildCommonData(model, trnName),
       setglg

src/business/betdrv/event/index.js

@@ -20,21 +20,21 @@ export default {
     ...ccvpan,
     ...limitbody,
     ...doctre,
-    async init () {
+    async init() {
       const params = {
         spt: JSON.parse(localStorage.getItem('row_' + this.trnName)),
         trninr: this.$route.query.trninr,
       }
 
-      if ( typeof(this.$route.query.inr) == 'string'){
+      if (typeof (this.$route.query.inr) == 'string') {
         params.spt = null
       }
       const res = await Api.post('/service/betdrv/init', {
         ...params,
         transName: this.trnName,
         userId: window.sessionStorage.userId || 'ZL',
-        bedgrp:{
-          rec:{
+        bedgrp: {
+          rec: {
             inr: this.$route.query.inr
           }
         },
@@ -48,7 +48,7 @@ export default {
       this.copyValueFromVoData(this.model.setmod.setglg, res.data.setglg)
     },
     // 兼容处理在前端model中定义了字段，后端返回的数据中不存在字段的问题
-    copyValueFromVoData (model, data) {
+    copyValueFromVoData(model, data) {
       let keysList = Object.keys(model)
       keysList.map((key) => {
         if (data[key]) {
@@ -137,7 +137,7 @@ export default {
     handleChangePurpos() {
       this.queryHndtypCodeTableList(this.root.trnName);
     },
-    buildLiaccv () {
+    buildLiaccv() {
       let params = {
         ...buildFn.buildCommonData(this.model, this.trnName),
         liaccvg: this.model.liaccv.liaccvg,
@@ -149,7 +149,7 @@ export default {
       return params
     },
     // 公共组件setmod处理方式改变触发联动
-    changeSetmodModel (emitParams) {
+    changeSetmodModel(emitParams) {
       let reqParams = {}
       switch (emitParams.code) {
         case 'processMethods':
@@ -159,7 +159,7 @@ export default {
         case 'changeDsp':
           let index = emitParams.index;
           let setglgRequest = buildFn.buildSetglg(this.model, this.trnName);
-          setglgRequest.setglg = {setgll:  emitParams.list};
+          setglgRequest.setglg = { setgll: emitParams.list };
           this.setgllAccts(setglgRequest, index);
           break
         default:

src/business/betdrv/model/check.js

@@ -168,7 +168,7 @@ export default {
         {max: 35,message:"长度不能超过35"}
     ],
     "bedgrp.blk.matper":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 65,message:"长度不能超过65"}
     ],
     "bedgrp.prb.adrelc":[
@@ -176,7 +176,7 @@ export default {
         {max: 35,message:"长度不能超过35"}
     ],
     "ledgrp.rec.utlnbr":[
-        {type: "string", required: false, message: "必输项"},
+        {type: "string", required: true, message: "必输项"},
         { max: 999,message:"长度不能超过3"}
     ],
         // "bedgrp.blk.docdis":[
@@ -184,7 +184,7 @@ export default {
         //     {max: 3500,message:"长度不能超过3500"}
         // ],
     "bedgrp.blk.intdis":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 1300,message:"长度不能超过1300"}
     ],
     "bedgrp.oth.pts.ref":[
@@ -192,7 +192,7 @@ export default {
         {max: 16,message:"长度不能超过16"}
     ],
     "bedgrp.blk.comcon":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 1300,message:"长度不能超过1300"}
     ],
     "bedgrp.blk.setinsbe":[

src/business/betset/event/buildCommons.js

@@ -58,7 +58,7 @@ export default {
       ...this.buildCommonData(model, trnName),
       liaall: model.liaall,
       liaccv: model.liaccv,
-      // doceot: model.trnmod.trndoc.doceot,
+      doceot: model.trnmod.trndoc.doceot,
     };
     return params
   },

src/business/betset/model/index.js

@@ -59,7 +59,8 @@ export default class Betset {
         },
         ledgrp: {
             rec: {
-                ownref: ''
+                ownref: '',
+                ver: '',
             },
             cbs: {
                 opn1: {
@@ -165,8 +166,6 @@ export default class Betset {
             prb: {
                 pts: new Pts().data,
             },
-       
-      
             apc: {
             pts: new Pts().data,
             },
@@ -217,6 +216,7 @@ export default class Betset {
                 nam: '',
                 branchinr:'',
                 frepayflg: '',
+                ver: '',
             },
             cbs: {
                 opn1: {

src/business/letdrv/event/buildCommons.js

@@ -42,13 +42,6 @@ export default {
         branchInr: model.ledgrp.rec.branchinr,
         hndtyp: model.ledgrp.rec.hndtyp,
         gartyp: model.ledgrp.rec.gartyp,
-        fingua: model.ledgrp.rec.fingua,
-        // segtyp: model.bedgrp.ghd.segtyp,
-        fromflg: model.ledgrp.rec.fromflg,
-        othersno: model.ledgrp.rec.othersno,
-        sndto: model.ledgrp.rec.sndto,
-        // swiftflg: model.gitp.swiftflg,
-        giduil: model.ledgrp.rec.giduil,
         purpos: model.ledgrp.rec.purpos,
         revflg: model.ledgrp.rec.revflg,
         cnfsta: model.ledgrp.rec.cnfsta,

src/business/letdrv/views/Drv.vue

@@ -287,7 +287,7 @@
         <c-col :span="12">
           <el-form-item label="" label-width="5px" prop="bedgrp.cbs.max.amt">
             <c-input-currency
-                v-model="maxamt"
+                v-model="model.bedgrp.cbs.max.amt"
                 placeholder="请输入金额"
             ></c-input-currency>
           </el-form-item>
@@ -638,17 +638,17 @@ export default {
       this.model.bedgrp.cbs.max.cur = this.model.ledgrp.cbs.nom1.cur
       return this.model.bedgrp.cbs.max.cur
     },
-    maxamt:{
-      get:function (){
-        // this.model.bedgrp.cbs.max.amt = this.model.ledgrp.cbs.opn1.amt
-        return this.model.bedgrp.cbs.max.amt
-      },
-      // set:function (newVal){
-      //   this.model.bedgrp.cbs.max.amt = newVal
-      // }
-      set:function (){}
+    // maxamt:{
+    //   get:function (){
+    //     // this.model.bedgrp.cbs.max.amt = this.model.ledgrp.cbs.opn1.amt
+    //     return this.model.bedgrp.cbs.max.amt
+    //   },
+    //   // set:function (newVal){
+    //   //   this.model.bedgrp.cbs.max.amt = newVal
+    //   // }
+    //   set:function (){}
 
-    },
+    // },
     opn2cur(){
       this.model.bedgrp.cbs.opn2.cur = this.model.ledgrp.cbs.nom1.cur
       return this.model.bedgrp.cbs.opn2.cur