决策大屏部分调整

app/view/datacollect/index4GY18Y.ejs

@@ -1121,10 +1121,10 @@
                 allgccb.end_gather_tp = ZhCalc.add(allgccb.end_gather_tp, cb.end_gather_tp);
                 allgccb.end_sf_tp = ZhCalc.add(allgccb.end_sf_tp, cb.end_sf_tp);
                 allgccb.end_yf_tp = ZhCalc.add(allgccb.end_yf_tp, cb.end_yf_tp);
-                hzHtml += '<tr class="bg-dark" style="line-height: 2rem;text-align: right;"><td style="text-align: left">' + cb.name + '</td><td>' + cb.end_gather_tp + '</td><td>' + cb.end_sf_tp + '</td><td>' + cb.end_yf_tp + '</td><td>' + cb.end_df_tp + '</td></tr>';
+                hzHtml += '<tr class="bg-dark" style="line-height: 2rem;text-align: center;"><td style="text-align: left">' + cb.name + '</td><td>' + cb.end_gather_tp + '</td><td>' + cb.end_sf_tp + '</td><td>' + cb.end_yf_tp + '</td><td>' + cb.end_df_tp + '</td></tr>';
             }
             allgccb.end_df_tp = ZhCalc.sub(allgccb.end_yf_tp, allgccb.end_sf_tp);
-            hzHtml += '<tr class="bg-dark" style="line-height: 2rem;text-align: right;"><td style="text-align: left">' + allgccb.name + '</td><td>' + allgccb.end_gather_tp + '</td><td>' + allgccb.end_sf_tp + '</td><td>' + allgccb.end_yf_tp + '</td><td>' + allgccb.end_df_tp + '</td></tr>';
+            hzHtml += '<tr class="bg-dark" style="line-height: 2rem;text-align: center;"><td style="text-align: left">' + allgccb.name + '</td><td>' + allgccb.end_gather_tp + '</td><td>' + allgccb.end_sf_tp + '</td><td>' + allgccb.end_yf_tp + '</td><td>' + allgccb.end_df_tp + '</td></tr>';
             $('.stage-data').html(hzHtml);
             setTableboxHeight();
             // console.log(sr_tenders, cb_tenders);

app/view/setting/datacollect_modal.ejs

@@ -160,7 +160,7 @@
                             </select>
                           </span>
                     </li>
-                    <li class="d-flex justify-content-start align-items-center mb-3">
+                    <li class="d-flex justify-content-start align-items-center mb-1">
                         <span class="col-auto">工程成本费用分类(最多只能选择4个，界面只有4个)：</span>
                         <span class="mr-2">
                             <div class="dropdown show">
@@ -181,6 +181,9 @@
                             </div>
                         </span>
                     </li>
+                    <li class="d-flex justify-content-start align-items-center mb-3">
+                        <span class="col-auto" id="show_xmgl"></span>
+                    </li>
                 </ul>
             </div>
             <div class="modal-footer">
@@ -217,11 +220,14 @@
                 $('#cb_cate_value_select').html('<option value="0">请选择值</option>')
             }
             $('#cb_show_select').find('input').prop('checked', false);
+            const show_xmgl_array = [];
             $('#cb_show_select').find('input').each(function () {
                 if (daPing06Set.cb_show && daPing06Set.cb_show.length > 0 && daPing06Set.cb_show.includes(parseInt($(this).val()))) {
                     $(this).prop('checked', true);
+                    show_xmgl_array.push($(this).next().text());
                 }
             });
+            $('#show_xmgl').text(show_xmgl_array.join('、'));
         });
         $('#cb_show_select').on('click', function (e) {
             e.stopPropagation();
@@ -233,6 +239,13 @@
                 toastr.warning('最多只能选择4个');
                 return;
             }
+            const show_xmgl_array = [];
+            $('#cb_show_select').find('input').each(function () {
+                if ($(this).is(':checked')) {
+                    show_xmgl_array.push($(this).next().text());
+                }
+            });
+            $('#show_xmgl').text(show_xmgl_array.join('、'));
         });
         $('#dp06_save_btn').click(function () {
             if ($('#sr_cate_select').val() === '0') {