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/brtdck/event/buildCommons.js

@@ -120,7 +120,7 @@ export default {
     let params = {
       ...this.buildCommonData(model, trnName),
       rec: {
-        objtyp: 'LID',
+        objtyp: 'BRD',
         objinr: model.brdgrp.rec.objinr,
         ownref: model.brdgrp.rec.ownref,
       },
@@ -131,9 +131,10 @@ export default {
     let params = {
       ...this.buildCommonData(model, trnName),
       rec: {
-        objtyp: 'LID',
-        objinr: model.brdgrp.rec.objinr,
+        objtyp: 'BRD',
+        inr: model.lidgrp.rec.inr,
         ownref: model.brdgrp.rec.ownref,
+        mhtyp: model.mhtyp,
         // swiftflg: model.gitp.swiftflg,
       },
     };

src/business/brtdck/model/index.js

@@ -137,7 +137,7 @@ export default class Brtdck {
                 amt: ''
             },
             max2: {
-                amt: ''
+                amt: '0.0'
             }
         }
     },
@@ -158,6 +158,9 @@ export default class Brtdck {
                 cur: '',
                 amt: ''
             }
+        },
+        blk: {
+            defdet: ''
         }
     },
    

src/business/brtdck/views/Brtdckp.vue

@@ -228,6 +228,7 @@
                   v-model="model.brdgrp.cbs.max.cur"
                   style="width: 100%"
                   placeholder=""
+                  disabled
                   :code="codes.curtxt1"
               >
               </c-select>
@@ -253,14 +254,14 @@
                   v-show="model.brdgrp.cbs.max.amt!=model.oldbrdgrp.cbs.max.amt"> </span>
           </c-col>
           <c-col :span="11">
-            <c-form-item label="" label-width="5px" prop="oldbrdgrp.cbs.max.amt">
+            <el-form-item label="原始单据金额"  prop="oldbrdgrp.cbs.max.amt" v-show="model.brdgrp.cbs.max.amt!=model.oldbrdgrp.cbs.max.amt">
               <c-input v-model="model.oldbrdgrp.cbs.max.amt" placeholder=""
                        class="m-input-currency"
                        style="width: 100%"
                        disabled
                        v-show="model.brdgrp.cbs.max.amt!=model.oldbrdgrp.cbs.max.amt"
               ></c-input>
-            </c-form-item>
+            </el-form-item>
           </c-col>
         </c-col>
 
@@ -270,6 +271,7 @@
             <el-form-item label="提取附加金额" prop="brdgrp.cbs.opn2.cur">
               <c-select
                   v-model="opn2cur"
+                  disabled
                   style="width: 100%"
                   placeholder="请选择币种"
                   :code="codes.curtxt1"
@@ -298,13 +300,14 @@
                   v-show="model.brdgrp.cbs.max2.amt!=model.oldbrdgrp.cbs.max2.amt"> </span>
           </c-col>
           <c-col :span="11">
-            <c-form-item label="" label-width="5px" prop="oldbrdgrp.cbs.max2.amt">
+            <el-form-item label="原始附加金额" prop="oldbrdgrp.cbs.max2.amt" v-show="model.brdgrp.cbs.max2.amt!=model.oldbrdgrp.cbs.max2.amt">
               <c-input v-model="model.oldbrdgrp.cbs.max2.amt" :placeholder="$t('other.please_enter')+'Balance'"
                        class="m-input-currency"
                        style="width: 100%"
                        disabled
-                       v-show="model.brdgrp.cbs.max2.amt!=model.oldbrdgrp.cbs.max2.amt"></c-input>
-            </c-form-item>
+                       v-show="model.brdgrp.cbs.max2.amt!=model.oldbrdgrp.cbs.max2.amt"
+                       ></c-input>
+            </el-form-item>
           </c-col>
         </c-col>
 
@@ -536,10 +539,12 @@
               :model="model"
               :argadr="{
               title: '',
-              grp: 'brtp',
-              rol: 'oth',
+              grp: 'brdgrp',
+              rol: 'apl',
             }"
-              :disabled="this.flag3"
+              @keyup.enter.native="
+                queryGridEtyPromptDialogData('APL', 'C')
+              "
               :disabledExtkey="this.flag4"
               :isAdrblk="true"
               :noRef="true"
@@ -586,6 +591,13 @@ export default {
       }
 
     },
+    "model.mhtyp": function () {
+      if (this.model.mhtyp == 'R') {
+        this.model.brdgrp.cbs.max.amt=this.model.oldbrdgrp.cbs.max.amt;
+        this.model.brdgrp.cbs.max2.amt=this.model.oldbrdgrp.cbs.max2.amt;
+      }
+
+    },
 
     "model.brdgrp.prb.pts.extkey": {
       immediate: true,
@@ -606,17 +618,6 @@ export default {
       }
 
     },
-
-    "model.brtp.oth.pts.extkey": {
-      immediate: true,
-      handler(val, oldVal) {
-        if (this.model.brtp.oth.pts.extkey != '') {
-          this.flag3 = true;
-        } else {
-          this.flag3 = false;
-        }
-      }
-    },
   },
   methods: {},
   created: function () {

src/business/letnot/event/buildCommons.js

@@ -92,7 +92,7 @@ export default {
       ...this.buildCommonData(model, trnName),
       liaall: model.liaall,
       liaccv: model.liaccv,
-      doceot: model.trnmod.trndoc.doceot,
+      doceot: model.docpan.doceot,
     };
     return params
   },

src/business/letnot/model/index.js

@@ -117,7 +117,7 @@ export default class Letnot {
             },
             letp: {
                 usr: {
-                    extkey: ''
+                    extkey: window.sessionStorage.userId || 'ZL',
                 },
                 aamp: {
                     aammod: {