From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/strandedPersonnel.vue | 54 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/admin/src/views/business/strandedPersonnel.vue b/admin/src/views/business/strandedPersonnel.vue
index 904b9a6..2916436 100644
--- a/admin/src/views/business/strandedPersonnel.vue
+++ b/admin/src/views/business/strandedPersonnel.vue
@@ -5,8 +5,8 @@
<el-form-item label="濮撳悕" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ヨ瀹㈠悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鍏徃鍚嶇О" prop="companyName">
- <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ュ叕鍙稿悕绉�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="缁勭粐鍚嶇О" prop="companyName">
+ <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="鐢ㄦ埛绫诲瀷" prop="type">
<el-select v-model="searchForm.type" placeholder="璇烽�夋嫨">
@@ -33,7 +33,7 @@
<!-- <el-table-column type="selection" width="55"></el-table-column>-->
<el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
<el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="companyName" label="鍏徃" min-width="100px"></el-table-column>
+ <el-table-column prop="companyName" label="缁勭粐" min-width="100px"></el-table-column>
<el-table-column label="鐢ㄦ埛绫诲瀷" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.type === 0">鍔冲姟璁垮</span>
@@ -42,25 +42,30 @@
</template>
</el-table-column>
<el-table-column prop="inDate" label="鍏ュ満鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="endtime" label="鎺堟潈鍒版湡鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="timeOut" label="瓒呮椂鏃堕暱" min-width="100px"></el-table-column>
+ <el-table-column prop="outDate" label="鎺堟潈鍒版湡鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column label="瓒呮椂鏃堕暱" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.outStatus === 1">{{row.timeOut.toString().replace('-', '')}}鍒嗛挓</span>
+ <span v-else>-</span>
+ </template>
+ </el-table-column>
<el-table-column label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.outStatus === 0">鏈秴鏃�</span>
- <span v-else-if="row.timeOut === 1">宸茶秴鏃�</span>
- <span v-else-if="row.timeOut === 2">鍗冲皢瓒呮椂</span>
+ <span style="color: red;" v-else-if="row.outStatus === 1">宸茶秴鏃�</span>
+ <span v-else-if="row.outStatus === 2">鍗冲皢瓒呮椂</span>
</template>
</el-table-column>
-<!-- <el-table-column-->
-<!-- v-if="containPermissions(['business:member:update', 'business:member:delete'])"-->
-<!-- label="鎿嶄綔"-->
-<!-- min-width="120"-->
-<!-- fixed="right"-->
-<!-- >-->
-<!-- <template slot-scope="{row}">-->
-<!-- <el-button type="text" icon="el-icon-edit" v-permissions="['business:member:update']" @click="thaw(row.id)">绂诲巶</el-button>-->
-<!-- </template>-->
-<!-- </el-table-column>-->
+ <el-table-column
+ v-if="containPermissions(['business:member:update', 'business:member:delete'])"
+ label="鎿嶄綔"
+ min-width="120"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <el-button type="text" icon="el-icon-edit" v-permissions="['business:member:update']" @click="departure(row.id)">绂诲巶</el-button>
+ </template>
+ </el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
@@ -77,6 +82,7 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import { findAllList } from '@/api/system/common'
+import { level } from '@/api/business/staging'
export default {
name: 'strandedPersonnel',
extends: BaseTable,
@@ -104,6 +110,20 @@
this.getUser()
},
methods: {
+ departure(id) {
+ this.$confirm('纭畾绂诲満鍚�, 鏄惁缁х画?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ level(id)
+ .then(res => {
+ this.search()
+ })
+ }).catch(() => {
+
+ });
+ },
// thaws () {
// if (this.tableData.selectedRows.length === 0) return this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
// const ids = this.tableData.selectedRows.map(item => {
--
Gitblit v1.9.3