letdrw交易L/C Details页面Detp.vue兑付方式方法修改

src/model/Letdrw/Pattern.js

@@ -202,7 +202,7 @@ export default {
     ],
 
     "ledgrp.blk.mixdet":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 140,message:"长度不能超过140"}
     ],
     "letp.avbp.ptsget.sdamod.dadsnd":[
@@ -223,11 +223,11 @@ export default {
         {max: 35,message:"长度不能超过35"}
     ],
     "ledgrp.blk.avbwthtxt":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 140,message:"长度不能超过140"}
     ],
     "ledgrp.avb.pts.adrblk":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 140,message:"长度不能超过140"}
     ],
     "ledgrp.avb.dbfadrblkcn":[
@@ -254,17 +254,17 @@ export default {
     ],
 
     "ledgrp.blk.defdet":[
-      {type: "string", required: true, message: "必输项"},
+      {type: "string", required: false, message: "必输项"},
       {max: 140,message:"长度不能超过140"}
     ],
     "ledgrp.blk.feetxt":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 210,message:"长度不能超过210"}
     ],
 
     "ledgrp.blk.dftat":[
-        {type: "string", required: true, message: "必输项"},
-        {max: 35,message:"长度不能超过35"}
+        {type: "string", required: false, message: "必输项"},
+        {max: 105,message:"长度不能超过105"}
     ],
 
     "letp.drwp.ptsget.sdamod.dadsnd":[
@@ -285,7 +285,7 @@ export default {
         {max: 35,message:"长度不能超过35"}
     ],
     "ledgrp.drw.pts.adrblk":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 140,message:"长度不能超过140"}
     ],
     "ledgrp.drw.dbfadrblkcn":[

src/views/Business/Letdrw/Detp.vue

@@ -11,7 +11,6 @@
               style="width: 100%"
               placeholder="请选择指定银行"
               :code="codes.avbwth"
-              @change="avbwthEvent"
             >
             </c-select>
           </el-form-item>
@@ -19,7 +18,7 @@
 
         <c-col :span="24">
           <c-ptap
-            v-if="model.ledgrp.rec.avbwth!='O'"
+            v-if="model.ledgrp.rec.avbwth != 'O'"
             :model="model"
             :argadr="{
               title: '',
@@ -37,7 +36,25 @@
 
         <!-- 名称地址 -->
         <c-col :span="24">
-          <el-form-item label="" prop="ledgrp.blk.avbwthtxt">
+          <el-form-item
+            label=""
+            prop="ledgrp.avb.pts.adrblk"
+            v-if="model.ledgrp.rec.avbwth != 'O'"
+          >
+            <c-input
+              type="textarea"
+              :rows="3"
+              v-model="model.ledgrp.avb.pts.adrblk"
+              maxlength="140"
+              show-word-limit
+              placeholder="请输入Address Block"
+              :disabled="model.ledgrp.rec.avbwth!=''"
+            ></c-input>
+          </el-form-item>
+        </c-col>
+        <c-col :span="24">
+          <el-form-item label="" prop="ledgrp.blk.avbwthtxt"
+            v-if="model.ledgrp.rec.avbwth == 'O'">
             <c-input
               type="textarea"
               :rows="3"
@@ -45,21 +62,9 @@
               maxlength="140"
               show-word-limit
               placeholder="请输入名称地址"
-              :disabled="model.ledgrp.rec.avbwth!='O'"
             ></c-input>
           </el-form-item>
         </c-col>
-        <!-- <c-col :span="12">
-      <el-form-item label="Address Block" prop="ledgrp.avb.pts.adrblk">
-        <c-input
-          type="textarea"
-          v-model="model.ledgrp.avb.pts.adrblk"
-          maxlength="35"
-          show-word-limit
-          placeholder="请输入Address Block"
-        ></c-input>
-      </el-form-item>
-    </c-col> -->
 
         <!-- 信用证兑付方式  Available by-->
         <c-col :span="24">
@@ -69,7 +74,6 @@
               style="width: 100%"
               placeholder="请选择兑付方式"
               :code="codes.avbby0"
-              @change="avbbykeyEvent"
             >
             </c-select>
           </el-form-item>
@@ -109,7 +113,16 @@
                   size="small"
                   type="primary"
                   icon="el-icon-search"
-                  @click="showGridPromptDialog('letp.lcrdftat.buttxmsel', null, null,{TXT: 'ledgrp.blk.dftat'}, {TXT: false},'doxpDialog')"
+                  @click="
+                    showGridPromptDialog(
+                      'letp.lcrdftat.buttxmsel',
+                      null,
+                      null,
+                      { TXT: 'ledgrp.blk.dftat' },
+                      { TXT: false },
+                      'doxpDialog'
+                    )
+                  "
                   :disabled="blkDftatFlag"
                 >
                   ...
@@ -131,6 +144,7 @@
             :onlySearch="false"
             @onSeainf="onSeainf"
             @onAplpDet="onDrwpDet"
+            :disabledExtkey="blkDftatFlag"
             :disabled="blkDftatFlag"
           >
           </c-ptap>
@@ -267,7 +281,6 @@
       </el-form-item>
     </c-col>-->
 
-
         <!-- 交单期限 Days of presentation period-->
         <c-col :span="24">
           <el-form-item label="交单期限" prop="ledgrp.rec.prepers18">
@@ -282,8 +295,18 @@
                   size="small"
                   type="primary"
                   icon="el-icon-search"
-                  @click="showGridPromptDialog('letp.preper.buttxmsel', null, null,{TXT: 'ledgrp.rec.prepers18'}, {TXT: false},'doxpDialog')"
-                  disabled                >
+                  @click="
+                    showGridPromptDialog(
+                      'letp.preper.buttxmsel',
+                      null,
+                      null,
+                      { TXT: 'ledgrp.rec.prepers18' },
+                      { TXT: false },
+                      'doxpDialog'
+                    )
+                  "
+                  disabled
+                >
                   ...
                 </c-button>
               </template>
@@ -319,7 +342,16 @@
                   size="small"
                   type="primary"
                   icon="el-icon-search"
-                  @click="showGridPromptDialog('letp.charia.buttxmsel', null, null,{TXT: 'ledgrp.blk.feetxt'}, {TXT: false},'doxpDialog')"
+                  @click="
+                    showGridPromptDialog(
+                      'letp.charia.buttxmsel',
+                      null,
+                      null,
+                      { TXT: 'ledgrp.blk.feetxt' },
+                      { TXT: false },
+                      'doxpDialog'
+                    )
+                  "
                 >
                   ...
                 </c-button>
@@ -797,6 +829,7 @@ import commonProcess from '~/mixin/commonProcess'
 import CodeTable from '~/config/CodeTable'
 import Event from '~/model/Letdrw/Event'
 import Ptap from '~/views/Public/Ptap'
+import Utils from '~/utils'
 
 export default {
   components: {
@@ -812,30 +845,58 @@ export default {
   },
   methods: {
     ...Event,
-    avbwthEvent(){
-      if (this.model.ledgrp.rec.avbwth != 'A'||this.model.ledgrp.rec.avbwth != 'O') {
-        this.model.ledgrp.avb.pts.extkey = ''
-        this.model.ledgrp.blk.avbwthtxt = ''
-      }
-    },
-    avbbykeyEvent() {
-      if (this.model.ledgrp.rec.avbby == 'P') {
-        this.model.ledgrp.rec.tenmaxday = 0
-        this.model.ledgrp.blk.defdet = ''
-      }
-      if (this.model.ledgrp.rec.avbby == 'D'||this.model.ledgrp.rec.avbby =='M') {
+    // avbbykeyEvent() {
+    //   if (this.model.ledgrp.rec.avbby == 'P') {
+    //     this.model.ledgrp.rec.tenmaxday = 0
+    //     this.model.ledgrp.blk.defdet = ''
+    //   }
+    //   if (this.model.ledgrp.rec.avbby == 'D'||this.model.ledgrp.rec.avbby =='M') {
         
-        this.model.ledgrp.blk.defdet = '' //汇票期限置空
-        this.model.ledgrp.drw.pts.extkey = ''//付款人置空
-        this.model.ledgrp.drw.pts.adrblk = ''  //名称地址置空.pts.adrblk
-
-      }
-      this.executeCheck('ledgrp.rec.avbby').then((res) => {
-        if (res.respCode == SUCCESS) {
-          Utils.copyValueFromVO(this.model, res.data)
-        }
-      })
-    },
+    //     this.model.ledgrp.blk.defdet = '' //汇票期限置空
+    //     this.model.ledgrp.drw.pts.extkey = ''//付款人置空
+    //     this.model.ledgrp.drw.pts.adrblk = ''  //名称地址置空.pts.adrblk
+
+    //   }
+    //   this.executeCheck('ledgrp.rec.avbby').then((res) => {
+    //     if (res.respCode == SUCCESS) {
+    //       Utils.copyValueFromVO(this.model, res.data)
+    //     }
+    //   })
+    // },
+    openRevolvingDetails(val){
+    if(val ==='' && !(this.model.ledgrp.rec.revtyp ===''&& this.model.ledgrp.rec.revtimes == '0' && this.model.ledgrp.rec.revdat ===''
+      &&this.model.ledgrp.rec.revcum ===''&&this.model.ledgrp.blk.revcls ===''&&this.model.ledgrp.blk.revnotes ==='') ){
+        this.$confirm('Are you sure you want to delete the entered Revolving Details?','提示',{
+            confirmButtonText: 'Yes',
+            cancelButtonText: 'No',
+            type: 'warning',
+            showClose:false
+          }).then(() => {//yes的执行在这里写
+            this.executeRule('ledgrp.rec.revflg').then(res => {
+                if (res.respCode == SUCCESS) {
+                    this.model.ledgrp.rec.revdat ='';//后端在事件中把日期置为null而不是nullstr，导致日期实际并没有清空，故在此加清空日期
+                    this.updateModel(res.data)
+                }
+            })
+            // this.model.ledgrp.rec.revtyp ='';
+            // this.model.ledgrp.rec.revtimes = '0';
+            // this.model.ledgrp.rec.revdat ='';
+            // this.model.ledgrp.rec.revcum ='';
+            // this.model.ledgrp.blk.revcls ='';
+            // this.model.ledgrp.blk.revnotes ='';
+            // this.$message({
+            //       type: 'success',
+            //       message: '删除成功!'
+            // });
+          }).catch(() => {//No的功能在这里写
+            this.model.ledgrp.rec.revflg ='X'
+                // this.$message({
+                //   type: 'info',
+                //   message: '已取消'
+                // });  
+          }); 
+    }
+  }
   },
   created: function () {},
   computed: {
@@ -843,7 +904,8 @@ export default {
       get() {
         return (
           this.model.ledgrp.rec.avbwth == 'A' ||
-          this.model.ledgrp.rec.avbwth == 'S' 
+          this.model.ledgrp.rec.avbwth == 'S' ||
+          this.model.ledgrp.rec.avbwth == ''
         )
       },
     },

src/views/Business/Letdrw/Ovwp.vue

@@ -147,6 +147,7 @@
             <c-checkbox
               v-model="model.letp.aamp.aammod.addamtflg"
               style="margin-left: 10px"
+              @change="openAddAmount"
               >附加金额</c-checkbox
             >
           </c-col>
@@ -415,6 +416,7 @@
 
         <c-col :span="12" class="centerLable marginLable">
           <c-checkbox v-model="model.ledgrp.rec.revflg"
+            @change="openRevolvingDetails"
             >Revolving L/C</c-checkbox
           >
         </c-col>
@@ -1107,6 +1109,68 @@ export default {
         this.model.ledgrp.rec.apprultxt = ''
       }
     },
+    openAddAmount(val){
+      if(val ==='' && !(this.model.ledgrp.cbs.max2.amt =='0.000'&& this.model.ledgrp.blk.addamtcov === '') ){
+        this.$confirm('Do you really want to delete the additional amount of this contract?','提示',{
+            confirmButtonText: 'Yes',
+            cancelButtonText: 'No',
+            type: 'warning',
+            showClose:false
+          }).then(() => {//yes的执行在这里写
+            this.executeRule('letp.aamp.aammod.addamtflg').then(res => {
+                if (res.respCode == SUCCESS) {
+                    this.updateModel(res.data)
+                }
+            })
+            // this.model.ledgrp.cbs.max2.amt ='0.000';
+            // this.model.ledgrp.blk.addamtcov = '';
+            // this.$message({
+            //       type: 'success',
+            //       message: '删除成功!'
+            // });
+          }).catch(() => {//No的功能在这里写
+            this.model.letp.aamp.aammod.addamtflg ='X'
+                // this.$message({
+                //   type: 'info',
+                //   message: '已取消'
+                // });  
+          }); 
+      }
+    },
+    openRevolvingDetails(val){
+    if(val ==='' && !(this.model.ledgrp.rec.revtyp ===''&& this.model.ledgrp.rec.revtimes == '0' && this.model.ledgrp.rec.revdat ===''
+      &&this.model.ledgrp.rec.revcum ===''&&this.model.ledgrp.blk.revcls ===''&&this.model.ledgrp.blk.revnotes ==='') ){
+        this.$confirm('Are you sure you want to delete the entered Revolving Details?','提示',{
+            confirmButtonText: 'Yes',
+            cancelButtonText: 'No',
+            type: 'warning',
+            showClose:false
+          }).then(() => {//yes的执行在这里写
+            this.executeRule('ledgrp.rec.revflg').then(res => {
+                if (res.respCode == SUCCESS) {
+                    this.model.ledgrp.rec.revdat ='';//后端在事件中把日期置为null而不是nullstr，导致日期实际并没有清空，故在此加清空日期
+                    this.updateModel(res.data)
+                }
+            })
+            // this.model.ledgrp.rec.revtyp ='';
+            // this.model.ledgrp.rec.revtimes = '0';
+            // this.model.ledgrp.rec.revdat ='';
+            // this.model.ledgrp.rec.revcum ='';
+            // this.model.ledgrp.blk.revcls ='';
+            // this.model.ledgrp.blk.revnotes ='';
+            // this.$message({
+            //       type: 'success',
+            //       message: '删除成功!'
+            // });
+          }).catch(() => {//No的功能在这里写
+            this.model.ledgrp.rec.revflg ='X'
+                // this.$message({
+                //   type: 'info',
+                //   message: '已取消'
+                // });  
+          }); 
+    }
+  }
   },
   created: function () {},
 }

src/views/Business/Letopn/Detp.vue

@@ -129,6 +129,7 @@
             :onlySearch="false"
             @onSeainf="onSeainf"
             @onAplpDet="onDrwpDet"
+            :disabledExtkey="blkDftatFlag"
             :disabled="blkDftatFlag"
           >
           </c-ptap>