getopn bug(852,869)

src/views/Business/Getopn/Ovwp.vue

@@ -32,7 +32,7 @@
 
                   <c-button
                     style="margin: 0 0"
-                    :disabled=this.flag
+                    :disabled="this.flag"
                     size="small"
                     type="primary"
                     @click="onGitpButgetref"
@@ -705,7 +705,7 @@
                   placeholder="请选择Applicable Rules"
                 >
                   <el-option
-                    v-for="item in codes.apprul"
+                    v-for="item in codes.apprulc1"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
@@ -1191,7 +1191,7 @@
               prop="gidgrp.apl.pts.adrblk"
             >
               <c-input
-                :disabled="model.gidgrp.apl.pts.adrblk!=''"
+                :disabled="model.gidgrp.apl.pts.adrblk != ''"
                 rows="4"
                 type="textarea"
                 v-model="model.gidgrp.apl.pts.adrblk"
@@ -1464,19 +1464,36 @@
               </el-form-item>
             </c-col>
             <c-col :span="24">
-              <el-form-item
+              <c-col :span="20">
+                <el-form-item
+                  v-if="model.gitp.swiftflg == 'Y'"
+                  label="Validity until"
+                  prop="gidgrp.rec.expdat"
+                >
+                  <c-date-picker
+                    :disabled="model.gidgrp.rec.exptyp == 'OPEN'"
+                    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="4"
                 v-if="model.gitp.swiftflg == 'Y'"
-                label="Validity until"
-                prop="gidgrp.rec.expdat"
+                class="centerLable"
               >
-                <c-date-picker
-                  :disabled="model.gidgrp.rec.exptyp == 'OPEN'"
-                  type="date"
-                  v-model="model.gidgrp.rec.expdat"
-                  style="width: 100%"
-                  placeholder="请选择Validity until"
-                ></c-date-picker>
-              </el-form-item>
+                <c-checkbox
+                  :disabled="
+                    model.gidgrp.rec.expdat != '' ||
+                    model.gidgrp.rec.expflg == 'X'
+                  "
+                  v-model="model.gidgrp.rec.expflg"
+                  >Unlimited Liability</c-checkbox
+                >
+              </c-col>
             </c-col>
 
             <c-col :span="24">
@@ -1539,7 +1556,7 @@
                 prop="gidgrp.rec.liatypc"
               >
                 <c-select
-                  :disabled="model.gidgrp.rec.purpos == 'ISSU'"
+                  :disabled="model.gidgrp.rec.purpos != 'ISCO'"
                   v-model="model.gidgrp.rec.liatypc"
                   style="width: 100%"
                   placeholder="请选择Liability Type "
@@ -1579,7 +1596,12 @@
                 v-if="model.gitp.swiftflg == 'Y'"
                 class="centerLable"
               >
-                <c-checkbox v-model="model.gidgrp.rec.liaflg"
+                <c-checkbox
+                  :disabled="
+                    model.gidgrp.rec.liadat != '' ||
+                    model.gidgrp.rec.liaflg == 'X'
+                  "
+                  v-model="model.gidgrp.rec.liaflg"
                   >Unlimited Liability</c-checkbox
                 >
               </c-col>

src/views/Business/Gitopn/Gidtxtp.vue

@@ -17,7 +17,6 @@
                 maxlength="32500"
                 show-word-limit
                 placeholder="请输入Guarantee Text with Variables"
-                @change="selectOrCheckboxRule('gidgrp.blk.gidtxt')"
               ></c-input-xml>
             </el-form-item>
             <el-form-item

src/views/Business/Gitopn/Ovwp.vue

@@ -752,7 +752,7 @@
                 placeholder="请选择Applicable Rules"
               >
                 <el-option
-                  v-for="item in codes.apprul"
+                  v-for="item in codes.apprulc1"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"