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/config/CodeTable/index.js

@@ -5395,11 +5395,12 @@ const CodeTable = {
         { label: "Seller", value: "SEL" },
         { label: "Ordering Institution", value: "ORI" },
     ],
-    gitopm_rolall:[
+    gitopn_rolall:[
         {label:"Appliant",value:"APL"},
         {label:"1st Adv.thr.Bank",value:"ATB"},
         {label:"Beneficiary",value:"BEN"},
         {label:"Accountee",value:"CTR"},
+        {label:"Issuing Bank",value:"ISS"}
     ],
     rolchgflg: [
         { label: "Changes and deletion allowed if new", value: "" },

src/model/Brtdck/Pattern.js

@@ -197,7 +197,7 @@ export default {
         {max: 35,message:"长度不能超过35"}
     ],
     "brdgrp.blk.matper":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 65,message:"长度不能超过65"}
     ],
     "brtp.oth.adrelc":[

src/model/Gitopn/Default.js

@@ -228,5 +228,6 @@ export default {
     "cfagit.recp.dclp.actiontype"               :Utils.defaultFunction,
     "cfagit.recp.dclp.actiondesc"               :Utils.defaultFunction,
     "cnybop.voup"                               :Utils.defaultFunction,
+    "gitp.preperp"                              :Utils.defaultFunction,
 }
 //你可以添加自动default处理

src/views/Business/Brtdck/Brtdckp.vue

@@ -153,6 +153,7 @@
               style="width: 100%"
               placeholder="请输入Maturity Date"
               value-format="yyyy-MM-dd"
+              :disabled="model.brdgrp.blk.matper!=''||model.brdgrp.rec.docflg=='P'"
             ></c-date-picker>
           </el-form-item>
         </c-col>
@@ -341,6 +342,7 @@
               style="width: 100%"
               placeholder="Maturity Date"
               value-format="yyyy-MM-dd"
+              :disabled="model.brdgrp.blk.matper!=''||model.brdgrp.rec.docflg=='P'"
             ></c-date-picker>
           </el-form-item>
         </c-col>
@@ -385,6 +387,7 @@
               maxlength="65"
               show-word-limit
               placeholder="请输入Maturity Period"
+              :disabled="model.brdgrp.rec.matdat!=null&&model.brdgrp.rec.matdat!=''||model.brdgrp.rec.docflg=='P'"
             ></c-input>
           </c-form-item>
         </c-col>

src/views/Business/Cltdav/index.vue

@@ -88,54 +88,56 @@ import Coninfp from "~/views/Public/Coninfp";
 import Doctre from "~/views/Public/Doctre";
 
 export default {
-name: "Cltdav",
-components: {
-"m-sel": Sel,
-"m-account": Account,
-"m-setpan": Setpan,
-"m-engp": Engp,
-"m-glepan": Glepan,
-"m-docpan": Docpan,
-"m-doctre": Doctre,
-"m-coninfp": Coninfp,
-"m-ccvpan": Ccvpan,
-},
+    name: "Cltdav",
+    components: {
+        "m-sel": Sel,
+        "m-account": Account,
+        "m-setpan": Setpan,
+        "m-engp": Engp,
+        "m-glepan": Glepan,
+        "m-docpan": Docpan,
+        "m-doctre": Doctre,
+        "m-coninfp": Coninfp,
+        "m-ccvpan": Ccvpan,
+    },
 
-provide() {
-return {
-root: this
-}
-},
-mixins: [commonProcess, commonFuncs],    // 里面包含了Default、Check等的公共处理
-data() {
-return {
-tabVal: "sel",
-trnName: "cltdav",
-model: new Cltdav().data,
-checkRules: Check,
-defaultRules: Default,
-pattern: Pattern,
-rules: null,
-codes: { ...CodeTable },
-}
-},
-methods: {
-tabClick() {
-}
-},
-created: async function () {
-console.log("进入cltdav交易");
-let rtnmsg = await this.init({})
-if (rtnmsg.respCode == SUCCESS) {
-    this.updateModel(rtnmsg.data);
-//TODO 处理数据逻辑
-
-}
-else {
-this.$notify.error({ title: '错误', message: '服务请求失败！' });
-}
-}
+    provide() {
+        return {
+            root: this
+        }
+    },
+    mixins: [commonProcess, commonFuncs],    // 里面包含了Default、Check等的公共处理
+    data() {
+        return {
+            tabVal: "sel",
+            trnName: "cltdav",
+            model: new Cltdav().data,
+            checkRules: Check,
+            defaultRules: Default,
+            pattern: Pattern,
+            rules: null,
+            codes: { ...CodeTable },
+        }
+    },
+    methods: {
+        tabClick() {
+        }
+    },
+    created: async function () {
+        console.log("进入cltdav交易");
+        let rtnmsg = await this.init({})
+        if (rtnmsg.respCode == SUCCESS) {
+            this.updateModel(rtnmsg.data);
+            if (this.isInDisplay) {
+                this.restoreDisplay();
+            }
+        }
+        else {
+            this.$notify.error({ title: '错误', message: '服务请求失败！' });
+        }
+    }
 }
 </script>
 <style>
+
 </style>
\ No newline at end of file

src/views/Business/Gitopn/Ptyp.vue

@@ -177,7 +177,7 @@
                   @keyup.enter.native="
                     showGridPromptDialog(`gidgrp.apl.pts.extkey`)
                   "
-                  @change="benChange"
+                  @blur="benBlur"
                 ></c-input>
                 <template slot="footer">
                   <c-button
@@ -258,7 +258,7 @@
                   @keyup.enter.native="
                     showGridPromptDialog(`gidgrp.ctr.pts.extkey`)
                   "
-                  @change="benChange"
+                  @blur="benBlur"
                 ></c-input>
                 <template slot="footer">
                   <c-button
@@ -333,7 +333,7 @@
                   @keyup.enter.native="
                     showGridPromptDialog(`gidgrp.apl.pts.extkey`)
                   "
-                  @change="benChange"
+                  @blur="benBlur"
                 ></c-input>
                 <template slot="footer">
                   <c-button
@@ -414,7 +414,7 @@
                   @keyup.enter.native="
                     showGridPromptDialog(`gidgrp.ctr.pts.extkey`)
                   "
-                  @change="benChange"
+                  @blur="benBlur"
                 ></c-input>
                 <template slot="footer">
                   <c-button
@@ -638,7 +638,7 @@
                   @keyup.enter.native="
                     showGridPromptDialog(`gidgrp.ben.pts.extkey`)
                   "
-                  @change="benChange"
+                  @blur="benBlur"
                 ></c-input>
                 <template slot="footer">
                   <c-button
@@ -702,7 +702,7 @@
                   @keyup.enter.native="
                     showGridPromptDialog(`gidgrp.atb.pts.extkey`)
                   "
-                  @change="benChange"
+                  @blur="benBlur"
                 ></c-input>
                 <template slot="footer">
                   <c-button
@@ -810,7 +810,7 @@ export default {
   },
   methods: { 
     ...Event,
-    async benChange() {
+    async benBlur() {
       let rtnmsg = await this.executeDefault("gidgrp.rec.sndto");
       if (rtnmsg.respCode == SUCCESS) {
         Utils.copyValueFromVO(this.model, rtnmsg.data);

src/views/Business/Gitopn/Ptypc.vue

@@ -179,6 +179,7 @@
                   @keyup.enter.native="
                     showGridPromptDialog(`gidgrp.iss.pts.extkey`)
                   "
+                  @blur="issBlur"
                 ></c-input>
                 <template slot="footer">
                   <c-button
@@ -342,6 +343,7 @@ import Event from "~/model/Gitopn/Event";
 import Ptap from "~/views/Public/Ptap";
 import Utils from "~/utils";
 
+
 export default {
   components: { "c-ptap": Ptap },
   inject: ["root"],
@@ -352,6 +354,12 @@ export default {
   },
   methods: {
     ...Event,
+    async issBlur() {
+      let rtnmsg = await this.executeDefault("gidgrp.rec.sndto");
+      if (rtnmsg.respCode == SUCCESS) {
+        Utils.copyValueFromVO(this.model, rtnmsg.data);
+      }
+    },
   },
   created: function () {},
 };

src/views/Business/Gitopn/index.vue

@@ -364,12 +364,12 @@ export default {
       }
       if (name === "dclpp") {
         rulePath = "dclpp";
-      }if (name === "gidtxtp"){
+      }
+      if (name === "gidtxtp"){
         rulePath = "gitp.gidtxtp"
-      }if (name === "ptypc"){
+      }
+      if (name === "ptypc"){
         rulePath = "gitp.ptypc"
-      }if(name==="ptyp"){
-        rulePath = "gitp.ptyp"
       }
       if (!!rulePath) {
         this.executeRule(rulePath).then((res) => {

src/views/Business/Gitpop/Ovwp.vue

@@ -649,10 +649,92 @@
               ></c-date-picker>
             </el-form-item>
           </c-col>
+
           <c-col :span="24">
             <c-col :span="14">
               <el-form-item
-                v-show="model.gitp.swiftflg != 'Y'"
+                v-show="model.gitp.swiftflg == ''"
+                label="Validity until"
+                prop="gidgrp.rec.expdat"
+              >
+                <c-date-picker
+                  type="date"
+                  v-model="model.gidgrp.rec.expdat"
+                  style="width: 90%"
+                  placeholder="请选择Validity until"
+                ></c-date-picker>
+              </el-form-item>
+            </c-col>
+            <c-col
+              :span="7"
+              v-if="model.gitp.swiftflg == ''"
+              class="centerLable"
+            >
+              <c-checkbox v-model="model.gidgrp.rec.expflg"
+                >Unlimited Guarantee</c-checkbox
+              >
+            </c-col>
+            <c-col
+              :span="3"
+              v-show="model.gitp.swiftflg == ''"
+              class="centerLable"
+            >
+              <c-button
+                size="small"
+                type="primary"
+                @click="onGitpWbxs"
+                disabled
+                style="color: white"
+              >
+                显示文本
+              </c-button>
+            </c-col>
+          </c-col>
+          <c-col :span="24">
+            <c-col :span="14">
+              <el-form-item
+                v-show="model.gitp.swiftflg == ''"
+                label="Our Liability until"
+                prop="gidgrp.rec.liadat"
+              >
+                <c-date-picker
+                  type="date"
+                  v-model="model.gidgrp.rec.liadat"
+                  style="width: 90%"
+                  placeholder="请选择Our Liability until"
+                ></c-date-picker>
+              </el-form-item>
+            </c-col>
+            <c-col
+              :span="7"
+              v-show="model.gitp.swiftflg == ''"
+              class="centerLable"
+            >
+              <c-checkbox
+                v-model="model.gidgrp.rec.liaflg"
+                >Unlimited Liability</c-checkbox
+              >
+            </c-col>
+            <c-col
+              :span="3"
+              v-show="model.gitp.swiftflg == ''"
+              class="centerLable"
+            >
+              <c-button
+                size="small"
+                type="primary"
+                @click="onGitpYptxy"
+                disabled
+              >
+                协议签署
+              </c-button>
+            </c-col>
+          </c-col>
+
+          <c-col :span="24">
+            <c-col :span="14">
+              <el-form-item
+                v-show="model.gitp.swiftflg == 'N'"
                 label="Validity until"
                 prop="gidgrp.rec.expdat"
               >
@@ -667,16 +749,17 @@
             </c-col>
             <c-col
               :span="7"
-              v-if="model.gitp.swiftflg != 'Y'"
+              v-if="model.gitp.swiftflg == 'N'"
               class="centerLable"
             >
               <c-checkbox v-model="model.gidgrp.rec.expflg"
+                :disabled="model.gidgrp.rec.expdat!=''||model.gidgrp.ghd.segtyp=='02'"
                 >Unlimited Guarantee</c-checkbox
               >
             </c-col>
             <c-col
               :span="3"
-              v-show="model.gitp.swiftflg != 'Y'"
+              v-show="model.gitp.swiftflg == 'N'"
               class="centerLable"
             >
               <c-button
@@ -693,7 +776,7 @@
           <c-col :span="24">
             <c-col :span="14">
               <el-form-item
-                v-show="model.gitp.swiftflg != 'Y'"
+                v-show="model.gitp.swiftflg == 'N'"
                 label="Our Liability until"
                 prop="gidgrp.rec.liadat"
               >
@@ -711,21 +794,22 @@
             </c-col>
             <c-col
               :span="7"
-              v-show="model.gitp.swiftflg != 'Y'"
+              v-show="model.gitp.swiftflg == 'N'"
               class="centerLable"
             >
               <c-checkbox
                 v-model="model.gidgrp.rec.liaflg"
                 :disabled="
                   model.gidgrp.rec.hndtyp != 'OC' ||
-                  model.gidgrp.rec.expflg == 'X'
+                  model.gidgrp.rec.expflg == 'X'  ||
+                  model.gidgrp.rec.liadat != ''
                 "
                 >Unlimited Liability</c-checkbox
               >
             </c-col>
             <c-col
               :span="3"
-              v-show="model.gitp.swiftflg != 'Y'"
+              v-show="model.gitp.swiftflg == 'N'"
               class="centerLable"
             >
               <c-button
@@ -786,6 +870,27 @@
               </c-select>
             </el-form-item>
           </c-col>
+          <c-col :span="24">
+            <el-form-item
+              v-show="model.gitp.swiftflg != 'Y'"
+              label="是否显示查询码"
+              prop="gidgrp.gidcxm.cxmflg"
+            >
+              <c-select
+                v-model="model.gidgrp.gidcxm.cxmflg"
+                style="width: 100%"
+                placeholder="请选择是否显示查询码"
+              >
+                <el-option
+                  v-for="item in codes.cxmflg"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </c-select>
+            </el-form-item>
+          </c-col>
         </c-col>
         <!-- ============右边================= -->
         <c-col :span="11" :offset="1">
@@ -1034,27 +1139,7 @@
             </c-col>
           </c-col>
 
-          <c-col :span="24">
-            <el-form-item
-              v-show="model.gitp.swiftflg != 'Y'"
-              label="是否显示查询码"
-              prop="gidgrp.gidcxm.cxmflg"
-            >
-              <c-select
-                v-model="model.gidgrp.gidcxm.cxmflg"
-                style="width: 100%"
-                placeholder="请选择是否显示查询码"
-              >
-                <el-option
-                  v-for="item in codes.cxmflg"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </c-select>
-            </el-form-item>
-          </c-col>
+          
 
           <c-col :span="24">
             <c-col :span="24">

src/views/Business/Gitpop/Ptyp.vue

@@ -76,6 +76,8 @@
                 rol: 'con',
               }"
               :disabled="true"
+              :disabledRef="true"
+              :disabledExtkey="true"
               @onAplpDet="onConpDet"
             >
             </c-ptap>

src/views/Business/Letopn/Ovwp.vue

@@ -511,7 +511,6 @@ export default {
           }).then(() => {//yes的执行在这里写
             this.executeRule('ledgrp.rec.revflg').then(res => {
                 if (res.respCode == SUCCESS) {
-                    this.model.ledgrp.rec.revdat ='';//后端在事件中把日期置为null而不是nullstr，导致日期实际并没有清空，故在此加清空日期
                     this.updateModel(res.data)
                 }
             })

src/views/Review/Business/ReviewCltdav.vue

+<template>
+    <ReviewWrapper>
+      <Cltdav></Cltdav>
+    </ReviewWrapper>
+  </template>
+  
+  <script>
+  import Cltdav from "~/views/Business/Cltdav";
+  import { ReviewWrapper } from "~/components/gj-common.min.js";
+  
+  export default {
+    name: "ReviewCltdav",
+    components: { ReviewWrapper, Cltdav },
+    created() {},
+    mounted() {},
+  };
+  </script>
+  
+  <style></style>
\ No newline at end of file

src/views/Review/ReviewRouter.js

@@ -72,7 +72,6 @@ import ReviewGetame from "./Business/ReviewGetame.vue";
 import ReviewCctdav from "./Business/ReviewCctdav.vue";
 import ReviewCctdcr from "./Business/ReviewCctdcr.vue";
 import ReviewCcttra from "./Business/ReviewCcttra.vue";
-import ReviewCctset from "./Business/ReviewCctset.vue";
 import ReviewLttopn from "./Business/ReviewLttopn.vue";
 import ReviewLitdck from "./Business/ReviewLitdck.vue";
 import ReviewBrtlat from "./Business/ReviewBrtlat.vue";
@@ -90,6 +89,7 @@ import ReviewLitcan from "./Business/ReviewLitcan.vue";
 import ReviewBetamc from "./Business/ReviewBetamc.vue";
 import ReviewCptcan from "./Business/ReviewCptcan.vue";
 import ReviewCptrep from "./Business/ReviewCptrep.vue";
+import ReviewCltdav from "./Business/ReviewCltdav.vue";
 
 
 const ReviewRouter = [
@@ -191,8 +191,9 @@ const ReviewRouter = [
     { path: "cctdav", component: ReviewCctdav, name: "ReviewCctdav", meta: { title: "复核-Cctdav" } },
     { path: "cctdcr", component: ReviewCctdcr, name: "ReviewCctdcr", meta: { title: "复核-Cctdcr" } },
     { path: "ccttra", component: ReviewCcttra, name: "ReviewCcttra", meta: { title: "复核-Ccttra" } },
-    { path: "cctset", component: ReviewCctset, name: "ReviewCctset", meta: { title: "复核-Cctset" } },
     { path: "lttopn", component: ReviewLttopn, name: "ReviewLttopn", meta: { title: "复核-Lttopn" } },
+    { path: "cltdav", component: ReviewCltdav, name: "ReviewCltdav", meta: { title: "复核-Cltdav" } },
+    
     { path: "Cptati", component: ReviewCptati, name: "ReviewCptati", meta: { title: "复核-Cptati" } },
     { path: "Cptato", component: ReviewCptato, name: "ReviewCptato", meta: { title: "复核-Cptato" } },
     { path: "Cptcan", component: ReviewCptcan, name: "ReviewCptcan", meta: { title: "复核-Cptcan" } },