Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuOperation

# Conflicts:
#	modules/all_models/stdGlj_glj.js

modules/all_models/stdGlj_glj.js

@@ -2,23 +2,24 @@
  * Created by Zhong on 2018/3/22.
  */
 /*标准工料机*/
-const mongoose = require('mongoose');
+const mongoose = require("mongoose");
 const Schema = mongoose.Schema;
 //标准工料机的组成物只来自标准工料机
 const std_gljComponent = new Schema(
-    {
-        ID: Number,
-        consumeAmt: Number,
-        consumeAmtProperty: {
-            type: Schema.Types.Mixed,
-            default: {}
-        }
+  {
+    ID: Number,
+    consumeAmt: Number,
+    consumeAmtProperty: {
+      type: Schema.Types.Mixed,
+      default: {},
     },
-    { _id: false },
-    { versionKey: false }
+  },
+  { _id: false },
+  { versionKey: false }
 );
 
-const std_glj = new Schema({
+const std_glj = new Schema(
+  {
     deleted: Boolean,
     repositoryId: Number,
     ID: Number,
@@ -26,9 +27,10 @@ const std_glj = new Schema({
     name: String,
     specs: String,
     basePrice: Number,
+    taxRate: Number,
     priceProperty: {
-        type: Schema.Types.Mixed,
-        default: {}
+      type: Schema.Types.Mixed,
+      default: {},
     },
     gljClass: Number,
     gljType: Number,
@@ -41,7 +43,9 @@ const std_glj = new Schema({
     offSiteTransportLossRate: Number, //场外运输损耗率
     handlingLossRate: Number, //每增一次装卸损耗率
     lossRate: Number, // 损耗率
-}, { versionKey: false });
+  },
+  { versionKey: false }
+);
 
 mongoose.model('std_glj_lib_gljList', std_glj, 'std_glj_lib_gljList');
 mongoose.model('std_glj_lib_gljList_backup', std_glj, 'std_glj_lib_gljList_backup');

public/web/rpt_value_define.js

@@ -76,6 +76,8 @@ const JV = {
     PROP_HANDLE_TYPE_CHANGE_QUANTITIES_BILLS: "转化工程量清单",
     PROP_HANDLE_TYPE_CHANGE_QUANTITIES_BILLS_SORT_TYPE: "工程量清单排序类型",
     PROP_HANDLE_TYPE_CHANGE_QUANTITIES_BILLS_DATA_TYPE: "工程量清单数据类型",
+    PROP_HANDLE_TYPE_FX_GLJ: "分项定额人材机处理",
+    PROP_HANDLE_TYPE_LAND_COMPS: "清单土地计算合并",
 
     PROP_ADJUST_COLLECTION: "数据调整集",
     PROP_ADJUST_ACTION: "action",

web/maintain/report/html/rpt_tpl_dtl_info.html

@@ -10,19 +10,30 @@
                 <div class="row">
                     <div class="input-group col-2">
                         <div class="input-group-addon">方向</div>
-                        <select class="form-control input-sm" id="rptTplPageOrientation"><option>横向</option><option>竖向</option></select>
+                        <select class="form-control input-sm" id="rptTplPageOrientation">
+                            <option>横向</option>
+                            <option>竖向</option>
+                        </select>
                     </div>
                     <div class="input-group col-2">
                         <div class="input-group-addon">纸张</div>
-                        <select class="form-control input-sm" id="rptTplPageSize"><option>A3</option><option>A4</option></select>
+                        <select class="form-control input-sm" id="rptTplPageSize">
+                            <option>A3</option>
+                            <option>A4</option>
+                        </select>
                     </div>
                     <div class="input-group col-2">
                         <div class="input-group-addon">单位</div>
-                        <select class="form-control input-sm" id="rptTplUnit"><option>厘米</option></select>
+                        <select class="form-control input-sm" id="rptTplUnit">
+                            <option>厘米</option>
+                        </select>
                     </div>
                     <div class="input-group col-4">
                         <div class="input-group-addon">交叉表显示方向</div>
-                        <select class="form-control input-sm" id="element_cross_display_seq" disabled><option value ="0">纵向优先</option><option value ="1">横向优先</option></select>
+                        <select class="form-control input-sm" id="element_cross_display_seq" disabled>
+                            <option value="0">纵向优先</option>
+                            <option value="1">横向优先</option>
+                        </select>
                     </div>
                 </div>
             </div>
@@ -31,7 +42,10 @@
                 <div class="row">
                     <div class="input-group col-3">
                         <div class="input-group-addon">分栏</div>
-                        <select class="form-control input-sm" id="rptTplMultiCols"><option>1</option><option>2</option></select>
+                        <select class="form-control input-sm" id="rptTplMultiCols">
+                            <option>1</option>
+                            <option>2</option>
+                        </select>
                     </div>
                     <div class="input-group input-group-sm col-3">
                         <label class="form-check-label">空行提上
@@ -47,21 +61,31 @@
             <div class="row" id="element_content_height_width">
                 <div class="form-group col-md-3" id="flow_content_height_div">
                     <label>流水显示行 - 高度</label>
-                    <input class="form-control input-sm" id="element_content_height" type="number" value="0.6" step="0.1" min="0" max="50" onchange="zTreeOprObj.changeProperty(`流水式表_信息.流水式表_数据.CommonHeight`, this)" disabled>
+                    <input class="form-control input-sm" id="element_content_height" type="number" value="0.6"
+                        step="0.1" min="0" max="50"
+                        onchange="zTreeOprObj.changeProperty(`流水式表_信息.流水式表_数据.CommonHeight`, this)" disabled>
                 </div>
                 <div class="form-group col-md-3" id="cross_row_height_div" style="display: none">
                     <label>交叉显示行 - 高度</label>
-                    <input class="form-control input-sm" id="element_cross_row_height" type="number" value="3.0" step="0.1" min="0" max="50" onchange="zTreeOprObj.changeProperty(`交叉表_信息.交叉行.CommonHeight`, this)" disabled>
+                    <input class="form-control input-sm" id="element_cross_row_height" type="number" value="3.0"
+                        step="0.1" min="0" max="50"
+                        onchange="zTreeOprObj.changeProperty(`交叉表_信息.交叉行.CommonHeight`, this)" disabled>
                 </div>
                 <div class="form-group col-md-3">
                     <label>交叉显示列 - 宽度</label>
-                    <input class="form-control input-sm" id="element_content_width" type="number" value="4.0" step="0.1" min="0" max="50" onchange="zTreeOprObj.changeProperty(`交叉表_信息.交叉列.CommonWidth`, this)" disabled>
+                    <input class="form-control input-sm" id="element_content_width" type="number" value="4.0" step="0.1"
+                        min="0" max="50" onchange="zTreeOprObj.changeProperty(`交叉表_信息.交叉列.CommonWidth`, this)" disabled>
                 </div>
             </div>
             <div class="row" id="element_adhoc_flags">
                 <div class="input-group col-2">
                     <div class="input-group-addon">额外标记</div>
-                    <select class="form-control input-sm" id="element_flags_select" onchange="zTreeOprObj.onChangeFlag('taxType', this)"><option value ="NA">N/A</option><option value ="1">一般计税</option><option value ="2">简易计税</option></select>
+                    <select class="form-control input-sm" id="element_flags_select"
+                        onchange="zTreeOprObj.onChangeFlag('taxType', this)">
+                        <option value="NA">N/A</option>
+                        <option value="1">一般计税</option>
+                        <option value="2">简易计税</option>
+                    </select>
                 </div>
                 <div class="input-group col-4">
                     <div class="input-group-addon">工程类型</div>
@@ -79,22 +103,29 @@
                             <li id="valuationSelector_changeBudget" value="changeBudget">变更预算</li>
                             <li id="valuationSelector_settlement" value="settlement">结算</li>
                         </ul>
-                    
+
                     </div>
                 </div>
                 <div class="input-group col-3">
                     <div class="input-group-addon">报表汇总类型</div>
-                    <select class="form-control input-sm" id="element_rptFlags_select" onchange="zTreeOprObj.onChangeFlag('reportType', this)"><option value ="NA">N/A</option><option value ="billSummary">工程清单汇总</option><option value ="gljSummary">工程工料机汇总</option></select>
+                    <select class="form-control input-sm" id="element_rptFlags_select"
+                        onchange="zTreeOprObj.onChangeFlag('reportType', this)">
+                        <option value="NA">N/A</option>
+                        <option value="billSummary">工程清单汇总</option>
+                        <option value="gljSummary">工程工料机汇总</option>
+                    </select>
                 </div>
                 <div class="input-group col-2">
                     <div class="input-group-addon">项目汇总级别</div>
-                    <select class="form-control input-sm" id="element_sumLv_flags" onchange="zTreeOprObj.onChangeFlag('sumLevelType', this)">
-                        <option value ="NA">N/A</option>
-                        <option value ="construct">建设项目级别</option>
-                        <option value ="Single">单项工程级别</option>
-                        <option value ="custom">用户自选工程</option>
+                    <select class="form-control input-sm" id="element_sumLv_flags"
+                        onchange="zTreeOprObj.onChangeFlag('sumLevelType', this)">
+                        <option value="NA">N/A</option>
+                        <option value="construct">建设项目级别</option>
+                        <option value="Single">单项工程级别</option>
+                        <option value="custom">用户自选工程</option>
                         <option value="complexUnit">跨项目自选工程(3个建设项目单位工程)</option>
                         <option value="stageContrast">前后阶段对比（当前项目对其他项目）</option>
+                        <option value="stageGLJContrast">前后阶段工料机对比（当前项目对其他项目）</option>
                         <option value="unitPriceContrast">单价偏差对比</option>
                         <option value="complexConstruct">跨项目汇总对比（3个建设项目）</option>
                         <option value="stageBackContrast">审核项目对比（其他项目对当前项目）</option>
@@ -103,12 +134,13 @@
                     </select>
                 </div>
             </div>
-               
+
         </div>
-        <div class="row">
+        <div class="row p-3">
             <div class="input-group col-3">
                 <div class="input-group-addon">审核对比数据级别</div>
-                <select id="element_contrastType_select" class="form-control" onchange="zTreeOprObj.onChangeFlag('contrastType', this)">
+                <select id="element_contrastType_select" class="form-control"
+                    onchange="zTreeOprObj.onChangeFlag('contrastType', this)">
                     <option value="NA">N/A</option>
                     <option value="chapter">项目节</option>
                     <option value="bill">清单</option>
@@ -117,7 +149,8 @@
             </div>
             <div class="input-group col-2">
                 <div class="input-group-addon">存在数据级别</div>
-                <select id="element_existLevel_select" class="form-control" onchange="zTreeOprObj.onChangeFlag('existLevel', this)">
+                <select id="element_existLevel_select" class="form-control"
+                    onchange="zTreeOprObj.onChangeFlag('existLevel', this)">
                     <option value="NA">N/A</option>
                     <option value="true">是</option>
                     <option value="false">否</option>
@@ -142,6 +175,27 @@
                 </select>
             </div>
         </div>
-      
+        <div class="row p-3">
+            <div class="input-group col-3">
+                <div class="input-group-addon">审核对比类型</div>
+                <select class="form-control input-sm" id="element_constructSumFlags_audit"
+                    onchange="zTreeOprObj.onChangeFlag('auditType', this)">
+                    <option value="NA">N/A</option>
+                    <!-- <option value="audit_compare">审核对比</option> -->
+                    <option value="project_compare">步骤对比</option>
+                </select>
+
+            </div>
+            <div class="input-group col-3">
+                <div class="input-group-addon">含量指标类型</div>
+                <select class="form-control input-sm" id="element_costIndexFlags_audit"
+                    onchange="zTreeOprObj.onChangeFlag('costIndexType', this)">
+                    <option value="NA">N/A</option>
+                    <option value="mainScaleContrast">各阶段主要工程规模对比</option>
+                    <option value="mainScaleContrastGai">各阶段主要工程规模对比(概算)</option>
+                </select>
+            </div>
+        </div>
+
     </div>
 </div>

web/maintain/report/html/rpt_tpl_dtl_pre_hdl_change_quantities_bills.html

@@ -1,32 +1,30 @@
 <div id="div_quantities_bills_sort_bar">
-<div class="form-group row" id="div_quantities_bills_sort_type">
-    <div class="input-group col-5">
-        <div class="input-group-addon">排序方式</div>
-        <select class="form-control input-sm" id="select_quantities_bills_sort_types"
-            onchange="preHandleQuantitiesBillsSortObj.onQuantitiesBillsSortTypeChange(this)">
-            <option value="onlyBill">清单排序合并</option>
-            <option value="all">同项目节下排序合并</option>
-            <option value="onlyChapt">只有章节汇总数据</option>
-            <option value="auditComparison">审核对比合并排序（流水）</option>
-            <option value="onlyBillAuditComparison">工程量清单审核对比合并排序（流水）</option>
-            <option value="summaryAudit">汇总对比合并排序（交叉）</option>
-            <option value="stageContrast">阶段对比合并排序（流水）</option>
-            <option value="constructAudit">跨建设项目对比合并排序（交叉）</option>
-        </select>
+    <div class="form-group row" id="div_quantities_bills_sort_type">
+        <div class="input-group col-5">
+            <div class="input-group-addon">排序方式</div>
+            <select class="form-control input-sm" id="select_quantities_bills_sort_types"
+                onchange="preHandleQuantitiesBillsSortObj.onQuantitiesBillsSortTypeChange(this)">
+                <option value="onlyBill">清单排序合并</option>
+                <option value="all">同项目节下排序合并</option>
+                <option value="onlyChapt">只有章节汇总数据</option>
+                <option value="auditComparison">审核对比合并排序（流水）</option>
+                <option value="onlyBillAuditComparison">工程量清单审核对比合并排序（流水）</option>
+                <option value="summaryAudit">汇总对比合并排序（交叉）</option>
+                <option value="stageContrast">阶段对比合并排序（流水）</option>
+                <option value="constructAudit">跨建设项目对比合并排序（交叉）</option>
+                <option value="onlyBillStageContrast">工程量清单阶段对比合并排序（流水）</option>
+            </select>
+        </div>
     </div>
-</div>
-<div class="form-group row" id="div_quantities_bills_type">
-    <div class="input-group col-5">
-        <div class="input-group-addon">处理对象</div>
-        <select class="form-control input-sm" id="select_quantities_bills_types"
-            onchange="preHandleQuantitiesBillsSortObj.onQuantitiesBillsTypesChange(this)">
-            <option value="normal">普通</option>
-            <option value="cross">交叉数据</option>
-            <option value="flow">流水数据</option>
-           
-        </select>
+    <div class="form-group row" id="div_quantities_bills_type">
+        <div class="input-group col-5">
+            <div class="input-group-addon">处理对象</div>
+            <select class="form-control input-sm" id="select_quantities_bills_types"
+                onchange="preHandleQuantitiesBillsSortObj.onQuantitiesBillsTypesChange(this)">
+                <option value="normal">普通</option>
+                <option value="cross">交叉数据</option>
+                <option value="flow">流水数据</option>
+            </select>
+        </div>
     </div>
-</div>
-</div>
-
-
+</div>

web/maintain/report/js/rpt_tpl_main.js

@@ -955,11 +955,12 @@ let zTreeOprObj = {
                             else if (sumLvType === 'custom') $("#element_sumLv_flags")[0].selectedIndex = 3
                             else if (sumLvType === 'complexUnit') $("#element_sumLv_flags")[0].selectedIndex = 4
                             else if (sumLvType === 'stageContrast') $("#element_sumLv_flags")[0].selectedIndex = 5
-                            else if (sumLvType === 'unitPriceContrast') $("#element_sumLv_flags")[0].selectedIndex = 6
-                            else if (sumLvType === 'complexConstruct') $("#element_sumLv_flags")[0].selectedIndex = 7
-                            else if (sumLvType === 'stageBackContrast') $("#element_sumLv_flags")[0].selectedIndex = 8
-                            else if (sumLvType === 'stageUnitContrast') $("#element_sumLv_flags")[0].selectedIndex = 9
-                            else if (sumLvType === 'stageMultipleUnitContrast') $("#element_sumLv_flags")[0].selectedIndex = 10
+                            else if (sumLvType === 'stageGLJContrast') $("#element_sumLv_flags")[0].selectedIndex = 6
+                            else if (sumLvType === 'unitPriceContrast') $("#element_sumLv_flags")[0].selectedIndex = 7
+                            else if (sumLvType === 'complexConstruct') $("#element_sumLv_flags")[0].selectedIndex = 8
+                            else if (sumLvType === 'stageBackContrast') $("#element_sumLv_flags")[0].selectedIndex = 9
+                            else if (sumLvType === 'stageUnitContrast') $("#element_sumLv_flags")[0].selectedIndex = 10
+                            else if (sumLvType === 'stageMultipleUnitContrast') $("#element_sumLv_flags")[0].selectedIndex = 11
                             else $("#element_sumLv_flags")[0].selectedIndex = 0;
                         } else {
                             $("#element_sumLv_flags")[0].selectedIndex = 0;
@@ -1001,8 +1002,26 @@ let zTreeOprObj = {
                             } else {
                                 $("#element_Flags_tplType")[0].selectedIndex = 0;
                             }
+                        }
+                        if (me.currentNode.flags.hasOwnProperty('auditType')) {
+                            let val = me.currentNode.flags['auditType'];
+                            if (val === 'project_compare') {
+                                $("#element_constructSumFlags_audit")[0].selectedIndex = 1;
+                            } else {
+                                $("#element_constructSumFlags_audit")[0].selectedIndex = 0;
+                            }
+                        } else {
+                            $("#element_constructSumFlags_audit")[0].selectedIndex = 0;
+                        }
+                        if (me.currentNode.flags.hasOwnProperty('costIndexType')) {
+                            let val = me.currentNode.flags['costIndexType'];
+                            if (val === 'mainScaleContrast') {
+                                $("#element_costIndexFlags_audit")[0].selectedIndex = 1;
+                            } else {
+                                $("#element_costIndexFlags_audit")[0].selectedIndex = 0;
+                            }
                         } else {
-                            $("#element_Flags_tplType")[0].selectedIndex = 0;
+                            $("#element_costIndexFlags_audit")[0].selectedIndex = 0;
                         }
                     } else {
                         $("#element_flags_select")[0].selectedIndex = 0;
@@ -1016,6 +1035,7 @@ let zTreeOprObj = {
                         $('#valuationSelector .mutiSelector li').removeClass('checked');
                         $("#element_existLevel_select")[0].selectedIndex = 0;
                         $("#element_Flags_tplType")[0].selectedIndex = 0;
+                        $("#element_costIndexFlags_audit")[0].selectedIndex = 0;
                     }
 
                     if ($("#rpt_tpl_visual_tab")[0].className === "nav-link p-1 active") {

web/maintain/report/js/rpt_tpl_pre_handle.js

@@ -289,9 +289,11 @@ let preHandleObj = {
         types.push({
             Name: JV.PROP_HANDLE_TYPE_CHANGE_QUANTITIES_BILLS, Title: ''
         });
+        types.push({ Name: JV.PROP_HANDLE_TYPE_FX_GLJ, Title: '' });
+        types.push({ Name: JV.PROP_HANDLE_TYPE_LAND_COMPS, Title: '' });
         // types.push({Name: "纯手工填写", Title: ""});
         me.typeTreeObj = $.fn.zTree.init($("#pre_handle_type_reversed"), preHandleTypeSetting, types);
-        me.setDisabledBandSelect([0, 1, 2, 3, 4, 5, 6, 7]);
+        me.setDisabledBandSelect([0, 1, 2, 3, 4, 5, 6, 7, 8]);
         me.build_handle_data_selection();
     },
     setDisabledBandSelect: function (disabledIdxArr) {
@@ -337,6 +339,12 @@ let preHandleObj = {
             case JV.PROP_HANDLE_TYPE_CHANGE_QUANTITIES_BILLS:
                 rst = { Name: "预处理环节", Title: "", "映射数据对象": "bills", "预处理类型": preHandleType };
                 break;
+            case JV.PROP_HANDLE_TYPE_FX_GLJ:
+                rst = { Name: "预处理环节", Title: "", "映射数据对象": "bills", "预处理类型": preHandleType };
+                break;
+            case JV.PROP_HANDLE_TYPE_LAND_COMPS:
+                rst = { Name: "预处理环节", Title: "", "映射数据对象": "bills", "预处理类型": preHandleType };
+                break;
             default:
                 rst = { Name: "预处理环节", Title: "", "映射数据对象": "bills", "预处理类型": "排序", "排序方式": "normal", "排序键值集": [] };
                 break;
@@ -380,6 +388,10 @@ let preHandleObj = {
                 item[JV.PROP_HANDLE_TYPE_CHANGE_QUANTITIES_BILLS_SORT_TYPE] = "all";// 工程量清单排序
                 item[JV.PROP_HANDLE_TYPE_CHANGE_QUANTITIES_BILLS_DATA_TYPE] = 'bills'; // 工程量清单输出级别
                 break;
+            case JV.PROP_HANDLE_TYPE_FX_GLJ:
+                break;
+            case JV.PROP_HANDLE_TYPE_LAND_COMPS:
+                break;
             default:
                 item[JV.PROP_HANDLE_TYPE] = JV.PROP_HANDLE_TYPE_SORT;
                 item[JV.PROP_SORT_TYPE] = "normal";
@@ -595,6 +607,12 @@ let preHandleObj = {
                     case JV.PROP_HANDLE_TYPE_CHANGE_QUANTITIES_BILLS:
                         rst.push(preHandleQuantitiesBillsSortObj.extractTabFields(handleObj));
                         break;
+                    case JV.PROP_HANDLE_TYPE_FX_GLJ:
+                        rst.push(preHandleBillDataMoveObj.extractTabFields(handleObj));
+                        break;
+                    case JV.PROP_HANDLE_TYPE_LAND_COMPS:
+                        rst.push(preHandleBillDataMoveObj.extractTabFields(handleObj));
+                        break;
                     default:
                         break;
                 }
@@ -1305,3 +1323,18 @@ let preHandleQuantitiesBillsSortObj = {
         me.currentNode[JV.PROP_HANDLE_TYPE_CHANGE_QUANTITIES_BILLS_DATA_TYPE] = dom.value;
     },
 }
+let preHandleFXGLJObj = {
+    copyNode: function (src, dest) {
+        //
+    },
+    refresh_node: function () {
+        $("#div_summary_type")[0].style.display = "";
+        if (preHandleObj.currentNode) {
+        }
+    },
+    extractTabFields: function (handleObj) {
+        let rst = {};
+        //
+        return rst;
+    }
+}