优化

src/views/dashboard/CheckJobReport.vue

@@ -4,7 +4,10 @@
       <div class="salesCard">
         <a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
           <div class="extra-wrapper" slot="tabBarExtraContent">
-            <a-button type="primary" icon="printer" @click="handlePrint()">打印</a-button>
+            <a-month-picker style="margin-left: 8px" v-model="queryParam.startMonth" placeholder="开始月份" @change="onStartChange" />
+            <a-month-picker style="margin-left: 8px" v-model="queryParam.endMonth" placeholder="结束月份" @change="onEndChange" />
+            <a-button style="margin-left: 8px" type="default" @click="getData()">查询</a-button>
+            <a-button style="margin-left: 8px" type="primary" icon="printer" @click="handlePrint()">打印</a-button>
             <a-button style="margin-left: 8px" type="primary" @click="doExport()">导出</a-button>
             <a-select style="margin-left: 8px" @change="changeYear" v-model="queryParam.year" placeholder="请选择">
               <a-select-option
@@ -43,6 +46,11 @@
                     tableLayout="auto"
                     :scroll="{x: 1, y: BaseTool.Constant.scrollY }"
                     rowKey="month">
+                    <span slot="action" slot-scope="record">
+                      <template>
+                        <a @click="handleView(record)">查看明细</a>
+                      </template>
+                    </span>
                   </a-table>
                 </div>
               </a-col>
@@ -52,6 +60,7 @@
       </div>
     </a-card>
     <print-in-check-job-report ref="basePrintModal" @ok="handleOk"/>
+    <detail-check-job-report ref="detailModal" @ok="handleOk"/>
   </div>
 </template>
 
@@ -59,19 +68,27 @@
 import { getMonthReport, exportMonthReport } from '@/api/report/check-job'
 import { Chart } from '@antv/g2'
 import PrintInCheckJobReport from '@/views/dashboard/modules/PrintInCheckJobReport'
+import DetailCheckJobReport from '@/views/dashboard/modules/DetailCheckJobReport'
 
 export default {
   name: 'Analysis',
   components: {
     PrintInCheckJobReport,
-    Chart
+    Chart,
+    DetailCheckJobReport
+  },
+  props: {
+    title: {
+      type: String,
+      default: '保养任务月统计报表'
+    }
   },
   data () {
     return {
       loading: false,
       serverData: [],
       queryParam: {
-        year: 2021,
+        // year: 2021,
         standardLevel: 2
       },
       years: [],
@@ -105,16 +122,23 @@ export default {
           title: '完成率',
           width: 120,
           dataIndex: 'finishRate'
+        },
+        {
+          title: '操作',
+          key: 'action',
+          width: '200px',
+          align: 'center',
+          scopedSlots: { customRender: 'action' }
         }
       ]
     }
   },
   created () {
     this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_PLAN_LEVEL)
