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/betcan/model/index.js

@@ -156,6 +156,7 @@ export default class Betcan {
             strinf: '',
             bedgrp: {
                 rec: {
+                    inr: "",
                     predat: '',
                     rcvdat: '',
                     doctypcod: '',

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/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/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>