fix: 更新合同管理相关字段名称，优化显示内容

app/const/contract.js

@@ -35,8 +35,8 @@ const colSet = {
         { name: '计算2', field: 'calc2', fixed: [] },
     ],
     [type.income]: [
-        { name: '累计回款', field: 'yf_price', fixed: ['alias'] },
-        { name: '回款进度', field: 'stackedBar', fixed: ['alias'] },
+        { name: '累计应回', field: 'yf_price', fixed: ['alias'] },
+        { name: '应回进度', field: 'stackedBar', fixed: ['alias'] },
         { name: '累计实回', field: 'sf_price', fixed: ['alias'] },
         { name: '实回进度', field: 'stackedBarSf', fixed: ['alias'] },
         { name: '备注1', field: 'remark', fixed: [] },
@@ -52,8 +52,8 @@ const defaultColSet = {
         { field: 'stackedBar', show: 1 },
         { field: 'sf_price', show: 0 },
         { field: 'stackedBarSf', show: 0 },
-        { field: 'remark', show: 0, alias: '文本框1' },
-        { field: 'remark2', show: 0, alias: '文本框2' },
+        { field: 'remark', show: 0, alias: '备注1' },
+        { field: 'remark2', show: 0, alias: '备注2' },
         { field: 'calc', show: 0, alias: '计算1' },
         { field: 'calc2', show: 0, alias: '计算2' },
     ],
@@ -62,8 +62,8 @@ const defaultColSet = {
         { field: 'stackedBar', show: 1 },
         { field: 'sf_price', show: 0 },
         { field: 'stackedBarSf', show: 0 },
-        { field: 'remark', show: 0, alias: '文本框1' },
-        { field: 'remark2', show: 0, alias: '文本框2' },
+        { field: 'remark', show: 0, alias: '备注1' },
+        { field: 'remark2', show: 0, alias: '备注2' },
         { field: 'calc', show: 0, alias: '计算1' },
         { field: 'calc2', show: 0, alias: '计算2' },
     ],

app/public/js/contract_detail.js

@@ -78,12 +78,12 @@ $(document).ready(function() {
       calc2: {title: '计算2', colSpan: '1', rowSpan: '2', field: 'calc2', hAlign: 2, width: 120, type: 'Number', readOnly: 'readOnly.calc'},
     }
     // 根据 colSet 组装最终显示的列配置
-        colSet.forEach(col => {
-            const colInfo = colMap && colMap[col.field];
-            if (colInfo && col.show) {
-                contractSpreadSetting.cols.push(Object.assign({}, colInfo, { title: (col && col.alias) || col.name }));
-            }
-        });
+    colSet.forEach(col => {
+        const colInfo = colMap && colMap[col.field];
+        if (colInfo && col.show) {
+            contractSpreadSetting.cols.push(Object.assign({}, colInfo, { title: (col && col.alias) || col.name }));
+        }
+    });
 
 
     const contractSpread = SpreadJsObj.createNewSpread($('#contract-spread')[0]);
@@ -120,7 +120,7 @@ $(document).ready(function() {
             node.stackedBarSf = [];
             node.stackedBarSfTips = [];
             node.stackedBarSf.push({ color: '#bbb', percent: ZhCalc.div(node.total_price, base), field: 'total_price', hintNum: false });
-            node.stackedBarSf.push({ color: '#007bff', percent: ZhCalc.div(node.sf_price, base), field: 'sf_price', hintNum: true });
+            node.stackedBarSf.push({ color: '#28a745', percent: ZhCalc.div(node.sf_price, base), field: 'sf_price', hintNum: true });
             node.stackedBarSfTips.push(`合同金额: ${node.total_price || 0}`);
             node.stackedBarSfTips.push(`累计${contract_type === contractConst.type.expenses ? '实付' : '实回'}: ${node.sf_price || 0}`);
         }

app/public/js/contract_tender.js

@@ -82,10 +82,10 @@ const tenderListSpec = (function(){
         html.push(`<tr>
                         <th style="width: 5%">合同个数</th>
                         <th style="width: 8%">合同金额</th>
-                        <th style="width: 15%">支出进度</th>
+                        <th style="width: 15%">应付进度</th>
                         <th style="width: 5%">合同个数</th>
                         <th style="width: 8%">合同金额</th>
-                        <th style="width: 15%">回款进度</th>
+                        <th style="width: 15%">应回进度</th>
                     </tr>`, '</thead>');
         return html.join('');
     }
@@ -110,5 +110,3 @@ const tenderListSpec = (function(){
     }
     return { getTenderNodeHtml, getTenderTreeHeaderHtml, calculateParent }
 })();
-
-

app/view/contract/index.ejs

@@ -29,10 +29,10 @@
                     <tr class="text-center">
                         <th width="6%">合同个数</th>
                         <th width="10%">合同金额</th>
-                        <th width="15%">支出进度</th>
+                        <th width="15%">应付进度</th>
                         <th width="6%">合同个数</th>
                         <th width="10%">合同金额</th>
-                        <th width="15%">回款进度</th>
+                        <th width="15%">应回进度</th>
                     </tr>
                     <tbody id="projectList">
                     </tbody>