1

app/controller/tender_controller.js

@@ -1372,21 +1372,21 @@ module.exports = app => {
                         case 'change':
                             responseData.data[f] = await ctx.service.change.getAllDataByCondition({
                                 columns: [ 'cid', 'code', 'name', 'selected' ],
-                                where: { tid: this.ctx.tender.id, valid: 1, status: auditConst.flow.status.checked },
+                                where: { tid: this.ctx.tender.id, valid: 1 },
                                 orders: [['sin_time', 'desc']],
                             });
                             break;
                         case 'change_project':
                             responseData.data[f] = await ctx.service.changeProject.getAllDataByCondition({
                                 columns: [ 'id', 'code', 'name', 'selected' ],
-                                where: { tid: this.ctx.tender.id, status: auditConst.changeProject.status.checked },
+                                where: { tid: this.ctx.tender.id },
                                 orders: [['in_time', 'desc']],
                             });
                             break;
                         case 'change_apply':
                             responseData.data[f] = await ctx.service.changeApply.getAllDataByCondition({
                                 columns: [ 'id', 'code', 'name', 'selected' ],
-                                where: { tid: this.ctx.tender.id, status: auditConst.changeApply.status.checked },
+                                where: { tid: this.ctx.tender.id },
                                 orders: [['in_time', 'desc']],
                             });
                             break;

app/public/report/js/rpt_change_rela.js

@@ -1,12 +1,14 @@
 const rptChangeRela = (function (){
     const info = {
-        change: { title: '请选择变更令' },
-        change_project: { title: '请选择变更立项' },
-        change_apply: { title: '请选择变更申请' },
+        change: { title: '请选择变更令', colHeader: ['选择', '变更令号', '工程名称'] },
+        change_project: { title: '请选择变更立项', colHeader: ['选择', '变更立项编号', '工程名称'] },
+        change_apply: { title: '请选择变更申请', colHeader: ['选择', '变更申请编号', '工程名称'] },
     };
     const data = {};
     let curType = '';
     const initList = function () {
+        const header = info[curType].colHeader;
+        $('#scr-header').html(`<tr><th>${header[0]}</th><th>${header[1]}</th><th>${header[2]}</th></tr>`);
         const html = [], arr = data[curType];
         for (const a of arr) {
             const checked = a.selected ? 'checked' : '';

app/view/report/rpt_all_popup.ejs

@@ -524,7 +524,7 @@
             </div>
             <div class="modal-body">
                 <table class="table table-bordered">
-                    <tr class="text-center"><th>选择</th><th>变更令号</th><th>工程名称</th></tr>
+                    <thead id="scr-header"><tr class="text-center"><th>选择</th><th>变更令号</th><th>工程名称</th></tr></thead>
                     <tbody id="scr-list">
                     </tbody>
                 </table>