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

@@ -16,12 +16,12 @@ export default {
         {type: "string", required: false, message: "必输项"},
         {max: 3,message:"长度不能超过3"}
     ],
-    "ledgrp.cbs.opn1.amt":[
-        {type: "string", required: false, message: "必输项"},
-        {max: 18,message:"整数位不能超过14位"},
-        // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
-        {pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
-    ],
+    // "ledgrp.cbs.opn1.amt":[
+    //     {type: "string", required: false, message: "必输项2"},
+    //     {max: 18,message:"整数位不能超过14位"},
+    //     // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+    //     {pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+    // ],
     "ledgrp.apl.pts.nam":[
         {type: "string", required: false, message: "必输项"},
         {max: 40,message:"长度不能超过40"}
@@ -56,10 +56,10 @@ export default {
         {max: 6,message:"长度不能超过6",trigger:"blur"}
     ],
     "reqdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "ledgrp.rec.cnfdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "letp.recget.sdamod.dadsnd":[
         {type: "string", required: false, message: "必输项"},
@@ -113,19 +113,19 @@ export default {
         {type: "string", required: true, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
-    "ledgrp.rec.nomton":[
-        {type: "number", required: false, message: "必输项",trigger: "blur"},
-        {type: "number",max: 99,message:"长度不能超过2",trigger: "blur"}
-    ],
+    // "ledgrp.rec.nomton":[
+    //     {type: "number", required: false, message: "必输项",trigger: "blur"},
+    //     {type: "number",max: 99,message:"长度不能超过2",trigger: "blur"}
+    // ],
     "ledgrp.ben.adrelc":[
         {type: "string", required: true, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
-    "ledgrp.cbs.max.amt":[
-        {type: "string", required: false, message: "必输项"},
-        {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
-    ],
+    // "ledgrp.cbs.max.amt":[
+    //     {type: "string", required: false, message: "必输项"},
+    //     {max: 18,message:"整数位不能超过14位"},
+    //     {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+    // ],
     "ledgrp.iss.pts.ref":[
         {type: "string", required: false, message: "必输项"},
         {max: 16,message:"长度不能超过16"}
@@ -135,10 +135,10 @@ export default {
         {max: 16,message:"长度不能超过16"}
     ],
     "ledgrp.rec.opndat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "ledgrp.rec.preadvdt":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "ledgrp.iss.pts.extkey":[
         {type: "string", required: false, message: "必输项"},
@@ -153,10 +153,10 @@ export default {
         {max: 35,message:"长度不能超过35"}
     ],
     "ledgrp.rec.shpdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "ledgrp.rec.advdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "ledgrp.iss.pts.adrblk":[
         {type: "string", required: true, message: "必输项"},
@@ -167,7 +167,7 @@ export default {
         {max: 35,message:"长度不能超过35"}
     ],
     "ledgrp.rec.expdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "ledgrp.iss.adrelc":[
         {type: "string", required: true, message: "必输项"},
@@ -245,7 +245,6 @@ export default {
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
-   
     "trnmod.trndoc.advnam":[
         {type: "string", required: false, message: "必输项"},
         {max: 50,message:"长度不能超过50"}
@@ -346,7 +345,7 @@ export default {
         {type: "string", required: true, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
-    // "setmod.dspflg"                      :null,
+    "setmod.dspflg"                      :null,
     "ledgrp.rec.lcrtyp"                      :null,
     "ledgrp.rec.apprul"                      :null,
     "liaall.limmod.limpts.nonrevflg1"                      :null,

src/business/letame/event/buildCommons.js

@@ -135,7 +135,7 @@ export default {
       ...this.buildCommonData(model, trnName),
       rec: {
         objtyp: 'LED',
-        objinr: model.ledgrp.rec.objinr,
+        objinr: model.ledgrp.rec.inr,
         ownref: model.ledgrp.rec.ownref,
       },
     };
@@ -146,7 +146,7 @@ export default {
       ...this.buildCommonData(model, trnName),
       rec: {
         objtyp: 'LED',
-        objinr: model.ledgrp.rec.objinr,
+        objinr: model.ledgrp.rec.inr,
         ownref: model.ledgrp.rec.ownref,
         swiftflg: model.letp.swiftflg,
       },