From 05cf6324ea8322164d99a3d3d4161fe374534b3b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 18 二月 2024 15:22:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
platform/src/views/business/dispatchUnit.vue | 173 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 86 insertions(+), 87 deletions(-)
diff --git a/platform/src/views/business/dispatchUnit.vue b/platform/src/views/business/dispatchUnit.vue
index 52506af..cf32e52 100644
--- a/platform/src/views/business/dispatchUnit.vue
+++ b/platform/src/views/business/dispatchUnit.vue
@@ -1,94 +1,92 @@
<template>
- <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>
- <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: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"
- stripe
- >
- <el-table-column label="搴忓彿" width="80px">
- <template slot-scope="scope">
- <span>{{scope.$index + 1}}</span>
- </template>
- </el-table-column>
- <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" style="color: green;">瀹℃牳閫氳繃</span>
- <span v-if="row.unitStatus === 2" style="color: red;">瀹℃牳涓嶉�氳繃</span>
- </template>
- </el-table-column>
- <el-table-column prop="createDate" label="娣诲姞鏃ユ湡"></el-table-column>
- <el-table-column label="鏄惁鍋滅敤">
- <template slot-scope="{row}">
- <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>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
- </template>
- <!-- 鏂板缓/淇敼 -->
- <OperaDispatchUnitWindow ref="operaDispatchUnitWindow" @success="handlePageChange"/>
- <!-- 璇︽儏 -->
- <dispatchUnitDetails ref="dispatchUnitDetails" @success="handlePageChange"/>
- </TableLayout>
+ <TableLayout :permissions="['business:dispatchunit:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="鎵�灞炰紒涓�" prop="companyId">
+ <el-select v-model="searchForm.companyId" placeholder="璇烽�夋嫨" @change="search">
+ <el-option
+ v-for="item in companyList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="娲鹃仯鍗曚綅" prop="name">
+ <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>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <el-table
+ v-loading="isWorking.search"
+ :data="tableData.list"
+ stripe
+ >
+ <el-table-column label="搴忓彿" width="80px">
+ <template slot-scope="scope">
+ <span>{{scope.$index + 1}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="companyName" label="鎵�灞炰紒涓�" min-width="100px"></el-table-column>
+ <el-table-column prop="name" label="娲鹃仯鍗曚綅" min-width="100px"></el-table-column>
+ <el-table-column label="娲鹃仯鍗曚綅鐘舵��" min-width="100px">
+ <template slot-scope="{row}">
+ <span :class="'du-status'+row.unitStatus" v-if="row.unitStatus === 0">寰呭鏍�</span>
+ <span v-if="row.unitStatus === 1">
+ <span :class="'du-status'+row.worktypeStatus" v-if="row.worktypeStatus ==null || row.worktypeStatus === 0">宸ョ寰呭</span>
+ <span :class="'du-status'+row.worktypeStatus" v-else-if="row.worktypeStatus === 1">瀹℃牳閫氳繃</span>
+ <span :class="'du-status'+row.worktypeStatus" v-else-if="row.worktypeStatus === 2">宸ョ瀹℃牳涓嶉�氳繃</span>
+ </span>
+ <span :class="'du-status'+row.unitStatus" v-if="row.unitStatus === 2">瀹℃牳涓嶉�氳繃</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="createDate" label="鎻愪氦鏃ユ湡" min-width="100px"></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.dispatchUnitDetailsPlat.open('娲鹃仯鍗曚綅璇︽儏', row)" icon="el-icon-edit" v-permissions="['business:dispatchunit:update']">鏌ョ湅璇︽儏</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination
+ @size-change="handleSizeChange"
+ @current-change="handlePageChange"
+ :pagination="tableData.pagination"
+ >
+ </pagination>
+ </template>
+ <!-- 鏂板缓/淇敼 -->
+ <dispatchUnitDetailsPlat ref="dispatchUnitDetailsPlat" @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'
-import dispatchUnitDetails from '@/components/business/dispatchUnitDetails'
-import { updateById } from '@/api/business/dispatchUnit'
+import dispatchUnitDetailsPlat from '@/components/business/dispatchUnitDetailsPlat'
+import {pageAll as companyAll} from '@/api/business/company'
export default {
- name: 'DispatchUnit',
+ name: 'dispatchUnitReview',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaDispatchUnitWindow, dispatchUnitDetails },
+ components: { TableLayout, Pagination, dispatchUnitDetailsPlat },
data () {
return {
// 鎼滅储
searchForm: {
name: '',
- dataType: 0
- }
+ companyId: ''
+ },
+ companyList:[]
}
},
created () {
@@ -99,18 +97,19 @@
'field.main': 'id'
})
this.search()
+ this.loadSelectList()
},
- methods: {
- // 淇敼鐘舵��
- changeStatus(status, row) {
- updateById({ status, id: row.id })
- .then(res => {
- this.search()
- })
- .catch(err => {
- row.status = row.status === 0 ? 1 : 0
- })
+ methods:{
+ // handlePageChange() {
+ // this.search()
+ // },
+ loadSelectList() {
+ companyAll({}).then(res => {
+ this.companyList = res
+ }).catch(err => {
+ })
}
+
}
}
</script>
--
Gitblit v1.9.3