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

@@ -445,14 +445,14 @@ export default {
         {type: "string", required: false, message: "必输项"},
         {max: 40,message:"长度不能超过40"}
     ],
-    "ledgrp.blk.lcrgod":[
-        {type: "string", required: true, message: "必输项"},
-        {max: 52000,message:"长度不能超过52000"}
-    ],
-    "ledgrp.blk.lcrdoc":[
-        {type: "string", required: true, message: "必输项"},
-        {max: 65,message:"长度不能超过65"}
-    ],
+    // "ledgrp.blk.lcrgod":[
+    //     {type: "string", required: true, message: "必输项"},
+    //     {max: 52000,message:"长度不能超过52000"}
+    // ],
+    // "ledgrp.blk.lcrdoc":[
+    //     {type: "string", required: true, message: "必输项"},
+    //     {max: 65,message:"长度不能超过65"}
+    // ],
     "ledgrp.blk.adlcnd":[
         {type: "string", required: false, message: "必输项"},
         {max: 52000,message:"长度不能超过52000"}
@@ -474,14 +474,6 @@ export default {
         {type: "string", required: false, message: "必输项"},
         {max: 20,message:"长度不能超过20"}
     ],
-    "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: "输入正确的日期"}
     ],

src/business/letnot/views/Detp.vue

@@ -25,6 +25,8 @@
               grp: 'ledgrp',
               rol: 'avb',
             }"
+            @keyup.enter.native="
+          queryGridEtyPromptDialogData('AVB', 'B')"
             :noRef="true"
             :onlySearch="true"
             :disabledExtkey="!avbFlag"
@@ -128,6 +130,8 @@
               grp: 'ledgrp',
               rol: 'drw',
             }"
+            @keyup.enter.native="
+          queryGridEtyPromptDialogData('DRW', '')"
             :noRef="true"
             :onlySearch="false"
             :disabledExtkey="blkDftatFlag"

src/business/letnot/views/Ptyp.vue

@@ -12,6 +12,8 @@
               grp: 'ledgrp',
               rol: 'adv',
             }"
+            @keyup.enter.native="
+          queryGridEtyPromptDialogData('ADV', 'B')"
             disabled
             disabledRef
             disabledExtkey
@@ -28,6 +30,8 @@
               grp: 'ledgrp',
               rol: 'a2b',
             }"
+            @keyup.enter.native="
+          queryGridEtyPromptDialogData('A2B', 'C')"
           >
           </c-ptap>
         </c-col>
@@ -57,6 +61,8 @@
               grp: 'ledgrp',
               rol: 'apb',
             }"
+            @keyup.enter.native="
+          queryGridEtyPromptDialogData('APB', 'C')"
           >
           </c-ptap>
         </c-col>
@@ -76,6 +82,8 @@
               grp: 'ledgrp',
               rol: 'rmb',
             }"
+            @keyup.enter.native="
+          queryGridEtyPromptDialogData('RMB', 'B')"
           >
           </c-ptap>
         </c-col>
@@ -89,6 +97,8 @@
               grp: 'ledgrp',
               rol: 'con',
             }"
+            @keyup.enter.native="
+          queryGridEtyPromptDialogData('CON', 'B')"
             :onlySearch="true"
             disabled
             disabledRef

src/business/litdck/model/check.js

@@ -4,44 +4,11 @@ import Utils from '~/utils';
  * Litdck Check规则
  */
 let checkObj = {
-  invtyp: null,
-  'outlen.acttyp': null,
-  'outlen.szflg': null,
-  'liaall.misamt': null,
-  'liaall.limmod.limpts.oth.pts.extkey': null,
-  'liaall.limmod.ownref': null,
-  'liaall.limmod.ecifno': null,
-  'brdgrp.prb.adrelc': null,
-  'brdgrp.rec.ownref': null,
-  'brdgrp.cbs.max.amt': null,
-  'brdgrp.blk.docdis': null,
-  'brdgrp.srm.djuref': null,
   'brtp.furide': null,
-  'brdgrp.prb.pts.adrblk': null,
-  'brdgrp.prb.namelc': null,
-  'liaall.limmod.limpts.oth.pts.nam': null,
   'setmod.dspflg': null,
-  'brdgrp.rec.rcvdat': null,
-  'brdgrp.rec.docflg': null,
-  'brdgrp.rec.disdat': null,
-  'brdgrp.rec.orddat': null,
-  'brdgrp.prb.pts.nam': null,
-  'brdgrp.ben.pts.nam': null,
-  'liaall.limmod.limpts.wrk.pts.nam': null,
-  'brdgrp.rec.predat': null,
-  'brdgrp.prb.pts.extkey': null,
-  'brdgrp.rec.matdat': null,
-  'liaall.limmod.limpts.wrk.pts.extkey': null,
-  'brdgrp.srm.djudat': null,
   'mtabut.coninf.conexedat': null,
-  'brdgrp.prb.pts.ref': null,
-  'brdgrp.srm.djuusr': null,
   'liaall.limmod.limpts.nonrevflg1': null,
-  'brdgrp.apl.pts.nam': null,
-  'setmod.docamt': null,
-  'brdgrp.blk.setinsbr': null,
   'brdgrp.rec.docprbrol': null,
-  'brdgrp.blk.comcon': null,
   'brtp.lidget.sdamod.dadsnd': [
     { type: 'string', required: false, message: '必输项' },
     { max: 16, message: '长度不能超过16' },
@@ -393,7 +360,7 @@ let checkObj = {
   'brdgrp.srm.djuusr': [{ type: 'string', required: false }],
   'brdgrp.srm.djudat': [{ type: 'string', required: false }],
   'brdgrp.srm.djuref': [{ type: 'string', required: false }],
-  invtyp: [{ type: 'string', required: true, message: '必输项' }],
+  'brdgrp.rec.invtyp': [{ type: 'string', required: true, message: '必输项' }],
   'szflg': [{ type: 'string', required: true, message: '必输项' }],
   'outlen.acttyp': [{ type: 'string', required: false, message: '必输项' }],
   'brdgrp.srm.djutyp': [{ type: 'string', required: true, message: '必输项' }],

src/business/litdck/model/index.js

@@ -38,7 +38,7 @@ export default class Litdck {
           stadat: '',
           dscinsflg: '',
           nam: '',
-          docprbrol: '',
+          docprbrol: 'PRB',
           pntinr: '',
           pnttyp: '',
           ownusr: '',

src/business/litdck/views/Litdckp.vue

@@ -202,7 +202,7 @@
         </el-form-item>
       </c-col>
       <c-col :span="12">
-        <el-form-item label="发票类型" prop="model.brdgrp.rec.invtyp">
+        <el-form-item label="发票类型" prop="brdgrp.rec.invtyp">
           <c-select
             v-model="model.brdgrp.rec.invtyp"
             style="width: 100%"