Merge branch 'master' of http://192.168.0.110:11080/fukai/vue-gjjs

src/components/InputCurrency.vue

@@ -74,6 +74,9 @@ export default {
   methods: {
     onBlur() {
       this.isOnBlur = true;
+      if(this.model.trim() === "") {
+        this.model = "0";
+      }
     },
     focus() {
       this.isOnBlur = false;

src/mixin/commonProcess.js

@@ -147,6 +147,14 @@ export default {
       return fn;
     },
     /**
+     * 用于手动的触发model里属性的 executeDefault 
+     * @param {string} rule 执行的 rule path
+     * @param {any} value   更改的值
+     */
+    defaultFunction (rule, value) {
+      Utils.defaultFunction.call(this, rule, value)
+    },
+    /**
      * 更新Model
      * @param {any} data model数据
      */

src/utils/index.js

@@ -208,7 +208,9 @@ export default class Utils {
             if (res.respCode == SUCCESS){
                 const data = res.data;
                 Utils.copyValueFromVO(this.model, data)
-                callback()
+                if (typeof callback === "function") {
+                    callback()
+                }
             }
         })
     }

src/views/Business/Ditopn/Ovwp.vue

@@ -120,6 +120,7 @@
             v-model="model.didgrp.cbs.nom1.amt"
             style="text-align: left; width: 100%"
             placeholder="请输入信用证金额"
+            @keyup.enter.native="defaultFunction('didgrp.cbs.nom1.amt', model.didgrp.cbs.nom1.amt)"
           ></c-input-currency>
         </el-form-item>
       </c-col>

src/views/Business/Ditopn/index.vue

@@ -7,6 +7,8 @@
         :handleCheck="handleCheck"
         :handleStash="handleStash"
       >
+        <el-button size="small">流程附言</el-button>
+        <el-button size="small">交易历史</el-button>
         <el-button size="small">备忘录</el-button>
         <el-button size="small">影像信息</el-button>
         <el-button size="small">保存模板</el-button>