-    this.initSelectYear()
+    // this.initSelectYear()
   },
   mounted () {
-    this.changeYear(this.queryParam.year)
+    // this.changeYear(this.queryParam.year)
   },
   methods: {
     initSelectYear () {
@@ -142,6 +166,25 @@ export default {
     },
     changeLevel (value) {
       this.queryParam.standardLevel = value
+      this.getData()
+    },
+    onStartChange (date, dateString) {
+      this.$nextTick(() => {
+        this.queryParam.startMonth = this.BaseTool.Date.formatter(dateString + '-01', this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
+      })
+    },
+    onEndChange (date, dateString) {
+      this.queryParam.endMonth = this.BaseTool.Date.formatter(dateString + '-01', this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
+    },
+    getData () {
+      if (this.queryParam.startMonth == null) {
+        this.$message.error('请选择起始月份')
+        return
+      }
+      if (this.queryParam.endMonth == null) {
+        this.$message.error('请选择结束月份')
+        return
+      }
       getMonthReport(this.queryParam)
         .then(res => {
           this.chartsData = res.data
@@ -193,7 +236,11 @@ export default {
     handlePrint (record) {
       const modal = this.$refs.basePrintModal
       this.visible = false
-      modal.base({ year: this.queryParam.year, data: this.chartsData })
+      modal.base({ startMonth: this.queryParam.startMonth, endMonth: this.queryParam.endMonth, title: this.title, data: this.chartsData })
+    },
+    handleView (record) {
+      const modal = this.$refs.detailModal
+      modal.base(record)
     },
     handleOk () {
       this.visible = true

src/views/dashboard/CheckJobReportWeek.vue

@@ -43,6 +43,11 @@
                     tableLayout="auto"
                     :scroll="{x: 1, y: BaseTool.Constant.scrollY }"
                     rowKey="month">
+                    <span slot="action" slot-scope="record">
+                      <template>
+                        <a @click="handleView(record)">查看明细</a>
+                      </template>
+                    </span>
                   </a-table>
                 </div>
               </a-col>
@@ -52,6 +57,7 @@
       </div>
     </a-card>
     <print-in-check-job-report-week ref="basePrintModal" @ok="handleOk"/>
+    <detail-check-job-report ref="detailModal" @ok="handleOk"/>
   </div>
 </template>
 
@@ -59,12 +65,14 @@
 import { getWeekReport, exportWeekReport } from '@/api/report/check-job'
 import { Chart } from '@antv/g2'
 import PrintInCheckJobReportWeek from '@/views/dashboard/modules/PrintInCheckJobReportWeek'
+import DetailCheckJobReport from '@/views/dashboard/modules/DetailCheckJobReport'
 
 export default {
   name: 'Analysis',
   components: {
     PrintInCheckJobReportWeek,
-    Chart
+    Chart,
+    DetailCheckJobReport
   },
   data () {
     return {
@@ -90,6 +98,13 @@ export default {
           title: '保养标准工时',
           width: 120,
           dataIndex: 'totalHours'
+        },
+        {
+          title: '操作',
+          key: 'action',
+          width: '200px',
+          align: 'center',
+          scopedSlots: { customRender: 'action' }
         }
       ]
     }
@@ -168,6 +183,10 @@ export default {
       this.visible = false
       modal.base({ year: this.queryParam.year, data: this.chartsData })
     },
+    handleView (record) {
+      const modal = this.$refs.detailModal
+      modal.base(record)
+    },
     handleOk () {
       this.visible = true
     }

src/views/dashboard/RepairReport.vue

@@ -4,7 +4,10 @@
       <div class="salesCard">
         <a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
           <div class="extra-wrapper" slot="tabBarExtraContent">
-            <a-button type="primary" icon="printer" @click="handlePrint()">打印</a-button>
+            <a-month-picker style="margin-left: 8px" v-model="queryParam.startMonth" placeholder="开始月份" @change="onStartChange" />
+            <a-month-picker style="margin-left: 8px" v-model="queryParam.endMonth" placeholder="结束月份" @change="onEndChange" />
+            <a-button style="margin-left: 8px" type="default" @click="getData()">查询</a-button>
+            <a-button style="margin-left: 8px" type="primary" icon="printer" @click="handlePrint()">打印</a-button>
             <a-button style="margin-left: 8px" type="primary" @click="doExport()">导出</a-button>
             <a-select style="margin-left: 8px" @change="changeYear" v-model="queryParam.year" placeholder="请选择">
               <a-select-option
@@ -19,7 +22,7 @@
             <a-row>
               <a-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
                 <div style="padding: 10px">
-                  <div id="container"></div>
+                  <div id="container" style="width: 100%;overflow-x:auto"></div>
                 </div>
               </a-col>
             </a-row>
@@ -35,6 +38,11 @@
                     tableLayout="auto"
                     :scroll="{x: 1, y: BaseTool.Constant.scrollY }"
                     rowKey="month">
+                    <span slot="action" slot-scope="record">
+                      <template>
+                        <a @click="handleView(record)">查看明细</a>
+                      </template>
+                    </span>
                   </a-table>
                 </div>
               </a-col>
@@ -44,6 +52,7 @@
       </div>
     </a-card>
     <print-in-repair-report ref="basePrintModal" @ok="handleOk"/>
+    <detail-repair-report ref="detailModal" @ok="handleOk"/>
   </div>
 </template>
 
@@ -51,12 +60,14 @@
 import { getMonthReportBig24, exportMonthReportBig24 } from '@/api/report/application-form'
 import { Chart } from '@antv/g2'
 import PrintInRepairReport from '@/views/dashboard/modules/PrintInRepairReport'
+import DetailRepairReport from '@/views/dashboard/modules/DetailRepairReport'
 
 export default {
   name: 'Analysis',
   components: {
     PrintInRepairReport,
-    Chart
+    Chart,
+    DetailRepairReport
   },
   props: {
     /**
@@ -68,7 +79,7 @@ export default {
     },
     title: {
       type: String,
-      default: '>24小时非计划性维修'
+      default: '大于24小时非计划性维修'
     }
   },
   data () {
@@ -76,7 +87,7 @@ export default {
       loading: false,
       serverData: [],
       queryParam: {
-        year: 2021,
+        // year: 2021,
         searchType: this.searchType
       },
       years: [],
@@ -94,15 +105,22 @@ export default {
           title: '数量',
           width: 120,
           dataIndex: 'num'
+        },
+        {
+          title: '操作',
+          key: 'action',
+          width: '200px',
+          align: 'center',
+          scopedSlots: { customRender: 'action' }
         }
       ]
     }
   },
   created () {
-    this.initSelectYear()
+    // this.initSelectYear()
   },
   mounted () {
-    this.changeYear(this.queryParam.year)
+    // this.changeYear(this.queryParam.year)
   },
   methods: {
     initSelectYear () {
@@ -115,6 +133,25 @@ export default {
     },
     changeYear (value) {
       this.queryParam.year = value
+      this.getData()
+    },
+    onStartChange (date, dateString) {
+      this.$nextTick(() => {
+        this.queryParam.startMonth = this.BaseTool.Date.formatter(dateString + '-01', this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
+      })
+    },
+    onEndChange (date, dateString) {
+      this.queryParam.endMonth = this.BaseTool.Date.formatter(dateString + '-01', this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
+    },
+    getData () {
+      if (this.queryParam.startMonth == null) {
+        this.$message.error('请选择起始月份')
+        return
+      }
+      if (this.queryParam.endMonth == null) {
+        this.$message.error('请选择结束月份')
+        return
+      }
       getMonthReportBig24(this.queryParam)
         .then(res => {
           this.chartsData = res.data
@@ -154,7 +191,11 @@ export default {
     handlePrint (record) {
       const modal = this.$refs.basePrintModal
       this.visible = false
-      modal.base({ year: this.queryParam.year, title: this.title, data: this.chartsData })
+      modal.base({ startMonth: this.queryParam.startMonth, endMonth: this.queryParam.endMonth, title: this.title, data: this.chartsData })
+    },
+    handleView (record) {
+      const modal = this.$refs.detailModal
+      modal.base(record)
     },
     handleOk () {
       this.visible = true

src/views/dashboard/RepairReportMttr.vue

@@ -4,16 +4,20 @@
       <div class="salesCard">
         <a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
           <div class="extra-wrapper" slot="tabBarExtraContent">
-            <a-button type="primary" icon="printer" @click="handlePrint()">打印</a-button>
-            <a-button style="margin-left: 8px" type="primary" @click="doExport()">导出</a-button>
-            <a-select style="margin-left: 8px" @change="changeYear" v-model="queryParam.year" placeholder="请选择">
+
+            <!--            <a-select style="margin-left: 8px" @change="changeYear" v-model="queryParam.year" placeholder="请选择">
               <a-select-option
                 v-for="item in years"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value">{{ item.label }}
               </a-select-option>
-            </a-select>
+            </a-select>-->
+            <a-month-picker style="margin-left: 8px" v-model="queryParam.startMonth" placeholder="开始月份" @change="onStartChange" />
+            <a-month-picker style="margin-left: 8px" v-model="queryParam.endMonth" placeholder="结束月份" @change="onEndChange" />
+            <a-button style="margin-left: 8px" type="default" @click="getData()">查询</a-button>
+            <a-button style="margin-left: 8px" type="primary" icon="printer" @click="handlePrint()">打印</a-button>
+            <a-button style="margin-left: 8px" type="primary" @click="doExport()">导出</a-button>
           </div>
           <a-tab-pane loading="true" tab="图形统计" key="1">
             <a-row>
@@ -33,8 +37,13 @@
                     :data-source="chartsData"
                     :columns="columns"
                     tableLayout="auto"
-                    :scroll="{x: 1, y: BaseTool.Constant.scrollY }"
+                    :scroll="{x: 1000, y: BaseTool.Constant.scrollY }"
                     rowKey="month">
+                    <span slot="action" slot-scope="record">
+                      <template>
+                        <a @click="handleView(record)">查看明细</a>
+                      </template>
+                    </span>
                   </a-table>
                 </div>
               </a-col>
@@ -44,6 +53,7 @@
       </div>
     </a-card>
     <print-in-repair-report-mttr ref="basePrintModal" @ok="handleOk"/>
+    <detail-repair-report ref="detailModal" @ok="handleOk"/>
   </div>
 </template>
 
@@ -51,12 +61,14 @@
 import { getMonthReportMttr, exportMonthReportMttr } from '@/api/report/application-form'
 import { Chart } from '@antv/g2'
 import PrintInRepairReportMttr from '@/views/dashboard/modules/PrintInRepairReportMttr'
+import DetailRepairReport from '@/views/dashboard/modules/DetailRepairReport'
 
 export default {
   name: 'Analysis',
   components: {
     PrintInRepairReportMttr,
-    Chart
+    Chart,
+    DetailRepairReport
   },
   props: {
     title: {
@@ -69,7 +81,6 @@ export default {
       loading: false,
       serverData: [],
       queryParam: {
-        year: 2021
       },
       years: [],
       visible: true,
@@ -96,20 +107,29 @@ export default {
           title: '平均修复时间（小时）',
           width: 120,
           dataIndex: 'mttr'
+        },
+        {
+          title: '操作',
+          key: 'action',
+          width: '200px',
+          align: 'center',
+          scopedSlots: { customRender: 'action' }
         }
       ]
     }
   },
   created () {
-    this.initSelectYear()
+    // this.initSelectYear()
   },
   mounted () {
-    this.changeYear(this.queryParam.year)
+    // this.changeYear(this.queryParam.year)
   },
   methods: {
     initSelectYear () {
-      var myDate = new Date()
-      this.queryParam.year = myDate.getFullYear()// 获取当前年
+      const myDate = new Date()
+      // this.queryParam.year = myDate.getFullYear()// 获取当前年
+      this.queryParam.startMonth = myDate.getFullYear() + '-01-01'
+      this.queryParam.endMonth = myDate.getFullYear() + '-12-01'
       this.years = []
       for (let i = 0; i < 5; i++) {
         this.years.push({ value: (this.queryParam.year - i), label: (this.queryParam.year - i) + '年' })
@@ -117,6 +137,25 @@ export default {
     },
     changeYear (value) {
       this.queryParam.year = value
+      this.getData()
+    },
+    onStartChange (date, dateString) {
+      this.$nextTick(() => {
+        this.queryParam.startMonth = this.BaseTool.Date.formatter(dateString + '-01', this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
+      })
+    },
+    onEndChange (date, dateString) {
+      this.queryParam.endMonth = this.BaseTool.Date.formatter(dateString + '-01', this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
+    },
+    getData () {
+      if (this.queryParam.startMonth == null) {
+        this.$message.error('请选择起始月份')
+        return
+      }
+      if (this.queryParam.endMonth == null) {
+        this.$message.error('请选择结束月份')
+        return
+      }
       getMonthReportMttr(this.queryParam)
         .then(res => {
           this.chartsData = res.data
@@ -143,6 +182,9 @@ export default {
       this.chart.legend({
         position: 'bottom'
       })
+      this.chart.option('scrollbar', {
+        type: 'horizontal'
+      })
       this.chart.render()
     },
     doExport () {
@@ -156,7 +198,11 @@ export default {
     handlePrint (record) {
       const modal = this.$refs.basePrintModal
       this.visible = false
-      modal.base({ year: this.queryParam.year, title: this.title, data: this.chartsData })
+      modal.base({ startMonth: this.queryParam.startMonth, endMonth: this.queryParam.endMonth, title: this.title, data: this.chartsData })
+    },
+    handleView (record) {
+      const modal = this.$refs.detailModal
+      modal.base(record)
     },
     handleOk () {
       this.visible = true

src/views/dashboard/modules/DetailCheckJobReport.vue

@@ -0,0 +1,217 @@
+<template>
+  <a-modal
+    :title="modalTitle"
+    :width="1200"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @cancel="handleCancel"
+  >
+    <title-divider title="明细列表" width="90px"></title-divider>
+    <a-table
+      bordered
+      :data-source="data"
+      :columns="columns"
+      :scroll="{x: 1000, y: BaseTool.Constant.scrollY}"
+      tableLayout="auto"
+      rowKey="id"
+    >
+      <span slot="action" slot-scope="record">
+        <template>
+          <a @click="handleView(record)">查看</a>
+        </template>
+      </span>
+      <span slot="status" slot-scope="text">
+        <badge :text="BaseTool.Object.getField(statusMap,text)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_STATUS[text]"/>
+      </span>
+    </a-table>
+    <template slot="footer">
+      <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">返回</a-button>
+    </template>
+  </a-modal>
+</template>
+
+<script>
+import DetailList from '@/components/tools/DetailList'
+const DetailListItem = DetailList.Item
+
+export default {
+  name: 'DetailRepairReport',
+  components: {
+    DetailList,
+    DetailListItem
+  },
+  data () {
+    return {
+      confirmLoading: false,
+      mdl: {},
+      modalTitle: null,
+      visible: false,
+      // 下拉框map
+      typeMap: {},
+      statusMap: {},
+      model: {},
+      // 查询参数
+      queryParam: {
+        filter: this.filter,
+        searchType: this.searchType
+      },
+      // 表头
+      columns: [
+        {
+          title: '序号',
+          dataIndex: 'index',
+          checked: true,
+          width: '70px',
+          customRender: (text, record, index) => {
+            return `${index + 1}`
+          }
+        },
+        {
+          title: '设备新号',
+          dataIndex: 'sbNo',
+          checked: true,
+          width: '150px'
+        },
+        {
+          title: '设备名称',
+          dataIndex: 'sbName',
+          checked: true,
+          width: '200px'
+        },
+        {
+          title: '设备部位',
+          dataIndex: 'partName',
+          checked: true,
+          width: '150px'
+        },
+        {
+          title: '维护等级',
+          dataIndex: 'standardLevel',
+          width: '100px',
+          checked: true,
+          customRender: (text, record, index) => {
+            return this.BaseTool.Table.getMapText(this.standardLevelMap, text)
+          }
+        },
+        {
+          title: '任务要求',
+          dataIndex: 'requirement',
+          checked: true,
+          width: '200px'
+        },
+        {
+          title: '计划周期',
+          dataIndex: 'period',
+          checked: true,
+          width: '150px',
+          customRender: (text, record, index) => {
+            return text + this.BaseTool.Table.getMapText(this.periodTypeMap, record.periodType)
+          }
+        },
+        /*        {
+          title: '计划名称',
+          dataIndex: 'planName',
+          checked: true
+        }, */
+        {
+          title: '负责人',
+          dataIndex: 'checkUserName',
+          checked: true,
+          width: '150px'
+        },
+
+        // {
+        // title: '负责部件',
+        // dataIndex: 'partName',
+        // checked: true
+        // },
+        /*  {
+          title: '截至日期',
+          dataIndex: 'endTime',
+          checked: true,
+          width: '200px'
+        }, */
+        {
+          title: '标准工时',
+          dataIndex: 'standardHours',
+          checked: true,
+          width: '200px'
+        },
+        {
+          title: '实际工时',
+          dataIndex: 'realHours',
+          checked: true,
+          width: '200px'
+        },
+        {
+          title: '实际结束时间',
+          dataIndex: 'actualEndTime',
+          checked: true,
+          width: '200px'
+        },
+        {
+          title: '执行日期',
+          dataIndex: 'startTime',
+          checked: true,
+          width: '200px'
+        },
+        {
+          title: '实际执行日期',
+          dataIndex: 'actualStartTime',
+          checked: true,
+          width: '200px',
+          customRender: (text, record, index) => {
+            return (text == null ? '暂无' : this.BaseTool.Date.formatter(text, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN))
+          }
+        },
+        {
+          title: '任务状态',
+          dataIndex: 'status',
+          width: '100px',
+          checked: true,
+          fixed: 'right',
+          scopedSlots: { customRender: 'status' }
+        },
+        {
+          title: '操作',
+          key: 'action',
+          width: '100px',
+          fixed: 'right',
+          align: 'center',
+          scopedSlots: { customRender: 'action' },
+          checked: true
+        }
+      ],
+      // 下拉框map
+      levelMap: {},
+      standardLevelMap: {},
+      sbStatusMap: {},
+      periodTypeMap: {},
+      data: []
+    }
+  },
+  created () {
+    // 下拉框map
+    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_JOB_STATUS)
+    this.sbStatusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
+    this.periodTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_PLAN_PERIOD_TYPE)
+    this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBINFO_LEVEL)
+    this.standardLevelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_PLAN_LEVEL)
+  },
+  methods: {
+    base (record) {
+      this.visible = true
+      this.modalTitle = '详情'
+      this.model = record
+      this.data = record.detailList
+    },
+    handleCancel () {
+      this.visible = false
+      this.confirmLoading = false
+    },
+    handleView (record) {
+
+    }
+  }
+}
+</script>

src/views/dashboard/modules/DetailRepairReport.vue

@@ -0,0 +1,218 @@
+<template>
+  <a-modal
+    :title="modalTitle"
+    :width="1200"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @cancel="handleCancel"
+  >
+    <title-divider title="明细列表" width="90px"></title-divider>
+    <a-table
+      bordered
+      :data-source="data"
+      :columns="columns"
+      :scroll="{x: 1000, y: BaseTool.Constant.scrollY}"
+      tableLayout="auto"
+      rowKey="id"
+    >
+      <span slot="action" slot-scope="record">
+        <template>
+          <a @click="handleView(record)">查看</a>
+        </template>
+      </span>
+      <span slot="status" slot-scope="text">
+        <badge :text="BaseTool.Object.getField(statusMap,text)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_STATUS[text]"/>
+      </span>
+    </a-table>
+    <template slot="footer">
+      <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">返回</a-button>
+    </template>
+  </a-modal>
+</template>
+
+<script>
+import DetailList from '@/components/tools/DetailList'
+const DetailListItem = DetailList.Item
+
+export default {
+  name: 'DetailRepairReport',
+  components: {
+    DetailList,
+    DetailListItem
+  },
+  data () {
+    return {
+      confirmLoading: false,
+      mdl: {},
+      modalTitle: null,
+      visible: false,
+      // 下拉框map
+      typeMap: {},
+      statusMap: {},
+      model: {},
+      // 查询参数
+      queryParam: {
+        filter: this.filter,
+        searchType: this.searchType
+      },
+      // 表头
+      columns: [
+        {
+          title: '序号',
+          dataIndex: 'index',
+          checked: true,
+          width: '70px',
+          customRender: (text, record, index) => {
+            return `${index + 1}`
+          }
+        },
+        {
+          title: '设备编号',
+          checked: true,
+          width: '100px',
+          dataIndex: 'sbNo'
+        },
+        {
+          title: '设备名称',
+          checked: true,
+          width: '150px',
+          dataIndex: 'sbId',
+          customRender: (text, record, index) => {
+            return record.sbName
+          }
+        },
+        {
+          title: '报修人',
+          checked: true,
+          width: '120px',
+          dataIndex: 'actualUser'
+        },
+        {
+          title: '维修人',
+          checked: true,
+          width: '120px',
+          dataIndex: 'repairUserName'
+        },
+        /*  {
+            title: '报修来源',
+            checked: true,
+            width: '100px',
+            dataIndex: 'source',
+            customRender: (text, record, index) => {
+              return this.BaseTool.Object.getField(this.sourceMap, text)
+            }
+          }, */
+        {
+          title: '维修类型',
+          checked: true,
+          width: '150px',
+          dataIndex: 'category',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.planFlagMap, text)
+          }
+        },
+        {
+          title: '报修时间',
+          checked: true,
+          width: '200px',
+          dataIndex: 'applyTime'
+        },
+        /* {
+          title: '紧急等级',
+          checked: true,
+          width: '200px',
+          dataIndex: 'level',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.levelMap, text)
+          }
+        },
+        {
+          title: '计划性维修',
+          checked: true,
+          dataIndex: 'needStop',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.needStopMap, text)
+          }
+        }, */
+        {
+          title: '创建日期',
+          width: '200px',
+          dataIndex: 'createdTime'
+        },
+        {
+          title: '接收超时',
+          checked: true,
+          width: '100px',
+          dataIndex: 'receiveOvertime',
+          customRender: (text, record, index) => {
+            if (text) {
+              return '是'
+            } else {
+              return '否'
+            }
+          }
+        },
+        {
+          title: '维修超时',
+          checked: true,
+          width: '100px',
+          dataIndex: 'repairOvertime',
+          customRender: (text, record, index) => {
+            if (text) {
+              return '是'
+            } else {
+              return '否'
+            }
+          }
+        },
+        {
+          title: '报修状态',
+          checked: true,
+          width: '100px',
+          dataIndex: 'status',
+          fixed: 'right',
+          scopedSlots: { customRender: 'status' }
+        },
+        {
+          title: '操作',
+          checked: true,
+          fixed: 'right',
+          key: 'action',
+          width: '100px',
+          align: 'center',
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      // 下拉框map
+      sourceMap: {},
+      levelMap: {},
+      needStopMap: {},
+      planFlagMap: {},
+      data: []
+    }
+  },
+  created () {
+    // 下拉框map
+    this.sourceMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_SOURCE)
+    this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_LEVEL)
+    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_STATUS)
+    this.needStopMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
+    this.planFlagMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_CATEGORY)
+  },
+  methods: {
+    base (record) {
+      this.visible = true
+      this.modalTitle = '详情'
+      this.model = record
+      this.data = record.detailList
+    },
+    handleCancel () {
+      this.visible = false
+      this.confirmLoading = false
+    },
+    handleView (record) {
+
+    }
+  }
+}
+</script>

