Merge remote-tracking branch 'origin/settle-test-20230110' into settle-test-20230110

src/business/betdrv/event/buildCommons.js

@@ -52,6 +52,7 @@ export default {
         OLDMAX: model.oldbedgrp.cbs.max,
         OLDMAX2: model.oldbedgrp.cbs.max2,
         OPN1: model.bedgrp.cbs.opn1,
+        OPN2: model.bedgrp.cbs.opn2,
         // MAC: model.bedgrp.cbs.mac,
         // MAC2: model.bedgrp.cbs.mac2,
         // OPC2: model.bedgrp.cbs.opc2,

src/business/betsnd/event/buildCommons.js

@@ -59,7 +59,7 @@ export default {
         nam: model.bedgrp.rec.nam,
         docprbrol: model.bedgrp.rec.docprbrol,
         advdocflg: model.bedgrp.rec.advdocflg,
-
+        inr:model.bedgrp.rec.inr
       },
       cbsMap: {
         MAX: model.bedgrp.cbs.max,

src/business/betsnd/model/index.js

@@ -102,7 +102,8 @@ export default class Betsnd {
                     docrol: '',
                     matdat: '',
                     nam: '',
-                    docprbrol: ''
+                    docprbrol: '',
+                    inr: ''
                 },
                 prb: {
                     pts: new Pts().data,

src/business/betsnd/views/Rgfp.vue

@@ -227,7 +227,7 @@
       <c-col :span="24">
         <el-form-item label="付款人" prop="bedgrp.rec.payrol">
           <c-select v-model="model.bedgrp.rec.payrol" style="width: 100%" placeholder="请选择付款人"
-                    :code="codes.rolall"
+                    :code="codes.payrol"
                     @change="eventFunction(
               'bedgrp.rec.payrol'
             )">

src/business/letdrv/views/Drv.vue

@@ -278,7 +278,7 @@
                 v-model="model.bedgrp.cbs.max.cur"
                 style="width: 100%"
                 placeholder="请输入单据金额"
-                
+                disabled
                 :code="codes.curtxt1"
             ></c-select>
           </el-form-item>

src/business/letdrw/model/check.js

@@ -260,8 +260,8 @@ let checkObj = {
         {max: 65,message:"长度不能超过65"}
     ],
     "ledgrp.rec.tenmaxday":[
-        {type: "string", required: false, message: "必输项"},
-        {type: "string",max: 9999,message:"长度不能超过4"}
+        {type: "number", required: false, message: "必输项"},
+        {type: "number",max: 9999,message:"长度不能超过4"}
     ],
     "ledgrp.rec.porloa":[
         {type: "string", required: false, message: "必输项"},

src/business/letdrw/model/index.js

@@ -15,7 +15,7 @@ export default class Letdrw {
                     },
                     max2: {
                         cur: '',
-                        amt: ''
+                        amt: '0.0'
                     }
                 }
             },
@@ -124,7 +124,7 @@ export default class Letdrw {
                     },
                     max2: {
                         cur: '',
-                        amt: '0.000'
+                        amt: '0.00'
                     }
                 },
                 iss: {
@@ -210,7 +210,7 @@ export default class Letdrw {
                     },
                     max2: {
                         amt: '',
-                        cur: ''
+                        cur: '0.00'
                     }
                 },
                 srm: {