Merge branch 'ty_urgent' into api

Helius

2020-12-23 844e37605b65a2a3d95b466d663d91ac8584350c

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

@@ -251,7 +251,7 @@
   var myForm = MForm.initForm({
      invokeUrl : basePath+"/admin/moneyCardUse/bj",
      beforeSubmit : function() {
			

         //校验业绩
         var ifAchieveOk=true;
         $("#tbody2").children("tr").each(function(){
@@ -270,8 +270,8 @@
            layer.msg("业绩金额不能大于支付金额",{icon:2})
            return false;
         }
			
			


         var money = parseFloat($("#money").val());
         var total = parseFloat($("#zkTotal").html());
      },
@@ -292,9 +292,9 @@
         itemIndex=0;
      }
       var id=MTools.randomStr();
	 	

       var table=$("#"+trId).find("td").eq(3).find("table")
	 	

       var achieveIndex=$("#"+trId).find("td").eq(3).find("table").find("tr").length;
      var html= '<tr> <td><select class="autoFull select2 input-sm" id="'+id+'"  name="items['+itemIndex+'].achaeveList['+achieveIndex+'].beaultId" '
            +'data-url="'+basePath+'/admin/getShopStaffByRoleName?roleName=美疗师" data-value="suId" data-filed="suName" data-def=""'