|
|
@@ -123,7 +123,6 @@
|
|
|
start-placeholder="开始日期"
|
|
|
end-placeholder="结束日期"
|
|
|
v-model="queryParams.range"
|
|
|
- :picker-options="pickerOptions"
|
|
|
>
|
|
|
</DataRangePicker>
|
|
|
</el-form-item>
|
|
|
@@ -173,6 +172,7 @@
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
+ header-align="center"
|
|
|
prop="title"
|
|
|
label="任务名称"
|
|
|
width="250px"
|
|
|
@@ -181,9 +181,9 @@
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
+ header-align="center"
|
|
|
prop="checkOrgName"
|
|
|
label="检查主体"
|
|
|
- align="center"
|
|
|
width="180px"
|
|
|
v-if="columns[5].visible"
|
|
|
>
|
|
|
@@ -207,7 +207,7 @@
|
|
|
prop="status"
|
|
|
label="任务进度"
|
|
|
align="center"
|
|
|
- width="180px"
|
|
|
+ width="120px"
|
|
|
v-if="columns[10].visible"
|
|
|
>
|
|
|
<template slot-scope="r">
|
|
|
@@ -225,7 +225,7 @@
|
|
|
<el-table-column
|
|
|
prop="orgName"
|
|
|
label="受检机构"
|
|
|
- align="center"
|
|
|
+ header-align="center"
|
|
|
width="180px"
|
|
|
v-if="columns[4].visible"
|
|
|
>
|
|
|
@@ -234,7 +234,7 @@
|
|
|
<el-table-column
|
|
|
prop="planStartTime"
|
|
|
label="任务时间"
|
|
|
- align="center"
|
|
|
+ header-align="center"
|
|
|
width="300px"
|
|
|
v-if="columns[2].visible"
|
|
|
><template slot-scope="r">
|
|
|
@@ -280,7 +280,7 @@
|
|
|
align="center"
|
|
|
prop="exceptionCount"
|
|
|
label="隐患问题数"
|
|
|
- width="180px"
|
|
|
+ width="120px"
|
|
|
v-if="columns[9].visible"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
@@ -295,8 +295,8 @@
|
|
|
<el-table-column
|
|
|
label="操作"
|
|
|
fixed="right"
|
|
|
- align="center"
|
|
|
- width="180px"
|
|
|
+ header-align="center"
|
|
|
+ width="200px"
|
|
|
>
|
|
|
<template slot-scope="r">
|
|
|
<!-- <el-button v-if="
|
|
|
@@ -317,6 +317,7 @@
|
|
|
<el-button
|
|
|
type="text"
|
|
|
@click="showscanRecord(r.row)"
|
|
|
+ v-if="r.row.status == 2 || r.row.status == 3"
|
|
|
v-hasPermi="['resumption:taskManager:query']"
|
|
|
>扫描记录</el-button
|
|
|
>
|
|
|
@@ -326,6 +327,19 @@
|
|
|
v-if="showRegisterBtn(r.row)"
|
|
|
>任务登记</el-button
|
|
|
>
|
|
|
+ <el-button
|
|
|
+ type="text"
|
|
|
+ size="mini"
|
|
|
+ slot="reference"
|
|
|
+ icon="el-icon-delete"
|
|
|
+ @click="handleDel(r.row.id)"
|
|
|
+ v-if="
|
|
|
+ r.row.status == 3 &&
|
|
|
+ r.row.submitorId == userId &&
|
|
|
+ r.row.sourceType == 1
|
|
|
+ "
|
|
|
+ >删除</el-button
|
|
|
+ >
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -507,6 +521,21 @@ export default {
|
|
|
let path = "/safetycheck/tempregister/add";
|
|
|
this.$router.push(path);
|
|
|
},
|
|
|
+ handleDel(taskId) {
|
|
|
+ this.$modal
|
|
|
+ .confirm("确认删除该临时登记?")
|
|
|
+ .then(() => {
|
|
|
+ return api.remove(taskId);
|
|
|
+ })
|
|
|
+ .then((r) => {
|
|
|
+ if (r && r.data) {
|
|
|
+ this.$message.info("删除成功");
|
|
|
+ this.getList();
|
|
|
+ } else {
|
|
|
+ this.$message.warning("删除失败");
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
async getList() {
|
|
|
console.log(this.queryParams, "this.queryParams");
|
|
|
this.loading = true;
|