Tony Kang 1 month ago
parent
commit
776923ff5b
2 changed files with 20 additions and 10 deletions
  1. 10 9
      app/controller/change_controller.js
  2. 10 1
      app/view/report/index.ejs

+ 10 - 9
app/controller/change_controller.js

@@ -524,9 +524,9 @@ module.exports = app => {
                                 const one = {
                                     id: cl.id,
                                 };
-                                if (useChangeUsedData.length > 0 && ctx.helper._.findIndex(useChangeUsedData, {cbid: cl.id}) !== -1) {
+                                if (useChangeUsedData.length > 0 && ctx.helper._.findIndex(useChangeUsedData, { cbid: cl.id }) !== -1) {
                                     // 获取比例值
-                                    const uc = ctx.helper._.find(useChangeUsedData, {cbid: cl.id});
+                                    const uc = ctx.helper._.find(useChangeUsedData, { cbid: cl.id });
                                     const minLimit = Math.ceil(ctx.helper.mul(ctx.helper.div(uc.qty, cl.camount), 100));
                                     if (minLimit <= renderData.deLimit) {
                                         one.delimit = renderData.deLimit;
@@ -536,16 +536,16 @@ module.exports = app => {
                                     one.delimit = renderData.deLimit;
                                     cl.delimit = renderData.deLimit;
                                 }
-                                if (!ctx.helper._.isEqual(one, {id: cl.id})) updateList.push(one);
+                                if (!ctx.helper._.isEqual(one, { id: cl.id })) updateList.push(one);
                             }
                             console.log(updateList);
                             if (updateList.length > 0) await ctx.service.changeAuditList.defaultUpdateRows(updateList);
-                            await ctx.service.change.defaultUpdate({delimit: stateInfo.value}, {where: {cid: change.cid}});
+                            await ctx.service.change.defaultUpdate({ delimit: stateInfo.value }, { where: { cid: change.cid } });
                         }
                         // 判断是否更新变更类别
-                        if (ctx.helper._.findIndex(fun_set.change_class, {value: change.class, checked: true}) === -1) {
-                            renderData.change.class = ctx.helper._.find(fun_set.change_class, {checked: true}).value;
-                            await ctx.service.change.saveInfo({class: ctx.helper._.find(fun_set.change_class, {checked: true}).value});
+                        if (ctx.helper._.findIndex(fun_set.change_class, { value: change.class, checked: true }) === -1) {
+                            renderData.change.class = ctx.helper._.find(fun_set.change_class, { checked: true }).value;
+                            await ctx.service.change.saveInfo({ class: ctx.helper._.find(fun_set.change_class, { checked: true }).value });
                         }
                         // 获取固定审批流列表
                         if (tender.info.shenpi.change === shenpiConst.sp_status.gdspl) {
@@ -938,7 +938,8 @@ module.exports = app => {
                     orders: [['order', 'desc']],
                 }) : [];
                 if (stages.length > 0) {
-                    const usedBills = [], usedPos = [];
+                    const usedBills = [],
+                        usedPos = [];
                     for (const s of stages) {
                         if (s.status === audit.stage.status.checked) {
                             const usedPreBills = await ctx.service.stageBillsFinal.getUsedBills(ctx.tender.id, s.order);
@@ -1583,7 +1584,7 @@ module.exports = app => {
                 switch (data.type) {
                     case 'gather':
                         responseData.data = await ctx.service.changeAuditList.gatherBgBills(ctx.tender.id);
-                        responseData.data.sort((a, b) => { return ctx.helper.compareCode(a.code, b.code) });
+                        responseData.data.sort((a, b) => { return ctx.helper.compareCode(a.code, b.code); });
                         break;
                     default:
                         throw '查询的数据不存在';

+ 10 - 1
app/view/report/index.ejs

@@ -50,7 +50,7 @@
                 <div class="d-inline-block" id="divSelectableBizs_up">
                     <div class="dropdown" id="divSelectableStages">
                         <button class="btn btn-sm btn-light dropdown-toggle text-primary" type="button" id="btnCurrentStage" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
-                        <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" id="optionSelectableStages"></div>
+                        <div class="dropdown-menu special-stage-scrollable-div" aria-labelledby="dropdownMenuButton" id="optionSelectableStages"></div>
                     </div>
                     <div class="dropdown" id="divSelectableAdvancePays" style="display:none;">
                         <button class="btn btn-sm btn-light dropdown-toggle text-primary" type="button" id="btnCurrentAdvancePay" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
@@ -833,6 +833,8 @@
             $("#optionSelectableStages")[0].style.display = '';
             $("#btnCurrentStage")[0].innerText = '第' + current_stage_order + '期';
             $("#optionSelectableStages").empty();
+            // $("#optionSelectableStages")[0].style.overflow = 'auto';
+            // $("#optionSelectableStages")[0].style.height = '200';
             if (STAGE_LIST.length > 0 && STAGE_ID < 0) {
                 for (let i = STAGE_LIST.length; i > 0; i--) {
                     if (parseInt(STAGE_LIST[i - 1].order) !== current_stage_order) {
@@ -1057,3 +1059,10 @@
     });
 </script>
 
+<style>
+    .special-stage-scrollable-div {
+      overflow: auto;
+      height: 300px;
+    }
+</style>
+