src/views/dashboard/modules/PrintInCheckJobReport.vue

@@ -13,7 +13,7 @@
         Hitachi</br>>保养任务月统计报表
       </div>
       <div>
-        <div class="col-md-4 text-center" style="padding: 0">统计年份: {{ record.year }}</div>
+        <div class="col-md-4 text-center" style="padding: 0">统计周期: {{ record.startMonth }} 至 {{ record.endMonth }}</div>
       </div>
       <table class="gridtable list">
         <tbody>
@@ -76,7 +76,7 @@ export default {
     handleCancel (values) {
       this.visible = false
       this.$emit('ok', values)
-    },
+    }
   }
 }
 </script>

src/views/dashboard/modules/PrintInRepairReport.vue

@@ -13,7 +13,7 @@
         Hitachi</br> {{ record.title }}
       </div>
       <div>
-        <div class="col-md-4 text-center" style="padding: 0">统计年份: {{ record.year }}</div>
+        <div class="col-md-4 text-center" style="padding: 0">统计周期: {{ record.startMonth }} 至 {{ record.endMonth }}</div>
       </div>
       <table class="gridtable list">
         <tbody>

src/views/dashboard/modules/PrintInRepairReportMttr.vue

@@ -13,7 +13,7 @@
         Hitachi</br> {{ record.title }}
       </div>
       <div>
-        <div class="col-md-4 text-center" style="padding: 0">统计年份: {{ record.year }}</div>
+        <div class="col-md-4 text-center" style="padding: 0">统计周期: {{ record.startMonth }} 至 {{ record.endMonth }}</div>
       </div>
       <table class="gridtable list">
         <tbody>