优化

src/views/repair/application-form/modules/RepairApplicationFormTable.vue

@@ -39,23 +39,24 @@
       :columns="columns"
       :data="loadData"
       :alert="options.alert"
+      :scroll="{x: 111, y: BaseTool.Constant.scrollY }"
       :rowSelection="options.rowSelection"
       showPagination="auto"
     >
       <span slot="action" slot-scope="record">
-        <!--<template>
-          <a @click="handleView(record)">查看</a>
+        <template>
+<!--          <a @click="handleView(record)">查看</a>-->
           <template v-if="[1,2].includes(type)">
-            <operation-button
+<!--            <operation-button
               v-if="DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === record.status && $auth('repair-application-forms-edit')"
-              @click="handleEdit(record)" >修改</operation-button>
+              @click="handleEdit(record)" >修改</operation-button>-->
             <operation-button
               v-if="DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === record.status && $auth('repair-application-forms-del')"
               :type="2"
               title="是否要删除该条数据？"
               @confirm="batchDelete(record.id)">删除</operation-button>
           </template>
-        </template>-->
+        </template>
       </span>
       <span slot="status" slot-scope="text">
         <badge :text="BaseTool.Object.getField(statusMap,text)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_STATUS[text]"/>
@@ -118,18 +119,19 @@ export default {
           title: '序号',
           dataIndex: 'index',
           checked: true,
+          width: '100px',
           customRender: (text, record, index) => {
             return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
           }
         },
-        {
+        /* {
           title: '设备名称',
           checked: true,
           dataIndex: 'sbId',
           customRender: (text, record, index) => {
             return record.sbName
           }
-        },
+        }, */
         // {
         // title: '部件名称',
         // dataIndex: 'partId',
@@ -146,6 +148,7 @@ export default {
         {
           title: '维修人',
           checked: true,
+          width: '150px',
           dataIndex: 'repairUserName'
         },
         // {
@@ -156,21 +159,23 @@ export default {
         {
           title: '报修来源',
           checked: true,
+          width: '150px',
           dataIndex: 'source',
           customRender: (text, record, index) => {
             return this.BaseTool.Object.getField(this.sourceMap, text)
           }
         },
 
-        {
+        /*    {
           title: '紧急等级',
           checked: true,
           dataIndex: 'level',
           scopedSlots: { customRender: 'level' }
-        },
+        }, */
         {
           title: '问题描述',
           checked: true,
+          width: '150px',
           dataIndex: 'content',
           customRender: (text, record, index) => {
             return this.BaseTool.Table.customRenderWidth(this, text, '150px')
@@ -179,14 +184,22 @@ export default {
         {
           title: '报修状态',
           checked: true,
+          width: '150px',
           dataIndex: 'status',
           scopedSlots: { customRender: 'status' }
         },
         {
           title: '报修时间',
           checked: true,
+          width: '150px',
           dataIndex: 'applyTime'
         },
+        {
+          title: '维修完成时间',
+          checked: true,
+          width: '150px',
+          dataIndex: 'repairEndTime'
+        },
         // {
         //  title: '备注',
         // checked: true,
@@ -196,16 +209,12 @@ export default {
         // }
         // },
         {
-          title: '创建日期',
-          dataIndex: 'createdTime'
+          title: '操作',
+          checked: true,
+          key: 'action',
+          align: 'center',
+          scopedSlots: { customRender: 'action' }
         }
-        // {
-        // title: '操作',
-        // checked: true,
-        // key: 'action',
-        // align: 'center',
-        // scopedSlots: { customRender: 'action' }
-        // }
       ],
       // 下拉框map
       sourceMap: {},

src/views/sb/info/modules/Detail.vue

@@ -138,8 +138,8 @@
         <q-tab-pane key="3" tab="保养任务">
           <check-job-table :type="2" :check-type="2" :table-params="{sbId: model.id}" ref="spotJobTable" />
         </q-tab-pane>
-        <q-tab-pane key="4" tab="历史故障分析">
-          <repair-reason-table :table-params="{sbId: model.id}" ref="repairReasonTable" />
+        <q-tab-pane key="4" tab="历史故障">
+          <repair-application-form-table :type="2" :table-params="{sbId: model.id, sbName: model.name}" ref="repairApplicationFormTable" />
         </q-tab-pane>
         <q-tab-pane key="5" tab="历史费用">
           <repair-fee-table :table-params="{sbId: model.id}" ref="repairFeeTable" />