Răsfoiți Sursa

执行后不可编辑

xuzhiheng 5 ani în urmă
părinte
comite
629aee0183

+ 2 - 1
src/history/historytask.go

@@ -99,7 +99,7 @@ func (this *HistoryData) HistoryTask(history_id string) {
 func (this *HistoryData) HistoryList() {
 	id := this.GetString("id")
 	if this.Method() == "POST" {
-		data, _ := Mgo.Find("historylog", map[string]interface{}{"user_id": id}, `{"updatetime":-1}`, nil, false, -1, -1)
+		data, _ := Mgo.Find("historylog", map[string]interface{}{"user_id": id}, `{"createtime":-1}`, nil, false, -1, -1)
 		this.ServeJson(map[string]interface{}{
 			"data": data,
 		})
@@ -115,6 +115,7 @@ func UpdateHistoryState(state int, history_id string, count int) {
 			"$set": map[string]interface{}{
 				"state":        state,
 				"result_count": count,
+				"finishtime":   time.Now().Unix(),
 			},
 		}, false, false)
 		return

+ 0 - 1
src/main.go

@@ -57,7 +57,6 @@ func init() {
 	for _, v := range util.Sysconfig["project_appid"].([]interface{}) {
 		history.ProjectAppidMap[v.(string)] = true
 	}
-	log.Println("ProjectAppidMap", history.ProjectAppidMap)
 }
 
 func main() {

+ 14 - 5
src/web/templates/private/customer_history.html

@@ -31,7 +31,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 saveHistorylog" 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">
@@ -132,8 +132,8 @@
                                     <table id="departTable" class="table table-bordered">
                                         <thead>
                                         <div style="margin: 10px 10px 0px;">
-                                            <a class="btn btn-default" onclick="showDepart()">新增</a>
-                                            <a class="btn btn-default" onclick="select_Depart()">选择</a>
+                                            <a class="btn btn-default addHistoryRule" onclick="showDepart()">新增</a>
+                                            <a class="btn btn-default chooseHistoryRule" onclick="select_Depart()">选择</a>
                                         </div>
                                         <tr class="show-select">
                                             <th>编号</th>
@@ -270,6 +270,12 @@
     var selected_rules = [];
     var c_id = getParam("id");
     var hid = getParam("hid");
+    var ischeck = getParam("check");
+    if (ischeck == "true"){
+        $(".saveHistorylog").hide();
+        $(".addHistoryRule").hide();
+        $(".chooseHistoryRule").hide();
+    }
     if (history_rule !== null){
         if (history_rule.length>0){
             html = "";
@@ -292,8 +298,11 @@
                 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 class="btn btn-info" eid="'+selected_rules[i].rule_id+'" onclick="updateRule(this)">编辑</a><a style="margin-left:10px" class="btn btn-danger" eid="'+selected_rules[i].rule_id+'" onclick="del_selected_rule(this)">删除</a></td>'
-                    // html += '<td></td>'
+                    if (ischeck == "true"){
+                        html += '<td></td>'
+                    }else{
+                        html += '<td><a class="btn btn-info" eid="'+selected_rules[i].rule_id+'" onclick="updateRule(this)">编辑</a><a style="margin-left:10px" class="btn btn-danger" eid="'+selected_rules[i].rule_id+'" onclick="del_selected_rule(this)">删除</a></td>'
+                    }
                     // html += '<td></td>'
                     num++
                 }

+ 2 - 2
src/web/templates/private/historylog_list.html

@@ -173,13 +173,13 @@
                         var tmp = "";
                         if(row.state === 2){
                             tmp = '<div>' +
-                              '<a class="btn btn-sm btn-primary" href="/service/customer/history?id='+ row.user_id +'&hid='+ val +'">编辑</a>' +
+                              '<a class="btn btn-sm btn-primary" href="/service/customer/history?id='+ row.user_id +'&hid='+ val +'&check=true">查看</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>';
                         }else if(row.state === 1){
                             tmp = '<div>' +
-                              '<a class="btn btn-sm btn-primary" href="/service/customer/history?id='+ row.user_id +'&hid='+ val +'">编辑</a>' +
+                              '<a class="btn btn-sm btn-primary" href="/service/customer/history?id='+ row.user_id +'&hid='+ val +'&check=true">查看</a>' +
                               '<a style="margin-left:10px" class="btn btn-sm btn-info">进行</a>' +
                               '<a style="margin-left:10px" class="btn btn-sm btn-info" eid="'+val+'" onclick="cloneWork(this)">克隆</a>' +
                               '</div>';