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/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/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" },