Merge branch 'dev' into uat

app/const/tender_info.js

@@ -47,6 +47,11 @@ const defaultInfo = {
             corporation: '',
             date: '',
         },
+        detect: {
+            company: '',
+            corporation: '',
+            date: '',
+        },
     },
     // 技术参数
     tech_param: {

app/public/css/main.css

@@ -192,6 +192,10 @@ input.nospin[type="number"]{-moz-appearance:textfield;}
 .in-4{padding-left:63px!important}
 .in-5{padding-left:84px!important}
 .in-6{padding-left:105px!important}
+.in-7{padding-left:126px!important}
+.in-8{padding-left:147px!important}
+.in-9{padding-left:168px!important}
+.in-10{padding-left:189px!important}
 /*滚动条*/
 /* 滚动条 */
 /*水平滚动条的样式*/

app/public/js/measure_material.js

@@ -299,8 +299,8 @@ $(function () {
                 for (const sid of stage_id) {
                     const curLedger = _.find(result.curLedgerData, {sid: sid});
                     const curPos = _.find(result.curPosData, {sid: sid});
-                    gclGatherModel.loadLedgerData(ledger, curLedger.ledgerData);
-                    gclGatherModel.loadPosData(pos, curPos.posData);
+                    gclGatherModel.loadLedgerData(_.cloneDeep(ledger), curLedger.ledgerData);
+                    gclGatherModel.loadPosData(_.cloneDeep(pos), curPos.posData);
                     const gclGatherData = gclGatherModel.gatherGclData();
                     // console.log(gclGatherData);
                     const insertGcl = [];
@@ -385,8 +385,8 @@ $(function () {
             } else {
                 const curLedgerData = result.curLedgerData;
                 const curPosData = result.curPosData;
-                gclGatherModel.loadLedgerData(ledger, curLedgerData);
-                gclGatherModel.loadPosData(pos, curPosData);
+                gclGatherModel.loadLedgerData(_.cloneDeep(ledger), curLedgerData);
+                gclGatherModel.loadPosData(_.cloneDeep(pos), curPosData);
                 const gclGatherData = gclGatherModel.gatherGclData();
                 const insertGcl = [];
                 for (const g of gclList) {

app/public/js/tender.js

@@ -33,6 +33,10 @@ function loadCommonProperty () {
     $('#supervision2-company').val(property.construction_unit.supervision2.company);
     $('#supervision2-corporation').val(property.construction_unit.supervision2.corporation);
     $('#supervision2-date').val(property.construction_unit.supervision2.date);
+    // 检测单位
+    $('#detect-company').val(property.construction_unit.detect.company);
+    $('#detect-corporation').val(property.construction_unit.detect.corporation);
+    $('#detect-date').val(property.construction_unit.detect.date);
 
     // 技术参数
     $('#loadLevel').val(property.tech_param.loadLevel);
@@ -512,6 +516,11 @@ $(document).ready(function() {
                     corporation: $('#supervision2-corporation').val(),
                     date: $('#supervision2-date').val(),
                 },
+                detect: {
+                    company: $('#detect-company').val(),
+                    corporation: $('#detect-corporation').val(),
+                    date: $('#detect-date').val(),
+                },
             },
             tech_param: {
                 loadLevel: _.toNumber($('#loadLevel').val()),

app/view/dashboard/index.ejs

@@ -35,7 +35,7 @@
                 <div class="col-6 px-0">
                     <div class="card ml-3">
                         <div class="card-header card-white d-flex justify-content-between">
-                            <div class="card-big-htext"><span class="card-icon mr-2"></span>参与的标段动态</div>
+                            <div class="card-big-htext"><span class="card-icon mr-2"></span>需要你处理</div>
                             <div>
                                 <select class="form-control form-control-sm" id="select-doing-type">
                                     <option value="0">全部</option>
@@ -302,7 +302,7 @@
                 <div class="col-9 px-0">
                     <div class="card ml-3">
                         <div class="card-header card-white d-flex justify-content-between">
-                            <div class="card-big-htext"><span class="card-icon mr-2"></span>需要你关注</div>
+                            <div class="card-big-htext"><span class="card-icon mr-2"></span>参与的标段动态</div>
                             <div>
                                 <select class="form-control form-control-sm" id="select-notice-type">
                                     <option value="0">全部</option>

app/view/material/modal.ejs

@@ -145,4 +145,4 @@
     </div>
 </div>
 <script src="/public/js/moment/moment.min.js"></script>
-<script src="/public/js/measure_material.js?202204191"></script>
+<script src="/public/js/measure_material.js?202210091"></script>

app/view/tender/detail_modal.ejs

@@ -228,6 +228,35 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="form-group">
+                                <label>检测单位：</label>
+                                <div class="row">
+                                    <div class="col-12 mb-2">
+                                        <div class="input-group input-group-sm">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text">单位名称</span>
+                                            </div>
+                                            <input type="text" class="form-control" value="" id="detect-company" maxlength="100" oninput="limitReturn(this)">
+                                        </div>
+                                    </div>
+                                    <div class="col-6 pr-0">
+                                        <div class="input-group input-group-sm">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text">法人代表</span>
+                                            </div>
+                                            <input type="text" class="form-control" value="" id="detect-corporation" maxlength="100" oninput="limitReturn(this)">
+                                        </div>
+                                    </div>
+                                    <div class="col-6">
+                                        <div class="input-group input-group-sm">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text">签订日期</span>
+                                            </div>
+                                            <input type="date" class="form-control" value="" id="detect-date">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
                         <div class="tab-pane" id="jscs">
                             <div class="form-group">
@@ -921,6 +950,10 @@
         $('#supervision2-company').val(property.construction_unit.supervision2.company);
         $('#supervision2-corporation').val(property.construction_unit.supervision2.corporation);
         $('#supervision2-date').val(property.construction_unit.supervision2.date);
+        // 检测单位
+        $('#detect-company').val(property.construction_unit.detect.company);
+        $('#detect-corporation').val(property.construction_unit.detect.corporation);
+        $('#detect-date').val(property.construction_unit.detect.date);
 
         // 技术参数
         $('#load-level').find("option:contains('" + property.tech_param.loadLevel + "')").attr("selected",true);
@@ -982,6 +1015,11 @@
                     corporation: $('#supervision2-corporation').val(),
                     date: $('#supervision2-date').val(),
                 },
+                detect: {
+                    company: $('#detect-company').val(),
+                    corporation: $('#detect-corporation').val(),
+                    date: $('#detect-date').val(),
+                },
             },
             tech_param: {
                 loadLevel: $('#load-level').find("option:selected").text(),

config/web.js

@@ -60,8 +60,8 @@ const JsFiles = {
                     '/public/js/zh_calc.js',
                     '/public/js/PinYinOrder.bundle.js',
                     '/public/js/shares/tender_list_order.js',
-                    '/public/js/tender_showhide.js',
                     '/public/js/shares/show_level.js',
+                    '/public/js/tender_showhide.js',
                     '/public/js/tender_list.js',
                 ],
                 mergeFile: 'tender_list',
@@ -72,8 +72,8 @@ const JsFiles = {
                     '/public/js/zh_calc.js',
                     '/public/js/PinYinOrder.bundle.js',
                     '/public/js/shares/tender_list_order.js',
-                    '/public/js/tender_showhide.js',
                     '/public/js/shares/show_level.js',
+                    '/public/js/tender_showhide.js',
                     '/public/js/tender_list_info.js',
                 ],
                 mergeFile: 'tender_list_info',
@@ -84,8 +84,8 @@ const JsFiles = {
                     '/public/js/zh_calc.js',
                     '/public/js/PinYinOrder.bundle.js',
                     '/public/js/shares/tender_list_order.js',
-                    '/public/js/tender_showhide.js',
                     '/public/js/shares/show_level.js',
+                    '/public/js/tender_showhide.js',
                     '/public/js/tender_list_progress.js',
                 ],
                 mergeFile: 'tender_list_progress',
@@ -96,8 +96,8 @@ const JsFiles = {
                     '/public/js/zh_calc.js',
                     '/public/js/PinYinOrder.bundle.js',
                     '/public/js/shares/tender_list_order.js',
-                    '/public/js/tender_showhide.js',
                     '/public/js/shares/show_level.js',
+                    '/public/js/tender_showhide.js',
                     '/public/js/tender_list_manage.js',
                 ],
                 mergeFile: 'tender_list_manage',

db_script/change.js

@@ -66,7 +66,7 @@ const checkStagePos = async function (stage, decimal, preStage) {
     for (const sp of stagePos) {
         const filterTimesOrder = stageChange.filter(x => {
             if (x.pid === sp.pid && !x.no_value) {
-                return x.times < sp.times || (x.stimes === sp.times && x.sorder <= sp.order);
+                return x.stimes < sp.times || (x.stimes === sp.times && x.sorder <= sp.order);
             } else {
                 return false;
             }
@@ -124,11 +124,9 @@ const checkStageBills = async function (stage, decimal, preStage) {
     const stageBills = await querySql(`SELECT * From ${billsTable} where sid = ?`, [stage.id]);
     for (const sb of stageBills) {
         const filterTimesOrder = stageChange.filter(x => {
-            if (x.lid === sb.lid && !x.no_value) {
-                return x.times < sb.times || (x.stimes === sb.times && x.sorder <= sb.order);
-            } else {
-                return false;
-            }
+            if (x.no_value) return false;
+            if (x.lid !== sb.lid) return false;
+            return x.stimes < sb.times || (x.stimes === sb.times && x.sorder <= sb.order);
         });
         const filterLatest = BaseUtil.filterLastestData(filterTimesOrder, ['pid', 'cbid'], 'stimes', 'sorder');
         if (filterLatest.length === 0) continue;

sql/update.sql

@@ -84,7 +84,8 @@ CREATE TABLE `zh_revise_price` (
 CREATE TABLE `zh_stage_bills_pc` (
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   `tid` int(11) unsigned NOT NULL COMMENT '标段id',
-  `sid` int(11) NOT NULL,
+  `sid` int(11) UNSIGNED NOT NULL COMMENT '期id',
+  `sorder` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '第几期'
   `lid` varchar(36) COLLATE utf8_unicode_ci NOT NULL COMMENT '项目节id',
   `org_price` decimal(24,8) NOT NULL DEFAULT 0 COMMENT '原单价',
   `unit_price` decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期单价',
@@ -149,83 +150,83 @@ ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT  '本期补差(
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 
 ALTER TABLE `zh_stage_pos_final_0`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0  COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0  COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_1`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0  COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0  COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_2`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0  COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_3`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_4`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_5`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_6`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_7`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_8`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_9`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_10`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_11`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_12`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_13`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_14`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_15`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_16`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_17`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_18`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 ALTER TABLE `zh_stage_pos_final_19`
-ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `unit_price`,
+ADD COLUMN `contract_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(合同)' AFTER `contract_expr`,
 ADD COLUMN `qc_pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差(变更)' AFTER `contract_pc_tp`,
 ADD COLUMN `pc_tp`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '本期补差' AFTER `qc_pc_tp`;
 
@@ -492,4 +493,38 @@ ALTER TABLE `zh_stage_change_final`
 ADD COLUMN `unit_price`  decimal(24,8) NOT NULL DEFAULT 0 COMMENT '清单单价' AFTER `no_value`;
 
 Update `zh_stage_change` sc LEFT JOIN zh_change_audit_list cal ON sc.cbid = cal.id Set sc.unit_price = IFNULL(cal.unit_price, 0);
-Update `zh_stage_change_final` sc LEFT JOIN zh_change_audit_list cal ON sc.cbid = cal.id Set sc.unit_price = IFNULL(cal.unit_price, 0);
+Update `zh_stage_change_final` sc LEFT JOIN zh_change_audit_list cal ON sc.cbid = cal.id Set sc.unit_price = IFNULL(cal.unit_price, 0);
+
+CREATE TABLE `zh_glj_lib` (
+  `id` int(8) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id',
+  `list_id` int(8) NOT NULL COMMENT '工料机列表id',
+  `glj_id` int(8) NOT NULL COMMENT '导入的工料机id',
+  `glj_pid` int(8) NOT NULL COMMENT '父节点id',
+  `level` tinyint(2) NOT NULL DEFAULT '1' COMMENT '目录层级',
+  `is_leaf` tinyint(1) NOT NULL,
+  `full_path` text NOT NULL,
+  `order` tinyint(5) NOT NULL,
+  `code` varchar(30) NOT NULL DEFAULT '' COMMENT '编号',
+  `name` varchar(255) NOT NULL DEFAULT '' COMMENT '名称',
+  `unit` varchar(18) NOT NULL DEFAULT '' COMMENT '单位',
+  `rise_range` decimal(24,8) NOT NULL DEFAULT '0.00000000',
+  `fall_range` decimal(24,8) NOT NULL DEFAULT '0.00000000',
+  `spec` varchar(50) NOT NULL DEFAULT '' COMMENT '规格',
+  `type` int(8) unsigned NOT NULL DEFAULT '0' COMMENT '工料分类',
+  `memo` varchar(255) NOT NULL DEFAULT '' COMMENT '备注',
+  PRIMARY KEY (`id`),
+  KEY `idx_pid` (`glj_pid`) USING BTREE,
+  KEY `idx_list_id` (`list_id`) USING BTREE,
+  KEY `idx_level` (`level`) USING BTREE,
+  KEY `idx_chapter_id` (`glj_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='工料机数据表';
+
+CREATE TABLE `zh_glj_lib_list` (
+  `id` int(8) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id',
+  `name` varchar(60) NOT NULL COMMENT '项目章节名称',
+  `remark` varchar(60) DEFAULT '' COMMENT '备注',
+  `create_time` int(10) NOT NULL COMMENT '创建时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='工料机列表数据表';
+
+INSERT INTO `calculation`.`zh_permission` (`id`, `name`, `controller`, `action`, `pid`, `icon_class`, `create_time`, `isshow`) VALUES ('73', '工料机库', 'glj-lib', 'all', '44', '', '13', '1');