jianghan7 пре 1 година
родитељ
комит
ad14040e12

+ 5 - 2
src/front/remark.go

@@ -759,6 +759,7 @@ func (f *Front) CheckList() {
 			if status := qu.ObjToString(l["s_status"]); status == "进行中" { //更新任务进度
 				giveNum := qu.IntAll(l["i_givenum"])
 				sourceinfo := qu.ObjToString(l["s_sourceinfo"])
+
 				tagNum := util.Mgo.Count(sourceinfo, map[string]interface{}{"s_usertaskid": mgo.BsonIdToSId(l["_id"]), "b_istag": true})
 				progressFloat := float64(tagNum) / float64(giveNum)
 				value, _ := strconv.ParseFloat(fmt.Sprintf("%.4f", progressFloat), 64)
@@ -804,7 +805,8 @@ func (f *Front) CheckData() {
 			query["s_excp"] = map[string]interface{}{"$exists": true}
 		}
 		count := util.Mgo.Count(sourceinfo, query)
-		fields := map[string]interface{}{"v_baseinfo.title": 1, "b_check": 1, "i_ckdata": 1, "s_login": 1, "b_istag": 1, "s_excp": 1, "s_excp_info": 1}
+		fields := map[string]interface{}{"v_baseinfo.title": 1, "v_baseinfo.buyer": 1, "v_baseinfo.s_winner": 1, "v_baseinfo.budget": 1,
+			"v_baseinfo.bidamount": 1, "b_check": 1, "i_ckdata": 1, "s_login": 1, "b_istag": 1, "s_excp": 1, "s_excp_info": 1}
 		info, _ := util.Mgo.Find(sourceinfo, query, `{"_id": 1}`, fields, false, start, limit)
 		f.ServeJson(map[string]interface{}{
 			"draw":            draw,
@@ -973,7 +975,8 @@ func (f *Front) CheckJyData() {
 			query["i_ckdata"] = 0
 		}
 		count := util.Mgo.Count(sourceinfo, query)
-		fields := map[string]interface{}{"v_baseinfo.title": 1, "b_check": 1, "i_ckdata": 1, "s_login": 1, "b_istag": 1, "s_excp": 1, "s_excp_info": 1, "b_isEff": 1}
+		fields := map[string]interface{}{"v_baseinfo.title": 1, "v_baseinfo.buyer": 1, "v_baseinfo.s_winner": 1, "v_baseinfo.budget": 1,
+			"v_baseinfo.bidamount": 1, "b_check": 1, "i_ckdata": 1, "s_login": 1, "b_istag": 1, "s_excp": 1, "s_excp_info": 1}
 		info, _ := util.Mgo.Find(sourceinfo, query, `{"_id": 1}`, fields, false, start, limit)
 		f.ServeJson(map[string]interface{}{
 			"draw":            draw,

+ 11 - 3
src/web/templates/project/check_data_list.html

@@ -101,6 +101,10 @@
                             <th>数据状态</th>
                             <th>标的物状态</th>
                             <th>标题</th>
+                            <th>采购单位</th>
+                            <th>中标单位</th>
+                            <th>预算</th>
+                            <th>中标单位</th>
                             <th>用户</th>
                         </tr>
                         </thead>
@@ -146,7 +150,7 @@
             "lengthChange": false,
             "searching": true,
             "processing": true,
-            // "pageLength": 20,
+            "pageLength": 20,
             "ordering": false,
             "info": true,
             "autoWidth": false,
@@ -174,7 +178,7 @@
             },
             "columns": [
                 {"data": null, width: "2%"},
-                {"data": "s_excp", width: "5%", render: function (val) {
+                {"data": "s_excp", width: "4%", render: function (val) {
                         let tmp;
                         if (val !== undefined && val !== "") {
                             tmp = '<span style="display: inline-block;font-size:14px;">异常</span>'
@@ -183,7 +187,7 @@
                         }
                         return tmp
                     }},
-                {"data": "b_isEff", width: "5%", render: function (val) {
+                {"data": "b_isEff", width: "4%", render: function (val) {
                         let tmp;
                         if (val) {
                             tmp = '<span style="display: inline-block;font-size:14px;">检查有效</span>'
@@ -201,6 +205,10 @@
                         }
                         return tmp
                     }},
+                {"data": "v_baseinfo.buyer", "defaultContent": ""},
+                {"data": "v_baseinfo.s_winner", "defaultContent": ""},
+                {"data": "v_baseinfo.budget", "defaultContent": ""},
+                {"data": "v_baseinfo.bidamount", "defaultContent": ""},
                 {"data": "s_login", "defaultContent": ""},
             ],
             "initComplete": function () {

+ 11 - 3
src/web/templates/project/check_user_data_list.html

@@ -51,6 +51,10 @@
                             <th>数据状态</th>
                             <th>质检状态</th>
                             <th>标题</th>
+                            <th>采购单位</th>
+                            <th>中标单位</th>
+                            <th>预算</th>
+                            <th>中标金额</th>
                             <th>用户</th>
                         </tr>
                         </thead>
@@ -75,7 +79,7 @@
             "lengthChange": false,
             "searching": false,
             "processing": true,
-            // "pageLength": 20,
+            "pageLength": 20,
             "ordering": false,
             "info": true,
             "autoWidth": false,
@@ -103,7 +107,7 @@
             },
             "columns": [
                 {"data": null, width: "2%"},
-                {"data": "s_excp", width: "5%", render: function (val) {
+                {"data": "s_excp", width: "4%", render: function (val) {
                         let tmp;
                         if (val !== undefined && val !== "") {
                             tmp = '<span style="display: inline-block;font-size:14px;">异常</span>'
@@ -112,7 +116,7 @@
                         }
                         return tmp
                     }},
-                {"data": "b_check", width: "5%", render: function (val) {
+                {"data": "b_check", width: "4%", render: function (val) {
                         let tmp;
                         if (val) {
                             tmp = '<span style="display: inline-block;font-size:14px;">已质检</span>'
@@ -130,6 +134,10 @@
                         }
                         return tmp
                     }},
+                {"data": "v_baseinfo.buyer", "defaultContent": ""},
+                {"data": "v_baseinfo.s_winner", "defaultContent": ""},
+                {"data": "v_baseinfo.budget", "defaultContent": ""},
+                {"data": "v_baseinfo.bidamount", "defaultContent": ""},
                 {"data": "s_login", "defaultContent": ""},
             ],
             "initComplete": function () {

+ 1 - 1
src/web/templates/project/remark_list.html

@@ -56,7 +56,7 @@
             "paging": true,
             "lengthChange": false,
             "processing": true,
-            // "pageLength": 20,
+            "pageLength": 20,
             "searching": true,
             "ordering": false,
             "info": true,