no message

src/front/group.go

@@ -56,7 +56,7 @@ func (f *Front) GroupTaskListByAdmin() {
 		start, _ := f.GetInteger("start")
 		limit, _ := f.GetInteger("length")
 		draw, _ := f.GetInteger("draw")
-		status := f.GetString("status")
+		status := f.GetString("s_status")
 		searchStr := f.GetString("search[value]")
 		search := strings.TrimSpace(searchStr)
 		query := map[string]interface{}{
@@ -103,6 +103,7 @@ func (f *Front) GroupTaskListByAdmin() {
 func (f *Front) GroupUserTaskList() {
 	defer qu.Catch()
 	//groupId := f.GetString("s_groupid") //用户组id
+	pid := f.GetString("pid")
 	groupTaskId := f.GetString("grouptaskid") //用户组任务id
 	qu.Debug("groupTaskId：", groupTaskId)
 	if f.Method() == "POST" {
@@ -155,6 +156,7 @@ func (f *Front) GroupUserTaskList() {
 		isNotTagNum := util.Mgo.Count(sourceinfo, map[string]interface{}{"s_grouptaskid": groupTaskId, "b_istag": false})       //未标注数量
 		allNum := util.Mgo.Count(sourceinfo, map[string]interface{}{"s_grouptaskid": groupTaskId})                              //数据总量
 		qu.Debug("数据总量：", allNum, "已分发量：", isGiveNum, "待分发量：", isNotGiveNum, "已标注量：", isTagNum, "未标注量：", isNotTagNum)
+		f.T["pid"] = pid
 		f.T["grouptaskid"] = groupTaskId
 		f.T["allNum"] = allNum
 		f.T["isGiveNum"] = isGiveNum

src/front/user.go

@@ -482,6 +482,7 @@ func (f *Front) UserTaskSave() {
 func (f *Front) UserTaskList() {
 	defer qu.Catch()
 	user := f.GetSession("user").(map[string]interface{})
+	s_role := qu.ObjToString(user["i_role"])
 	s_personid := qu.ObjToString(user["id"])
 	if f.Method() == "POST" {
 		start, _ := f.GetInteger("start")
@@ -491,8 +492,10 @@ func (f *Front) UserTaskList() {
 		searchStr := f.GetString("search[value]")
 		search := strings.TrimSpace(searchStr)
 		query := map[string]interface{}{
-			"s_stype":    "user",
-			"s_personid": s_personid,
+			"s_stype": "user",
+		}
+		if s_role != "0" && s_role != "1" {
+			query["s_personid"] = s_personid
 		}
 		if status != "-1" { //任务状态
 			query["s_status"] = status

src/web/templates/project/project_clear.html

@@ -238,7 +238,7 @@
                 {
                     "data": "_id", width: "11%", render: function (val, a, row, pos) {
                         tmp = '<div>' +
-                            '<a class="btn btn-sm btn-primary" href="/front/group/user/task/list?grouptaskid=' + val + '&s_sourceinfo='+row.s_sourceinfo+'">查看</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-primary" href="/front/group/user/task/list?pid='+projectid+'&grouptaskid=' + val + '&s_sourceinfo='+row.s_sourceinfo+'">查看</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-primary" onclick="retrieveTask(\''+val+'\',\''+row.s_sourceinfo+'\',\''+row.s_status+'\')">收回</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-primary">质检</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-primary" onclick="repulseTask(\''+val+'\',\''+row.s_sourceinfo+'\',\''+row.s_status+'\')">打回</a>&nbsp;&nbsp;' +
@@ -349,11 +349,14 @@
 
     function saveTask() {
         let arr = []
+        let valNum = 0
+        let num = parseInt($('#modal-num').html())
         $('.group-item').each(function () {
             var selectId = $(this).find("select option:checked").val()
             var inputVal = $(this).find("input").val()
-            if (inputVal === "") {
-                showTip("请填写有效数字")
+            valNum += parseInt(inputVal)
+            if (inputVal === "" || valNum > num) {
+                showTip("分发数量有问题")
                 return
             }
             let tmp = {}
@@ -368,19 +371,22 @@
             }
             arr.push(tmp)
         })
-        console.log(arr)
-        $.ajax({
-            url: "/front/project/task/save",
-            type: 'POST',
+        if (arr.length > 0) {
+            console.log(arr)
+            $.ajax({
+                url: "/front/project/task/save",
+                type: 'POST',
                 data: {"s_projectid": projectid, "s_group": JSON.stringify(arr), "s_type": stype},
-            success: function (r) {
-                if (r.success) {
-                    location.reload()
-                } else {
-                    showTip(r.msg);
+                success: function (r) {
+                    if (r.success) {
+                        location.reload()
+                    } else {
+                        showTip(r.msg);
+                    }
                 }
-            }
-        })
+            })
+        }
+
     }
 
     // 收回

src/web/templates/project/task_detail.html

@@ -9,9 +9,9 @@
             <small></small>
         </h1>
         <ol class="breadcrumb">
-            <li><a href="#"><i class="fa fa-dashboard"></i> 项目分发</a></li>
+            <li><a href="/front/project"><i class="fa fa-dashboard"></i> 项目列表</a></li>
+            <li><a href="/front/project/task/list?pid={{ .T.pid }}"><i class="fa fa-dashboard"></i> 项目分发</a></li>
             <li><a href="#"><i class="fa fa-dashboard"></i> 任务分发</a></li>
-
         </ol>
     </section>
     <!-- Main content -->
@@ -325,13 +325,15 @@
 
     function saveTask() {
         let arr = []
+        let valNum = 0
+        let num = parseInt($('#modal-num').html())
         if (stype === "man") {
             $('.group-item').each(function () {
                 var selectId = $(this).find("select option:checked").val()
                 var inputVal = $(this).find("input").val()
-                console.log(selectId, inputVal)
-                if (inputVal === "") {
-                    showTip("未设置分发条数")
+                valNum += parseInt(inputVal)
+                if (inputVal === ""|| valNum > num) {
+                    showTip("分发数量有问题")
                     return
                 }
                 let tmp = {}
@@ -384,20 +386,23 @@
                 return;
             }
         }
-        console.log(arr)
-        $.ajax({
-            url: "/front/user/task/save",
-            type: "POST",
-            data: {"grouptaskid": grouptaskid, "usernums": JSON.stringify(arr)},
-            success: function (r) {
-                if (r.success) {
-                    console.log(r.data)
-                    location.reload()
-                }else {
-                    showTip(r.msg)
+        if (arr.length > 0) {
+            console.log(arr)
+            $.ajax({
+                url: "/front/user/task/save",
+                type: "POST",
+                data: {"grouptaskid": grouptaskid, "usernums": JSON.stringify(arr)},
+                success: function (r) {
+                    if (r.success) {
+                        console.log(r.data)
+                        location.reload()
+                    }else {
+                        showTip(r.msg)
+                    }
                 }
-            }
-        })
+            })
+        }
+
     }
 
     // 收回