结算部位、结算台账，清单显示结算状态

app/view/settle/index.ejs

@@ -114,7 +114,10 @@
     const settleStatusColor = JSON.parse('<%- JSON.stringify(settleStatusColor )%>');
     const billsSpreadSetting = {
         cols: [
-            {title: '结算状态', colSpan: '1', rowSpan: '2', field: 'settle_status', hAlign: 1, width: 60, formatter: '@', readOnly: true, getValue: function(data) { return data.b_code ? '' : settleStatusHint[data.settle_status] || '' }},
+            {title: '结算状态', colSpan: '1', rowSpan: '2', field: 'settle_status', hAlign: 1, width: 60, formatter: '@', readOnly: true, getValue: function(data) {
+                // return data.b_code ? '' : settleStatusHint[data.settle_status] || ''
+                return settleStatusHint[data.settle_status] || '';
+            }},
             {title: '项目节编号', colSpan: '1', rowSpan: '2', field: 'code', hAlign: 0, width: 145, formatter: '@', readOnly: true, cellType: 'tree'},
             {title: '清单编号', colSpan: '1', rowSpan: '2', field: 'b_code', hAlign: 0, width: 70, formatter: '@', readOnly: true},
             {title: '名称', colSpan: '1', rowSpan: '2', field: 'name', hAlign: 0, width: 185, formatter: '@', readOnly: true},

app/view/settle/select.ejs

@@ -100,7 +100,10 @@
     const billsSpreadSetting = {
         cols: [
             {title: '选择', colSpan: '1', rowSpan: '2', field: 'selected', hAlign: 1, width: 30, formatter: '@', cellType: 'checkbox'},
-            {title: '结算状态', colSpan: '1', rowSpan: '2', field: 'settle_status', hAlign: 1, width: 60, formatter: '@', getValue: function(data) { return data.b_code ? '' : (settleStatusHint[data.settle_status] || '') }},
+            {title: '结算状态', colSpan: '1', rowSpan: '2', field: 'settle_status', hAlign: 1, width: 60, formatter: '@', getValue: function(data) {
+                //return data.b_code ? '' : (settleStatusHint[data.settle_status] || '')
+                return settleStatusHint[data.settle_status] || '';
+            }},
             {title: '项目节编号', colSpan: '1', rowSpan: '2', field: 'code', hAlign: 0, width: 145, formatter: '@', cellType: 'tree'},
             {title: '清单编号', colSpan: '1', rowSpan: '2', field: 'b_code', hAlign: 0, width: 70, formatter: '@'},
             {title: '名称', colSpan: '1', rowSpan: '2', field: 'name', hAlign: 0, width: 185, formatter: '@'},