Merge remote-tracking branch 'origin/api' into api

jyy

2021-01-19 0a67d6a24417507a27e03d53da82bbd802257148

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html

@@ -303,6 +303,13 @@
                     }
                  } else {
                     Vue.set(item,'isActive',true);
                     var hasAmount = 0;
                     for(var i = 0; i < payMoneys.length; i++) {
                        hasAmount += parseFloat(payMoneys[i].money);
                     }
                     if (_this.order.arrears - hasAmount > 0) {
                        Vue.set(item, 'money', _this.order.arrears - hasAmount);
                     }
                     _this.payMoneys.push(item);
                  }
               });