Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/controller/setting_controller.js

@@ -99,6 +99,7 @@ module.exports = app => {
 
                 // 过滤数据
                 ctx.service.projectAccount.searchFilter(ctx.request.query, projectId);
+                ctx.sort = ['id', 'desc'];
                 const total = await ctx.service.projectAccount.getCountWithBuilder();
 
                 // 获取数据规则
@@ -195,6 +196,7 @@ module.exports = app => {
                 // const rule = ctx.service.projectAccount.rule('updateUser');
                 // const frontRule = ctx.helper.validateConvert(rule);
                 const page = ctx.page;
+                ctx.sort = ['id', 'desc'];
                 const total = await ctx.service.projectAccount.count({ project_id: projectId });
                 // 获取项目用户列表
                 // const accountData = await ctx.service.projectAccount.getAllDataByCondition({

app/view/setting/info.ejs

@@ -50,7 +50,24 @@
                             </div>
                             <div class="form-group">
                                 <label>创建时间</label>
-                                <input class="form-control form-control-sm" value=<%= dateStr%> type="text" readonly>
+                                <input class="form-control form-control-sm" value="<%= dateStr%>" type="text" readonly>
+                            </div>
+                            <legend>其他信息（报表显示）</legend>
+                            <div class="form-group">
+                                <label>主管部门</label>
+                                <input class="form-control form-control-sm" type="text" value="<%= projectData.rpt_authority %>" <% if (projectData.user_account !== ctx.session.sessionUser.account) { %>readonly<% } else { %>name="rpt_authority" id="rpt_authority"<% } %>>
+                            </div>
+                            <div class="form-group">
+                                <label>建设项目类别</label>
+                                <input class="form-control form-control-sm" type="text" value="<%= projectData.rpt_items %>" value="<%= projectData.rpt_authority %>" <% if (projectData.user_account !== ctx.session.sessionUser.account) { %>readonly<% } else { %>name="rpt_items" id="rpt_items"<% } %>>
+                            </div>
+                            <div class="form-group">
+                                <label>级别</label>
+                                <input class="form-control form-control-sm" type="text" value="<%= projectData.rpt_level %>" <% if (projectData.user_account !== ctx.session.sessionUser.account) { %>readonly<% } else { %>name="rpt_level" id="rpt_level"<% } %>>
+                            </div>
+                            <div class="form-group">
+                                <label>建设性质</label>
+                                <input class="form-control form-control-sm" type="text" value="<%= projectData.rpt_nature %>" <% if (projectData.user_account !== ctx.session.sessionUser.account) { %>readonly<% } else { %>name="rpt_nature" id="rpt_nature"<% } %>>
                             </div>
                             <% if (projectData.user_account === ctx.session.sessionUser.account) { %></form><% } %>
                     </div>

sql/update.sql

@@ -40,3 +40,8 @@ CREATE TABLE `zh_ledger_tag` (
   `modify_time` datetime DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=216 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+ALTER TABLE `zh_project` ADD `rpt_authority` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '主管部门(报表显示)' AFTER `page_path`;
+ALTER TABLE `zh_project` ADD `rpt_items` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '建设项目类别(报表显示)' AFTER `rpt_authority`;
+ALTER TABLE `zh_project` ADD `rpt_level` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '级别(报表显示)' AFTER `rpt_items`;
+ALTER TABLE `zh_project` ADD `rpt_nature` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '建设性质(报表显示)' AFTER `rpt_level`;