|
@@ -1,6 +1,6 @@
|
|
<template>
|
|
<template>
|
|
<div class="device">
|
|
<div class="device">
|
|
- <template v-if="!addOrUpdateVisible && !detailVisible&& !previewVisible">
|
|
|
|
|
|
+ <template v-if="!addOrUpdateVisible && !detailVisible && !historyVisible">
|
|
<!-- 查询、新增操作 -->
|
|
<!-- 查询、新增操作 -->
|
|
<el-form-item label="名称/编号">
|
|
<el-form-item label="名称/编号">
|
|
<el-input v-model="dataForm.name" placeholder="名称/编号" clearable/>
|
|
<el-input v-model="dataForm.name" placeholder="名称/编号" clearable/>
|
|
@@ -155,15 +155,15 @@
|
|
label="备注">
|
|
label="备注">
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
- prop="responsibilityUser"
|
|
|
|
|
|
+ prop="responsibilityUserName"
|
|
header-align="center"
|
|
header-align="center"
|
|
align="center"
|
|
align="center"
|
|
- min-width="100"
|
|
|
|
|
|
+ min-width="80"
|
|
:show-overflow-tooltip="true"
|
|
:show-overflow-tooltip="true"
|
|
label="责任人">
|
|
label="责任人">
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
- prop="userOf"
|
|
|
|
|
|
+ prop="userOfName"
|
|
header-align="center"
|
|
header-align="center"
|
|
align="center"
|
|
align="center"
|
|
min-width="100"
|
|
min-width="100"
|
|
@@ -222,14 +222,14 @@
|
|
fixed="right"
|
|
fixed="right"
|
|
header-align="center"
|
|
header-align="center"
|
|
align="center"
|
|
align="center"
|
|
- width="200"
|
|
|
|
|
|
+ width="240"
|
|
label="操作">
|
|
label="操作">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<el-button v-if="isAuth('prod:equipment:info')" type="text" size="small" @click="detailHandle(scope.row.id)">查看</el-button>
|
|
<el-button v-if="isAuth('prod:equipment:info')" type="text" size="small" @click="detailHandle(scope.row.id)">查看</el-button>
|
|
<el-button v-if="isAuth('prod:equipment:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">编辑</el-button>
|
|
<el-button v-if="isAuth('prod:equipment:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">编辑</el-button>
|
|
<el-button v-if="isAuth('prod:updateVerification:update')" type="text" size="small" @click="historyHandle(scope.row)">检定</el-button>
|
|
<el-button v-if="isAuth('prod:updateVerification:update')" type="text" size="small" @click="historyHandle(scope.row)">检定</el-button>
|
|
<el-button v-if="isAuth('prod:updateBreakage:update')" type="text" size="small" @click="historyHandle(scope.row)">报损</el-button>
|
|
<el-button v-if="isAuth('prod:updateBreakage:update')" type="text" size="small" @click="historyHandle(scope.row)">报损</el-button>
|
|
-<!-- <el-button v-if="isAuth('prod:updateBreakage:update')" style="color: red" type="text" size="small" @click="deleteHandle(scope.row.id)">历史数据</el-button>-->
|
|
|
|
|
|
+ <el-button v-if="isAuth('prod:equipment:info')" type="text" size="small" @click="historyHandle(scope.row.id)">历史数据</el-button>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
@@ -246,7 +246,7 @@
|
|
<!-- 弹窗, 新增 / 修改 -->
|
|
<!-- 弹窗, 新增 / 修改 -->
|
|
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" @onChose="onChose"></add-or-update>
|
|
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" @onChose="onChose"></add-or-update>
|
|
<detail v-if="detailVisible" ref="detail" @onChose="onChose"></detail>
|
|
<detail v-if="detailVisible" ref="detail" @onChose="onChose"></detail>
|
|
-<!-- <history v-if="historyVisible" ref="history" @onChose="onChose"></history>-->
|
|
|
|
|
|
+ <device-history v-if="historyVisible" ref="history" @onChose="onChose"></device-history>
|
|
<preview-component v-if="previewVisible" ref="preview" @onChose="onChose"></preview-component>
|
|
<preview-component v-if="previewVisible" ref="preview" @onChose="onChose"></preview-component>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
@@ -260,9 +260,11 @@ import UserComponent from '../common/user-component'
|
|
import {optionsEquipmentState} from '@/utils/enums'
|
|
import {optionsEquipmentState} from '@/utils/enums'
|
|
import {isAuth} from '@/utils'
|
|
import {isAuth} from '@/utils'
|
|
import PreviewComponent from '@/views/modules/common/preview-component.vue'
|
|
import PreviewComponent from '@/views/modules/common/preview-component.vue'
|
|
|
|
+import DeviceHistory from '@/views/modules/device/device-history.vue'
|
|
export default {
|
|
export default {
|
|
name: 'temp',
|
|
name: 'temp',
|
|
components: {
|
|
components: {
|
|
|
|
+ DeviceHistory,
|
|
PreviewComponent,
|
|
PreviewComponent,
|
|
Detail,
|
|
Detail,
|
|
History,
|
|
History,
|