From a2299a6d4a6f99e9c11132138f5d3e9ec68f03ea Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 19:19:34 +0800
Subject: [PATCH] 开发更新
---
admin/src/views/workorder/workorderList.vue | 59 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 36 insertions(+), 23 deletions(-)
diff --git a/admin/src/views/workorder/workorderList.vue b/admin/src/views/workorder/workorderList.vue
index 0936036..6d497de 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,23 +18,27 @@
<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-cascader v-model="searchForm.areaIds" @change="changeSel" placeholder="璇烽�夋嫨宸℃鍖哄煙" clearable
+ <el-form-item prop="cateId" label="宸ュ崟鍒嗙被">
+ <el-cascader v-model="searchForm.areaIds" @change="changeSel" placeholder="璇烽�夋嫨宸ュ崟鍒嗙被" clearable
:options="cateList" :props="{
label: 'name',
value: 'id',
children: 'childCategoryList'
}"></el-cascader>
</el-form-item>
- <el-form-item label="鎻愪氦鏃ユ湡">
+ <el-form-item label="鏉ユ簮" prop="origin">
+ <el-select v-model="searchForm.origin" clearable filterable>
+ <el-option label="鑷缓" :value="0" />
+ <el-option label="闂杞伐鍗�" :value="1" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="涓婃姤鏃堕棿">
<el-date-picker v-model="searchForm.selDate" @change="changeSelDate" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" type="daterange"></el-date-picker>
</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 @click="reset">閲嶇疆</el-button>
</section>
</el-form>
@@ -43,11 +47,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 +63,24 @@
}}</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 label="鏉ユ簮" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.origin == 0">鑷缓</span>
+ <span v-if="row.origin == 1">闂杞伐鍗�</span>
+ </template>
+ </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>
@@ -80,7 +90,7 @@
<pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
</pagination>
</template>
- <Detail v-if="showDetail" ref="DetailRef" @close="showDetail = false" @success="search" />
+ <Detail v-if="openDetail" ref="DetailRef" @close="openDetail = false" @success="search" />
<!-- 鏂板缓/淇敼 -->
<OperaYwWorkorderWindow ref="operaYwWorkorderWindow" @success="handlePageChange" />
</TableLayout>
@@ -98,18 +108,18 @@
export default {
name: 'YwWorkorder',
extends: BaseTable,
- components: { TableLayout, Pagination,Detail, OperaYwWorkorderWindow },
+ components: { TableLayout, Pagination, Detail, OperaYwWorkorderWindow },
data() {
return {
// 鎼滅储
- showDetail: false,
+ openDetail: false,
searchForm: {
selDate: [],
- areaType: '',
areaIds: '',
projectId: '',
buildingId: '',
cateId: '',
+ origin: ''
},
projectList: [],
buildList: [],
@@ -128,12 +138,14 @@
},
methods: {
handleDetail(row) {
- this.showDetail = true
+ this.openDetail = true
this.$nextTick(() => {
- this.$refs.DetailRef.visible = true
- this.$refs.DetailRef.id = row.id
- this.$refs.DetailRef.getDetail()
-
+ this.$refs.DetailRef.open('宸ュ崟璇︽儏', { workorderId: row.id }, true)
+ // this.$refs.DetailRef.isShow = true
+ // this.$refs.DetailRef.visible = true
+ // this.$refs.DetailRef.id = row.id
+ // this.$refs.DetailRef.getDetail()
+
})
},
initData() {
@@ -170,6 +182,7 @@
buildingId: '',
cateId: '',
}
+ this.buildList = []
this.search()
},
changeSelDate(e) {
--
Gitblit v1.9.3