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

src/business/betcan/model/index.js

@@ -142,7 +142,8 @@ export default class Betcan {
                     pts: new Pts().data,
                 },
                 rec: {
-                    ownref: ''
+                    ownref: '',
+                    branchinr: ''
                 },
                 cbs: {
                     opn1: {
@@ -155,6 +156,7 @@ export default class Betcan {
             strinf: '',
             bedgrp: {
                 rec: {
+                    inr: "",
                     predat: '',
                     rcvdat: '',
                     doctypcod: '',

src/business/betsnd/model/check.js

@@ -144,20 +144,20 @@ export default {
         {max: 35,message:"长度不能超过35"}
     ],
     "bedgrp.rec.rcvdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "bedgrp.rec.shpdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "bedgrp.prb.adrelc":[
         {type: "string", required: true, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
     "bedgrp.rec.predat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "bedgrp.rec.matdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "bedgrp.blk.matper":[
         {type: "string", required: true, message: "必输项"},
@@ -172,7 +172,7 @@ export default {
         {max: 1300,message:"长度不能超过1300"}
     ],
     "bedgrp.rec.disdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "bedgrp.rec.lescom":[
         {type: "string", required: false, message: "必输项"},
@@ -183,10 +183,10 @@ export default {
         {type: "string", required: true, message: "必输项"},
         {max: 390,message:"长度不能超过390"}
     ],
-    "bedgrp.blk.docdis":[
-        {type: "string", required: true, message: "必输项"},
-        {max: 3500,message:"长度不能超过3500"}
-    ],
+    // "bedgrp.blk.docdis":[
+    //     {type: "string", required: true, message: "必输项"},
+    //     {max: 3500,message:"长度不能超过3500"}
+    // ],
     "betp.docp.ptsget.sdamod.dadsnd":[
         {type: "string", required: false, message: "必输项"},
         {max: 16,message:"长度不能超过16"}
@@ -203,10 +203,10 @@ export default {
         {type: "string", required: true, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
-    "bedgrp.doc.pts.adrblk":[
-        {type: "string", required: true, message: "必输项"},
-        {max: 140,message:"长度不能超过140"}
-    ],
+    // "bedgrp.doc.pts.adrblk":[
+    //     {type: "string", required: true, message: "必输项"},
+    //     {max: 140,message:"长度不能超过140"}
+    // ],
     "bedgrp.doc.dbfadrblkcn":[
         {type: "string", required: true, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
@@ -223,10 +223,10 @@ export default {
         {type: "string", required: true, message: "必输项"},
         {max: 650,message:"长度不能超过650"}
     ],
-    "bedsnd.newbenadr":[
-        {type: "string", required: true, message: "必输项"},
-        {max: 175,message:"长度不能超过175"}
-    ],
+    // "bedsnd.newbenadr":[
+    //     {type: "string", required: true, message: "必输项"},
+    //     {max: 175,message:"长度不能超过175"}
+    // ],
     "bedgrp.blk.benref":[
         {type: "string", required: true, message: "必输项"},
         {max: 160,message:"长度不能超过160"}
@@ -263,31 +263,11 @@ export default {
         {type: "string", required: false, message: "必输项"},
         {max: 16,message:"长度不能超过16"}
     ],
-    "setmod.docamt":[
-        {type: "number", required: false, message: "必输项"},
-        {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
-    ],
 
     "setmod.zmqacc":[
         {type: "string", required: false, message: "必输项"},
         {max: 20,message:"长度不能超过20"}
     ],
-    "mtabut.coninf.oitinf.oit.inftxt":[
-        {type: "string", required: false, message: "必输项"},
-        {max: 60,message:"长度不能超过60"}
-    ],
-    "mtabut.coninf.oitset.oit.inftxt":[
-        {type: "string", required: false, message: "必输项"},
-        {max: 60,message:"长度不能超过60"}
-    ],
-    "mtabut.coninf.conexedat":[
-        {type: "date", required: false, message: "输入正确的日期"}
-    ],
-    "mtabut.coninf.usr.extkey":[
-        {type: "string", required: false, message: "必输项"},
-        {max: 8,message:"长度不能超过8"}
-    ],
     "trnmod.trndoc.advnam":[
         {type: "string", required: false, message: "必输项"},
         {max: 50,message:"长度不能超过50"}
@@ -413,7 +393,7 @@ export default {
         {max: 35,message:"长度不能超过35"}
     ],
     "rmbclm.valdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "cnybop.cnylib.spk":[
         {type: "string", required: false, message: "必输项"},
@@ -452,13 +432,13 @@ export default {
         {max: 3,message:"长度不能超过3"}
     ],
     "cnybop.cnylib.doccurdate":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "cnybop.cnylib.denddate":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "cnybop.cnylib.dcreditenddate":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "cnybop.cnylib.famt":[
         {type: "string", required: false, message: "必输项"},
@@ -466,14 +446,14 @@ export default {
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
     "cnybop.cnylib.dexchangedate":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "cnybop.fexchangeamt":[
         {type: "string", required: false, message: "必输项"},
         {max: 20,message:"长度不能超过20"}
     ],
     "cnybop.cnylib.dexchangeenddate":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "cnybop.saddwordlib":[
         {type: "string", required: true, message: "必输项"},

src/business/betsnd/views/Dscins.vue

@@ -191,7 +191,7 @@
           title: '',
           grp: 'bedgrp',
           rol: 'doc',
-        }":disabled1="
+        }" :disabled1="
           model.bedgrp.rec.docrol != 'OTH' || model.bedgrp.rec.docrolflg == ''
         " :disabled="true">
         </c-ptap1>

src/business/betsnd/views/Rgfp.vue

@@ -84,7 +84,7 @@
         <c-col :span="24">
           <el-form-item label="到期日" prop="bedgrp.rec.matdat">
             <c-date-picker type="date" v-model="model.bedgrp.rec.matdat" style="width: 100%" placeholder="请选择到期日"
-                           value-format="yyyy-MM-dd" :disabled="true"></c-date-picker>
+                           value-format="yyyy-MM-dd" ></c-date-picker>
           </el-form-item>
         </c-col>
         <!-- <c-col :span="12"></c-col> -->
@@ -176,9 +176,9 @@
 
         <c-col :span="12">
           <el-form-item label="" label-width="5px" prop="ledgrp.cbs.opn1.amt">
-            <c-input v-model="model.ledgrp.cbs.opn1.amt" placeholder="请输入信用证余额" disabled
+            <c-input-currency v-model="model.ledgrp.cbs.opn1.amt" placeholder="请输入信用证余额" disabled
                      class="m-input-currency">
-            </c-input>
+            </c-input-currency>
           </el-form-item>
         </c-col>
       </c-col>

src/business/letcan/event/buildCommons.js

@@ -51,7 +51,7 @@ export default {
       cbsMap: {
         MAX: model.ledgrp.cbs.max,
         OPN1: model.ledgrp.cbs.opn1,
-        OPN2: model.ledgrp.cbs.opn1,
+        OPN2: model.ledgrp.cbs.opn2,
         MAC: model.ledgrp.cbs.mac,
         MAC2: model.ledgrp.cbs.mac2,
         OPC2: model.ledgrp.cbs.opc2,

src/business/letcan/model/check.js

@@ -85,7 +85,7 @@ export default {
 
   'letp0.cnftxt': [
     { type: 'string', required: false, message: '必输项' },
-    { max: 40, message: '长度不能超过40' },
+    { max: 400, message: '长度不能超过40' },
   ],
   'letcanf.strinf': [
     { type: 'string', required: false, message: '必输项' },

src/business/letcan/model/index.js

@@ -99,6 +99,20 @@ export default class Letcan {
         },
         rmbrol: '',
       },
+
+      async queryGridEtyPromptDialogData(type, ptytyp) {
+        let params = {
+          userId: window.sessionStorage.userId || 'ZL',
+          ptytyp: ptytyp,
+          extkey: this.model.ledgrp[type.toLowerCase()].pts.extkey,
+        };
+        let res = await Api.post('/service/ptspta/list', params);
+        if (res.respCode == SUCCESS) {
+          this.root.$refs['etyDialog'].show = true;
+          this.root.promptData.data = res.data.ptaInfos;
+          this.root.promptData.type = type;
+        }
+      },
       setmod: new Pub().data.Setmod,
       mtabut: new Pub().data.Mtabut,
       trnmod: new Pub().data.Trnmod,

src/business/letcan/views/Canp.vue

@@ -272,7 +272,7 @@
         <c-col :span="24">
           <el-form-item label="确认文本" prop="letp0.cnftxt">
             <c-input
-              v-model="model.letp0.cnftxt"
+              v-model="cnftxt"
               maxlength="40"
               placeholder="请输入"
               disabled
@@ -334,6 +334,13 @@ export default {
   },
   methods: {},
   created: function () {},
+  computed:{
+    cnftxt(){
+      this.model.letp0.cnftxt="The L/C was canceled  "+new Date()
+return this.model.letp0.cnftxt
+    }
+
+  }
 }
 
 </script>

src/business/letdrw/views/Ovwp1.vue

@@ -436,12 +436,43 @@ export default {
   data() {
     return {}
   },
+
+   watch:{
+    "model.ledgrp":{
+     immediate: true,
+     deep: true,
+     handler(val,oldval){
+      const res = this.model.ledgrp
+       if(res.cbs.nom1.cur !== "" || res.cbs.nom1.amt !== "" || res.apl.pts.adrblk !== "" || res.rec.stacty !== "" ){
+        this.model.ledgrp.rec.nam = (res.cbs.nom1.cur.concat(" ").concat(res.cbs.nom1.amt).concat(" ").concat(res.rec.stacty).concat(".").concat(res.ben.pts.nam)).substring(0,40);
+       }
+     }
+   },
+ "model.ledgrp.iss":{
+     immediate: true,
+     deep: true,
+     handler(val,oldval){
+      if(this.model.ledgrp.iss.pts !==""){
+        this.getstacty()
+      }
+    }
+    }
+   },
   methods: {
     apprulChange(v) {
       if (v !== 'OTHR') {
         this.model.ledgrp.rec.apprultxt = ''
       }
     },
+     async getstacty() {
+    let params = {
+      ptainr: this.model.ledgrp.iss.pts.ptainr
+    }
+    let res = await Api.post('/service/letopn/stacty', params);
+    if (res.respCode == SUCCESS) {
+      this.model.ledgrp.rec.stacty = res.data;
+    }
+    }
   },
   created: function () {},
   computed:{

src/business/letrsv/event/buildCommons.js

@@ -52,6 +52,7 @@ export default {
     let dataObj = {
       rec: {
         objtyp: 'LED',
+        objinr: model.ledgrp.rec.objinr,
         ownref: model.ledgrp.rec.ownref,
         opndat: model.ledgrp.rec.opndat,
         expdat: model.ledgrp.rec.expdat,

src/business/letrsv/model/check.js

@@ -288,16 +288,16 @@ let checkObj = {
     ],
     "ledgrp.drw.pts.adrblk": [
         { type: "string", required: true, message: "必输项" },
-        { max: 35, message: "长度不能超过35" }
+        { max: 350, message: "长度不能超过35" }
     ],
     "ledgrp.drw.dbfadrblkcn": [
         { type: "string", required: true, message: "必输项" },
-        { max: 35, message: "长度不能超过35" }
+        { max: 350, message: "长度不能超过35" }
     ],
 
     "ledgrp.drw.adrelc": [
         { type: "string", required: true, message: "必输项" },
-        { max: 35, message: "长度不能超过35" }
+        { max: 350, message: "长度不能超过35" }
     ],
 
     "ledgrp.rec.shpfro": [

src/business/letrsv/model/index.js

@@ -9,11 +9,11 @@ export default class Letrsv {
                 cbs: {
                     max: {
                         cur: '',
-                        amt: ''
+                        amt: '0.00'
                     },
                     max2: {
                         cur: '',
-                        amt: ''
+                        amt: '0.00'
                     }
                 }
             },

src/business/letrsv/views/Ovwp1.vue

@@ -446,6 +446,38 @@ export default {
   data() {
     return {};
   },
+
+ watch:{
+    "model.ledgrp":{
+     immediate: true,
+     deep: true,
+     handler(val,oldval){
+      const res = this.model.ledgrp
+       if(res.cbs.nom1.cur !== "" || res.cbs.nom1.amt !== "" || res.apl.pts.adrblk !== "" || res.rec.stacty !== "" ){
+        this.model.ledgrp.rec.nam = (res.cbs.nom1.cur.concat(" ").concat(res.cbs.nom1.amt).concat(" ").concat(res.rec.stacty).concat(".").concat(res.ben.pts.nam)).substring(0,40);
+       }
+     }
+   },
+ "model.ledgrp.iss":{
+     immediate: true,
+     deep: true,
+     handler(val,oldval){
+      if(this.model.ledgrp.iss.pts !==""){
+        this.getstacty()
+      }
+    }
+    },
+      //国家地区
+    async getstacty() {
+    let params = {
+      ptainr: this.model.ledgrp.iss.pts.ptainr
+    }
+    let res = await Api.post('/service/letrsv/stacty', params);
+    if (res.respCode == SUCCESS) {
+      this.model.ledgrp.rec.stacty = res.data;
+    }
+    }
+   },
   computed: {
     flag() {
       return this.model.mtabut.coninf.usr.extkey == "";
@@ -502,6 +534,15 @@ export default {
   },
   created: function () {
   },
+  async getstacty() {
+    let params = {
+      ptainr: this.model.ledgrp.iss.pts.ptainr
+    }
+    let res = await Api.post('/service/letopn/stacty', params);
+    if (res.respCode == SUCCESS) {
+      this.model.ledgrp.rec.stacty = res.data;
+    }
+    }
 };
 </script>
 <style>

src/views/Business/Letcan/Canp.vue

@@ -198,7 +198,7 @@
               style="width: 100%"
               placeholder="请选择类型"
               disabled
-              :code="codes.lcrtyp"
+              :code="codes.lcrtyp1"
             >
             </c-select>
           </el-form-item>