diff --git a/src/views/cost/costStatistics/index.vue b/src/views/cost/costStatistics/index.vue index 79345ed2..5aa07486 100644 --- a/src/views/cost/costStatistics/index.vue +++ b/src/views/cost/costStatistics/index.vue @@ -86,9 +86,8 @@ import ButtonNav from '@/components/ButtonNav'; const tableProps = [ { - prop: 'recTime', + prop: 'time', label: '日期', - filter: (val) => parseTime(val, '{y}年{m}月{d}日'), }, { prop: 'originArea', @@ -249,13 +248,6 @@ export default { }, methods: { buttonClick(val) { - if (val.statisticType === 2) { - this.tableProps[0].filter = (val) => - parseTime(val, '{y}年第{w}周'); - }else{ - this.tableProps[0].filter = (val) => - parseTime(val, '{y}年{m}月{d}日'); - } this.formConfig2[0].startPlaceholder = '开始时间'; this.formConfig2[0].endPlaceholder = '结束时间'; switch (val.btnName) { diff --git a/src/views/cost/deep/costDeepEnergy/index.vue b/src/views/cost/deep/costDeepEnergy/index.vue index 9a493e4f..3813a81e 100644 --- a/src/views/cost/deep/costDeepEnergy/index.vue +++ b/src/views/cost/deep/costDeepEnergy/index.vue @@ -86,9 +86,8 @@ import ButtonNav from '@/components/ButtonNav'; const tableProps = [ { - prop: 'recTime', + prop: 'time', label: '日期', - filter: (val) => parseTime(val, '{y}年{m}月{d}日'), }, { prop: 'remark', @@ -98,16 +97,16 @@ const tableProps = [ prop: 'energyTypeName', label: '能源类型', }, - { - prop: 'bindObjectName', - label: '监控对象', - filter: (val) => (val != null ? val : '--'), - }, - { - prop: 'meterName', - label: '抄表名', - filter: (val) => (val != null ? val : '--'), - }, + // { + // prop: 'bindObjectName', + // label: '监控对象', + // filter: (val) => (val != null ? val : '--'), + // }, + // { + // prop: 'meterName', + // label: '抄表名', + // filter: (val) => (val != null ? val : '--'), + // }, { prop: 'quantity', label: '累计使用量', @@ -127,16 +126,16 @@ const tableProps2 = [ prop: 'energyTypeName', label: '能源类型', }, - { - prop: 'bindObjectName', - label: '监控对象', - filter: (val) => (val != null ? val : '--'), - }, - { - prop: 'meter', - label: '抄表名', - filter: (val) => (val != null ? val : '--'), - }, + // { + // prop: 'bindObjectName', + // label: '监控对象', + // filter: (val) => (val != null ? val : '--'), + // }, + // { + // prop: 'meter', + // label: '抄表名', + // filter: (val) => (val != null ? val : '--'), + // }, { prop: 'quantity', label: '累计使用量', @@ -273,13 +272,6 @@ export default { }, methods: { buttonClick(val) { - if (val.statisticType === 2) { - this.tableProps[0].filter = (val) => - parseTime(val, '{y}年第{w}周'); - }else{ - this.tableProps[0].filter = (val) => - parseTime(val, '{y}年{m}月{d}日'); - } switch (val.btnName) { case 'search': this.listQuery.pageNo = 1; diff --git a/src/views/cost/deep/costDeepOthercostHis/index.vue b/src/views/cost/deep/costDeepOthercostHis/index.vue index 68370cda..875f1e8d 100644 --- a/src/views/cost/deep/costDeepOthercostHis/index.vue +++ b/src/views/cost/deep/costDeepOthercostHis/index.vue @@ -87,9 +87,8 @@ import ButtonNav from '@/components/ButtonNav'; const tableProps = [ { - prop: 'recTime', + prop: 'time', label: '日期', - filter: (val) => parseTime(val, '{y}年{m}月{d}日'), }, { prop: 'remark', @@ -250,13 +249,6 @@ export default { }, methods: { buttonClick(val) { - if (val.statisticType === 2) { - this.tableProps[0].filter = (val) => - parseTime(val, '{y}年第{w}周'); - }else{ - this.tableProps[0].filter = (val) => - parseTime(val, '{y}年{m}月{d}日'); - } switch (val.btnName) { case 'search': this.listQuery.pageNo = 1; diff --git a/src/views/cost/deep/costDeepRatioHis/index.vue b/src/views/cost/deep/costDeepRatioHis/index.vue index f83e5c64..04248d6e 100644 --- a/src/views/cost/deep/costDeepRatioHis/index.vue +++ b/src/views/cost/deep/costDeepRatioHis/index.vue @@ -85,9 +85,8 @@ import ButtonNav from '@/components/ButtonNav'; const tableProps = [ { - prop: 'recTime', + prop: 'time', label: '日期', - filter: (val) => parseTime(val, '{y}年{m}月{d}日'), }, { prop: 'remark', @@ -119,9 +118,8 @@ const tableProps = [ ]; const tableProps2 = [ { - prop: 'recTime', + prop: 'time', label: '日期', - filter: (val) => parseTime(val, '{y}年{m}月{d}日'), }, { prop: 'remark', @@ -239,13 +237,6 @@ export default { }, methods: { buttonClick(val) { - if (val.statisticType === 2) { - this.tableProps[0].filter = (val) => - parseTime(val, '{y}年第{w}周'); - }else{ - this.tableProps[0].filter = (val) => - parseTime(val, '{y}年{m}月{d}日'); - } switch (val.btnName) { case 'search': this.listQuery.pageNo = 1; diff --git a/src/views/cost/deep/costStatistics/index.vue b/src/views/cost/deep/costStatistics/index.vue index ccdfcd79..5ae2769e 100644 --- a/src/views/cost/deep/costStatistics/index.vue +++ b/src/views/cost/deep/costStatistics/index.vue @@ -87,9 +87,8 @@ import ButtonNav from '@/components/ButtonNav'; const tableProps = [ { - prop: 'recTime', + prop: 'time', label: '时间', - filter: (val) => parseTime(val, '{y}年{m}月{d}日'), }, { prop: 'remark', @@ -309,13 +308,6 @@ export default { }, methods: { buttonClick(val) { - if (val.statisticType === 2) { - this.tableProps[0].filter = (val) => - parseTime(val, '{y}年第{w}周'); - }else{ - this.tableProps[0].filter = (val) => - parseTime(val, '{y}年{m}月{d}日'); - } switch (val.btnName) { case 'search': this.listQuery.pageNo = 1; diff --git a/src/views/cost/raw/costEnergy/index.vue b/src/views/cost/raw/costEnergy/index.vue index 5d8b7628..0177d17e 100644 --- a/src/views/cost/raw/costEnergy/index.vue +++ b/src/views/cost/raw/costEnergy/index.vue @@ -86,9 +86,8 @@ import ButtonNav from '@/components/ButtonNav'; const tableProps = [ { - prop: 'recTime', + prop: 'time', label: '日期', - filter: (val) => parseTime(val, '{y}年{m}月{d}日'), }, { prop: 'remark', @@ -98,16 +97,16 @@ const tableProps = [ prop: 'energyTypeName', label: '能源类型', }, - { - prop: 'bindObjectName', - label: '监控对象', - filter: (val) => (val != null ? val : '--'), - }, - { - prop: 'meterName', - label: '抄表名', - filter: (val) => (val != null ? val : '--'), - }, + // { + // prop: 'bindObjectName', + // label: '监控对象', + // filter: (val) => (val != null ? val : '--'), + // }, + // { + // prop: 'meterName', + // label: '抄表名', + // filter: (val) => (val != null ? val : '--'), + // }, { prop: 'quantity', label: '累计使用量', @@ -127,16 +126,16 @@ const tableProps2 = [ prop: 'energyTypeName', label: '能源类型', }, - { - prop: 'bindObjectName', - label: '监控对象', - filter: (val) => (val != null ? val : '--'), - }, - { - prop: 'meter', - label: '抄表名', - filter: (val) => (val != null ? val : '--'), - }, + // { + // prop: 'bindObjectName', + // label: '监控对象', + // filter: (val) => (val != null ? val : '--'), + // }, + // { + // prop: 'meter', + // label: '抄表名', + // filter: (val) => (val != null ? val : '--'), + // }, { prop: 'quantity', label: '累计使用量', @@ -274,11 +273,6 @@ export default { }, methods: { buttonClick(val) { - if (val.statisticType === 2) { - this.tableProps[0].filter = (val) => parseTime(val, '{y}年第{w}周'); - } else { - this.tableProps[0].filter = (val) => parseTime(val, '{y}年{m}月{d}日'); - } switch (val.btnName) { case 'search': this.listQuery.pageNo = 1; diff --git a/src/views/cost/raw/costMaterial/index.vue b/src/views/cost/raw/costMaterial/index.vue index 5bc8dba7..46e2e6c9 100644 --- a/src/views/cost/raw/costMaterial/index.vue +++ b/src/views/cost/raw/costMaterial/index.vue @@ -87,9 +87,8 @@ import ButtonNav from '@/components/ButtonNav'; const tableProps = [ { - prop: 'recTime', + prop: 'time', label: '日期', - filter: (val) => parseTime(val, '{y}年{m}月{d}日'), }, { prop: 'remark', @@ -271,11 +270,6 @@ export default { }, methods: { buttonClick(val) { - if (val.statisticType === 2) { - this.tableProps[0].filter = (val) => parseTime(val, '{y}年第{w}周'); - } else { - this.tableProps[0].filter = (val) => parseTime(val, '{y}年{m}月{d}日'); - } switch (val.btnName) { case 'search': this.listQuery.pageNo = 1; diff --git a/src/views/cost/raw/costOriginRatioHis/index.vue b/src/views/cost/raw/costOriginRatioHis/index.vue index 31bb42e0..6f86faee 100644 --- a/src/views/cost/raw/costOriginRatioHis/index.vue +++ b/src/views/cost/raw/costOriginRatioHis/index.vue @@ -49,9 +49,8 @@ import { parseTime } from '@/filter/code-filter'; import tableHeightMixin from '@/mixins/lb/tableHeightMixin'; const tableProps = [ { - prop: 'recTime', + prop: 'time', label: '日期', - filter: (val) => parseTime(val, '{y}年{m}月{d}日'), width:130, }, { @@ -176,13 +175,6 @@ export default { }, methods: { buttonClick(val) { - if (val.statisticType === 2) { - this.tableProps[0].filter = (val) => - parseTime(val, '{y}年第{w}周'); - }else{ - this.tableProps[0].filter = (val) => - parseTime(val, '{y}年{m}月{d}日'); - } switch (val.btnName) { case 'search': this.listQuery.pageNo = 1; diff --git a/src/views/cost/raw/costOthercostHis/index.vue b/src/views/cost/raw/costOthercostHis/index.vue index d8be184a..8a3cff11 100644 --- a/src/views/cost/raw/costOthercostHis/index.vue +++ b/src/views/cost/raw/costOthercostHis/index.vue @@ -87,9 +87,8 @@ import ButtonNav from '@/components/ButtonNav'; const tableProps = [ { - prop: 'recTime', + prop: 'time', label: '日期', - filter: (val) => parseTime(val, '{y}年{m}月{d}日'), }, { prop: 'remark', @@ -248,13 +247,6 @@ export default { }, methods: { buttonClick(val) { - if (val.statisticType === 2) { - this.tableProps[0].filter = (val) => - parseTime(val, '{y}年第{w}周'); - }else{ - this.tableProps[0].filter = (val) => - parseTime(val, '{y}年{m}月{d}日'); - } switch (val.btnName) { case 'search': this.listQuery.pageNo = 1; diff --git a/src/views/cost/raw/costStatistics/index.vue b/src/views/cost/raw/costStatistics/index.vue index bab8ea00..b416e1f5 100644 --- a/src/views/cost/raw/costStatistics/index.vue +++ b/src/views/cost/raw/costStatistics/index.vue @@ -87,9 +87,8 @@ import ButtonNav from '@/components/ButtonNav'; const tableProps = [ { - prop: 'recTime', + prop: 'time', label: '时间', - filter: (val) => parseTime(val, '{y}年{m}月{d}日'), }, { prop: 'remark', @@ -309,13 +308,6 @@ export default { }, methods: { buttonClick(val) { - if (val.statisticType === 2) { - this.tableProps[0].filter = (val) => - parseTime(val, '{y}年第{w}周'); - }else{ - this.tableProps[0].filter = (val) => - parseTime(val, '{y}年{m}月{d}日'); - } switch (val.btnName) { case 'search': this.listQuery.pageNo = 1;