Browse Source

选择变更令,全选,排序

MaiXinRong 3 years ago
parent
commit
3fd2fa9671

+ 2 - 1
app/controller/tender_controller.js

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

+ 12 - 0
app/public/report/js/rpt_custom.js

@@ -181,6 +181,18 @@ const rptCustomObj = (function () {
                 }
                 $('#change-select-result').html(selectHtml.join(''));
             });
+            $('#change-select-all').click(function () {
+                const change = $('[name=change-select-check]');
+                const selectHtml = [];
+                for (const sc of change) {
+                    sc.checked = this.checked;
+                    if (this.checked) {
+                        const c = self.changes.find(x => { return x.cid === sc.value });
+                        selectHtml.push(`<tr><td class="text-center">${selectHtml.length + 1}</td><td>${c.code}</td><td>${c.name}</td></tr>`);
+                    }
+                }
+                $('#change-select-result').html(selectHtml.join(''));
+            })
         },
 
         show: async function (title, resolve) {

+ 4 - 0
app/view/report/rpt_all_popup.ejs

@@ -474,6 +474,10 @@
                 <div class="alert alert-danger my-2 p-2" id="change-select-hint" style="display: none">我是提示呀</div>
             </div>
             <div class="modal-footer">
+                <div class="form-check form-check-inline mr-auto">
+                    <input class="form-check-input" type="checkbox" id="change-select-all">
+                    <label class="form-check-label" for="change-select-all">全选</label>
+                </div>
                 <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">取消</button>
                 <button class="btn btn-sm btn-primary" id="change-select-ok">确定</button>
             </div>