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

src/business/betsnd/model/check.js

@@ -160,15 +160,15 @@ export default {
         { required: false, message: "输入正确的日期"}
     ],
     "bedgrp.blk.matper":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 65,message:"长度不能超过65"}
     ],
     "bedgrp.blk.intdis":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 1300,message:"长度不能超过1300"}
     ],
     "bedgrp.blk.comcon":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 1300,message:"长度不能超过1300"}
     ],
     "bedgrp.rec.disdat":[
@@ -216,11 +216,11 @@ export default {
         {max: 35,message:"长度不能超过35"}
     ],
     "bedsnd.usadet":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 650,message:"长度不能超过650"}
     ],
     "bedsnd.addphr":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 650,message:"长度不能超过650"}
     ],
     // "bedsnd.newbenadr":[

src/business/betsnd/model/index.js

@@ -17,7 +17,7 @@ export default class Betsnd {
                 cre752flg: '',
                 docgrdm: {
                     docdsclab: "",			//  Label of document description		.brtp.docgrdm.docdsclab
-                    docgrd: "",                    //brtp.docgrdm.docgrd
+                    docgrdVos: "",                    //brtp.docgrdm.docgrd
                 },
             },
             rmbclmlate: '',
@@ -97,7 +97,7 @@ export default class Betsnd {
                     disdat: '',
                     doctypcod: '',
                     docrolflg: '',
-                    lescom: '',
+                    lescom: '0.00',
                     shpdat: '',
                     docrol: '',
                     matdat: '',

src/business/betsnd/views/Dscins.vue

@@ -217,7 +217,11 @@ export default {
   computed: {
     bedsndIngdsc: {
       get() {
-        return this.model.bedsnd.ingdsc != ''
+        if(this.model.bedsnd.ingdsc == ''){
+          return this.model.bedsnd.ingdsc = 'X'
+        }else{
+          return this.model.bedsnd.ingdsc != ''
+        }
       },
       set(val) {
         this.model.bedsnd.ingdsc = val ? 'X' : ''

src/business/brtset/event/buildCommons.js

@@ -79,7 +79,8 @@ export default {
       },
       ptsList: ptsptaList,
       transName: trnName,
-      userId: window.sessionStorage.userId ? window.sessionStorage.userId : 'ZL'
+      userId: window.sessionStorage.userId ? window.sessionStorage.userId : 'ZL',
+      setglg: model.setmod.setglg,
     };
     return dataObj
   },

src/business/brtset/event/index.js

@@ -61,6 +61,10 @@ export default {
         }
       })
     },
