Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/controller/sub_proj_setting_controller.js

@@ -544,7 +544,10 @@ module.exports = app => {
                 const projectData = await ctx.service.project.getDataById(projectId);
                 if (projectData === null) throw '没有对应的项目数据';
                 if (ctx.session.sessionUser.is_admin === 0) throw '没有访问权限';
-                const tenderList = await ctx.service.tender.getList('', null, 1);
+                // 默认查询已完工的标段
+                const { done = '1' } = ctx.query || {};
+                const buildStatusFilter = ctx.service.tender.db.format(' AND build_status = ?', [tenderConst.buildStatus.status.finish]);
+                const tenderList = await ctx.service.tender.getList('', null, 1, done === '1' ? buildStatusFilter : '');
                 const removeTenders = await ctx.service.shenpiAudit.getRemoveTenders(tenderList);
                 if (removeTenders.length > 0) {
                     ctx.helper._.remove(tenderList, function(n) {

app/public/js/change_information.js

@@ -5807,7 +5807,7 @@ $(document).ready(() => {
         });
         $('#change_form input[type="text"]').blur(function () {
             let val_name = $(this).attr('name');
-            let val = _.trim($(this).val()) !== '' ? _.trim($(this).val()) : null;
+            let val = _.trim($(this).val()) !== '' ? _.trim($(this).val()) : '';
             switch(val_name) {
                 case 'code':
                     if(!val) {
@@ -5829,19 +5829,19 @@ $(document).ready(() => {
 
         $('#change_form textarea').blur(function () {
             const val_name = $(this).attr('name');
-            let val = _.trim($(this).val()) !== '' ? _.trim($(this).val()) : null;
+            let val = _.trim($(this).val()) !== '' ? _.trim($(this).val()) : '';
             updateInfo(val_name, val);
         });
 
         $('#change_form select').change(function () {
             const val_name = $(this).attr('name');
-            let val = _.trim($(this).val()) !== '' ? _.trim($(this).val()) : null;
+            let val = _.trim($(this).val()) !== '' ? _.trim($(this).val()) : '';
             updateInfo(val_name, val);
         });
 
         $('#change_form input[type="radio"]').change(function () {
             const val_name = $(this).attr('name');
-            let val = _.trim($(this).val()) !== '' ? _.trim($(this).val()) : null;
+            let val = _.trim($(this).val()) !== '' ? _.trim($(this).val()) : '';
             updateInfo(val_name, val);
         });
 

app/public/js/setting_manage.js

@@ -178,7 +178,21 @@ $(document).ready(() => {
         quality: '质量管理',
     };
     const tabTypeKeys = ['tourist', 'schedule', 'contract', 'construction', 'quality'];
-
+    
+    const $filterTenderDone = $('body #filter-tender-done')
+    if (window.location.search && window.location.search.split('done=')[1]) {
+      $filterTenderDone.prop('checked', window.location.search.split('done=')[1] === '1' ? true : false);
+    } else {
+      $filterTenderDone.prop('checked', true);
+    }
+    $filterTenderDone.on('change', function() {
+      const isChecked = $(this).is(':checked');
+      if (isChecked) {
+        window.location.href = `/sp/${spid}/setting/manage?done=1`;
+      } else {
+        window.location.href = `/sp/${spid}/setting/manage?done=0`;
+      }
+    });
     $('body').on('click', '.c-body .tender-info', function () {
         $('.c-body .tender-info').removeClass('table-warning');
         $(this).addClass('table-warning');

app/view/change/addlist.ejs

@@ -16,9 +16,9 @@
                     </div>
                 </div>
             </div>
-            <div class="ml-auto">
+            <!-- <div class="ml-auto">
                 <a class="btn btn-sm btn-primary mr-1" id="add-all-revise" href="javascript: void(0);">勾选当前新增部位/清单</a>
-            </div>
+            </div> -->
         </div>
     </div>
     <div class="content-wrap row pr-46">

app/view/change/revise.ejs

@@ -47,7 +47,7 @@
                 </div>
             </div>
             <div class="ml-auto">
-                <a class="btn btn-sm btn-primary mr-1" id="add-all-revise" href="javascript: void(0);">勾选当前新增部位/清单</a>
+                <!-- <a class="btn btn-sm btn-primary mr-1" id="add-all-revise" href="javascript: void(0);">勾选当前新增部位/清单</a> -->
                 <a class="btn btn-sm btn-primary mr-1" id="ledger-check2" href="javascript: void(0);">数据检查</a>
             </div>
         </div>

app/view/sp_setting/manage.ejs

@@ -9,6 +9,10 @@
                 <div class="d-inline-block" id="show-level"></div>
                 <div class="d-inline-block"><button class="btn btn-sm btn-primary" data-toggle="modal" data-target="#select-tender">关联标段</button></div>
                 <div class="d-inline-block"><button class="btn btn-sm btn-primary" data-toggle="modal" data-target="#filter-tender">过滤标段</button></div>
+                <div class="d-inline-block custom-control custom-checkbox ml-2">
+                    <input type="checkbox" id="filter-tender-done" name="customCheckbox" class="custom-control-input" >
+                    <label class="custom-control-label" for="filter-tender-done">过滤完工标段</label>
+                </div>
             </div>
         </div>
     </div>
@@ -389,4 +393,5 @@
     let sp_lc, sp_type, sp_status, sp_status_list, cur_tenderid, cur_uid;
     const permissionConst = JSON.parse('<%- JSON.stringify(permissionConst) %>');
     const permissionBlock = JSON.parse('<%- JSON.stringify(permissionBlock) %>');
+    
 </script>