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

modules/reports/rpt_component/jpc_rte.js

@@ -114,6 +114,40 @@ const JE = {
         if (rst === null || rst === undefined) rst = newVal;
         return rst;
     },
+    getFieldValueArray: function(field, dataObj) {
+        let rst = null;
+        if (field.DataNodeName === 'NA') {
+            if (!field[JV.PROP_AD_HOC_DATA]) {
+                field[JV.PROP_AD_HOC_DATA] = [];
+            }
+            rst = field[JV.PROP_AD_HOC_DATA];
+        } else {
+            if (!field.DataNodeName) {
+                // that means this is a self-defined discrete field!
+                field.DataNodeName = JV.DATA_DISCRETE_DATA;
+                field.DataSeq = dataObj[JV.DATA_DISCRETE_DATA];
+                dataObj[JV.DATA_DISCRETE_DATA].push([]);
+            }
+            rst = dataObj[field.DataNodeName][field.DataSeq];
+        }
+        if (rst === null || rst === undefined) rst = [];
+        return rst;
+    },
+    setFieldValueArray: function(field, dataObj, newArr) {
+        if (newArr instanceof Array) {
+            if (field.DataNodeName === 'NA') {
+                field[JV.PROP_AD_HOC_DATA] = newArr;
+            } else {
+                if (!field.DataNodeName) {
+                    // that means this is a self-defined discrete field!
+                    field.DataNodeName = JV.DATA_DISCRETE_DATA;
+                    field.DataSeq = dataObj[JV.DATA_DISCRETE_DATA].length;
+                    dataObj[JV.DATA_DISCRETE_DATA].push([]);
+                }
+                dataObj[field.DataNodeName][field.DataSeq] = newArr;
+            }
+        }
+    },
     removeFieldValue: function (field, dataObj, valIdx) {
         if (field.DataNodeName === "NA") {
             if (field[JV.PROP_AD_HOC_DATA].length > valIdx && valIdx >= 0) {

web/building_saas/pm/html/project-management.html

@@ -151,16 +151,24 @@
             <!--建设项目汇总-->
             <div class="p-3" id="summary-project">
                 <legend>单价文件</legend>
-                <table class="table table-bordered table-hover table-sm" id="summary-project-unit-price-table">
-                    <thead><th style="width: 25px;"></th><th style="width: 330px;">名称</th><th style="width:40px;">使用</th></thead>
+                <table class="table table-bordered table-hover table-sm table-sc" id="summary-project-unit-price-table">
+                    <thead>
+                        <th style="width: 25px;" class="text-center"></th>
+                        <th style="width: 330px;" class="text-center">名称</th>
+                        <th style="width:40px;" class="text-center">使用</th>
+                    </thead>
                     <tbody>
                     </tbody>
                 </table>
 
 
                 <legend>费率文件</legend>
-                <table class="table table-bordered table-hover table-sm" id="summary-project-fee-table">
-                    <thead><th style="width: 25px;"></th><th style="width: 330px;">名称</th><th style="width:40px;">使用</th></thead>
+                <table class="table table-bordered table-hover table-sm table-sc" id="summary-project-fee-table">
+                    <thead>
+                        <th style="width: 25px;" class="text-center"></th>
+                        <th style="width: 330px;" class="text-center">名称</th>
+                        <th style="width:40px;" class="text-center">使用</th>
+                    </thead>
                     <tbody>
                     </tbody>
                 </table>

web/building_saas/pm/js/pm_newMain.js

@@ -3658,7 +3658,7 @@ function set_file_table(target, poj_tenders, fileList, type){
             + '<span class="form-text text-danger" style="display: none">本建设项目已存在该文件名，请重新输入！' +
             '</span></td>';
         let fileTypeStr = type === fileType.unitPriceFile ? '单价文件' : '费率文件';
-        let fileHtml = '<tr><td>' + fileCounter + '</td><td id="file_' + fileId + '"><div>' + fileList[i].name + hoverHtml + renHtml + usedHtml + '</tr>';
+        let fileHtml = '<tr><td class="text-center">' + fileCounter + '</td><td id="file_' + fileId + '"><div>' + fileList[i].name + hoverHtml + renHtml + usedHtml + '</tr>';
         fileCounter++;
         let targetBody = type === fileType.unitPriceFile ? target + '-unit-price-table tbody' : target + '-fee-table tbody';
         $(targetBody).append(fileHtml);