+    async maxAmtChange(){
+      let engpRequest = buildFn.buildEngp(this.model, this.trnName);
+      this.processLiaall(engpRequest);
+    },
     async tabClick(tab) {
       if (this.isInDisplay) {
         return;

src/business/brtset/model/index.js

@@ -38,7 +38,7 @@ export default class Bctset {
         cbs: {
           opn1: {
             cur: '',
-            amt: '',
+            amt: '0.00',
           },
           opn2: {
             cur: '',
@@ -127,7 +127,7 @@ export default class Bctset {
       },
       aamset: {
         utlamt: '',
-        utlamt2: '',
+        utlamt2: '0.00',
       },
       trtcre: {
         trtmod: {
@@ -428,7 +428,7 @@ export default class Bctset {
         cbs: {
           opn1: {
             cur: '',
-            amt: '',
+            amt: '0.00',
           },
         },
       },

src/business/brtset/views/Utlp.vue

@@ -101,6 +101,7 @@
                 v-model="model.brdgrp.cbs.opn1.cur"
                 maxlength="3"
                 placeholder="请输入单据余额币种"
+                :code="codes.cur"
                 disabled
               ></c-input>
             </el-form-item>
@@ -226,9 +227,10 @@
           <c-col :span="13">
             <el-form-item label="应付金额" prop="setmod.doccur">
               <c-input
-                v-model="model.setmod.doccur"
+                v-model="doccur"
                 maxlength="3"
                 placeholder="请选择币种"
+                :code="codes.cur"
                 disabled
               ></c-input>
             </el-form-item>
@@ -249,6 +251,7 @@
                 v-model="model.setmod.doccur"
                 maxlength="3"
                 placeholder="请选择币种"
+                :code="codes.cur"
                 disabled
               ></c-input>
             </el-form-item>
@@ -284,6 +287,7 @@
               <c-input
                 v-model="model.aamset.utlamt"
                 placeholder="请输入金额"
+                disabled
               ></c-input>
             </el-form-item>
           </c-col>
@@ -307,6 +311,7 @@
               <c-input
                 v-model="model.aamset.utlamt2"
                 placeholder="请输入金额"
+                disabled
               ></c-input>
             </el-form-item>
           </c-col>
@@ -484,6 +489,7 @@
                 v-model="model.lidgrp.cbs.opn1.cur"
                 maxlength="3"
                 placeholder="请输入币种"
+                :code="codes.cur"
                 disabled
               ></c-input>
             </el-form-item>
@@ -581,6 +587,7 @@
                 v-model="model.setmod.doccur"
                 maxlength="3"
                 placeholder="请输入币种"
+                :code="codes.cur"
                 disabled
               ></c-input>
             </el-form-item>
@@ -692,6 +699,7 @@ export default {
     return {
       flag4:true,
       flag3: true,
+      trnName: "brtset",
       cmtflg: [
         { label: "代理行模式", value: "C" },
         { label: "其他", value: "O" },
@@ -712,6 +720,19 @@ export default {
   },
   created: function () {},
   watch: {
+    "model.setmod.docamt":{
+      immediate: true,
+      handler(val, oldVal) {
+        this.model.brdgrp.cbs.max.amt=this.model.setmod.docamt;
+        this.model.aamset.utlamt=this.model.setmod.docamt-this.model.aamset.utlamt2;
+      },
+    },
+    "model.brdgrp.cbs.max.amt":{
+      immediate: true,
+      handler(val, oldVal) {
+        this.maxAmtChange();
+      },
+    },
     "model.brtp.ischktyp": {
       immediate: true,
       handler(val, oldVal) {
@@ -749,7 +770,11 @@ export default {
     opn2cur(){
       this.model.brdgrp.cbs.opn2.cur = this.model.brdgrp.cbs.max.cur
       return this.model.brdgrp.cbs.opn2.cur
-    }
+    },
+    doccur(){
+      this.model.setmod.doccur = this.model.brdgrp.cbs.max.cur
+      return this.model.setmod.doccur
+    } ,
   }
 };
 </script>

src/business/infbed/event/index.js

@@ -101,6 +101,7 @@ export default {
       const params = {
         //根据xx字段 查询处理的数据
         seaownref: row.seaownref,
+        userId: window.sessionStorage.userId || 'ZL',
       };
       const res = await Api.post('/service/infbed/dealWithByOwnref', params);
       if (res.respCode === SUCCESS) {

src/business/letopn/model/index.js

@@ -21,7 +21,7 @@ export default class Letopn {
                     spcrcb: '',
                 },
                 rec: {
-                    branchinr: '00000047',
+                    branchinr: '',
                     stagod: '',
                     tenmaxday: '',
                     nomton: '0',

src/config/CodeTable/index.js

@@ -7187,7 +7187,8 @@ const CodeTable = {
         { label: "航空公司账单", value: "Airway Bills" },
         { label: "受益人声明", value: "Beneficiary's Declaration" },
         { label: "提单复印件", value: "Bill of Lading Copies" },
-        { label: "提单原件", value: "Bill of Lading Originals" },
+        // { label: "提单原件", value: "Bill of Lading Originals" },
+        { label: "提单原件", value: "Original Bills of Lading" },
         { label: "证明书", value: "Certificate" },
         { label: "分析证书", value: "Certificate of Analysis" },
         { label: "原产地证书", value: "Certificate of Origin" },