关联标段增加字段及排序

app/controller/sub_proj_setting_controller.js

@@ -541,7 +541,7 @@ module.exports = app => {
                         }
                         break;
                     case 'noSp-tenders':
-                        responseData.data = await ctx.service.tender.getAllDataByCondition({ where: { project_id: projectId, spid: '' } });
+                        responseData.data = await ctx.service.tender.getNoSpTenders(projectId);
                         break;
                     case 'bind-sp':
                         if (!data.spid || !data.tidList) {

app/public/js/setting_manage.js

@@ -627,6 +627,8 @@ $(document).ready(() => {
             for (const t of result) {
                 html.push('<tr>');
                 html.push('<td><a target="_blank" href="/tender/', t.id, '">', t.name, '</a></td>');
+                html.push('<td>', t.user_name, '</td>');
+                html.push('<td>', moment(t.create_time).format('YYYY-MM-DD'), '</td>');
                 html.push('<td class="text-center">', '<input type="checkbox" data-tid="' + t.id + '">', '</td>');
                 html.push('</tr>');
             }

app/service/tender.js

@@ -716,6 +716,16 @@ module.exports = app => {
             }
             // return await this.ctx.subProject.setRelaTender({ id: spid, rela_tender: newTids });
         }
+
+        async getNoSpTenders(pid) {
+            const list = await this.getAllDataByCondition({ where: { project_id: pid, spid: '' }, orders: [['create_time', 'desc']] });
+            const accountList = await this.ctx.service.projectAccount.getAllDataByCondition({ where: { project_id: pid } });
+            for (const l of list) {
+                const user = accountList.find(item => item.id === l.user_id);
+                l.user_name = user ? user.name : '';
+            }
+            return list;
+        }
     }
 
     return Tender;

app/view/sp_setting/manage_modal.ejs

@@ -320,6 +320,8 @@
                     <table class="table table-hover table-bordered">
                         <thead>
                         <th class="text-center">名称</th>
+                        <th class="text-center">创建人</th>
+                        <th class="text-center">创建时间</th>
                         <th width="40" class="text-center"><input type="checkbox" id="select-all-tender" /></th>
                         </thead>
                         <tbody id="no-project-tenders">