Merge branch 'master' of http://smartcost.in.8866.org:26903/SmartCost/ConstructionOperation

config/config.js

@@ -29,7 +29,7 @@ module.exports = {
         },
         importURL:"192.168.1.184:6050"
     },
-    pp:{  server: "112.74.42.187",
+    pp:{  server: "172.18.111.231",
         port: "27017",
         options:{
             user:'smartcost',
@@ -80,4 +80,4 @@ module.exports = {
         }
     },
     pageSize: 20
-};
+};

modules/users/models/compilation_model.js

@@ -36,7 +36,7 @@ class CompilationModel extends BaseModel {
      */
     async getCompilationList(fields = null) {
         // 筛选字段
-        let field = fields == null ?{_id: 1, name: 1, is_release: 1, categoryID: 1, description: 1,overWriteUrl: 1,example: 1, "ration_valuation.id": 1, "ration_valuation.name": 1, "ration_valuation.enable": 1,
+        let field = fields == null ?{_id: 1, name: 1, is_release: 1, release_time:1,categoryID: 1, description: 1,overWriteUrl: 1,example: 1, "ration_valuation.id": 1, "ration_valuation.name": 1, "ration_valuation.enable": 1,
             "bill_valuation.id": 1, "bill_valuation.name": 1, "bill_valuation.enable": 1}:fields;
         let compilationData = await this.findDataByCondition({name: {$ne: ''}}, field, false);
 

web/users/views/compilation/index.html

@@ -6,7 +6,7 @@
             <h2>
                 <%= selectedCompilation.name %>
                 <% if(selectedCompilation.is_release) {%>
-                <span class="text-muted" style="margin-left: 5px;">已发布 <%= moment(selectedCompilation.update_time).format('YYYY-MM-DD')%></span>
+                <span class="text-muted" style="margin-left: 5px;">已发布 <%= moment(selectedCompilation.release_time).format('YYYY-MM-DD')%></span>
                 <% } %>
                 <a href="javascript:void(0);" data-id="<%= selectedCompilation._id %>" data-status="<%= selectedCompilation.is_release ? 0 : 1 %>" class="btn btn-primary btn-sm pull-right" id="release"><% if(selectedCompilation.is_release) {%>取消<% }else{ %>发布<% } %>编办</a>
             </h2>