From 0ee14f4e1a722687533aa8bb18d628b7add40fa0 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 03 十二月 2024 19:24:26 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
admin/src/views/workorder/workorderList.vue | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/admin/src/views/workorder/workorderList.vue b/admin/src/views/workorder/workorderList.vue
index 0936036..2444c86 100644
--- a/admin/src/views/workorder/workorderList.vue
+++ b/admin/src/views/workorder/workorderList.vue
@@ -2,7 +2,7 @@
<TableLayout :permissions="['business:ywworkorder:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item prop="areaType" label="浣嶇疆绫诲埆">
+ <el-form-item prop="areaType" label="浣嶇疆绫诲瀷">
<el-select v-model="searchForm.areaType">
<el-option label="瀹ゅ唴缁翠慨" value="0"></el-option>
<el-option label="鍏叡缁翠慨" value="1"></el-option>
@@ -18,7 +18,7 @@
<el-option v-for="item in buildList" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
- <el-form-item prop="cateId" label="鐗╁搧绫诲埆">
+ <el-form-item prop="cateId" label="宸ュ崟鍒嗙被">
<el-cascader v-model="searchForm.areaIds" @change="changeSel" placeholder="璇烽�夋嫨宸℃鍖哄煙" clearable
:options="cateList" :props="{
label: 'name',
@@ -33,8 +33,6 @@
<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 @click="reset">閲嶇疆</el-button>
</section>
</el-form>
@@ -43,11 +41,11 @@
<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>
+ <el-button type="primary" :loading="isWorking.export" v-permissions="['business:ywworkorder:exportExcel']"
+ @click="exportExcel" plain>瀵煎嚭</el-button>
</ul>
<el-table v-loading="isWorking.search" :data="tableData.list" stripe>
- <el-table-column prop="areaType" label="浣嶇疆绫诲瀷" min-width="80px">
+ <el-table-column prop="areaType" label="浣嶇疆绫诲瀷" min-width="70px">
<template v-slot="scope">
<span v-if="scope.row.areaType == 0">瀹ゅ唴瑁呬慨</span>
<span v-if="scope.row.areaType == 1">鍏叡鍖哄煙</span>
@@ -59,18 +57,18 @@
}}</span>
</template>
</el-table-column>
- <el-table-column prop="categoryName" label="鐗╁搧绫诲瀷" min-width="100px"></el-table-column>
- <el-table-column prop="creatorName" label="涓婃姤浜�" min-width="100px"></el-table-column>
+ <el-table-column prop="categoryName" label="宸ュ崟鍒嗙被" min-width="100px"></el-table-column>
+ <el-table-column prop="creatorName" label="涓婃姤浜�" min-width="80px"></el-table-column>
<el-table-column prop="createDate" 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">
+ <el-table-column prop="dealUserName" label="澶勭悊浜�" min-width="80px"></el-table-column>
+ <el-table-column label="宸ュ崟鐘舵��" min-width="70px">
<template slot-scope="{row}">
<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"
+ <el-table-column v-if="containPermissions(['business:ywworkorder:update'])" label="鎿嶄綔" width="80"
fixed="right">
<template slot-scope="{row}">
<span @click="handleDetail(row)" class="primaryColor cu">鏌ョ湅璇︽儏</span>
@@ -98,7 +96,7 @@
export default {
name: 'YwWorkorder',
extends: BaseTable,
- components: { TableLayout, Pagination,Detail, OperaYwWorkorderWindow },
+ components: { TableLayout, Pagination, Detail, OperaYwWorkorderWindow },
data() {
return {
// 鎼滅储
@@ -133,7 +131,7 @@
this.$refs.DetailRef.visible = true
this.$refs.DetailRef.id = row.id
this.$refs.DetailRef.getDetail()
-
+
})
},
initData() {
--
Gitblit v1.9.3