From 6e41324f84f0cf70871ca05292c5420bdcaaa98c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 04 二月 2024 14:36:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
platform/src/views/business/dispatchUnit.vue | 114 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 71 insertions(+), 43 deletions(-)
diff --git a/platform/src/views/business/dispatchUnit.vue b/platform/src/views/business/dispatchUnit.vue
index ba4cdc2..52506af 100644
--- a/platform/src/views/business/dispatchUnit.vue
+++ b/platform/src/views/business/dispatchUnit.vue
@@ -2,11 +2,8 @@
<TableLayout :permissions="['business:dispatchunit: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="name">
- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ユ淳閬ｅ崟浣�" @keypress.enter.native="search"></el-input>
+ <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ョ敤宸ュ崟浣嶅悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -15,9 +12,9 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
-<!-- <ul class="toolbar" v-permissions="['business:dispatchunit:create']">-->
-<!-- <li><el-button type="primary" @click="$refs.operaDispatchUnitWindow.open('娲鹃仯鍗曚綅璇︽儏')" icon="el-icon-plus" v-permissions="['business:dispatchunit:create']">鏂板缓</el-button></li>-->
-<!-- </ul>-->
+ <ul class="toolbar" v-permissions="['business:dispatchunit:create']">
+ <li><el-button type="primary" @click="$refs.operaDispatchUnitWindow.open('娣诲姞娲鹃仯鍗曚綅')" v-permissions="['business:dispatchunit:create']">鏂板娲鹃仯鍗曚綅</el-button></li>
+ </ul>
<el-table
v-loading="isWorking.search"
:data="tableData.list"
@@ -28,21 +25,35 @@
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column prop="companyId" label="鎵�灞炰紒涓�"></el-table-column>
- <el-table-column prop="companyId" label="娲鹃仯鍗曚綅"></el-table-column>
- <el-table-column prop="companyId" label="淇濋櫓鏂规"></el-table-column>
- <el-table-column prop="unitStatus" label="浼佷笟鐘舵��" min-width="100px">
+ <el-table-column prop="name" label="娲鹃仯鍗曚綅"></el-table-column>
+ <el-table-column label="浼佷笟鐘舵��">
<template slot-scope="{row}">
<span v-if="row.unitStatus === 0">寰呭鏍�</span>
- <span v-if="row.unitStatus === 1">瀹℃牳閫氳繃</span>
- <span v-if="row.unitStatus === 2">瀹℃牳涓嶉�氳繃</span>
+ <span v-if="row.unitStatus === 1" style="color: green;">瀹℃牳閫氳繃</span>
+ <span v-if="row.unitStatus === 2" style="color: red;">瀹℃牳涓嶉�氳繃</span>
</template>
</el-table-column>
- <el-table-column prop="unitStatus" label="鎿嶄綔" min-width="100px">
+ <el-table-column prop="createDate" label="娣诲姞鏃ユ湡"></el-table-column>
+ <el-table-column label="鏄惁鍋滅敤">
<template slot-scope="{row}">
- <span v-if="row.unitStatus === 0">寰呭鏍�</span>
- <span v-if="row.unitStatus === 1">瀹℃牳閫氳繃</span>
- <span v-if="row.unitStatus === 2">瀹℃牳涓嶉�氳繃</span>
+ <el-switch
+ @change="changeStatus($event, row)"
+ v-model="row.status"
+ active-color="#13ce66"
+ inactive-color="#ff4949"
+ :active-value="1"
+ :inactive-value="0">
+ </el-switch>
+ </template>
+ </el-table-column>
+ <el-table-column
+ v-if="containPermissions(['business:dispatchunit:update', 'business:dispatchunit:delete'])"
+ label="鎿嶄綔"
+ min-width="120"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <el-button type="text" @click="$refs.dispatchUnitDetails.open('娲鹃仯鍗曚綅璇︽儏', row)" v-permissions="['business:dispatchunit:update']">鏌ョ湅璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
@@ -53,36 +64,53 @@
>
</pagination>
</template>
- <!-- 璇︽儏 -->
+ <!-- 鏂板缓/淇敼 -->
<OperaDispatchUnitWindow ref="operaDispatchUnitWindow" @success="handlePageChange"/>
+ <!-- 璇︽儏 -->
+ <dispatchUnitDetails ref="dispatchUnitDetails" @success="handlePageChange"/>
</TableLayout>
</template>
<script>
- import BaseTable from '@/components/base/BaseTable'
- import TableLayout from '@/layouts/TableLayout'
- import Pagination from '@/components/common/Pagination'
- import OperaDispatchUnitWindow from '@/components/business/OperaDispatchUnitWindow'
- export default {
- name: 'DispatchUnit',
- extends: BaseTable,
- components: { TableLayout, Pagination, OperaDispatchUnitWindow },
- data () {
- return {
- // 鎼滅储
- searchForm: {
- name: ''
- }
- }
- },
- created () {
- this.config({
- module: '娲鹃仯鍗曚綅淇℃伅琛�',
- api: '/business/dispatchUnit',
- 'field.id': 'id',
- 'field.main': 'id'
- })
- this.search()
- }
+import BaseTable from '@/components/base/BaseTable'
+import TableLayout from '@/layouts/TableLayout'
+import Pagination from '@/components/common/Pagination'
+import OperaDispatchUnitWindow from '@/components/business/OperaDispatchUnitWindow'
+import dispatchUnitDetails from '@/components/business/dispatchUnitDetails'
+import { updateById } from '@/api/business/dispatchUnit'
+export default {
+ name: 'DispatchUnit',
+ extends: BaseTable,
+ components: { TableLayout, Pagination, OperaDispatchUnitWindow, dispatchUnitDetails },
+ data () {
+ return {
+ // 鎼滅储
+ searchForm: {
+ name: '',
+ dataType: 0
+ }
}
+ },
+ created () {
+ this.config({
+ module: '娲鹃仯鍗曚綅淇℃伅琛�',
+ api: '/business/dispatchUnit',
+ 'field.id': 'id',
+ 'field.main': 'id'
+ })
+ this.search()
+ },
+ methods: {
+ // 淇敼鐘舵��
+ changeStatus(status, row) {
+ updateById({ status, id: row.id })
+ .then(res => {
+ this.search()
+ })
+ .catch(err => {
+ row.status = row.status === 0 ? 1 : 0
+ })
+ }
+ }
+}
</script>
--
Gitblit v1.9.3