|
|
@@ -139,32 +139,18 @@
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
|
|
>重置</el-button
|
|
|
>
|
|
|
- <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ icon="el-icon-plus"
|
|
|
+ size="mini"
|
|
|
+ @click="handleAdd"
|
|
|
>临时登记</el-button
|
|
|
>
|
|
|
</el-form-item>
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
<!-- 按纽 -->
|
|
|
- <el-row :gutter="10" class="mb8">
|
|
|
- <!-- <el-col :span="1.5">
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- plain
|
|
|
- icon="el-icon-download"
|
|
|
- size="mini"
|
|
|
- @click="exportExcel()"
|
|
|
- v-hasPermi="['resumption:taskManager:export']"
|
|
|
- >导出</el-button
|
|
|
- >
|
|
|
- </el-col> -->
|
|
|
-
|
|
|
- <right-toolbar
|
|
|
- :showSearch.sync="showSearch"
|
|
|
- @queryTable="getList"
|
|
|
- :columns="columns"
|
|
|
- ></right-toolbar>
|
|
|
- </el-row>
|
|
|
+
|
|
|
<el-table
|
|
|
border
|
|
|
height="600"
|
|
|
@@ -173,6 +159,7 @@
|
|
|
:data="pageData"
|
|
|
>
|
|
|
<el-table-column
|
|
|
+ align="center"
|
|
|
type="index"
|
|
|
fixed
|
|
|
min-width="50"
|
|
|
@@ -216,8 +203,8 @@
|
|
|
<span>
|
|
|
<!-- <i class="circle" :style="statusColor(r.row.status, true)" /> -->
|
|
|
<!-- <label :style="statusColor(r.row.status, false)"> -->
|
|
|
- <label >
|
|
|
- {{
|
|
|
+ <label>
|
|
|
+ {{
|
|
|
getLabel(dict.type.safety_check_status, r.row.status)
|
|
|
}}</label
|
|
|
>
|
|
|
@@ -263,36 +250,26 @@
|
|
|
</template></el-table-column
|
|
|
>
|
|
|
|
|
|
-
|
|
|
-
|
|
|
<el-table-column
|
|
|
prop="submitBy"
|
|
|
label="检查人"
|
|
|
min-width="100"
|
|
|
v-if="false"
|
|
|
></el-table-column>
|
|
|
- <el-table-column
|
|
|
- label="检查时间"
|
|
|
- min-width="120"
|
|
|
- v-if="false"
|
|
|
- >
|
|
|
+ <el-table-column label="检查时间" min-width="120" v-if="false">
|
|
|
<template slot-scope="r">{{
|
|
|
r.row.submitTime | dateTime
|
|
|
}}</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
+ align="center"
|
|
|
prop="exceptionCount"
|
|
|
label="隐患问题数"
|
|
|
min-width="80"
|
|
|
v-if="columns[9].visible"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="des"
|
|
|
- label="备注"
|
|
|
- min-width="80"
|
|
|
- v-if="false"
|
|
|
- >
|
|
|
+ <el-table-column prop="des" label="备注" min-width="80" v-if="false">
|
|
|
</el-table-column>
|
|
|
<el-table-column label="操作" fixed="right" min-width="200">
|
|
|
<template slot-scope="r">
|
|
|
@@ -315,7 +292,7 @@
|
|
|
type="text"
|
|
|
@click="showscanRecord(r.row)"
|
|
|
v-hasPermi="['resumption:taskManager:query']"
|
|
|
- >检查登记簿</el-button
|
|
|
+ >扫描记录</el-button
|
|
|
>
|
|
|
<el-button
|
|
|
type="text"
|
|
|
@@ -338,7 +315,10 @@
|
|
|
<!-- 详情 -->
|
|
|
<dialog-detail ref="detaildialog"></dialog-detail>
|
|
|
<dialog-scan-record ref="scanrecorddialog"></dialog-scan-record>
|
|
|
- <dialog-temporary-task ref="dialogtemporarytask" @success="getList"></dialog-temporary-task>
|
|
|
+ <dialog-temporary-task
|
|
|
+ ref="dialogtemporarytask"
|
|
|
+ @success="getList"
|
|
|
+ ></dialog-temporary-task>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -354,7 +334,7 @@ import { getLabel } from "@/views/commonOption.js";
|
|
|
import OrgTreeSelect from "@/components/orgTreeSelect";
|
|
|
import { checkPermi } from "@/utils/permission.js";
|
|
|
import dayjs from "dayjs";
|
|
|
-import DialogTemporaryTask from "@/views/safetycheck/taskManager/components/dialog.temporarytask.vue"
|
|
|
+import DialogTemporaryTask from "@/views/safetycheck/taskManager/components/dialog.temporarytask.vue";
|
|
|
export default {
|
|
|
name: "checkTaskList",
|
|
|
dicts: ["resumption_plan_cycle", "resumption_status", "safety_check_status"],
|
|
|
@@ -364,7 +344,7 @@ export default {
|
|
|
DataRangePicker,
|
|
|
OrgTreeSelect,
|
|
|
OrgTree,
|
|
|
- DialogTemporaryTask
|
|
|
+ DialogTemporaryTask,
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
@@ -388,7 +368,7 @@ export default {
|
|
|
planStartTime: null,
|
|
|
title: null,
|
|
|
checkOrgIds: null,
|
|
|
- range:[],
|
|
|
+ range: [],
|
|
|
},
|
|
|
selectedOrgName: null,
|
|
|
pageData: [],
|
|
|
@@ -498,12 +478,12 @@ export default {
|
|
|
},
|
|
|
resetQuery() {
|
|
|
this.queryParams.checkOrgIds = [];
|
|
|
- this.queryParams.range=[];
|
|
|
+ this.queryParams.range = [];
|
|
|
this.resetForm("queryParams");
|
|
|
this.getList();
|
|
|
},
|
|
|
- handleAdd(){
|
|
|
-this.$refs["dialogtemporarytask"].show();
|
|
|
+ handleAdd() {
|
|
|
+ this.$refs["dialogtemporarytask"].show();
|
|
|
},
|
|
|
async getList() {
|
|
|
console.log(this.queryParams, "this.queryParams");
|