Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206

src/model/Betdcr/Pattern.js

@@ -113,7 +113,7 @@ export default {
 
     "bedgrp.oth.pts.adrblk": [
         { type: "string", required: true, message: "必输项" },
-        { max: 35, message: "长度不能超过35" }
+        { type: "string", max: 999, message: "长度不能超过35" }
     ],
     "bedgrp.oth.dbfadrblkcn": [
         { type: "string", required: true, message: "必输项" },
@@ -148,7 +148,7 @@ export default {
     ],
     "bedgrp.prb.pts.adrblk": [
         { type: "string", required: true, message: "必输项" },
-        { max: 35, message: "长度不能超过35" }
+        { type: "string", max: 999, message: "长度不能超过35" }
     ],
     "bedgrp.prb.dbfadrblkcn": [
         { type: "string", required: true, message: "必输项" },
@@ -159,22 +159,22 @@ export default {
         { max: 35, message: "长度不能超过35" }
     ],
     "bedgrp.blk.intdis": [
-        { type: "string", required: true, message: "必输项" },
+        { type: "string", required: false, message: "必输项" },
         { max: 65, message: "长度不能超过65" }
     ],
 
     "bedgrp.blk.docins": [
-        { type: "string", required: true, message: "必输项" },
+        { type: "string", required: false, message: "必输项" },
         { max: 35, message: "长度不能超过35" }
     ],
 
     "bedgrp.blk.disdoc": [
-        { type: "string", required: true, message: "必输项" },
+        { type: "string", required: false, message: "必输项" },
         { max: 35, message: "长度不能超过35" }
     ],
 
     "bedgrp.blk.docdis": [
-        { type: "string", required: true, message: "必输项" },
+        { type: "string", required: false, message: "必输项" },
         { max: 50, message: "长度不能超过50" }
     ],
 

src/model/Betdcr/index.js

@@ -98,6 +98,7 @@ export default class Betdcr {
                     docdisflg: "", //  Discrepancies modified		.bedgrp.blk.docdisflg
                     docins: "", //  Reasons for Rejection		.bedgrp.blk.docins
                     disdoc: "", //  Disposal of Documents		.bedgrp.blk.disdoc
+                    prsdoc: "", //.bedgrp.blk.prsdoc
                 },
             },
             advrefflg: "", //  Advice of Refusal MT734		.advrefflg

src/views/Business/Betdcr/Betdcrd.vue

 <template>
   <div class="eibs-tab">
     <!-- left -->
-    <c-col :span="12">
+    <c-col :span="11">
       <c-col :span="24">
         <el-form-item
           label="Internal Discrepancies"
@@ -64,7 +64,7 @@
       </c-col>
     </c-col>
     <!-- right -->
-    <c-col :span="12">
+    <c-col :span="11" :offset="1">
       <c-col :span="24">
         <el-form-item
           label="Reasons for Rejection"
@@ -130,7 +130,20 @@
     </c-col>
 
     <!-- next part -->
-    <c-col :span="24" style="height: 24px; margin-top: -10px">
+    <c-col :span="24">
+      <c-docpre
+        :model="model"
+        :argadr="{
+          path:'bedgrp.blk.prsdoc',
+          grp:'betp',
+          code:'docpre'
+        }"
+        
+      >
+      </c-docpre>
+    </c-col>
+
+    <!-- <c-col :span="24" style="height: 24px; margin-top: -10px">
       <el-form-item :label="model.betp.docgrdm.docdsclab" class="messageLabel">
         <c-button style="float: right" @click="addTableValue" type="primary"
           >新增单据</c-button
@@ -160,7 +173,7 @@
         </el-table-column>
         <el-table-column label="Document" prop="docnam" width="auto">
           <template slot-scope="scope">
-            <!-- {{scope.row.docnam}} -->
+             {{scope.row.docnam}}
             <c-select
               style="width: 100%"
               placeholder="请选择"
@@ -184,7 +197,7 @@
           </template>
         </el-table-column>
       </c-table>
-    </c-col>
+    </c-col> -->
     <!-- <c-col :span="12">
         <el-form-item label="Internal Discrepancies" prop="bedgrp.blk.intdis">
             <c-input type="textarea" v-model="model.bedgrp.blk.intdis" maxlength="65" show-word-limit placeholder="请输入Internal Discrepancies" ></c-input>
@@ -251,8 +264,11 @@ import Api from "~/service/Api";
 import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable";
 import Event from "~/model/Betdcr/Event";
+import Utils from "~/utils";
+import Docpre from "~/views/Public/Docpre";
 
 export default {
+  components:{"c-docpre":Docpre},
   inject: ["root"],
   props: ["model", "codes"],
   mixins: [commonProcess],
@@ -310,10 +326,15 @@ export default {
   computed: {
     docdisflg: {
       get() {
+        if(this.model.bedgrp.blk.docdis==""){
           return this.model.bedgrp.blk.docdisflg != "X";
+        }else{
+          return this.model.bedgrp.blk.docdisflg != "";
+        }
       },
       set(val) {
         this.model.bedgrp.blk.docdisflg = val ? "X" : "";
+        this.model.bedgrp.blk.docdis = "";
       },
     },
     rejpenins: {

src/views/Business/Betdcr/Betdcrs.vue

 <template>
   <div class="eibs-tab">
     <!-- left -->
-    <c-col :span="12">
+    <c-col :span="11">
       <c-col :span="24">
         <c-col :span="20">
           <el-form-item
@@ -41,7 +41,7 @@
             type="primary"
             :disabled="this.flag"
           >
-            获取
+            Get
           </c-button>
           <!-- </el-form-item> -->
         </c-col>
@@ -87,7 +87,7 @@
             type="primary"
             :disabled="this.flag"
           >
-            获取
+            Get
           </c-button>
           <!-- </el-form-item> -->
         </c-col>
@@ -215,7 +215,7 @@
     </c-col>
 
     <!-- right -->
-    <c-col :span="12">
+    <c-col :span="11" :offset="1">
       <c-col :span="24">
         <c-col :span="12">
           <el-form-item label="Open Amt. L/C" prop="ledgrp.cbs.opn1.cur">
@@ -258,6 +258,9 @@
             rol: 'prb',
           }"
           :disabled="true"
+          :enname="true"
+          :enRef="true"
+          :enNam="true"
         ></c-ptsmsg>
       </c-col>
       <c-col :span="24">
@@ -269,6 +272,8 @@
             rol: 'iss',
           }"
           :disabled="true"
+          :enRef="true"
+          :enNam="true"
         ></c-ptsmsg>
       </c-col>
       <c-col :span="24">
@@ -280,6 +285,8 @@
             rol: 'apl',
           }"
           :disabled="true"
+          :enRef="true"
+          :enNam="true"
         ></c-ptsmsg>
       </c-col>
     </c-col>
@@ -291,7 +298,7 @@
 
     <!-- next part -->
     <!-- left -->
-    <c-col :span="12">
+    <c-col :span="11">
       <c-col :span="24">
         <c-checkbox v-model="advrefflg" style="margin-left: 150px"
           >Receive advice of refusal</c-checkbox
@@ -332,7 +339,7 @@
       </c-col>
     </c-col>
     <!-- right -->
-    <c-col :span="12">
+    <c-col :span="11" :offset="1">
       <c-col :span="24">
         <el-form-item label="Payer" prop="bedgrp.rec.payrol">
           <c-select

src/views/Business/Bftsnd/Rgfp.vue

@@ -337,7 +337,7 @@
         </el-table-column>
         <el-table-column label="2nd" width="auto">
           <template slot-scope="scope">
-            <c-input v-model="scope.row.cmail2"></c-input>
+            <c-input v-model="scope.row.cmail2" @change="prsdoc"></c-input>
           </template>
         </el-table-column>
         <el-table-column label="Document" prop="docnam" width="auto">
@@ -870,17 +870,7 @@ export default {
       // }
     },//表格输入传入数据库
     async prsdoc() {
-        let rtnmsg = await this.executeRule("bfdgrp.blk.prsdoc")
-        if (rtnmsg.respCode == SUCCESS) {
-            //TODO 处理数据逻辑
-            this.updateModel(rtnmsg.data);
-
-        } else {
-            this.$notify.error({ title: '错误', message: '服务请求失败！' });
-        }
-    },
-    async matdat() {
-        let rtnmsg = await this.executeDefault("bfdgrp.blk.matper")
+        let rtnmsg = await this.executeDefault("bfdgrp.blk.prsdoc")
         if (rtnmsg.respCode == SUCCESS) {
             //TODO 处理数据逻辑
             this.updateModel(rtnmsg.data);

src/views/Business/Infled/index.vue

@@ -36,6 +36,7 @@ import Pattern from "~/model/Infled/Pattern"
 import Infsea from "./Infsea"
 
 export default {
+    name: "Infled",
     components:{
         "m-infsea" : Infsea,