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/Detopn/Pattern.js

@@ -150,7 +150,7 @@ export default {
         {type:"number", max:9999, message: "大小不超过9999" }
     ],
     "dedgrp.blk.defdet":[
-        {type: "string", required: false, message: "必输项"},
+        {type: "string", required: true, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
     "dedgrp.apl.adrelc":[

src/model/Public/Mtabut/index.js

@@ -5,18 +5,14 @@ export default class Mtabut {
                 oitinf: {
                     labinftxt: "",			//  Label for INFTXT		.mtabut.coninf.oitinf.labinftxt
                     oit: {
-                        inftxt: {
-                            rows: []
-                        },			//  Infotext		.mtabut.coninf.oitinf.oit.inftxt
+                        inftxt: "",			//  Infotext		.mtabut.coninf.oitinf.oit.inftxt
                         inflev: "",			//  Infotext Level		.mtabut.coninf.oitinf.oit.inflev
                     },
                 },
                 oitset: {
                     labinftxt: "",			//  Label for INFTXT		.mtabut.coninf.oitset.labinftxt
                     oit: {
-                        inftxt: {
-                            rows:[]
-                        },			//  Infotext		.mtabut.coninf.oitset.oit.inftxt
+                        inftxt: "",			//  Infotext		.mtabut.coninf.oitset.oit.inftxt
                         inflev: "",			//  Infotext Level		.mtabut.coninf.oitset.oit.inflev
                     },
                 },

src/views/Business/Detopn/Ovwp.vue

@@ -468,17 +468,33 @@
                 </el-form-item>
             </c-col>
 
-            <c-col :span="24">
-                <el-form-item label="远期付款指示" prop="dedgrp.blk.dftat">
-                    <c-input
-                        type="textarea"
-                        v-model="model.dedgrp.blk.dftat"
-                        maxlength="35"
-                        show-word-limit
-                        placeholder="请输入远期付款指示"
-                    ></c-input>
-                </el-form-item>
-            </c-col>
+            <div v-if="model.dedgrp.rec.avbby != 'D'">
+                <c-col :span="24">
+                    <el-form-item label="远期付款指示" prop="dedgrp.blk.dftat">
+                        <c-input
+                            type="textarea"
+                            v-model="model.dedgrp.blk.dftat"
+                            maxlength="35"
+                            show-word-limit
+                            placeholder="请输入远期付款指示"
+                            :disabled="!model.dedgrp.rec.avbby"
+                        ></c-input>
+                    </el-form-item>
+                </c-col>
+            </div>
+            <div v-else>
+                <c-col :span="24">
+                    <el-form-item label="远期付款指示" prop="dedgrp.blk.defdet">
+                        <c-input
+                            type="textarea"
+                            v-model="model.dedgrp.blk.defdet"
+                            maxlength="35"
+                            show-word-limit
+                            placeholder="请输入远期付款指示"
+                        ></c-input>
+                    </el-form-item>
+                </c-col>
+            </div>
         </c-col>
 
         <!-- ========================右边======================= -->
@@ -585,7 +601,10 @@
       -->
 
             <c-col :span="24">
-                <el-form-item label="受益人开户行联行行号" prop="dedgrp.beb.pts.bankno">
+                <el-form-item
+                    label="受益人开户行联行行号"
+                    prop="dedgrp.beb.pts.bankno"
+                >
                     <c-input
                         v-model="model.dedgrp.beb.pts.bankno"
                         maxlength="20"

src/views/Business/Infbdd/Infsea.vue

@@ -305,11 +305,7 @@
       </c-col>
     </el-row>
 
-    <el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body>
-      <div class="m-list-btns">
-          <m-busbtn ref="childs"  :ownref="ownref" trnCode="ditsel" :model="ditselModel" ownrefPath="bddgrp" tabIndex=3 @onChoose="onChoose" >11</m-busbtn>
-      </div>
-    </el-dialog>
+    <m-busbtn ref="childs"  :ownref="ownref" trnCode="ditsel" :model="ditselModel" ownrefPath="bddgrp" tabIndex=3 @onChoose="onChoose" >11</m-busbtn>
   </div>
 </template>
 <script>
@@ -328,10 +324,9 @@ export default {
   components:{'m-busbtn':BusNavbar},
   data() {
     return {
-        ditselModel: new DitselModel().data,
-        ownref:"",
-        initdialog:false,
-          trnData: {
+      ditselModel: new DitselModel().data,
+      ownref:"",
+      trnData: {
         columns: [
           '1 1 "编号" 200',
           '2 2 "交易名称" 120',
@@ -369,23 +364,20 @@ export default {
   },
   methods: {
     ...Event,
-     async getButtons(ownref){
-        this.initdialog = true
+      async getButtons(ownref){
         this.ownref = ownref
+        this.$refs.childs.initdialog = true
         console.log("ownref:" +ownref);
-        setTimeout(()=>{
-        this.$refs.childs.$emit("childmethods")
-        },10)
       },
         async  onChoose(code){
             //跳转交易
           this.$router.history.push("/business/" + code) 
-          this.initdialog = false                    
+          this.$refs.childs.initdialog = false                    
         } ,
         async  getDitSelInfo(code){
             //跳转交易
           this.$router.history.push("/business/" + code) 
-          this.initdialog = false                    
+          this.$refs.childs.initdialog = false                    
         },
         closeTrn(refId){
           this.$refs[refId].doClose();

src/views/Public/BusNavbar.vue

 <template>
-  <div class="busnavbar">
-    <div class="busnavbar-items">
-      <c-button
-        style="margin-left: 7px"
-        size="medium"
-        type="primary"
-        class="medium_bcs"
-        v-for="(item, index) in navcode"
-        v-bind:key="index"
-        @click.native="onNarBtnClick(item.code, item.index)"
-        :title="item.title"
-        :disabled="item.isDis === 'N'"
-        >{{ item.label }}</c-button
-      >
+  <el-dialog
+    :visible.sync="initdialog"
+    :title="'交易列表'"
+    append-to-body
+    :before-close="beforeClose"
+    @opened="opened"
+  >
+    <div class="m-list-btns">
+      <div class="busnavbar">
+        <div class="busnavbar-items">
+          <c-button
+            style="margin-left: 7px"
+            size="medium"
+            type="primary"
+            class="medium_bcs"
+            v-for="(item, index) in navcode"
+            v-bind:key="index"
+            @click.native="onNarBtnClick(item.code, item.index)"
+            :title="item.title"
+            :disabled="item.isDis === 'N'"
+            >{{ item.label }}</c-button
+          >
+        </div>
+      </div>
     </div>
-  </div>
+  </el-dialog>
 </template>
 <script>
 import Api from "~/service/Api";
@@ -22,28 +32,29 @@ import commonProcess from "~/mixin/commonProcess";
 
 export default {
   props: {
-    "ownref": {
-        required: true,
-    }, 
-    "trnCode": {
-        required: true,
-    }, 
-    "model": {
-        required: true,
-    }, 
-    "ownrefPath": {
-        required: false,
-        default: "didgrp"
+    ownref: {
+      required: true,
     },
-    "tabIndex": {
-        required: false,
-        default: 1
+    trnCode: {
+      required: true,
+    },
+    model: {
+      required: true,
+    },
+    ownrefPath: {
+      required: false,
+      default: "didgrp",
+    },
+    tabIndex: {
+      required: false,
+      default: 1,
     },
   },
   components: {},
   mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
   data() {
     return {
+      initdialog: false,
       navcode: [
         // {code:"",label:"",isDis:"",title:""},
       ],
@@ -70,26 +81,32 @@ export default {
       }
       return 0;
     },
+    opened() {
+      this.$emit("childmethods");
+    },
+    beforeClose() {
+      this.navcode = [];
+      this.initdialog = false;
+    },
   },
   mounted() {
-    this.trnName = this.trnCode
+    this.trnName = this.trnCode;
     this.$nextTick(function () {
       this.$on("childmethods", async function () {
-
         let res = await this.executeRule(`cfgfil.hotreg${this.tabIndex}`);
         if (res.respCode == SUCCESS) {
-            this.updateModel(res.data);
+          this.updateModel(res.data);
         } else {
-            this.$notify.error({
-                title: "错误",
-                message: "服务请求失败！",
-            });
+          this.$notify.error({
+            title: "错误",
+            message: "服务请求失败！",
+          });
         }
 
         this.navcode = [];
         //请求按钮数据
         this.model[this.ownrefPath].rec.ownref = this.ownref;
-        let rtnmsg = await this.executeRule(this.ownrefPath+".rec.ownref"); //didgrp_rec_ownref
+        let rtnmsg = await this.executeRule(this.ownrefPath + ".rec.ownref"); //didgrp_rec_ownref
         if (rtnmsg.respCode == SUCCESS) {
           //重置数组
           this.navcode = [];