台账修订，清单对比，章节明细相关

app/public/js/revise_gcl_compare.js

@@ -130,7 +130,7 @@ $(document).ready(() => {
         if (data) {
             for (const d of data) {
                 if (['1000', '1100', '1200', '1300'].indexOf(d.code) >= 0) {
-                    if (checkZero(d.total_price) && checkZero(d.deal_bills_tp)) {
+                    if (checkZero(d.new_total_price) && checkZero(d.org_total_price) && checkZero(d.deal_bills_tp)) {
                         continue;
                     }
                 }

sql/update.sql

@@ -33,10 +33,16 @@ CREATE TABLE `zh_budget_zb` (
   KEY `idx_full_path` (`bid`,`full_path`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='招标预算数据';
 
+ALTER TABLE `zh_budget_final`
+ADD COLUMN `zb_dgn_qty1`  decimal(24,8) NOT NULL DEFAULT 0.00000000 COMMENT '预算-设计数量1' AFTER `yu_tp`,
+ADD COLUMN `zb_dgn_qty2`  decimal(24,8) NOT NULL DEFAULT 0.00000000 COMMENT '预算-设计数量1' AFTER `zb_dgn_qty1`,
+ADD COLUMN `zb_dgn_qty`  varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '预算-设计数量1/设计数量2' AFTER `zb_dgn_qty2`,
+ADD COLUMN `zb_dgn_price`  decimal(24,8) NOT NULL DEFAULT 0.00000000 COMMENT '预算-经济指标' AFTER `zb_dgn_qty`,
+ADD COLUMN `zb_tp`  decimal(24,8) NOT NULL DEFAULT 0.00000000 COMMENT '预算-金额' AFTER `zb_dgn_price`;
+
 ALTER TABLE `zh_material_list_notjoin`
 ADD COLUMN `type` tinyint(1) NOT NULL DEFAULT 1 COMMENT '1为本期不参与调差，2为数量变更不参与调差' AFTER `mx_id`;
 
-
 ALTER TABLE `zh_stage_bills_pc`
 MODIFY COLUMN `lid` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '项目节id' AFTER `sorder`;