优化

src/service/second_push.go

@@ -231,6 +231,7 @@ func (s *SecondPush) SecondPushTask() {
 			if len(c)!=0&&c != nil{
 				if c["dep_rules"] !=nil&&len(c["dep_rules"].([]interface{}))!=0{
 					for _,m := range c["dep_rules"].([]interface{}){
+						log.Println("ruleid",mongoutil.BsonIdToSId(m.(map[string]interface{})["_id"]))
 						q := bson.M{
 							"ruleid":mongoutil.BsonIdToSId(m.(map[string]interface{})["_id"]),
 							"createtime":bson.M{
@@ -238,7 +239,7 @@ func (s *SecondPush) SecondPushTask() {
 								"$lte":endtime,
 							},
 						}
-						d,_:=MgoSecondPush.Find("usermail",q,nil,nil,false,0,0)
+						d,_:=MgoSecondPush.Find("usermail_0806_01",q,nil,nil,false,0,0)
 						if len(*d)>0&&d !=nil{
 							for _,l := range *d{
 								xlsxArr=append(xlsxArr, l)
@@ -264,6 +265,9 @@ func (s *SecondPush) SecondPushTask() {
 					log.Println(len(xlsxArr))
 					GetXlsxs(xlsxArr, customer_name, email, s_pushid)
 					go UpdateHistoryState(2, s_pushid, len(xlsxArr))
+					s.ServeJson(map[string]interface{}{
+						"status":true,
+					})
 					xlsxArr =[]map[string]interface{}{}
 				}
 			}
@@ -388,9 +392,8 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string) {
 			}
 			if dataType == 1 {
 				sh := xf.Sheets[0]
-				for i, v := range mMap {
+				for _, v := range mMap {
 					row := sh.AddRow()
-					row.AddCell().SetInt(i + 1)
 					row.AddCell().SetValue(v["matchkey"])
 					row.AddCell().SetValue(v["area"])
 					row.AddCell().SetValue(v["city"])
@@ -415,9 +418,8 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string) {
 				xf.Sheets = xf.Sheets[0:1]
 			} else if dataType == 2 {
 				sh := xf.Sheets[1]
-				for i, v := range mMap {
+				for _, v := range mMap {
 					row := sh.AddRow()
-					row.AddCell().SetInt(i + 1)
 					row.AddCell().SetValue(v["matchkey"])
 					row.AddCell().SetValue(v["area"])
 					row.AddCell().SetValue(v["city"])
@@ -463,9 +465,8 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string) {
 				xf.Sheets = xf.Sheets[1:2]
 			} else {
 				sh := xf.Sheets[2]
-				for i, v := range mMap {
+				for _, v := range mMap {
 					row := sh.AddRow()
-					row.AddCell().SetInt(i + 1)
 					row.AddCell().SetValue(v["matchkey"])
 					row.AddCell().SetValue(v["area"])
 					row.AddCell().SetValue(v["city"])

src/web/templates/private/customer_edit_euser.html

@@ -9,7 +9,7 @@
         </h1>
         <ol class="breadcrumb">
             <li><a href="#"><i class="fa fa-dashboard"></i> 首页</a></li>
-            <li><a href="/service/entCustomer/list"> 企业客户</a></li>
+            <li><a href="/service/entCustomer/list"> 签约客户</a></li>
             <li><a href="#"> 查看客户</a></li>
         </ol>
     </section>

src/web/templates/private/customer_ent_list.html

@@ -10,7 +10,7 @@
         </h1>
         <ol class="breadcrumb">
             <li><a href="#"><i class="fa fa-dashboard"></i> 首页</a></li>
-            <li><a href="#"> 企业客户</a></li>
+            <li><a href="#"> 签约客户</a></li>
         </ol>
     </section>
     <!-- Main content -->

src/web/templates/private/euser_tag_rule_l.html

@@ -10,7 +10,7 @@
         </h1>
         <ol class="breadcrumb">
             <li><a href="#"><i class="fa fa-dashboard"></i> 首页</a></li>
-            <li><a href="/service/entCustomer/list"> 企业客户</a></li>
+            <li><a href="/service/entCustomer/list"> 签约客户</a></li>
             <li><a href="/service/customer/euser?id={{.T.cid}}"> 查看客户</a></li>
             <li><a href="#"> 查看标签</a></li>
         </ol>

src/web/templates/private/historylog_list.html

@@ -46,7 +46,7 @@
                         <!-- /.box -->
                     </div>
                 </div>
-                <div class="row" id="second-push-list">
+                <div class="row" id="second-push-list" hidden>
                     <div class="col-xs-12">
                         <div class="box">
                             <div class="box-body">
@@ -195,7 +195,7 @@
                 }
             ]
         });
-        stable = $('#sdataTable').DataTable({
+        window.stable = $('#sdataTable').DataTable({
             "paging": true,
             "lengthChange": false,
             "searching": false,
@@ -290,7 +290,7 @@
                         var tmp = "";
                         if(row.state === 2){
                             tmp = '<div>' +
-                                '<a class="btn btn-sm btn-primary" href="/service/secondpush/create?id='+ row.user_id +'&s_pushid='+ val +'">编辑</a>' +
+                                '<a class="btn btn-sm btn-primary" href="/service/secondpush/create?id='+ row.user_id +'&s_pushid='+ val +'&complete=1">查看</a>' +
                                 '<a style="margin-left:10px" class="btn btn-sm btn-success" disabled>完成</a>' +
                                 '<a style="margin-left:10px" class="btn btn-sm btn-info" eid="'+val+'" onclick="cloneWork(this)">克隆</a>' +
                                 '</div>';
@@ -341,8 +341,9 @@
                     type: 'POST',
                     data:{"s_pushid":val},
                     success: function(r) {
-                        $(obj).removeClass("btn-info").addClass("btn-success").attr("disabled","disabled");
-                        $(obj).text("完成");
+                        if (r.status){
+                            stable.ajax.reload()
+                        }
                     },
                     error: function (r) {
                         $(obj).removeClass("btn-info").addClass("btn-danger");

src/web/templates/private/second_push_create.html

@@ -29,7 +29,7 @@
                                 <div class="box-header with-border">
                                     <i class="fa fa-tag"></i>
                                     <h3 class="box-title">用户基本信息</h3>
-                                    <a class="btn btn-primary btn-sm" style="float: right;margin-top: 7px;margin-right: 10px" onclick="saveCuser()"><i class="fa fa-fw fa-file-text fa-lg"></i>保存</a>
+                                    <a class="btn btn-primary btn-sm saveuser" style="float: right;margin-top: 7px;margin-right: 10px" onclick="saveCuser()"><i class="fa fa-fw fa-file-text fa-lg"></i>保存</a>
                                 </div>
                                 <div class="box-body">
                                     <div class="form-group">
@@ -65,8 +65,8 @@
                                                 <div class="col-sm-2">
                                                     <select class="form-control selectpicker" id="extfiledselect">
                                                         <option value="2">高级字段包</option>
-                                                        <option value="1">初级字段包</option>
-                                                        <option value="3">特殊字段包</option>
+                                                        <option value="1">标准字段包</option>
+                                                        <option value="3">深信服字段包</option>
                                                     </select>
                                                     <script>
                                                         $('#extfiledselect').on("change", function () {
@@ -114,7 +114,7 @@
                                     <table id="departTable" class="table table-bordered">
                                         <thead>
                                         <div style="margin: 10px 10px 0px;">
-                                            <a class="btn btn-default" onclick="select_Depart()">选择</a>
+                                            <a class="btn btn-default select-button" onclick="select_Depart()">选择</a>
                                         </div>
                                         <tr class="show-select">
                                             <th>编号</th>
@@ -194,6 +194,7 @@
     var selected_rules = [];
     var c_id = getParam("id");
     var s_pushid = getParam("s_pushid");
+    var iscomplete = getParam("complete");
     if (history_rule !== null){
         if (history_rule.length>0){
             html = "";
@@ -216,7 +217,7 @@
                 for (var i=0;i<selected_rules.length;i++){
                     html += '<tr><td>'+num+'</td><td>'+selected_rules[i].department_name+'</td><td>'+selected_rules[i].rule_name+'</td><td>'+selected_rules[i].update_time+'</td>'+'<td>'+selected_rules[i].department_status+'</td>'+'<td>'+selected_rules[i].rule_status+'</td>';
                     // if (selected_rules[i].isinc == "true"){
-                    html += '<td><a style="margin-left:10px" class="btn btn-danger" eid="'+selected_rules[i].rule_id+'" onclick="del_selected_rule(this)">删除</a></td>'
+                    html += '<td><a style="margin-left:10px" class="btn btn-danger delete-button" eid="'+selected_rules[i].rule_id+'" onclick="del_selected_rule(this)">删除</a></td>'
                     // html += '<td></td>'
                     // html += '<td></td>'
                     num++
@@ -239,6 +240,16 @@
             dt.setTime(parseInt(dataMap.endtime) * 1000);
             $('#endtime').find("input").val(dt.format("yyyy-MM-dd hh:mm:ss"));
         }
+        if (iscomplete == "1"){
+            $('#starttime').css("pointer-events","none");
+            $('#endtime').css("pointer-events","none");
+            $("#sendMail").attr("disabled",true);
+            $("#extfiledselect").attr("disabled",true);
+            $(".saveuser").hide();
+            $(".delete-button").hide();
+            $(".select-button").hide();
+
+        }
         if (dataMap.i_state == 0) {
             $('.tab_2').hide()
             $('#pushDiv').hide()
@@ -505,7 +516,7 @@
             for (var i=0;i<selected_rules.length;i++){
                 html += '<tr><td>'+num+'</td><td>'+selected_rules[i].department_name+'</td><td>'+selected_rules[i].rule_name+'</td><td>'+selected_rules[i].update_time+'</td>'+'<td>'+selected_rules[i].department_status+'</td>'+'<td>'+selected_rules[i].rule_status+'</td>';
                 // if (selected_rules[i].isinc == "true"){
-                html += '<td><a style="margin-left:10px" class="btn btn-danger" eid="'+selected_rules[i].rule_id+'" onclick="del_selected_rule(this)">删除</a></td>'
+                html += '<td><a style="margin-left:10px" class="btn btn-danger delete-button" eid="'+selected_rules[i].rule_id+'" onclick="del_selected_rule(this)">删除</a></td>'
                 // html += '<td><button class="btn btn-danger" onclick="del_selected_rule('+selected_rules[i].rule_id+')">删除</button></td>'
                 // }else{
                 // html += "<td></td>"