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

# Conflicts:
#	src/business/betset/model/index.js

src/business/betamc/model/index.js

@@ -98,6 +98,7 @@ export default class Betamc {
           rcvdat:"",			//  到单日期		.bedgrp.rec.rcvdat
           predat:"",			//  Presentation Date		.bedgrp.rec.predat
           docsta:"",			//  单据状态		.bedgrp.rec.docsta
+          branchinr:"",
         },
         cbs: {
           opn1: {

src/business/betamc/views/index.vue

@@ -37,7 +37,7 @@
               </c-content>
             </el-tab-pane>
             <!--PD000027 -->
-            <el-tab-pane label="费用/账务" name="setpan">
+            <el-tab-pane label="费用/账务" name="setmod">
               <c-content>
                 <m-setmod
                   :model="model"

src/business/betdcr/event/buildCommons.js

@@ -49,10 +49,10 @@ export default {
       cbsMap: {
         MAX: model.bedgrp.cbs.max,
         OPN1: model.bedgrp.cbs.opn1,
-        // MAC: model.bedgrp.cbs.mac,
-        // MAC2: model.bedgrp.cbs.mac2,
-        // OPC2: model.bedgrp.cbs.opc2,
-        // CNF: model.bedgrp.cbs.cnf,
+        MAC: model.bedgrp.cbs.mac,
+        MAC2: model.bedgrp.cbs.mac2,
+        OPC2: model.bedgrp.cbs.opc2,
+        CNF: model.bedgrp.cbs.cnf,
       },
       ptsList: ptsptaList,
       transName: trnName,

src/business/betdcr/model/index.js

@@ -33,6 +33,7 @@ export default class Betdcr {
                     intdis: ''
                 },
                 rec: {
+                    inr:'',
                     predat: '',
                     rcvdat: '',
                     doctypcod: '',
@@ -42,6 +43,7 @@ export default class Betdcr {
                     matdat: '',
                     nam: '',
                     docprbrol: '',
+                    branchinr:'',
                     advdocflg: ''
                 },
                 cbs: {

src/business/betdcr/views/Betdcrs.vue

@@ -58,7 +58,7 @@
           <c-fullbox>
             <c-input v-model="model.bedgrp.cbs.max.cur" maxlength="3" style="width: 50%" placeholder="请输入单据金额" disabled>
             </c-input>
-            <c-input v-model="model.bedgrp.cbs.max.amt" style="width: 50%" placeholder="请输入金额" disabled></c-input>
+            <c-input-currency v-model="model.bedgrp.cbs.max.amt" style="width: 50%" placeholder="请输入金额" disabled></c-input-currency>
             <template slot="footer">
               <c-checkbox v-model="model.betp.adaflg" style="margin-left: 10px" disabled>附加金额</c-checkbox>
             </template>
@@ -73,7 +73,7 @@
         </c-col>
         <c-col :span="12">
           <el-form-item label="" label-width="5px" prop="bedgrp.cbs.max.amt">
-            <c-input v-model="model.bedgrp.cbs.max.amt" placeholder="请输入金额" disabled></c-input>
+            <c-input-currency v-model="model.bedgrp.cbs.max.amt" placeholder="请输入金额" disabled></c-input-currency>
           </el-form-item>
         </c-col>
       </c-col>

src/business/betdrv/model/index.js

@@ -55,6 +55,7 @@ export default class Betdrv {
                     matdat: '',
                     dscinsflg: '',
                     nam: '',
+                    branchinr:'',
                     docprbrol: ''
                 },
                 prb: {

src/business/betrcl/model/index.js

@@ -45,7 +45,8 @@ export default class Betrcl {
                     ownref: '',
                     lescom: '',
                     matdat: '',
-                    nam: ''
+                    nam: '',
+                    branchinr:'',
                 },
                 cbs: {
                     opn1: {

src/business/betrcl/views/Rclp.vue

@@ -97,12 +97,12 @@
               placeholder="请输入单据金额"
               disabled
             ></c-input>
-            <c-input
+            <c-input-currency
               v-model="model.bedgrp.cbs.max.amt"
               style="width: 50%"
               placeholder="请输入金额"
               disabled
-            ></c-input>
+            ></c-input-currency>
             <template slot="footer">
               <c-checkbox
                 v-model="model.betp.adaflg"
@@ -127,11 +127,11 @@
         </c-col>
         <c-col :span="12">
           <el-form-item label="" label-width="5px" prop="bedgrp.cbs.max.amt">
-            <c-input
+            <c-input-currency
               v-model="model.bedgrp.cbs.max.amt"
               placeholder="请输入金额"
               disabled
-            ></c-input>
+            ></c-input-currency>
           </el-form-item>
         </c-col>
       </c-col>
@@ -160,7 +160,7 @@
             v-model="model.bedgrp.rec.matdat"
             style="width: 100%"
             placeholder="请选择到期日"
-            disabled
+            
           ></c-date-picker>
         </el-form-item>
       </c-col>

src/business/brtset/event/buildCommons.js

@@ -27,7 +27,7 @@ export default {
     }
     let dataObj = {
       rec: {
-        objtyp: 'lid',
+        objtyp: 'brd',
         ownref: model.brdgrp.rec.ownref,
         opndat: model.brdgrp.rec.opndat,
         expdat: model.brdgrp.rec.expdat,
@@ -36,7 +36,7 @@ export default {
         gartyp: model.brdgrp.rec.gartyp,
         fingua: model.brdgrp.rec.fingua,
         segtyp: model.brdgrp.ghd.segtyp,
-        fromflg: model.brdgrp.rec.fromflg,
+        fromflg: model.brdgrp.rec.fromflg,  
         othersno: model.brdgrp.rec.othersno,
         sndto: model.brdgrp.rec.sndto,
         swiftflg: model.brtp.swiftflg,
@@ -44,6 +44,27 @@ export default {
         purpos: model.brdgrp.rec.purpos,
         revflg: model.brdgrp.rec.revflg,
         cnfsta: model.brdgrp.rec.cnfsta,
+        docflg: model.brdgrp.rec.docflg,
+        ini: model.brdgrp.rec.ini,
+        paypsb: model.brdgrp.rec.paypsb,
+        matdat:model.brdgrp.rec.matdat,
+        mattxtflg:model.brdgrp.rec.mattxtflg,
+        advrefflg:model.brdgrp.rec.advrefflg,
+        advdocflg:model.brdgrp.rec.advdocflg,
+        docprbrol:model.brdgrp.rec.docprbrol,
+        cur:model.brdgrp.cbs.opn1.cur,
+        ptytyp:model.brdgrp.prb.ptytyp,
+        frepayflg:model.brdgrp.rec.frepayflg,
+        payrol:model.brdgrp.rec.payrol,
+        // dscbckamt:model.brdgrp.rec.dscbckamt,
+        totdat:model.brdgrp.rec.totdat,
+        // negate:model.brdgrp.rec.dscbckamt.negate,
+        pclbckamt:model.brdgrp.rec.pclbckamt,
+        docamt:model.brdgrp.rec.docamt,
+        doccur:model.brdgrp.rec.doccur,
+        
+    
+
       },
       cbsMap: {
         MAX: model.brdgrp.cbs.max,

src/business/brtset/model/index.js

@@ -25,6 +25,16 @@ export default class Bctset {
           docprbrol: '',
           frepayflg: '',
           inr:'',
+          totdat:'',
+          ptytyp:'',
+          pclbckamt:'',
+          dscbckamt:{
+            negate:'',
+          },
+          docamt:'',
+          doccur:'',
+
+
         },
         cbs: {
           opn1: {

src/business/inflid/views/Infsea.vue

@@ -278,7 +278,7 @@ export default {
       stmData: {
         columns: [
           {
-            label: '保函编号',
+            label: '信用证编号',
             prop: 'seaownref'
           },
           {

src/business/letcan/model/index.js

@@ -34,6 +34,7 @@ export default class Letcan {
           pts: new Pts().data,
         },
         rec: {
+          inr:'',
           revflg: '',
           expdat: '',
           expplc: '',
@@ -44,6 +45,7 @@ export default class Letcan {
           nam: '',
           opndat: '',
           redclsflg: '',
+          branchinr:'',
         },
         cbs: {
           opn1: {

src/business/letcan/views/Canp.vue

@@ -85,13 +85,13 @@
           </c-col>
           <c-col :span="8">
             <el-form-item label="" label-width="5px" prop="ledgrp.cbs.opn1.amt">
-              <c-input
+              <c-input-currency
                 v-model="model.ledgrp.cbs.opn1.amt"
                 style="text-align: left; width: 100%"
                 class="m-input-currency"
                 placeholder="请输入金额"
                 disabled
-              ></c-input>
+              ></c-input-currency>
             </el-form-item>
           </c-col>
           <c-col :span="5">

src/business/litopn/model/index.js

@@ -100,7 +100,7 @@ export default class Litopn {
         },
         rec: {
           inr:'',
-          tenmaxday: '',
+          tenmaxday: 0,
           expplc: '',
           nomton: '',
           stacty: '',