Merge branch 'dev1.4.1' of http://192.168.3.207:10080/qmx/datatag into dev1.4.1

src/client/client.go

@@ -70,6 +70,7 @@ func (this *Client) PersonnelIndex() {
 		}
 		entId := qu.IntAll(user["ent_id"])
 		count := Mgo.Count("entniche_rule", map[string]interface{}{"entId": entId, "entUserId": entUserId})
+
 		entRuleArr, ok := Mgo.Find("entniche_rule", map[string]interface{}{"entId": entId, "entUserId": entUserId}, `{"_id":-1}`, nil, false, start, limit)
 		if ok && entRuleArr != nil && *entRuleArr != nil && len(*entRuleArr) > 0 {
 			for _, v := range *entRuleArr {
@@ -88,11 +89,27 @@ func (this *Client) PersonnelIndex() {
 				"data":            nil,
 				"recordsFiltered": 0,
 				"recordsTotal":    0,
+
 			})
 		}
 	} else {
 		this.T["id"] = id
-		this.Render("/client/personnelIndex.html")
+		entUserId := 0
+		user := this.GetSession("user").(map[string]interface{})
+		if id == "" {
+			entUserId = qu.IntAll(user["id"])
+		} else {
+			entUserId, _ = strconv.Atoi(qu.SE.DecodeString(id))
+		}
+		entId := qu.IntAll(user["ent_id"])
+		leftNumData := JyMysql.FindOne("user_account", map[string]interface{}{"user_id":entUserId,"ent_id":entId},"left_num","")
+		var left int
+		if (*leftNumData)==nil{
+			left=0
+		}
+		left = int((*leftNumData)["left_num"].(int64))
+		this.T["left"] = left
+		this.Render("/client/personnelIndex.html",&this.T)
 	}
 }
 

src/web/templates/client/personnelIndex.html

@@ -7,6 +7,7 @@
     <section class="content-header">
         <h1>
             <small><a id="addTag" class="btn btn-primary opr">新增规则</a></small>
+            <small><h4 id="left" style="color: red;"></h4></small>
             <a class="btn btn-primary opr" id="back" style="float: right" href="javascript:history.go(-1)"> 返回</a>
         </h1>
     </section>
@@ -64,6 +65,7 @@
 <script>
     // menuActive("/customer/list");
     $('#addTag').attr("href", "/client/rule/create?entUserId="+{{.T.id}})
+    $('#left').text({{.T.left}})
     $(function () {
         ttable = $('#dataTable').DataTable({
             "paging": true,

src/web/templates/recharge.html

@@ -24,13 +24,13 @@
 
     <form action="/" method="post" id="rechargeForm">
         <div class="form-group has-feedback" >
-            <input id="entId" name="entId" type="number" class="form-control" placeholder="请输入企业id" >
+            <input id="entId" name="entId" type="text" class="form-control" placeholder="请输入企业id" >
         </div>
         <div class="form-group has-feedback" >
             <input id="phone" name="phone" type="tel" class="form-control" placeholder="请输入充值手机号" maxlength="11">
         </div>
         <div class="form-group has-feedback" >
-            <input id="rechargeNum" name="rechargeNum" type="number" class="form-control" placeholder="请输入充值数量" >
+            <input id="rechargeNum" name="rechargeNum" type="number" class="form-control"  style="padding-right:0" placeholder="请输入充值数量" >
         </div>
         <div class="form-group has-feedback">
             <input id="remark" name="remark" type="text" class="form-control" placeholder="备注" >