Merge branch 'dev2.1' into dev3.0

* dev2.1:
  no message
  no message
  no message

# Conflicts:
#	src/front/group.go
#	src/front/remark.go

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/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>
@@ -145,7 +149,7 @@
             "lengthChange": false,
             "searching": true,
             "processing": true,
-            // "pageLength": 20,
+            "pageLength": 20,
             "ordering": false,
             "info": true,
             "autoWidth": false,
@@ -173,7 +177,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>'
@@ -182,7 +186,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>'
@@ -200,6 +204,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 () {

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,

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>
@@ -74,7 +78,7 @@
             "lengthChange": false,
             "searching": false,
             "processing": true,
-            // "pageLength": 20,
+            "pageLength": 20,
             "ordering": false,
             "info": true,
             "autoWidth": false,
@@ -102,7 +106,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>'
@@ -111,7 +115,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>'
@@ -129,6 +133,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 () {

src/web/templates/project/remark_list.html

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