22表用

public/web/rpt_value_define.js

@@ -207,13 +207,15 @@ const JV = {
 
     PAGE_STATUS: ["EveryPage","FirstPage", "LastPage", "SegmentStart", "SegmentEnd", "Group", "CrossRowEnd", "CrossColEnd"],
 
-    CONTROL_PROPS: ["Shrink", "ShowZero", "Horizon", "Vertical", "Wrap", "VerticalForExcel"],
+    CONTROL_PROPS: ["Shrink", "ShowZero", "Horizon", "Vertical", "Wrap", "VerticalForExcel", "ShrinkFirst", "CloseOutput"],
     CONTROL_PROP_IDX_SHRINK: 0,
     CONTROL_PROP_IDX_SHOW_ZERO: 1,
     CONTROL_PROP_IDX_HORIZON: 2,
     CONTROL_PROP_IDX_VERTICAL: 3,
     CONTROL_PROP_IDX_WRAP: 4,
     CONTROL_PROP_IDX_VERTICAL_EXCEL: 5,
+    CONTROL_PROP_IDX_SHRINK_FIRST: 6,
+    CONTROL_PROP_IDX_CLOSE_OUTPUT: 7,
     BORDER_STYLE_PROPS: ["LineWeight", "DashStyle", "Color"],
     PROP_LINE_WEIGHT: "LineWeight",
     PROP_DASH_STYLE: "DashStyle",

web/maintain/report/html/rpt_tpl_dtl_field_loc.html

@@ -51,11 +51,11 @@
                 </div>
             </div>
             <div class="row" id="element_font">
-                <div class="form-group col-md-3">
+                <div class="form-group col-md-2">
                     <label>字体选择</label>
                     <select class="form-control" id="elementFonts" onchange="rpt_tpl_cfg_helper.fontChange(this)" disabled></select>
                 </div>
-                <div class="form-group col-md-3">
+                <div class="form-group col-md-2">
                     <label>字体名称</label>
                     <input class="form-control" id="eleFontName" value="" onchange="rpt_tpl_cfg_helper.fontNameChange(this)" disabled>
                 </div>
@@ -82,7 +82,7 @@
                 </div>
             </div>
             <div class="row" id="element_border">
-                <div class="form-group col-md-3">
+                <div class="form-group col-md-2">
                     <label>边框样式</label>
                     <select class="form-control" id="elementBorders" onchange="rpt_tpl_cfg_helper.borderChange(this)"></select>
                 </div>
@@ -104,7 +104,7 @@
                 </div>
             </div>
             <div class="row" id="element_control">
-                <div class="form-group col-md-3">
+                <div class="form-group col-md-2">
                     <label>控制选择</label>
                     <select class="form-control" id="elementControls" onchange="rpt_tpl_cfg_helper.controlChange(this)"></select>
                 </div>
@@ -131,6 +131,15 @@
                             <input type="checkbox" class="form-check-input" id="eleAutoWrap" onchange="" disabled>
                             自动折行
                         </label>
+                        <label class="form-check-label"> </label>
+                        <label class="form-check-label">
+                            <input type="checkbox" class="form-check-input" id="eleIsShrinkFirst" onchange="">
+                            缩放优先
+                        </label>
+                        <label class="form-check-label">
+                            <input type="checkbox" class="form-check-input" id="eleCloseOutput" onchange="">
+                            紧密输出
+                        </label>
                     </div>
                 </div>
             </div>
@@ -178,19 +187,19 @@
                 </div>
             </div>
             <div class="row" id="element_pre_suff">
-                <div class="input-group col-3">
+                <div class="input-group col-2">
                     <div class="input-group-addon">前缀</div>
                     <input class="form-control" id="elePrefix" value="" onkeyup="rpt_tpl_cfg_helper.changePreSuff(this, 'Prefix')">
                 </div>
-                <div class="input-group col-3">
+                <div class="input-group col-2">
                     <div class="input-group-addon">后缀</div>
                     <input class="form-control" id="eleSuffix" value="" onkeyup="rpt_tpl_cfg_helper.changePreSuff(this, 'Suffix')">
                 </div>
-                <div class="input-group col-3">
+                <div class="input-group col-2">
                     <div class="input-group-addon">格式</div>
                     <input class="form-control" id="eleFormat" value="" onkeyup="rpt_tpl_cfg_helper.changeFormat(this)">
                 </div>
-                <div class="input-group col-3">
+                <div class="input-group col-2">
                     <div class="input-group-addon">默认值</div>
                     <input class="form-control" id="eleDftValue" value="" onkeyup="rpt_tpl_cfg_helper.changeDftValue(this)">
                 </div>

web/maintain/report/js/rpt_tpl_pre_handle.js

@@ -231,6 +231,7 @@ const exposed_prj_glj_properties = [
     ,{Name: "项目人材机_类型", Title: "", Key: "type", Order: "ascend", individualType: fixed_glj_types}
     ,{Name: "项目人材机_数量", Title: "", Key: "quantity", Order: "ascend"}
     ,{Name: "项目人材机_是否暂估", Title: "", Key: "is_evaluate", Order: "ascend", isBoolean: true, booleanOptions: [1,0]}
+    ,{Name: "项目人材机_是否材料计算", Title: "", Key: "unit_price.calcMaterial", Order: "ascend", isBoolean: true, booleanOptions: [1,0]}
     ,{Name: "项目人材机_供货方式", Title: "", Key: "supply", Order: "ascend", individualType: fixed_supply_types}
     ,{Name: "项目人材机_三材类别", Title: "", Key: "materialType", Order: "ascend", individualType: fixed_material_types}
 ];