getame/getopn缺陷解决

src/model/Getame/Pattern.js

@@ -56,27 +56,27 @@ export default {
         {max: 3,message:"长度不能超过3"}
     ],
     "oldgidgrp.cbs.max.amt":[
-        {type: "number", required: false, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+        // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
     "trnmod.swiadd.amecur":[
         {type: "string", required: false, message: "必输项"},
         {max: 3,message:"长度不能超过3"}
     ],
     "trnmod.swiadd.ameamt":[
-        {type: "number", required: false, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+        // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
     "trnmod.swiadd.newcur":[
         {type: "string", required: false, message: "必输项"},
         {max: 3,message:"长度不能超过3"}
     ],
     "trnmod.swiadd.newamt":[
-        {type: "number", required: false, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+        // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
 
     "gitamep.ametxt":[

src/views/Business/Getame/Ameps20.vue

@@ -68,11 +68,13 @@
                 label-width="5px"
                 prop="oldgidgrp.cbs.max.amt"
               >
-                <c-input
+              <!-- 不确定能否回显负金额，因此空为disabled,故暂定能显示负金额 -->
+                <c-input-currency-min
                   disabled
                   v-model="model.oldgidgrp.cbs.max.amt"
                   placeholder="请输入"
-                ></c-input>
+                  class="input-currency-left"
+                ></c-input-currency-min>
               </c-form-item>
             </c-col>
           </c-col>
@@ -98,17 +100,13 @@
                 label-width="5px"
                 prop="trnmod.swiadd.ameamt"
               >
-                <c-input
+                <c-input-currency-min
                   v-model="model.trnmod.swiadd.ameamt"
                   placeholder="请输入"
                   @blur="ameamtBlur"
-                  @keyup.enter.native="
-                  defaultFunction(
-                    'trnmod.swiadd.newamt',
-                    model.trnmod.swiadd.newamt
-                  )
-                "
-                ></c-input>
+                  @keyup.enter.native="$event.target.blur()"
+                  class="input-currency-left"
+                ></c-input-currency-min>
               </c-form-item>
             </c-col>
           </c-col>
@@ -134,17 +132,13 @@
                 label-width="5px"
                 prop="trnmod.swiadd.newamt"
               >
-                <c-input
+                <c-input-currency-min
                   v-model="model.trnmod.swiadd.newamt"
                   placeholder="请输入"
                   @blur="newamtBlur"
-                  @keyup.enter.native="
-                  eventFunction(
-                    'trnmod.swiadd.newamt',
-                    model.trnmod.swiadd.newamt
-                  )
-                "
-                ></c-input>
+                  @keyup.enter.native="$event.target.blur()"
+                  class="input-currency-left"
+                ></c-input-currency-min>
               </c-form-item>
             </c-col>
           </c-col>
@@ -171,11 +165,13 @@
                 label-width="5px"
                 prop="trnmod.swiadd.addamt"
               >
-                <c-input
+              <!-- 不确定能否回显负金额，因此空为disabled,故暂定能显示负金额 -->
+                <c-input-currency-min
                   disabled
                   v-model="model.trnmod.swiadd.addamt"
                   placeholder="请输入"
-                ></c-input>
+                  class="input-currency-left"
+                ></c-input-currency-min>
               </c-form-item>
             </c-col>
           </c-col>
@@ -368,11 +364,13 @@
                 label-width="5px"
                 prop="oldgidgrp.cbs.max.amt"
               >
-                <c-input
+              <!-- 不确定能否回显负金额，因此空为disabled,故暂定能显示负金额 -->
+              <c-input-currency-min
                   disabled
                   v-model="model.oldgidgrp.cbs.max.amt"
                   placeholder="请输入"
-                ></c-input>
+                  class="input-currency-left"
+                ></c-input-currency-min>
               </c-form-item>
             </c-col>
           </c-col>
@@ -397,17 +395,13 @@
                 label-width="5px"
                 prop="trnmod.swiadd.ameamt"
               >
-                <c-input
+                <c-input-currency-min
                   v-model="model.trnmod.swiadd.ameamt"
                   placeholder="请输入"
                   @blur="ameamtBlur"
-                  @keyup.enter.native="
-                  defaultFunction(
-                    'trnmod.swiadd.newamt',
-                    model.trnmod.swiadd.newamt
-                  )
-                "
-                ></c-input>
+                  @keyup.enter.native="$event.target.blur()"
+                  class="input-currency-left"
+                ></c-input-currency-min>
               </c-form-item>
             </c-col>
           </c-col>
@@ -436,12 +430,7 @@
                   v-model="model.trnmod.swiadd.newamt"
                   placeholder="请输入"
                   @blur="newamtBlur"
-                  @keyup.enter.native="
-                  eventFunction(
-                    'trnmod.swiadd.newamt',
-                    model.trnmod.swiadd.newamt
-                  )
-                "
+                  @keyup.enter.native="$event.target.blur()"
                 ></c-input>
               </c-form-item>
             </c-col>
@@ -830,18 +819,14 @@
                 label-width="5px"
                 prop="trnmod.swiadd.addamt"
               >
-                <c-input
+                <c-input-currency-min
                   :disabled="model.trnmod.swiadd.addamtflg == ''"
                   v-model="model.trnmod.swiadd.addamt"
                   placeholder="请输入附加金额"
                   @blur="addamtBlur"
-                  @keyup.enter.native="
-                  defaultFunction(
-                    'trnmod.swiadd.addamt',
-                    model.trnmod.swiadd.addamt
-                  )
-                "
-                ></c-input>
+                  @keyup.enter.native="$event.target.blur()"
+                  class="input-currency-left"
+                ></c-input-currency-min>
               </c-form-item>
             </c-col>
           </c-col>

src/views/Business/Getame/Opnp.vue

 <template>
   <div class="eibs">
-    <c-col :span="12">
+    <!-- =======================================左边======================================== -->
+    <c-col :span="12" style="padding-right: 20px;">
+    <c-col :span="24">
       <el-form-item label="是否SWIFT格式" prop="gitp.swiftflg">
         <c-select
           v-model="model.gitp.swiftflg"
@@ -17,33 +19,13 @@
         </c-select>
       </el-form-item>
     </c-col>
-
-    <c-col :span="12">
-      <el-form-item label="是否对外担保" prop="gidgrp.rec.fingua">
-        <c-select
-          disabled
-          v-model="model.gidgrp.rec.fingua"
-          style="width: 100%"
-          placeholder="请选择是否对外担保"
-        >
-          <el-option
-            v-for="item in codes.fingua"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </c-select>
-      </el-form-item>
-    </c-col>
-
-    <c-col :span="12">
-      <c-col :span="20">
+    <c-col :span="24">
+      <c-col :span="model.gidgrp.cbs.max.cur == 'CNY'? 20 : 24">
         <el-form-item label="对外担保类型" prop="gidgrp.rec.cfaguatyp">
           <c-select
             disabled
             v-model="model.gidgrp.rec.cfaguatyp"
-            style="width: 90%"
+            :style="model.gidgrp.cbs.max.cur == 'CNY'? 'width:90%' : 'width:100%'"
             placeholder="请选择对外担保类型"
           >
             <el-option
@@ -65,6 +47,29 @@
         >
       </c-col>
     </c-col>
+  </c-col>
+
+  <!-- =======================================右边======================================== -->
+  <c-col :span="12" style="padding-left: 20px;">
+    <c-col :span="24">
+      <el-form-item label="是否对外担保" prop="gidgrp.rec.fingua">
+        <c-select
+          disabled
+          v-model="model.gidgrp.rec.fingua"
+          style="width: 100%"
+          placeholder="请选择是否对外担保"
+        >
+          <el-option
+            v-for="item in codes.fingua"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </c-select>
+      </el-form-item>
+    </c-col>
+  </c-col>
   </div>
 </template>
 <script>

src/views/Business/Getame/Ovwp.vue

@@ -49,7 +49,7 @@
       <el-collapse-item title="Seq C : 附加金额" name="aacp" v-if="model.gitp.swiftflg == 'Y' && (model.trnmod.swiadd.purposame == 'ISCA' || model.trnmod.swiadd.purposame == 'ICCA') && model.trnmod.swiadd.addamtflgc == 'X'">
         <m-aacp :model="model" :codes="codes"/>
       </el-collapse-item>
-      <el-collapse-item title="Seq C : 附加金额" name="aamp20" v-if="model.gitp.swiftflg == 'Y' && model.trnmod.swiadd.purposame == 'ISUA' && model.trnmod.swiadd.addamtflg == 'X' && model.gidgrp.rec.purpos != 'ISSU' || model.trnmod.swiadd.addamt!=''">
+      <el-collapse-item title="Seq C : 附加金额" name="aamp20" v-if="model.gitp.swiftflg == 'Y' && model.trnmod.swiadd.purposame == 'ISUA' && model.trnmod.swiadd.addamtflg == 'X' && model.gidgrp.rec.purpos != 'ISSU' || model.trnmod.swiadd.addamt!='0.00'">
         <m-aamp20 :model="model" :codes="codes"/>
       </el-collapse-item>
     </el-collapse>

src/views/Business/Getame/Ovwp1.vue

@@ -504,39 +504,6 @@
                 </c-select>
               </el-form-item>
             </c-col>
-  
-            <c-col :span="24">
-              <c-col :span="20">
-                <el-form-item
-                  v-if="model.gitp.swiftflg == 'N'"
-                  label="对外担保类型"
-                  prop="gidgrp.rec.cfaguatyp"
-                >
-                  <c-select
-                    disabled
-                    v-model="model.gidgrp.rec.cfaguatyp"
-                    style="width: 90%"
-                    placeholder="请选择对外担保类型"
-                    :code="codes.cfaguatyp"
-                  >
-                  </c-select>
-                </el-form-item>
-              </c-col>
-              <c-col
-                :span="4"
-                v-if="
-                  model.gidgrp.cbs.max.cur == 'CNY' && model.gitp.swiftflg == 'N'
-                "
-                class="centerLable"
-              >
-                <c-checkbox
-                  label="跨境人民币保函"
-                  disabled
-                  v-model="model.gidgrp.rec.cmtflg"
-                  >跨境人民币保函</c-checkbox
-                >
-              </c-col>
-            </c-col>
           </c-col>
         <!-- ============右边================= -->
         <c-col :span="12" style="padding-left: 20px;">
@@ -785,21 +752,6 @@
             <c-col :span="24">
               <el-form-item
                 v-if="model.gitp.swiftflg == 'N'"
-                label="被保证人"
-                prop="gidgrp.gidcxm.warran"
-              >
-                <c-input
-                  v-model="model.gidgrp.gidcxm.warran"
-                  maxlength="40"
-                  placeholder="请输入被保证人"
-                ></c-input>
-              </el-form-item>
-            </c-col>
-  
-            <!--  -->
-            <c-col :span="24">
-              <el-form-item
-                v-if="model.gitp.swiftflg == 'N'"
                 label="生效日期"
                 prop="gidgrp.rec.opndat"
               >
@@ -830,9 +782,53 @@
                 </c-select>
               </el-form-item>
             </c-col>
-  
-            <!--  -->
-  
+            
+            <c-col :span="24" v-if="model.gitp.swiftflg == 'N'">
+              <c-col :span="model.gidgrp.cbs.max.cur == 'CNY' ? 20 : 24">
+                <el-form-item
+                  label="担保类型"
+                  prop="gidgrp.rec.cfaguatyp"
+                >
+                  <c-select
+                    disabled
+                    v-model="model.gidgrp.rec.cfaguatyp"
+                    :style="model.gidgrp.cbs.max.cur == 'CNY' ? 'width: 90%' : 'width: 100%'"
+                    placeholder="请选择对外担保类型"
+                    :code="codes.cfaguatyp"
+                  >
+                  </c-select>
+                </el-form-item>
+              </c-col>
+              <c-col
+                :span="4"
+                v-if="
+                  model.gidgrp.cbs.max.cur == 'CNY'
+                "
+                class="centerLable"
+              >
+                <c-checkbox
+                  label="跨境人民币保函"
+                  disabled
+                  v-model="model.gidgrp.rec.cmtflg"
+                  >跨境人民币保函</c-checkbox
+                >
+              </c-col>
+            </c-col>
+            
+            <c-col :span="24">
+              <el-form-item
+                v-if="model.gitp.swiftflg == 'N'"
+                label="被保证人"
+                prop="gidgrp.gidcxm.warran"
+              >
+                <c-input
+                  v-model="model.gidgrp.gidcxm.warran"
+                  maxlength="40"
+                  placeholder="请输入被保证人"
+                ></c-input>
+              </el-form-item>
+            </c-col>
+
             <!--  -->
             <c-col :span="24">
               <el-form-item

src/views/Business/Getame/index.vue

@@ -35,7 +35,7 @@
                     <!-- 结算 -->
                     <m-setpan :model="model" :codes="codes" />
                   </el-collapse-item>
-                  <el-collapse-item v-if="this.flag" title="会计分录" name="glepan">
+                  <el-collapse-item title="会计分录" name="glepan">
                     <!-- 会计分录 -->
                     <m-glepan :model="model" :codes="codes" />
                   </el-collapse-item>
@@ -347,7 +347,6 @@ export default {
         ...CodeTable,
       },
       activeNames: ["engp"],
-      flag: false,
     };
   },
   methods: {
@@ -358,9 +357,6 @@ export default {
        **/
       let name = tab.name;
       let rulePath;
-      if (name === "setpan") {
-        this.flag = true;
-      }
       if (!!rulePath) {
         this.executeRule(rulePath).then((res) => {
           if (res.respCode == SUCCESS) {

src/views/Business/Getopn/Opnp.vue

@@ -56,7 +56,7 @@
           <c-select
             disabled
             v-model="model.gidgrp.rec.fingua"
-            style="width: 95%"
+            style="width: 100%"
             placeholder="请选择是否对外担保"
           >
             <el-option