工程量清单模式，隐藏计量单元功能适应性修改

app/public/js/div_resizer.js

@@ -30,7 +30,7 @@
     $.divResizer = function(setting) {
         const obj = $(setting.select);
         let drag, mouseMoveCount, startPos, orgSize1, orgSize2, newSize1, newSize2, objSize;
-        const rType = obj.attr('r-type'), aType = obj.attr('a-type');
+        const rType = obj.attr('r-Type') || 'width', aType = obj.attr('a-type');
         // if (obj.attr('r-type') === 'height') {
         //     obj.css('width', '100%').css('height', '1%').css('resize', 'vertical').css('cursor', 's-resize').css('float', 'top');
         // } else {
@@ -93,8 +93,8 @@
             refreshDivSize();
             if (setting.callback) { setting.callback(); }
         } else {
-            orgSize1 = $($(this).attr('div1'))[rType]();
-            orgSize2 = $($(this).attr('div2'))[rType]();
+            orgSize1 = $($(this).attr('div1')) ? $($(this).attr('div1'))[rType]() : 0;
+            orgSize2 = $($(this).attr('div2')) ? $($(this).attr('div2'))[rType]() : 0;
         }
 
         obj.mousedown(function (e) {

app/view/ledger/explode.ejs

@@ -28,11 +28,13 @@
                     <a href="javascript:void(0)" id="down-move" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
                     <a href="javascript:void(0)" id="up-move" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
                 </div>
+                <% if (tender.measure_type === measureType.tz.value) { %>
                 <div class="d-inline-block">
                     <div class="btn-group">
                         <button href="javascript: void(0);" class="btn btn-sm btn-light text-primary" id="pos-show"><i class="fa fa-eye-slash"></i> 隐藏计量单元</button>
                     </div>
                 </div>
+                <% } %>
                 <div class="d-inline-block">
                     <div class="btn-group">
                         <button href="javascript: void(0);" class="btn btn-sm btn-light text-primary" id="features-show"><i class="fa fa-eye"></i> 显示特征</button>

app/view/revise/info.ejs

@@ -30,11 +30,13 @@
                     <a href="javascript: void(0);" name="base-opr" type="down-move" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
                     <a href="javascript: void(0);" name="base-opr" type="up-move" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
                 </div>
+                <% if (tender.measure_type === measureType.tz.value) { %>
                 <div class="d-inline-block">
                     <div class="btn-group">
                         <button href="javascript: void(0);" class="btn btn-sm btn-light text-primary" id="pos-show"><i class="fa fa-eye-slash"></i> 隐藏计量单元</button>
                     </div>
                 </div>
+                <% } %>
                 <div class="d-inline-block">
                     <div class="input-group input-group-sm ml-2">
                         <div class="input-group-prepend">

app/view/stage/index.ejs

@@ -25,11 +25,13 @@
                 <div class="d-inline-block">
                     <button href="#row-view" class="btn btn-sm btn-light" data-toggle="modal" data-target="#row-view"><i class="fa fa-table"></i> 列显示</button>
                 </div>
+                <% if (tender.measure_type === measureType.tz.value) { %>
                 <div class="d-inline-block">
                     <div class="btn-group">
                         <button href="javascript: void(0);" class="btn btn-sm btn-light text-primary" id="pos-show"><i class="fa fa-eye-slash"></i> 隐藏计量单元</button>
                     </div>
                 </div>
+                <% } %>
                 <div class="d-inline-block">
                     <div class="btn-group">
                         <button href="javascript: void(0);" class="btn btn-sm btn-light text-primary" id="features-show"><i class="fa fa-eye"></i> 显示特征</button>

sql/update.sql

@@ -339,11 +339,70 @@ ADD COLUMN `qty` decimal(30, 8) NULL DEFAULT NULL COMMENT '本期调差数量' A
 ALTER TABLE `zh_change_ledger`
 ADD COLUMN `is_new_price` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '新增单价' AFTER `ex_tp1`;
 
+CREATE TABLE `zh_std_extra`  (
+  `id` int(8) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '自增id',
+  `spec` varchar(20) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '规格',
+  `value` decimal(24, 8) NOT NULL DEFAULT 0.00000000 COMMENT '值',
+  `list_id` int(8) NOT NULL COMMENT '列表id',
+  `extra_id` int(8) NOT NULL COMMENT '导入的清单id',
+  `extra_pid` int(8) NOT NULL COMMENT '父节点id',
+  `level` tinyint(2) NOT NULL DEFAULT 1 COMMENT '目录层级',
+  `order` tinyint(5) NOT NULL,
+  `full_path` text CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+  `is_leaf` tinyint(1) NOT NULL,
+  `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '分类名称',
+  `code` varchar(30) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '编号',
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX `idx_pid`(`extra_pid`) USING BTREE,
+  INDEX `idx_list_id`(`list_id`) USING BTREE,
+  INDEX `idx_level`(`level`) USING BTREE,
+  INDEX `idx_bill_id`(`extra_id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_unicode_ci COMMENT = '工程量清单数据表' ROW_FORMAT = Dynamic;
+
+CREATE TABLE `zh_std_extra_list`  (
+  `id` int(8) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '自增id',
+  `name` varchar(60) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '名称',
+  `remark` varchar(60) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT '' COMMENT '备注',
+  `create_time` int(10) NOT NULL COMMENT '创建时间',
+  `sub_type` tinyint(4) UNSIGNED NOT NULL DEFAULT 0 COMMENT '二级分类',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_unicode_ci COMMENT = '工程量清单列表数据表' ROW_FORMAT = Dynamic;
+
+CREATE TABLE `zh_tender_ass`  (
+  `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'id',
+  `tid` int(11) UNSIGNED NOT NULL COMMENT '标段id(zh_tender.id)',
+  `user_id` int(11) UNSIGNED NOT NULL COMMENT '协同人id(zh_project.id)',
+  `rela_id` varchar(36) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '关联id(zh_ledger_revise.id/...)',
+  `ass_type` varchar(20) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT 'ledger' COMMENT '协作类型(ledger/revise/...)',
+  `ass_id` varchar(1000) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '协同id(zh_ledger.ledger_id/zh_revise_bills.ledger_id/...)',
+  `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '用户名',
+  `company` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '单位',
+  `role` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '角色',
+  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `create_user_id` int(11) UNSIGNED NOT NULL COMMENT '创建人',
+  `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
+  `update_user_id` int(11) UNSIGNED NOT NULL COMMENT '最后修改人',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_unicode_ci ROW_FORMAT = Dynamic;
+
+CREATE TABLE `zh_ledger_template`  (
+  `id` varchar(36) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT 'uuid',
+  `pid` int(11) UNSIGNED NOT NULL COMMENT '项目id(zh_project.id)',
+  `create_user_id` int(11) UNSIGNED NOT NULL COMMENT '创建人id',
+  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `user_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '创建人姓名',
+  `user_company` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '创建人单位',
+  `user_role` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '创建人角色',
+  `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '模板名称',
+  `source` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '模板来源',
+  `content` json NULL COMMENT '模板内容',
+  `is_share` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否分享',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_unicode_ci ROW_FORMAT = Dynamic;
+
 ------------------------------------
 -- 表数据
 ------------------------------------
 
 INSERT INTO `zh_permission` (`id`, `name`, `controller`, `action`, `pid`, `icon_class`, `create_time`, `isshow`) VALUES (78, '附加数据', 'std-extra', 'all', 44, '', 14, 1);
 
-
-