高亮调整，sql更新

app/public/js/shenpi.js

@@ -1040,7 +1040,6 @@ $(document).ready(function () {
 
     let timer2 = null;
     let oldSearchVal2 = null;
-    let searchUser = [];
     $('body').on('input propertychange', '#batch input[name="audit-name"]', function(e) {
         oldSearchVal2 = e.target.value;
         timer2 && clearTimeout(timer2);
@@ -1051,41 +1050,33 @@ $(document).ready(function () {
             if (resultLength > 0) {
                 let content = $('#tender-list').html();
                 const replaceStr = $('#tender-list').find('.result').eq(0).html();
-                const regExp2 = new RegExp('<span class="result" style="background:yellow;">' + replaceStr + '</span>', 'g');
+                const regExp2 = new RegExp('<span class="result" style="background: yellow;">' + replaceStr + '</span>', 'g');
                 content = content.replace(regExp2, replaceStr);
-                const regExp3 = new RegExp('<span class="result" style="background:orange;">' + replaceStr + '</span>', 'g');
+                const regExp3 = new RegExp('<span class="result" style="background: orange;">' + replaceStr + '</span>', 'g');
                 content = content.replace(regExp3, replaceStr);
                 $('#tender-list').html(content);
             }
-            searchUser= [];
             $('#search-result').text('0/0');
             $('#up-search').attr('disabled', true);
             $('#down-search').attr('disabled', true);
             if (newVal && newVal === oldSearchVal2) {
-                const regExp = new RegExp(newVal, 'i');
-                let resultLength = 0;
+                const regExp = new RegExp(newVal, 'g');
                 for (let i = 0; i < $('#tender-list tr').length; i++) {
                     if (_.includes($('#tender-list tr').eq(i).children('td').eq(2).html(), newVal)) {
-                        if (resultLength === 0) {
-                            $('#tender-list tr').eq(i).children('td').eq(2).html($('#tender-list tr').eq(i).children('td').eq(2).html().replace(regExp, '<span class="result" style="background:orange;">' + newVal + '</span>'))
-                        } else {
-                            $('#tender-list tr').eq(i).children('td').eq(2).html($('#tender-list tr').eq(i).children('td').eq(2).html().replace(regExp, '<span class="result" style="background:yellow;">' + newVal + '</span>'))
-                        }
-                        resultLength++;
-                        searchUser.push(i);
+                        $('#tender-list tr').eq(i).children('td').eq(2).html($('#tender-list tr').eq(i).children('td').eq(2).html().replace(regExp, '<span class="result" style="background: yellow;">' + newVal + '</span>'))
                     }
                 }
-                if (resultLength > 0) {
-                    $('#search-result').text('1/' + resultLength);
+                const resultLength2 = $('#tender-list').find('.result').length;
+                if (resultLength2 > 0) {
+                    $('#tender-list').find('.result').eq(0).css('background', 'orange');
+                    $('#search-result').text('1/' + resultLength2);
                     $('#up-search').attr('disabled', false);
                     $('#down-search').attr('disabled', false);
                 }
-                // content = content.replace(regExp, '<span class="result" style="background:yellow;">' + newVal + '</span>');
             }
             if($('#tender-list').find('.result').length > 0) {
                 const X = $('#tender-list').find('.result').eq(0).offset().top;
-                // const Y = $('#tender-list').find('.result').eq(0).offset().left;
-                $('#tender-list').scrollTop(X - $('#tender-list').offset().top + $('#tender-list').scrollTop());
+                $('#tender-list').scrollTop(X - $('#tender-list').offset().top + $('#tender-list').scrollTop() - 30);
             }
         }, 400);
     });
@@ -1094,22 +1085,26 @@ $(document).ready(function () {
         const cur = parseInt($('#search-result').text().split('/')[0]);
         const total = parseInt($('#search-result').text().split('/')[1]);
         const now = cur - 1 !== 0 ? cur - 1: total;
-        $('#tender-list tr').eq(searchUser[cur-1]).children('td').eq(2).html($('#tender-list tr').eq(searchUser[cur-1]).children('td').eq(2).html().replace('<span class="result" style="background:orange;">', '<span class="result" style="background:yellow;">'))
-        $('#tender-list tr').eq(searchUser[now-1]).children('td').eq(2).html($('#tender-list tr').eq(searchUser[now-1]).children('td').eq(2).html().replace('<span class="result" style="background:yellow;">', '<span class="result" style="background:orange;">'))
+        $('#tender-list').find('.result').eq(cur-1).css('background', 'yellow');
+        $('#tender-list').find('.result').eq(now-1).css('background', 'orange');
+        // $('#tender-list tr').eq(searchUser[cur-1]).children('td').eq(2).html($('#tender-list tr').eq(searchUser[cur-1]).children('td').eq(2).html().replace('<span class="result" style="background:orange;">', '<span class="result" style="background:yellow;">'))
+        // $('#tender-list tr').eq(searchUser[now-1]).children('td').eq(2).html($('#tender-list tr').eq(searchUser[now-1]).children('td').eq(2).html().replace('<span class="result" style="background:yellow;">', '<span class="result" style="background:orange;">'))
         $('#search-result').text(now + '/' + total);
         const X = $('#tender-list').find('.result').eq(now-1).offset().top;
-        $('#tender-list').scrollTop(X - $('#tender-list').offset().top + $('#tender-list').scrollTop());
+        $('#tender-list').scrollTop(X - $('#tender-list').offset().top + $('#tender-list').scrollTop() - 30);
     });
 
     $('#down-search').on('click', function () {
         const cur = parseInt($('#search-result').text().split('/')[0]);
         const total = parseInt($('#search-result').text().split('/')[1]);
         const now = cur + 1 > total ? 1: cur + 1;
-        $('#tender-list tr').eq(searchUser[cur-1]).children('td').eq(2).html($('#tender-list tr').eq(searchUser[cur-1]).children('td').eq(2).html().replace('<span class="result" style="background:orange;">', '<span class="result" style="background:yellow;">'))
-        $('#tender-list tr').eq(searchUser[now-1]).children('td').eq(2).html($('#tender-list tr').eq(searchUser[now-1]).children('td').eq(2).html().replace('<span class="result" style="background:yellow;">', '<span class="result" style="background:orange;">'))
+        $('#tender-list').find('.result').eq(cur-1).css('background', 'yellow');
+        $('#tender-list').find('.result').eq(now-1).css('background', 'orange');
+        // $('#tender-list tr').eq(searchUser[cur-1]).children('td').eq(2).html($('#tender-list tr').eq(searchUser[cur-1]).children('td').eq(2).html().replace('<span class="result" style="background:orange;">', '<span class="result" style="background:yellow;">'))
+        // $('#tender-list tr').eq(searchUser[now-1]).children('td').eq(2).html($('#tender-list tr').eq(searchUser[now-1]).children('td').eq(2).html().replace('<span class="result" style="background:yellow;">', '<span class="result" style="background:orange;">'))
         $('#search-result').text(now + '/' + total);
         const X = $('#tender-list').find('.result').eq(now-1).offset().top;
-        $('#tender-list').scrollTop(X - $('#tender-list').offset().top + $('#tender-list').scrollTop());
+        $('#tender-list').scrollTop(X - $('#tender-list').offset().top + $('#tender-list').scrollTop() -30);
     });
 });
 

sql/update.sql

@@ -1,44 +1,100 @@
-ALTER TABLE `zh_project` ADD `rpt_authority` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '主管部门(报表显示)' AFTER `page_path`;
-ALTER TABLE `zh_project` ADD `rpt_items` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '建设项目类别(报表显示)' AFTER `rpt_authority`;
-ALTER TABLE `zh_project` ADD `rpt_level` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '级别(报表显示)' AFTER `rpt_items`;
-ALTER TABLE `zh_project` ADD `rpt_nature` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '建设性质(报表显示)' AFTER `rpt_level`;
+--
+-- 表的结构 `zh_schedule`
+--
 
-ALTER TABLE `zh_ledger`
-ADD COLUMN `dagl_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '档案管理-查看链接'AFTER `dagl_status`;
+CREATE TABLE `zh_schedule` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `tid` int(11) NOT NULL,
+  `total_tp` decimal(30,8) DEFAULT NULL COMMENT '已选台账总金额',
+  `plan_gcl` decimal(30,8) DEFAULT NULL COMMENT '计划总工程量',
+  `sj_gcl` decimal(30,8) DEFAULT NULL COMMENT '实际完成工程量',
+  `plan_tp` decimal(30,8) DEFAULT NULL COMMENT '计划总金额',
+  `sj_tp` decimal(30,8) DEFAULT NULL COMMENT '实际完成金额',
+  `stage_sj_tp` decimal(30,8) DEFAULT NULL COMMENT '计量期实际计量总额',
+  `mode` tinyint(1) DEFAULT '2' COMMENT '计划进度计算方式（默认为工程量）',
+  `revising` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否修订后并未更新数据',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='形象进度表';
 
-ALTER TABLE `zh_pos`
-ADD COLUMN `dagl_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '档案管理-查看链接'AFTER `dagl_status`;
+--
+-- 表的结构 `zh_schedule_audit`
+--
 
-ALTER TABLE `zh_revise_bills`
-ADD COLUMN `dagl_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '档案管理-查看链接'AFTER `dagl_status`;
+CREATE TABLE `zh_schedule_audit` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `tid` int(11) NOT NULL COMMENT '标段id',
+  `audit_id` int(11) NOT NULL COMMENT '用户id',
+  `permission` tinyint(1) NOT NULL DEFAULT '1' COMMENT '权限',
+  `in_time` datetime DEFAULT NULL COMMENT '入库时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='形象进度用户权限表';
 
-ALTER TABLE `zh_revise_pos`
-ADD COLUMN `dagl_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '档案管理-查看链接'AFTER `dagl_status`;
+--
+-- 表的结构 `zh_schedule_ledger`
+--
 
-ALTER TABLE `zh_advance_file`
-ADD COLUMN `extra_upload` TINYINT(1) NOT NULL DEFAULT '0' COMMENT '是否为审核通过后再次上传的文件，0为否' AFTER `fileext`;
+CREATE TABLE `zh_schedule_ledger` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `tid` int(11) NOT NULL COMMENT '标段id',
+  `ledger_id` int(11) NOT NULL COMMENT '台账id',
+  `gcl` decimal(30,8) DEFAULT NULL COMMENT '只记录已选最底层树工程量',
+  `tp` decimal(30,8) DEFAULT NULL COMMENT '只记录已选最底层树金额',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='进度已选台账';
+
+--
+-- 表的结构 `zh_schedule_ledger_history`
+--
 
-ALTER TABLE `zh_ledger`
-ADD COLUMN `check_calc`  tinyint(1) NULL DEFAULT 1 COMMENT '是否检查计算' AFTER `dagl_url`;
+CREATE TABLE `zh_schedule_ledger_history` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `tid` int(11) NOT NULL,
+  `ledger_id` int(11) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='旧台账（用于修订后对比新旧台账区别然后调整进度台账）';
+
+--
+-- 表的结构 `zh_schedule_ledger_month`
+--
+
+CREATE TABLE `zh_schedule_ledger_month` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `tid` int(11) NOT NULL COMMENT '标段id',
+  `lid` int(11) NOT NULL COMMENT '台账id',
+  `yearmonth` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT '计划年月',
+  `plan_gcl` decimal(30,8) DEFAULT NULL COMMENT '计划工程量',
+  `sj_gcl` decimal(30,8) DEFAULT NULL COMMENT '实际工程量',
+  `plan_tp` decimal(30,8) DEFAULT NULL COMMENT '计划金额',
+  `sj_tp` decimal(30,8) DEFAULT NULL COMMENT '实际计量金额',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='台账年月记录进度表';
+
+--
+-- 表的结构 `zh_schedule_month`
+--
+
+CREATE TABLE `zh_schedule_month` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `tid` int(11) NOT NULL COMMENT '标段id',
+  `yearmonth` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT '计划年月',
+  `plan_gcl` decimal(30,8) DEFAULT NULL COMMENT '计划工程量',
+  `sj_gcl` decimal(30,8) DEFAULT NULL COMMENT '实际工程量',
+  `plan_tp` decimal(30,8) DEFAULT NULL COMMENT '计划金额',
+  `sj_tp` decimal(30,8) DEFAULT NULL COMMENT '实际计量金额',
+  `stage_gcl_used` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否已被工程量计量',
+  `stage_tp_used` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否已被金额模式计量',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='进度年月记录汇总台账表';
 
-ALTER TABLE `zh_revise_bills`
-ADD COLUMN `check_calc`  tinyint(1) NULL DEFAULT 1 COMMENT '是否检查计算' AFTER `dagl_url`;
+--
+-- 表的结构 `zh_schedule_stage`
+--
 
-CREATE TABLE `zh_project_log` (
+CREATE TABLE `zh_schedule_stage` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `pid` int(11) NOT NULL COMMENT '操作项目',
-  `tid` int(11) NOT NULL COMMENT '操作标段',
-  `uid` int(11) NOT NULL COMMENT '操作人',
-  `type` tinyint(1) NOT NULL COMMENT '操作模块',
-  `status` tinyint(1) NOT NULL COMMENT '操作状态',
-  `msg` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '操作名称',
-  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '操作时间',
-  `os` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '系统信息',
-  `browser` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '浏览器信息',
-  `ip` varchar(45) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '操作人IP地址',
-  `address` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '操作人地址（接口获取）',
+  `tid` int(11) NOT NULL COMMENT '标段id',
+  `yearmonth` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT '计划月份',
+  `order` int(11) NOT NULL COMMENT '计量期数',
+  `tp` decimal(30,8) DEFAULT NULL COMMENT '本期计量完成金额',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='项目操作日志';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='计量进度-计划月份，计量期选中表';

sql/update20210129.sql

@@ -0,0 +1,44 @@
+ALTER TABLE `zh_project` ADD `rpt_authority` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '主管部门(报表显示)' AFTER `page_path`;
+ALTER TABLE `zh_project` ADD `rpt_items` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '建设项目类别(报表显示)' AFTER `rpt_authority`;
+ALTER TABLE `zh_project` ADD `rpt_level` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '级别(报表显示)' AFTER `rpt_items`;
+ALTER TABLE `zh_project` ADD `rpt_nature` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '建设性质(报表显示)' AFTER `rpt_level`;
+
+ALTER TABLE `zh_ledger`
+ADD COLUMN `dagl_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '档案管理-查看链接'AFTER `dagl_status`;
+
+ALTER TABLE `zh_pos`
+ADD COLUMN `dagl_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '档案管理-查看链接'AFTER `dagl_status`;
+
+ALTER TABLE `zh_revise_bills`
+ADD COLUMN `dagl_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '档案管理-查看链接'AFTER `dagl_status`;
+
+ALTER TABLE `zh_revise_pos`
+ADD COLUMN `dagl_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '档案管理-查看链接'AFTER `dagl_status`;
+
+ALTER TABLE `zh_advance_file`
+ADD COLUMN `extra_upload` TINYINT(1) NOT NULL DEFAULT '0' COMMENT '是否为审核通过后再次上传的文件，0为否' AFTER `fileext`;
+
+ALTER TABLE `zh_ledger`
+ADD COLUMN `check_calc`  tinyint(1) NULL DEFAULT 1 COMMENT '是否检查计算' AFTER `dagl_url`;
+
+ALTER TABLE `zh_revise_bills`
+ADD COLUMN `check_calc`  tinyint(1) NULL DEFAULT 1 COMMENT '是否检查计算' AFTER `dagl_url`;
+
+-- ----------------------------
+-- Table structure for zh_project_log
+-- ----------------------------
+CREATE TABLE `zh_project_log` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `pid` int(11) NOT NULL COMMENT '操作项目',
+  `tid` int(11) NOT NULL COMMENT '操作标段',
+  `uid` int(11) NOT NULL COMMENT '操作人',
+  `type` tinyint(1) NOT NULL COMMENT '操作模块',
+  `status` tinyint(1) NOT NULL COMMENT '操作状态',
+  `msg` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '操作名称',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '操作时间',
+  `os` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '系统信息',
+  `browser` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '浏览器信息',
+  `ip` varchar(45) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '操作人IP地址',
+  `address` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '操作人地址（接口获取）',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='项目操作日志';