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

src/business/brtdck/event/index.js

@@ -28,19 +28,7 @@ export default {
         ...params,
         transName: this.trnName,
         userId: window.sessionStorage.userId || 'ZL',
-        lidgrp:{
-          rec:{
-            inr:"00000026",
-          },
-        },
-        brdgrp:{
-          rec:{
-            inr:"00000049",
-          },
-        },
-        liaccv:{
-          concur:"CNY"
-        }
+        lidinr: this.$route.query.inr
       });
       if (!res.data) {
         return

src/business/brtdcr/event/index.js

@@ -27,11 +27,7 @@ export default {
       const res = await Api.post('/service/brtdcr/init', {
         transName: this.trnName,
         userId: window.sessionStorage.userId || 'ZL',
-        brdgrp:{
-          rec:{
-            inr: "00000030",
-          },
-        }
+        lidinr: this.$route.query.inr
       });
       if (!res.data) {
         return

src/business/brtset/event/index.js

@@ -28,7 +28,7 @@ export default {
         ...params,
         transName: this.trnName,
         userId: window.sessionStorage.userId || 'ZL',
-        brdgrp:{
+        lidgrp:{
           rec:{
             inr: "00000028",
           }

src/business/brtset/model/check.js

@@ -490,8 +490,8 @@ let checkObj = {
     { max: 22, message: '长度不能超过22' },
   ],
   'cfatrt.cda.cfeogudad': [
-    { type: 'string', required: true, message: '必输项' },
-    { max: 32, message: '长度不能超过32' },
+    // { type: 'string', required: true, message: '必输项' },
+    // { max: 32, message: '长度不能超过32' },
   ],
 
   'bopmod.dbcgrp.bas.rptno': [

src/business/brtset/model/index.js

@@ -406,6 +406,7 @@ export default class Bctset {
       },
       lidgrp: {
         rec: {
+          branchinr:"00000014",
           expdat: '',
           ownref: '',
         },

src/business/inflid/views/Infsea.vue

@@ -379,6 +379,10 @@ export default {
         {
           label:'保证金收取',
           route:'/business-new/lctopn'
+        },
+        {
+          label:'到单',
+          route:'/business-new/litdck'
         }
       ],
       currentHandleRow: {}

src/business/litdck/event/index.js

@@ -28,12 +28,8 @@ export default {
         ...params,
         transName: this.trnName,
         userId: window.sessionStorage.userId || 'ZL',
-        // lidinr: this.$route.query.inr
-        lidgrp:{
-          rec:{
-            inr:'00000122',
-          }
-        }
+        lidinr: this.$route.query.inr
+    
       });
       if (!res.data) {
         return
@@ -120,7 +116,7 @@ export default {
       let params = {
         userId: window.sessionStorage.userId || 'ZL',
         ptytyp: ptytyp,
-        extkey: this.model.gidgrp[type.toLowerCase()].pts.extkey,
+        extkey: this.model.brdgrp[type.toLowerCase()].pts.extkey,
       };
       let res = await Api.post('/service/ptspta/list', params);
       if (res.respCode == SUCCESS) {
@@ -136,7 +132,7 @@ export default {
       };
       let res = await Api.post('/service/ptspta/fetch', params);
       if (res.respCode == SUCCESS) {
-        this.$set(this.model.gidgrp, row.role.toLowerCase(), res.data);
+        this.$set(this.model.brdgrp, row.role.toLowerCase(), res.data);
       }
     },
     // 业务信息=》基本信息=》支出目的
@@ -174,3 +170,5 @@ export default {
     },
   },
 };
+
+

src/business/litdck/views/Litdckp.vue

@@ -491,6 +491,9 @@
               maxlength="16"
               placeholder="请输入地址编码"
               :disabled="model.brdgrp.rec.docprbrol != 'PRB'"
+              @keyup.enter.native="
+                queryGridEtyPromptDialogData('PRB', 'C')
+              "
             ></c-input>
             <template slot="footer">
               <c-button

src/business/litdck/views/index.vue

@@ -83,9 +83,7 @@
 
           <!--PD000546 -->
           <el-tab-pane label="附件信息" name="doctre">
-            <c-content>
           <m-doctre :model="model" :codes="codes" />
-            </c-content>
         </el-tab-pane>
 
         </c-tabs>
@@ -116,7 +114,7 @@ import Docpre from "./Docpre";
 import Srmp from "./Srmp";
 import Engp from "~/components/business/engp/views";
 import Coninfp from "~/components/business/coninfp/views";
-import Doctre from "~/components/business/doctre/views";
+import Doctre from "~/views/Public/Doctre";
 import Limitbody from "~/views/Public/Limitbody"
 import Setmod from "~/components/business/setmod/views";
 import Glentry from "~/components/business/glentry/views";