From 1a64b4bcc938db743396382a30f3b10136a1a27a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 25 十一月 2024 15:38:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/workorder/workorderList.vue | 96 +++++++++++++++++++++--------------------------
1 files changed, 43 insertions(+), 53 deletions(-)
diff --git a/admin/src/views/workorder/workorderList.vue b/admin/src/views/workorder/workorderList.vue
index 7af17bb..1173e81 100644
--- a/admin/src/views/workorder/workorderList.vue
+++ b/admin/src/views/workorder/workorderList.vue
@@ -2,74 +2,65 @@
<TableLayout :permissions="['business:ywworkorder:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_project)" prop="projectId">
- <el-input v-model="searchForm.projectId" placeholder="璇疯緭鍏ユ墍灞為」鐩紪鐮侊紙鍏宠仈yw_project)" @keypress.enter.native="search"></el-input>
+ <el-form-item prop="areaType">
+ <el-select v-model="searchForm.areaType">
+ <el-option label="瀹ゅ唴缁翠慨" value="0"></el-option>
+ <el-option label="鍏叡缁翠慨" value="1"></el-option>
+ </el-select>
</el-form-item>
- <el-form-item label="鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_building)" prop="buildingId">
- <el-input v-model="searchForm.buildingId" placeholder="璇疯緭鍏ユ墍灞為」鐩紪鐮侊紙鍏宠仈yw_building)" @keypress.enter.native="search"></el-input>
+ <el-form-item label="璇烽�夋嫨鎶ヤ慨鍖哄煙" prop="buildingId">
+ <el-input v-model="searchForm.buildingId" placeholder="璇疯緭鍏ユ墍灞為」鐩紪鐮侊紙鍏宠仈yw_building)"
+ @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鎵�灞炴埧闂寸紪鐮侊紙鍏宠仈yw_room)" prop="roomId">
- <el-input v-model="searchForm.roomId" placeholder="璇疯緭鍏ユ墍灞炴埧闂寸紪鐮侊紙鍏宠仈yw_room)" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="宸ュ崟鍒嗙被缂栫爜(鍏宠仈category锛�" prop="cateId">
- <el-input v-model="searchForm.cateId" placeholder="璇疯緭鍏ュ伐鍗曞垎绫荤紪鐮�(鍏宠仈category锛�" @keypress.enter.native="search"></el-input>
+ <el-form-item prop="cateId">
+ <el-input v-model="searchForm.cateId" placeholder="鎶ヤ慨鐗╁搧绫诲埆" @keypress.enter.native="search"></el-input>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:ywworkorder:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
+ <el-button type="primary" :loading="isWorking.export" v-permissions="['business:ywworkorder:exportExcel']"
+ @click="exportExcel">瀵煎嚭</el-button>
<el-button @click="reset">閲嶇疆</el-button>
</section>
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:ywworkorder:create', 'business:ywworkorder:delete']">
- <li><el-button type="primary" @click="$refs.operaYwWorkorderWindow.open('鏂板缓宸ュ崟')" icon="el-icon-plus" v-permissions="['business:ywworkorder:create']">鏂板缓</el-button></li>
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:ywworkorder:delete']">鍒犻櫎</el-button></li>
+ <li><el-button type="primary" @click="$refs.operaYwWorkorderWindow.open('鏂板缓宸ュ崟')" icon="el-icon-plus"
+ v-permissions="['business:ywworkorder:create']">鏂板缓</el-button></li>
+ <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete"
+ v-permissions="['business:ywworkorder:delete']">鍒犻櫎</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="projectId" label="鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_project)" min-width="100px"></el-table-column>
- <el-table-column prop="buildingId" label="鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_building)" min-width="100px"></el-table-column>
- <el-table-column prop="roomId" label="鎵�灞炴埧闂寸紪鐮侊紙鍏宠仈yw_room)" min-width="100px"></el-table-column>
- <el-table-column prop="userId" label="鎻愭姤浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="phone" label="鑱旂郴鐢佃瘽" min-width="100px"></el-table-column>
- <el-table-column prop="submitDate" label="鎻愭姤鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="cateId" label="宸ュ崟鍒嗙被缂栫爜(鍏宠仈category锛�" min-width="100px"></el-table-column>
- <el-table-column prop="areaType" label="淇濅慨鍖哄煙绫诲瀷 0瀹ゅ唴缁翠慨 1鍏叡鍖哄煙" min-width="100px"></el-table-column>
-
- <el-table-column prop="dealStatus" label="澶勭悊鐘舵�� 0寰呭鐞� 1宸插垎娲� 2宸插鐞�" min-width="100px"></el-table-column>
-
- <el-table-column prop="dealUserId" label="澶勭悊浜虹紪鐮�(鍏宠仈system_user)" min-width="100px"></el-table-column>
- <el-table-column prop="dealType" label="澶勭悊鏂瑰紡 0鎸囨淳鍚庡鐞� 1鐩存帴鍥炲" min-width="100px"></el-table-column>
- <el-table-column
- v-if="containPermissions(['business:ywworkorder:update', 'business:ywworkorder:delete'])"
- label="鎿嶄綔"
- min-width="120"
- fixed="right"
- >
+ <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
+ <el-table-column prop="areaType" label="浣嶇疆绫诲瀷" min-width="80px">
+ <template v-slot="scope">
+ <span v-if="scope.row.areaType == 0">瀹ゅ唴瑁呬慨</span>
+ <span v-if="scope.row.areaType == 1">鍏叡鍖哄煙</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="" label="鎶ヤ慨鍖哄煙" min-width="100px"></el-table-column>
+ <el-table-column prop="cateName" label="鎶ヤ慨鐗╁搧绫诲瀷" min-width="100px"></el-table-column>
+ <el-table-column prop="userName" label="涓婃姤浜�" min-width="100px"></el-table-column>
+ <el-table-column prop="submitDate" label="涓婃姤鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="dealUserName" label="澶勭悊浜�" min-width="100px"></el-table-column>
+ <el-table-column label="澶勭悊缁撴灉" min-width="100px">
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaYwWorkorderWindow.open('缂栬緫宸ュ崟', row)" icon="el-icon-edit" v-permissions="['business:ywworkorder:update']">缂栬緫</el-button>
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:ywworkorder:delete']">鍒犻櫎</el-button>
+ <span v-if="row.dealStatus == 0">寰呮寚娲�</span>
+ <span v-if="row.dealStatus == 1">宸叉寚娲�</span>
+ <span v-if="row.dealStatus == 2">宸插鐞�</span>
+ </template>
+ </el-table-column>
+ <el-table-column v-if="containPermissions(['business:ywworkorder:update'])"
+ label="鎿嶄綔" min-width="80" fixed="right">
+ <template slot-scope="{row}">
+ <span class="primaryColor cu">鏌ョ湅璇︽儏</span>
</template>
</el-table-column>
</el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
</pagination>
</template>
<!-- 鏂板缓/淇敼 -->
- <OperaYwWorkorderWindow ref="operaYwWorkorderWindow" @success="handlePageChange"/>
+ <OperaYwWorkorderWindow ref="operaYwWorkorderWindow" @success="handlePageChange" />
</TableLayout>
</template>
@@ -82,11 +73,11 @@
name: 'YwWorkorder',
extends: BaseTable,
components: { TableLayout, Pagination, OperaYwWorkorderWindow },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
- id: '',
+ areaType: '',
creator: '',
createDate: '',
editor: '',
@@ -105,7 +96,6 @@
phone: '',
submitDate: '',
cateId: '',
- areaType: '',
code: '',
dealStatus: '',
dispatchUserId: '',
@@ -118,7 +108,7 @@
}
}
},
- created () {
+ created() {
this.config({
module: '杩愮淮宸ュ崟淇℃伅琛�',
api: '/workorder/ywWorkorder',
--
Gitblit v1.9.3