getamt (bug870)

src/views/Business/Getame/Amedat20.vue

@@ -91,12 +91,12 @@
           <c-col :span="24">
             <el-form-item
               label="Old appr. Expiry Date"
-              prop="trnmod.swiadd.newdtaappexpdat"
+              prop="oldgidgrp.blk.dtaappexpdat"
             >
               <c-date-picker
                 disabled
                 type="date"
-                v-model="model.trnmod.swiadd.newdtaappexpdat"
+                v-model="model.oldgidgrp.blk.dtaappexpdat"
                 style="width: 100%"
                 placeholder="请选择"
               ></c-date-picker>
@@ -122,7 +122,11 @@
               prop="trnmod.swiadd.newexpdat"
             >
               <c-date-picker
-                disabled
+                :disabled="
+                  model.trnmod.swiadd.exptyp == 'OPEN' ||
+                  (model.trnmod.swiadd.exptyp == '' &&
+                    model.oldgidgrp.rec.expdat == '')
+                "
                 type="date"
                 v-model="model.trnmod.swiadd.newexpdat"
                 style="width: 100%"
@@ -137,12 +141,19 @@
               prop="trnmod.swiadd.exptxt"
             >
               <c-input
-                :disabled="model.trnmod.swiadd.exptyp != 'COND'"
+                :disabled="
+                  !(model.trnmod.swiadd.exptyp == 'COND') &&
+                  !(
+                    model.oldgidgrp.blk.exptxt != '' &&
+                    model.trnmod.swiadd.exptyp == ''
+                  )
+                "
                 type="textarea"
                 v-model="model.trnmod.swiadd.exptxt"
                 maxlength="65"
                 show-word-limit
                 placeholder="请输入New Expiry Condition"
+                @blur="exptxtBlur"
               ></c-input>
             </c-form-item>
           </c-col>
@@ -154,6 +165,10 @@
               prop="trnmod.swiadd.liatypc"
             >
               <c-select
+                :disabled="
+                  model.gidgrp.rec.hndtyp != 'OC' &&
+                  model.gidgrp.rec.purpos != 'CO'
+                "
                 :code="codes.exptyp"
                 v-model="model.trnmod.swiadd.liatypc"
                 style="width: 100%"
@@ -189,7 +204,11 @@
               prop="trnmod.swiadd.newliadat"
             >
               <c-date-picker
-                disabled
+                :disabled="
+                  model.trnmod.swiadd.liatypc == 'OPEN' ||
+                  (model.trnmod.swiadd.liatypc == '' &&
+                    model.oldgidgrp.rec.liadat == '')
+                "
                 type="date"
                 v-model="model.trnmod.swiadd.newliadat"
                 style="width: 100%"
@@ -204,7 +223,13 @@
               prop="trnmod.swiadd.liatxtc"
             >
               <c-input
-                :disabled="model.trnmod.swiadd.liatypc != 'COND'"
+                :disabled="
+                  !(model.trnmod.swiadd.liatypc == 'COND') &&
+                  !(
+                    model.oldgidgrp.blk.liatxtc != '' &&
+                    model.trnmod.swiadd.liatypc == ''
+                  )
+                "
                 type="textarea"
                 v-model="model.trnmod.swiadd.liatxtc"
                 maxlength="65"
@@ -237,6 +262,10 @@
               prop="trnmod.swiadd.newdtaappexpdat"
             >
               <c-date-picker
+                :disabled="
+                  model.trnmod.swiadd.exptyp != 'OPEN' &&
+                  model.oldgidgrp.rec.exptyp != 'OPEN'
+                "
                 type="date"
                 v-model="model.trnmod.swiadd.newdtaappexpdat"
                 style="width: 100%"
@@ -254,6 +283,7 @@ import Api from "~/service/Api";
 import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable";
 import Event from "~/model/Getame/Event";
+import Utils from "~/utils";
 
 export default {
   inject: ["root"],
@@ -262,7 +292,20 @@ export default {
   data() {
     return {};
   },
-  methods: { ...Event },
+  methods: {
+    ...Event,
+    async exptxtBlur() {
+      let rtnmsg = await this.executeDefault("gidgrp.blk.exptxt");
+      if (rtnmsg.respCode == SUCCESS) {
+        Utils.copyValueFromVO(this.model, rtnmsg.data);
+      }
+
+      let rtnmsg1 = await this.executeDefault("gidgrp.blk.atxexptxt");
+      if (rtnmsg1.respCode == SUCCESS) {
+        Utils.copyValueFromVO(this.model, rtnmsg1.data);
+      }
+    },
+  },
   created: function () {},
 };
 </script>

src/views/Business/Getame/Ptyp.vue

@@ -204,9 +204,13 @@
     </c-row>
              
     <c-col :span="24">
-      <el-form-item label="Additional Parties" >
-        <c-edit-table :model="model" v-bind="ptsaddg" style="margin-left:-120px">
-          <el-table-column label="操作" >
+      <el-form-item label="Additional Parties">
+        <c-edit-table
+          :model="model"
+          v-bind="ptsaddg"
+          style="margin-left: -120px"
+        >
+          <el-table-column label="操作">
             <template slot-scope="scope">
               <el-button
                 size="mini"
@@ -217,8 +221,8 @@
             </template>
           </el-table-column>
         </c-edit-table>
-    </el-form-item>
-</c-col> 
+      </el-form-item>
+    </c-col>
   </div>
 </template>
 <script>

src/views/Business/Gitame/Amedat20.vue

@@ -91,12 +91,12 @@
           <c-col :span="24">
             <el-form-item
               label="Old appr. Expiry Date"
-              prop="trnmod.swiadd.newdtaappexpdat"
+              prop="oldgidgrp.blk.dtaappexpdat"
             >
               <c-date-picker
                 disabled
                 type="date"
-                v-model="model.trnmod.swiadd.newdtaappexpdat"
+                v-model="model.oldgidgrp.blk.dtaappexpdat"
                 style="width: 100%"
                 placeholder="请选择"
               ></c-date-picker>
@@ -122,9 +122,10 @@
               prop="trnmod.swiadd.newexpdat"
             >
               <c-date-picker
-                :disabled="
+              :disabled="
                   model.trnmod.swiadd.exptyp == 'OPEN' ||
-                  model.oldgidgrp.rec.expdat == ''
+                  (model.trnmod.swiadd.exptyp == '' &&
+                    model.oldgidgrp.rec.expdat == '')
                 "
                 type="date"
                 v-model="model.trnmod.swiadd.newexpdat"
@@ -182,9 +183,10 @@
               prop="trnmod.swiadd.newliadat"
             >
               <c-date-picker
-                :disabled="
+              :disabled="
                   model.trnmod.swiadd.liatypc == 'OPEN' ||
-                  model.oldgidgrp.rec.liadat == ''
+                  (model.trnmod.swiadd.liatypc == '' &&
+                    model.oldgidgrp.rec.liadat == '')
                 "
                 type="date"
                 v-model="model.trnmod.swiadd.newliadat"

src/views/Business/Gitame/Ameps20.vue

@@ -287,14 +287,15 @@
                 v-model="model.trnmod.swiadd.purposame"
                 style="width: 100%"
                 placeholder="请输入Purpose of amend."
+                :code="getValues('trnmod.swiadd.purposame')"
               >
-                <el-option
+                <!-- <el-option
                   v-for="item in codes.purposame"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
                 >
-                </el-option>
+                </el-option> -->
               </c-select>
             </el-form-item>
           </c-col>