Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/OP/EntryDetails.vue

@@ -1749,7 +1749,7 @@ export default {
         },
         //其他费用标准值改变
         otherinput(val){
-            if (val.currency=='') {
+            if (val.currency==''||this.othercurrencys=='') {
                 return
             }
             var obj={}
@@ -1757,7 +1757,6 @@ export default {
             obj= this.othercurrencys.find(function(i){
                 return i.currencyId ===val.currency
             });
-            console.log(obj);
             rate=obj.rate
             val.subTotal=Number(val.cost)*Number(rate);
             this.otherExpense=0;