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

src/business/betdcr/event/buildCommons.js

@@ -44,6 +44,7 @@ export default {
         nam: model.bedgrp.rec.nam,
         docprbrol: model.bedgrp.rec.docprbrol,
         advdocflg: model.bedgrp.rec.advdocflg,
+        rejpenins: model.rejpenins,
 
       },
       cbsMap: {

src/business/betdcr/model/check.js

 export default {
     "liaall.limmod.limpts.nonrevflg1"                      :null,
-    "mtabut.clsflg"                      :null,
+    // "mtabut.clsflg"                      :null,
     "betp.ledget.sdamod.dadsnd": [
         { type: "string", required: false, message: "必输项" },
         { max: 16, message: "长度不能超过16" }
@@ -263,19 +263,19 @@ export default {
         { type: "string", required: false, message: "必输项" },
         { max: 1, message: "长度不能超过1" }
     ],
-    "mtabut.coninf.oitinf.oit.inftxt": [
-        { type: "string", required: true, message: "必输项" },
-        { max: 60, message: "长度不能超过60" }
-    ],
-    "mtabut.coninf.oitset.oit.inftxt": [
-        { type: "string", required: true, message: "必输项" },
-        { max: 60, message: "长度不能超过60" }
-    ],
-    "mtabut.coninf.conexedat": [
-        { type: "string", required: false, message: "输入正确的日期" }
-    ],
-    "mtabut.coninf.usr.extkey": [
-        { type: "string", required: false, message: "必输项" },
-        { max: 8, message: "长度不能超过8" }
-    ],
+    // "mtabut.coninf.oitinf.oit.inftxt": [
+    //     { type: "string", required: true, message: "必输项" },
+    //     { max: 60, message: "长度不能超过60" }
+    // ],
+    // "mtabut.coninf.oitset.oit.inftxt": [
+    //     { type: "string", required: true, message: "必输项" },
+    //     { max: 60, message: "长度不能超过60" }
+    // ],
+    // "mtabut.coninf.conexedat": [
+    //     { type: "string", required: false, message: "输入正确的日期" }
+    // ],
+    // "mtabut.coninf.usr.extkey": [
+    //     { type: "string", required: false, message: "必输项" },
+    //     { max: 8, message: "长度不能超过8" }
+    // ],
 }
\ No newline at end of file

src/business/betdcr/model/index.js

@@ -13,6 +13,7 @@ export default class Betdcr {
             advdisflg: '',
             ledgrp: {
                 rec: {
+                    inr: '',
                     ownref: ''
                 },
                 cbs: {
@@ -44,7 +45,7 @@ export default class Betdcr {
                     nam: '',
                     docprbrol: '',
                     branchinr:'',
-                    advdocflg: ''
+                    advdocflg: '',
                 },
                 cbs: {
                     opn1: {

src/business/betdcr/views/Betdcrs.vue

@@ -155,7 +155,7 @@
         </c-col>
         <c-col :span="12">
           <el-form-item label="" label-width="5px" prop="ledgrp.cbs.opn1.amt">
-            <c-input v-model="model.ledgrp.cbs.opn1.amt" placeholder="请输入金额" disabled></c-input>
+            <c-input-currency v-model="model.ledgrp.cbs.opn1.amt" placeholder="请输入金额" disabled></c-input-currency>
           </el-form-item>
         </c-col>
       </c-col>

src/business/letdrw/event/index.js

@@ -150,7 +150,7 @@ export default {
             let res = await Api.post('/service/letdrw/getOwnRef', params);
             if (res.respCode == SUCCESS) {
               loading.close();
-              this.model.Bedgrp.rec.ownref = res.data;
+              this.model.bedgrp.rec.ownref = res.data;
             }
           },
     // 获取gitopn弹框表格数据

src/business/letdrw/model/index.js

@@ -143,7 +143,7 @@ export default class Letdrw {
             },
             letp: {
                 usr: {
-                    extkey: ''
+                    extkey: 'ZL'
                 },
                 letp0: {
                     aammod: {
@@ -179,6 +179,7 @@ export default class Letdrw {
                     intdis: ''
                 },
                 rec: {
+                    inr:'',
                     rcvdat: '',
                     doctypcod: '',
                     ownref: '',
@@ -188,7 +189,9 @@ export default class Letdrw {
                     matdat: '',
                     dscinsflg: '',
                     nam: '',
-                    docprbrol: ''
+                    docprbrol: '',
+                    
+                    
                 },
                 oth: {
                     pts: new Pts().data
@@ -203,7 +206,7 @@ export default class Letdrw {
                     },
                     max: {
                         cur: '',
-                        amt: ''
+                        amt: '0.0'
                     },
                     max2: {
                         amt: '',

src/business/letdrw/views/Drv.vue

@@ -197,8 +197,6 @@
                   style="margin: 0 0"
                   size="small"
                   type="primary"
-                  :disabled="
-                    model.ledgrp.ben.pts.adrblk && !model.ledgrp.rec.ownref? false: true"
                   @click="getBedgrpOwnref"
                         >
                   获取