From d87b6ff6bf0681854bb431e8f8e93652a6540691 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 30 十一月 2024 13:53:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/Inspection/task.vue | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/admin/src/views/Inspection/task.vue b/admin/src/views/Inspection/task.vue
index 99b3ea0..e3a57eb 100644
--- a/admin/src/views/Inspection/task.vue
+++ b/admin/src/views/Inspection/task.vue
@@ -2,11 +2,11 @@
<TableLayout :permissions="['business:ywpatroltask:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="璁″垝鍚嶇О" prop="title">
- <el-input v-model="searchForm.title" placeholder="璇疯緭鍏ヨ鍒掑悕绉�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="璁″垝鍚嶇О" prop="planTitle">
+ <el-input v-model="searchForm.planTitle" placeholder="璇疯緭鍏ヨ鍒掑悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item >
- <el-select v-model="searchForm.status" filterable clearable>
+ <el-form-item label="浠诲姟鐘舵��">
+ <el-select v-model="searchForm.status" label="浠诲姟鐘舵��" filterable clearable>
<el-option value="0" label="寰呭紑濮�"></el-option>
<el-option value="1" label="杩涜涓�"></el-option>
<el-option value="2" label="宸茶秴鏈�"></el-option>
@@ -30,11 +30,11 @@
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="planTitle" label="璁″垝鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="schemeId" label="璁″垝缂栧彿" min-width="100px"></el-table-column>
+ <el-table-column prop="planCode" label="璁″垝缂栧彿" min-width="100px"></el-table-column>
<el-table-column prop="code" label="浠诲姟缂栧彿" min-width="100px"></el-table-column>
- <el-table-column prop="dealDate" label="浠诲姟鏃堕棿" min-width="100px">
+ <el-table-column prop="dealDate" label="浠诲姟鏃堕棿" min-width="140px">
<template v-slot="scope">
- <span>{{ scope.row.startDate }} {{ scope.row.endDate }}</span>
+ <span v-if="scope.row.startDate && scope.row.endDate">{{ scope.row.startDate.slice(0, 16) }} - {{ scope.row.endDate.slice(11, 16) }}</span>
</template>
</el-table-column>
<el-table-column prop="dealDate" label="瀹為檯瀹屾垚鏃堕棿" min-width="100px"></el-table-column>
@@ -55,7 +55,8 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:ywpatroltask:delete']">鍙栨秷</el-button>
+ <el-button type="text" @click="handleDetail(row)">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" @click="cancelById(row)" v-permissions="['business:ywpatroltask:delete']">鍙栨秷</el-button>
</template>
</el-table-column>
</el-table>
@@ -104,6 +105,9 @@
this.$refs.TaskDetailRef.id = row.id
this.$refs.TaskDetailRef.getDetail()
},
+ cancelById() {
+
+ },
}
}
</script>
--
Gitblit v1.9.3