|
@@ -6,6 +6,19 @@
|
|
|
<el-form-item label="名称/编号">
|
|
|
<el-input v-model="dataForm.name" placeholder="名称/编号" clearable/>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="点检责任人">
|
|
|
+ <user-component v-model="dataForm.creatorId"/>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="点检日期起">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="dataForm.date"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ type="daterange"
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期">
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="设备状态">
|
|
|
<el-select
|
|
|
v-model="dataForm.state"
|
|
@@ -21,7 +34,6 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button @click="search()">查询</el-button>
|
|
|
- <el-button v-if="isAuth('prod:equipment:save')" type="primary" @click="addOrUpdateHandle(0)">新增</el-button>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<!-- 数据表格 -->
|
|
@@ -36,6 +48,16 @@
|
|
|
width="50"
|
|
|
align="center">
|
|
|
</el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ min-width="100"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
+ label="日期">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.rowRersion ? getDate(scope.row.rowRersion) : '' }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
prop="code"
|
|
|
header-align="center"
|
|
@@ -281,13 +303,14 @@ import Detail from './temp-detail'
|
|
|
import History from './temp-history'
|
|
|
import OrgComponent from '../common/org-component'
|
|
|
import UserComponent from '../common/user-component'
|
|
|
-import {optionsEquipmentState} from '@/utils/enums'
|
|
|
+import {optionsEquipmentCheckState} from '@/utils/enums'
|
|
|
import {isAuth} from '@/utils'
|
|
|
import PreviewComponent from '@/views/modules/common/preview-component.vue'
|
|
|
import DeviceHistory from '@/views/modules/device/device-history.vue'
|
|
|
import DeviceDamage from '@/views/modules/device/device-damage.vue'
|
|
|
import DeviceCheck from '@/views/modules/device/device-check.vue'
|
|
|
import DeviceInspection from '@/views/modules/device/device-inspection.vue'
|
|
|
+import {getDate} from '@/utils/date-util'
|
|
|
export default {
|
|
|
name: 'inspection-list',
|
|
|
components: {
|
|
@@ -318,13 +341,14 @@ export default {
|
|
|
totalPage: 0,
|
|
|
dataListLoading: false,
|
|
|
dataListSelections: [],
|
|
|
- optionsState: optionsEquipmentState
|
|
|
+ optionsState: optionsEquipmentCheckState
|
|
|
}
|
|
|
},
|
|
|
created () {
|
|
|
this.getDataList()
|
|
|
},
|
|
|
methods: {
|
|
|
+ getDate,
|
|
|
isAuth,
|
|
|
onChose () {
|
|
|
this.addOrUpdateVisible = false
|
|
@@ -344,13 +368,16 @@ export default {
|
|
|
this.dataListLoading = true
|
|
|
this.addOrUpdateVisible = false
|
|
|
this.$http({
|
|
|
- url: this.$http.adornUrl('/biz-service/equipment/list'),
|
|
|
+ url: this.$http.adornUrl('/biz-service/equipmentCheckRecord/list'),
|
|
|
method: 'get',
|
|
|
params: this.$http.adornParams({
|
|
|
'current': this.pageIndex,
|
|
|
'size': this.pageSize,
|
|
|
+ 'creatorId': this.dataForm.creatorId ? this.dataForm.creatorId : null,
|
|
|
'name': this.dataForm.name ? this.dataForm.name : null,
|
|
|
- 'state': this.dataForm.state ? this.dataForm.state : null
|
|
|
+ 'state': this.dataForm.state ? this.dataForm.state : null,
|
|
|
+ 'dateStart': this.dataForm.date ? this.dataForm.date[0] : null,
|
|
|
+ 'dateEnd': this.dataForm.date ? this.dataForm.date[1] : null
|
|
|
})
|
|
|
}).then(({data}) => {
|
|
|
if (data && data.code === '200') {
|