From 73af3ed9fbcc616cdecc739fc4307163c19c5764 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 07 六月 2024 14:35:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/strandedPersonnel.vue | 205 +++++++++++++++++++++++++++++++-------------------
1 files changed, 127 insertions(+), 78 deletions(-)
diff --git a/admin/src/views/business/strandedPersonnel.vue b/admin/src/views/business/strandedPersonnel.vue
index 2916436..596ee84 100644
--- a/admin/src/views/business/strandedPersonnel.vue
+++ b/admin/src/views/business/strandedPersonnel.vue
@@ -1,80 +1,129 @@
<template>
- <TableLayout :permissions="['business:member:query']">
- <!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <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>
- <el-form-item label="鐢ㄦ埛绫诲瀷" prop="type">
- <el-select v-model="searchForm.type" placeholder="璇烽�夋嫨">
- <el-option label="璁垮" value="1"></el-option>
- <el-option label="鍔冲姟" value="0"></el-option>
- </el-select>
- </el-form-item>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
- <!-- 琛ㄦ牸鍜屽垎椤� -->
- <template v-slot:table-wrap>
-<!-- <ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">-->
-<!-- <li><el-button type="primary" v-permissions="['business:member:create']" @click="thaws">绂诲満</el-button></li>-->
-<!-- </ul>-->
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- @selection-change="handleSelectionChange"
+ <TableLayout :permissions="['business:member:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <el-form
+ ref="searchForm"
+ slot="search-form"
+ :model="searchForm"
+ label-width="100px"
+ inline
+ >
+ <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>
+ <el-form-item label="鐢ㄦ埛绫诲瀷" prop="type">
+ <el-select v-model="searchForm.type" placeholder="璇烽�夋嫨">
+ <el-option label="璁垮" value="1"></el-option>
+ <el-option label="鍔冲姟" value="0"></el-option>
+ </el-select>
+ </el-form-item>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <!-- <ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">-->
+ <!-- <li><el-button type="primary" v-permissions="['business:member:create']" @click="thaws">绂诲満</el-button></li>-->
+ <!-- </ul>-->
+ <el-table
+ v-loading="isWorking.search"
+ :data="tableData.list"
+ stripe
+ @selection-change="handleSelectionChange"
+ >
+ <!-- <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 label="鐢ㄦ埛绫诲瀷" min-width="100px">
+ <template slot-scope="{ row }">
+ <span v-if="row.type === 0">鍔冲姟璁垮</span>
+ <span v-if="row.type === 1">鏅�氳瀹�</span>
+ <span v-if="row.type === 2">鍐呴儴浜哄憳</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="inDate"
+ 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
>
-<!-- <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 label="鐢ㄦ埛绫诲瀷" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.type === 0">鍔冲姟璁垮</span>
- <span v-if="row.type === 1">鏅�氳瀹�</span>
- <span v-if="row.type === 2">鍐呴儴浜哄憳</span>
- </template>
- </el-table-column>
- <el-table-column prop="inDate" 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 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="departure(row.id)">绂诲巶</el-button>
- </template>
- </el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
+ <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 style="color: red" v-else-if="row.outStatus === 1"
+ >宸茶秴鏃�</span
>
- </pagination>
- </template>
- </TableLayout>
+ <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="departure(row.id)"
+ >绂诲巶</el-button
+ >
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination
+ @size-change="handleSizeChange"
+ @current-change="handlePageChange"
+ :pagination="tableData.pagination"
+ >
+ </pagination>
+ </template>
+ </TableLayout>
</template>
<script>
@@ -87,7 +136,7 @@
name: 'strandedPersonnel',
extends: BaseTable,
components: { TableLayout, Pagination },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -99,7 +148,7 @@
user: []
}
},
- created () {
+ created() {
this.config({
module: '浜哄憳淇℃伅琛�',
api: '/business/strandedPersonnel',
@@ -122,7 +171,7 @@
})
}).catch(() => {
- });
+ })
},
// thaws () {
// if (this.tableData.selectedRows.length === 0) return this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
@@ -146,7 +195,7 @@
//
// })
// },
- getUser () {
+ getUser() {
findAllList({})
.then(res => {
this.user = res.map(item => {
--
Gitblit v1.9.3