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

src/business/betcan/model/check.js

@@ -26,11 +26,11 @@ 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位' }
-    ],
+    // 'ledgrp.cbs.opn1.amt': [
+    //     { type: 'string', required: false, message: '必输项' },
+    //     { max: 18, message: '整数位不能超过14位' },
+    //     { pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: '小数位不能超过3位' }
+    // ],
     'betp0.recget.sdamod.dadsnd': [
         { type: 'string', required: false, message: '必输项' },
         { max: 16, message: '长度不能超过16' }
@@ -88,18 +88,18 @@ export default {
         { max: 40, message: '长度不能超过40' }
     ],
 
-    'bedgrp.rec.matdat': [
-        { type: 'date', required: false, message: '输入正确的日期' }
-    ],
-    'bedgrp.rec.orddat': [
-        { type: 'date', required: false, message: '输入正确的日期' }
-    ],
-    'bedgrp.rec.rcvdat': [
-        { type: 'date', required: false, message: '输入正确的日期' }
-    ],
-    'bedgrp.rec.predat': [
-        { type: 'date', required: false, message: '输入正确的日期' }
-    ],
+    // 'bedgrp.rec.matdat': [
+    //     { type: 'date', required: false, message: '输入正确的日期' }
+    // ],
+    // 'bedgrp.rec.orddat': [
+    //     { type: 'date', required: false, message: '输入正确的日期' }
+    // ],
+    // 'bedgrp.rec.rcvdat': [
+    //     { type: 'date', required: false, message: '输入正确的日期' }
+    // ],
+    // 'bedgrp.rec.predat': [
+    //     { type: 'date', required: false, message: '输入正确的日期' }
+    // ],
     'bedgrp.apl.pts.ref': [
         { type: 'string', required: false, message: '必输项' },
         { max: 16, message: '长度不能超过16' }
@@ -154,11 +154,11 @@ export default {
     ],
 
 
-    'setmod.docamt': [
-        { type: 'number', required: false, message: '必输项' },
-        { max: 18, message: '整数位不能超过14位' },
-        { pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: '小数位不能超过3位' }
-    ],
+    // 'setmod.docamt': [
+    //     { type: 'number', required: false, message: '必输项' },
+    //     { max: 18, message: '整数位不能超过14位' },
+    //     { pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: '小数位不能超过3位' }
+    // ],
 
 
 
@@ -170,20 +170,20 @@ export default {
 
 
 
-    'mtabut.coninf.oitinf.oit.inftxt': [
-        { type: 'string', required: true, message: '必输项' },
-        { max: 60, message: '长度不能超过60' }
-    ],
+    // '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.oitset.oit.inftxt': [
+    //     { type: 'string', required: true, message: '必输项' },
+    //     { max: 60, message: '长度不能超过60' }
+    // ],
 
-    'mtabut.coninf.conexedat': [
-        { type: 'date', required: false, message: '输入正确的日期' }
-    ],
+    // 'mtabut.coninf.conexedat': [
+    //     { type: 'date', required: false, message: '输入正确的日期' }
+    // ],
     'mtabut.coninf.usr.extkey': [
         { type: 'string', required: false, message: '必输项' },
         { max: 8, message: '长度不能超过8' }

src/business/betcan/model/index.js

@@ -164,7 +164,9 @@ export default class Betcan {
                     ownref: '',
                     orddat: '',
                     matdat: '',
-                    nam: ''
+                    nam: '',
+                    branchinr: '',
+                    clsdat: ''
                 },
                 cbs: {
                     opn1: {

src/business/betcan/views/Canp.vue

@@ -147,7 +147,7 @@
 
         <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 class="m-input-currency">
+            <c-input v-model="model.ledgrp.cbs.opn1.amt" placeholder="请输入信用证余额" disabled >
             </c-input>
           </el-form-item>
         </c-col>

src/business/letdrv/model/check.js

@@ -60,17 +60,17 @@ export default {
         { max: 40, message: "长度不能超过40" }
     ],
     "ledgrp.rec.opndat": [
-        { type: "date", required: false, message: "输入正确的日期" }
+        {  required: false, message: "输入正确的日期" }
     ],
     "ledgrp.rec.shpdat": [
-        { type: "date", required: false, message: "输入正确的日期" }
+        {  required: false, message: "输入正确的日期" }
     ],
     "bedgrp.prb.pts.ref": [
         { type: "string", required: false, message: "必输项" },
         { max: 16, message: "长度不能超过16" }
     ],
     "ledgrp.rec.expdat": [
-        { type: "date", required: false, message: "输入正确的日期" }
+        {  required: false, message: "输入正确的日期" }
     ],
     "ledgrp.rec.expplc": [
         { type: "string", required: false, message: "必输项" },
@@ -127,10 +127,10 @@ export default {
         { max: 35, message: "长度不能超过35" }
     ],
     "bedgrp.rec.rcvdat": [
-        { type: "date", required: false, message: "输入正确的日期" }
+        {  required: false, message: "输入正确的日期" }
     ],
     "bedgrp.rec.orddat": [
-        { type: "date", required: false, message: "输入正确的日期" }
+        {  required: false, message: "输入正确的日期" }
     ],
     "bedgrp.prb.pts.adrblk": [
         { type: "string", required: false, message: "必输项" },
@@ -141,10 +141,10 @@ export default {
         { max: 35, message: "长度不能超过35" }
     ],
     "bedgrp.rec.matdat": [
-        { type: "date", required: false, message: "输入正确的日期" }
+        {  required: false, message: "输入正确的日期" }
     ],
     "bedgrp.rec.shpdat": [
-        { type: "date", required: false, message: "输入正确的日期" }
+        {  required: false, message: "输入正确的日期" }
     ],
     "bedgrp.prb.adrelc": [
         { type: "string", required: true, message: "必输项" },
@@ -155,8 +155,8 @@ export default {
         { max: 65, message: "长度不能超过65" }
     ],
     "ledgrp.rec.utlnbr": [
-        { type: "number", required: false, message: "必输项" },
-        { type: "number", max: 999, message: "长度不能超过3" }
+        { type: "string", required: false, message: "必输项" },
+        { type: "string", max: 999, message: "长度不能超过3" }
     ],
     "bedgrp.blk.docdis": [
         { type: "string", required: false, message: "必输项" },
@@ -292,16 +292,16 @@ export default {
         { type: "string", required: false, message: "必输项" },
         { max: 3, message: "长度不能超过3" }
     ],
-    "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.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: "date", required: false, message: "输入正确的日期" }
+        {  required: false, message: "输入正确的日期" }
     ],
     "mtabut.coninf.usr.extkey": [
         { type: "string", required: false, message: "必输项" },
@@ -312,7 +312,7 @@ export default {
         { max: 16, message: "长度不能超过16" }
     ],
     "setmod.docamt": [
-        { type: "number", required: false, message: "必输项" },
+        { type: "string", required: false, message: "必输项" },
         { max: 18, message: "整数位不能超过14位" },
         { pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
@@ -325,7 +325,7 @@ export default {
         { max: 80, message: "长度不能超过80" }
     ],
     "bedgrp.srm.djudat": [
-        { type: "date", required: false, message: "输入正确的日期" }
+        {  required: false, message: "输入正确的日期" }
     ],
     "bedgrp.srm.djuref": [
         { type: "string", required: false, message: "必输项" },

src/business/letdrv/model/index.js

@@ -45,14 +45,14 @@ export default class Letdrv {
           ownref: '',
           avbby: '',
           nam: '',
-          inr: '',
           opndat: '',
-          utlnbr: ''
+          utlnbr: '0',
+          branchinr:'',
         },
         cbs: {
           opn1: {
             cur: '',
-            amt: ''
+            amt: '0.00'
           },
           nom1: {
             cur: '',
@@ -71,6 +71,7 @@ export default class Letdrv {
           intdis: '',
         },
         rec: {
+          branchinr:'',
           rcvdat: '',
           doctypcod: '',
           shpdat: '',

src/business/letdrv/views/index.vue

@@ -66,23 +66,20 @@
 
         </c-tabs>
       </el-form>
-      <c-grid-ety-prompt-dialog
-          ref="etyDialog"
-          :promptData="promptData"
-      >
-      </c-grid-ety-prompt-dialog>
-      <c-grid-ety-prompt-dialog
-          ref="doxpDialog"
-          :isPty="false"
-          :promptData="promptData"
-      >
-      </c-grid-ety-prompt-dialog>
       <c-function-btn
           :handleSubmit="handleSubmit"
           :handleCheck="handleCheck"
           :handleStash="handleStash"
       >
       </c-function-btn>
+      <!-- 选择数据的表格弹框 -->
+      <c-grid-ety-prompt-dialog
+          ref="etyDialog"
+          :promptData="promptData"
+          @select-ety="selectGridEtyPromptData"
+      >
+      </c-grid-ety-prompt-dialog>
+
     </c-page>
   </div>
 </template>
@@ -132,7 +129,7 @@ export default {
     return {
       tabVal: "ovwp",
       trnName: "letdrv",
-      trnType: "",
+      // trnType: "",
       model: new Letdrv().data,
       rules: formRules,
       codes: {