no message

src/config.json

@@ -2,7 +2,7 @@
     "port": "7000",
     "mgodb": "192.168.3.166:27082",
     "dbsize": 10,
-    "dbname": "wjh",
+    "dbname": "datacheck",
     "alltocoll": "marked",
     "defaultpwd": "123",
     "bidding":{

src/front/remark.go

@@ -673,6 +673,7 @@ func GetNextDataId1(id, coll, tid, tag string) string {
 	} else {
 		nextIdQuery["i_ckdata"] = 2
 	}
+	qu.Debug(nextIdQuery)
 	one, _ := util.Mgo.Find(coll, nextIdQuery, `{"_id":1}`, `{"_id":1}`, true, 0, 1)
 	if len(*one) == 1 && len((*one)[0]) > 0 {
 		return mgo.BsonIdToSId((*one)[0]["_id"])
@@ -1259,10 +1260,21 @@ func (f *Front) CheckSave() {
 		qu.Debug(set)
 		success = util.Mgo.UpdateById(sourceInfo, infoId, set)
 		//2、更新marked表
-		tmp, _ := util.Mgo.FindById(sourceInfo, infoId, map[string]interface{}{"v_baseinfo": 1, "v_taginfo": 1, "i_ckdata": 1})
-		delete(*tmp, "_id")
-		(*tmp)["updatetime"] = time.Now().Unix()
-		_ = util.Mgo.Update(util.AllToColl, map[string]interface{}{"_id": mgo.StringTOBsonId(infoId)}, map[string]interface{}{"$set": tmp}, true, false)
+		//tmp, _ := util.Mgo.FindById(sourceInfo, infoId, map[string]interface{}{"v_baseinfo": 1, "v_taginfo": 1, "i_ckdata": 1})
+		//delete(*tmp, "_id")
+		//(*tmp)["updatetime"] = time.Now().Unix()
+		//_ = util.Mgo.Update(util.AllToColl, map[string]interface{}{"_id": mgo.StringTOBsonId(infoId)}, map[string]interface{}{"$set": tmp}, true, false)
+		// 管理人员单独记录 统计需要
+		if userRole == "2" && strings.Contains(username, "_ys") {
+			save := map[string]interface{}{
+				"infoid":     infoId,
+				"projectid":  pid,
+				"username":   username,
+				"tagcheck":   tagSet,
+				"createtime": time.Now().Unix(),
+			}
+			util.Mgo.Save("jy_check", save)
+		}
 	}
 	//3、保存标注日志
 	_ = SaveLog(infoId, "", username, userId, userRole, qu.ObjToString((*project)["s_name"]), "质检", baseInfo, allTagFields)
@@ -2146,6 +2158,8 @@ func MarkTimePlace(content []interface{}, tagSet, baseSet, baseUnset map[string]
 }
 
 func MarkPurchasinglist(content []interface{}, tagSet, baseSet, baseUnset map[string]interface{}, istag bool, status int) {
+	qu.Debug(tagSet)
+	qu.Debug(content)
 	if status == -1 {
 		return
 	}
@@ -2194,11 +2208,11 @@ func MarkPurchasinglist(content []interface{}, tagSet, baseSet, baseUnset map[st
 	if len(purchasinglist)+delpclson == len(content) {
 		if len(purchasinglist) > 0 {
 			baseSet["purchasinglist"] = purchasinglist
-		} else if len(content) > 0 && delpclson == len(content) { //只有删除
+		} else if len(content) == 0 { //只有删除
 			baseUnset["purchasinglist"] = ""
 		}
-		//tagSet["purchasinglist"] = status
-		tagSet["purchasinglist"] = purchasinglistStatus
+		tagSet["purchasinglist"] = status
+		//tagSet["purchasinglist"] = purchasinglistStatus
 	} else {
 		qu.Debug("Purchasinglist Tag Error")
 	}
@@ -2253,7 +2267,7 @@ func MarkProcurementList(content []interface{}, tagSet, baseSet, baseUnset map[s
 	if len(procurementlist)+delpclson == len(content) {
 		if len(procurementlist) > 0 {
 			baseSet["procurementlist"] = procurementlist
-		} else if len(content) > 0 && delpclson == len(content) { //只有删除
+		} else if len(content) == 0 { //只有删除
 			baseUnset["procurementlist"] = ""
 		}
 		//tagSet["purchasinglist"] = status

src/web/templates/project/check_detail.html

@@ -974,13 +974,13 @@
                 delNewTwo: function (one, index, two) {
                     //two.ck_isnew = false //目前点删除按钮页面直接不显示，但是集合索引位置不变，所以加了此代码
                     //two.show = false
-                    if (two.isnew) {
+                    // if (two.isnew) {
                         one.content.splice(index, 1)
-                    } else {
-                        two.show = false
-                        two.status = "4"
-                        this.saveDataTwo(two, "4", one)
-                    }
+                    // } else {
+                    //     two.show = false
+                    //     two.status = "4"
+                    //     this.saveDataTwo(two, "4", one)
+                    // }
                     this.checkOneStatus({
                         one: one,
                         two: two,