From 30e858fa504b268b9b436afca0a1259cf6e8c488 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 19 八月 2025 11:01:40 +0800
Subject: [PATCH] 优化
---
admin/src/views/business/workorderShe.vue | 290 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 179 insertions(+), 111 deletions(-)
diff --git a/admin/src/views/business/workorderShe.vue b/admin/src/views/business/workorderShe.vue
index 88aba45..7bee81a 100644
--- a/admin/src/views/business/workorderShe.vue
+++ b/admin/src/views/business/workorderShe.vue
@@ -1,92 +1,112 @@
<template>
<TableLayout :permissions="['business:workorder:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <SearchFormCollapse slot="search-form">
+ <div slot="search-form">
<el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
- <el-form-item label="鎵�灞炲垎绫荤紪锛堝叧鑱攃ategory)" prop="categoryId">
- <el-input v-model="searchForm.categoryId" placeholder="璇疯緭鍏ユ墍灞炲垎绫荤紪锛堝叧鑱攃ategory)" @keypress.enter.native="search"></el-input>
+ <el-form-item label="浼ゅ绫诲瀷" prop="typeIdPath">
+ <treeselect
+ style="width: 200px"
+ v-model="searchForm.typeIdPath"
+ placeholder="浼ゅ绫诲瀷"
+ clearable
+ :options="categorys"
+ :normalizer="normalizeOptions"
+ :default-expand-level="1"
+ @input="search"
+ noChildrenText="娌℃湁瀛愰�夐」"
+ noOptionsText="娌℃湁鍙�夐」"
+ noResultsText="娌℃湁鍖归厤鐨勭粨鏋�" />
</el-form-item>
- <el-form-item label="涓婃姤浜哄憳缂栫爜锛堝叧鑱攎ember)" prop="memberId">
- <el-input v-model="searchForm.memberId" placeholder="璇疯緭鍏ヤ笂鎶ヤ汉鍛樼紪鐮侊紙鍏宠仈member)" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="閮ㄩ棬缂栫爜" prop="companyId">
- <el-input v-model="searchForm.companyId" placeholder="璇疯緭鍏ラ儴闂ㄧ紪鐮�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="SHE娑夊強浜哄憳绫诲瀷 0鏈汉 1鍚屼簨 2渚涘簲鍟�" prop="memberType">
- <el-input v-model="searchForm.memberType" placeholder="璇疯緭鍏HE娑夊強浜哄憳绫诲瀷 0鏈汉 1鍚屼簨 2渚涘簲鍟�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="SHE娑夊強浜哄憳渚涘簲鍟嗛泦鍚�" prop="memberNames">
- <el-input v-model="searchForm.memberNames" placeholder="璇疯緭鍏HE娑夊強浜哄憳渚涘簲鍟嗛泦鍚�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍙戠敓鍦扮偣/浣嶇疆缂栫爜锛堝叧鑱攃ategory锛�" prop="localtionId">
- <el-input v-model="searchForm.localtionId" placeholder="璇疯緭鍏ュ彂鐢熷湴鐐�/浣嶇疆缂栫爜锛堝叧鑱攃ategory锛�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="椋庨櫓绫诲瀷(鍏宠仈category锛�" prop="typeId">
- <el-date-picker v-model="searchForm.typeId" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ラ闄╃被鍨�(鍏宠仈category锛�" @change="search"/>
- </el-form-item>
- <el-form-item label="浣嶇疆鍦扮偣璺緞鍚嶇О" prop="locationName">
- <el-input v-model="searchForm.locationName" placeholder="璇疯緭鍏ヤ綅缃湴鐐硅矾寰勫悕绉�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="涓婃姤浜哄憳" prop="memberName">
+ <el-input v-model="searchForm.memberName" style="width: 150px" clearable placeholder="浜哄憳濮撳悕鎴栨墜鏈哄彿" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="宸ュ崟鍙�" prop="code">
- <el-input v-model="searchForm.code" placeholder="璇疯緭鍏ュ伐鍗曞彿" @keypress.enter.native="search"></el-input>
+ <el-input v-model="searchForm.code" clearable style="width: 150px" placeholder="宸ュ崟鍙�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="鎻愪氦鏃堕棿" prop="queryStartTime">
+ <el-date-picker type="datetime" v-model="searchForm.queryStartTime" style="width: 190px" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="寮�濮嬫椂闂�" @change="changeRadio" />
+ </el-form-item>
+ <el-form-item label="" prop="queryEndTime">
+ <el-date-picker type="datetime" v-model="searchForm.queryEndTime" style="width: 190px" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="缁撴潫鏃堕棿" @change="changeRadio" />
+ </el-form-item>
+ <el-form-item label="" prop="radio">
+ <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
+ <el-radio-button label="0">褰撳ぉ</el-radio-button>
+ <el-radio-button label="1">杩�7澶�</el-radio-button>
+ <el-radio-button label="2">杩�30澶�</el-radio-button>
+ </el-radio-group>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
</section>
</el-form>
- </SearchFormCollapse>
+ </div>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:workorder:create', 'business:workorder:delete']">
- <li><el-button type="primary" @click="$refs.operaWorkorderWindow.open('鏂板缓宸ュ崟淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:workorder:create']">鏂板缓</el-button></li>
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:workorder:delete']">鍒犻櫎</el-button></li>
+ <ul class="toolbar" v-permissions="['business:workorder:exportExcel']">
+ <li> <el-button type="primary" :loading="isWorking.export" @click="exportExcel">瀵煎嚭</el-button></li>
</ul>
<el-table
+ :height="tableHeightNew"
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="id" label="涓婚敭" min-width="100px"></el-table-column>
- <el-table-column prop="creator" label="鍒涘缓浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="editor" label="鏇存柊浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="isdeleted" label="鏄惁鍒犻櫎0鍚� 1鏄�" min-width="100px"></el-table-column>
- <el-table-column prop="categoryId" label="鎵�灞炲垎绫荤紪锛堝叧鑱攃ategory)" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
- <el-table-column prop="status" label="鐘舵�� 0寰呯‘璁�/寰呭垵瀹� 1寰呭垎閰�/寰呯粓瀹� 2寰呭鐞� 3 宸叉挙鍥� 4宸插鐞�" min-width="100px"></el-table-column>
- <el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="type" label="绫诲瀷 0浣嶇疆璐ｄ换浜� 1鐝暱 2鐗╀笟涓荤 3宸ョ▼甯� 4SHE璐熻矗浜� 5SHE宸ュ崟閭鎶勯�佷汉" min-width="100px"></el-table-column>
- <el-table-column prop="memberId" label="涓婃姤浜哄憳缂栫爜锛堝叧鑱攎ember)" min-width="100px"></el-table-column>
- <el-table-column prop="companyId" label="閮ㄩ棬缂栫爜" min-width="100px"></el-table-column>
- <el-table-column prop="submitDate" label="涓婃姤鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="memberType" label="SHE娑夊強浜哄憳绫诲瀷 0鏈汉 1鍚屼簨 2渚涘簲鍟�" min-width="100px"></el-table-column>
- <el-table-column prop="memberQwids" label="SHE娑夊強浜哄憳浼佷笟缂栫爜闆嗗悎" min-width="100px"></el-table-column>
- <el-table-column prop="memberNames" label="SHE娑夊強浜哄憳渚涘簲鍟嗛泦鍚�" min-width="100px"></el-table-column>
- <el-table-column prop="localtionId" label="鍙戠敓鍦扮偣/浣嶇疆缂栫爜锛堝叧鑱攃ategory锛�" min-width="100px"></el-table-column>
- <el-table-column prop="outJiuyi" label="鏄惁澶栭儴灏卞尰 0鍚� 1鏄�" min-width="100px"></el-table-column>
- <el-table-column prop="isYiwushi" label="鏄惁鍖诲姟瀹� 0鍚� 1鏄�" min-width="100px"></el-table-column>
- <el-table-column prop="isHurted" label="鏄惁鍙椾激 0鍚� 1鏄�" min-width="100px"></el-table-column>
- <el-table-column prop="workRelated" label="鏄惁鍜屽伐浣滅浉鍏�" min-width="100px"></el-table-column>
- <el-table-column prop="eventInfo" label="浜嬩欢璇存槑" min-width="100px"></el-table-column>
- <el-table-column prop="emialMemberIds" label="閭欢閫氱煡浜哄憳缂栫爜闆嗗悎" min-width="100px"></el-table-column>
- <el-table-column prop="qwnoticeMemberIds" label="浼佷笟寰俊閫氱煡浜哄憳缂栫爜闆嗗悎" min-width="100px"></el-table-column>
- <el-table-column prop="happenTime" label="鍙戠幇鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="typeId" label="椋庨櫓绫诲瀷(鍏宠仈category锛�" min-width="100px"></el-table-column>
- <el-table-column prop="riskInfo" label="椋庨櫓鎻忚堪" min-width="100px"></el-table-column>
- <el-table-column prop="managerId" label="褰撳墠鐗╀笟涓荤缂栫爜锛堝叧鑱攎ember锛�" min-width="100px"></el-table-column>
- <el-table-column prop="dealerId" label="褰撳墠澶勭悊浜哄憳缂栫爜锛堝叧鑱攎ember)" min-width="100px"></el-table-column>
- <el-table-column prop="dispatchTime" label="鍒嗛厤鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="dispatchInfo" label="鍒嗛厤澶囨敞" min-width="100px"></el-table-column>
- <el-table-column prop="dealTime" label="澶勭悊鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="dealInfo" label="澶勭悊澶囨敞" min-width="100px"></el-table-column>
- <el-table-column prop="problemId" label="DCA闂缂栫爜" min-width="100px"></el-table-column>
- <el-table-column prop="problemNum" label="DCA闂鏁伴噺" min-width="100px"></el-table-column>
- <el-table-column prop="locationName" label="浣嶇疆鍦扮偣璺緞鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="code" label="宸ュ崟鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="code" label="宸ュ崟鍙�" min-width="150px" fixed>
+ <template slot-scope="{row}">
+ <span style="color: #2E68EC;cursor: pointer" @click="$refs.operaWorkorderWindow.open('SHE浜嬩欢宸ュ崟璇︽儏', row)" >{{ row.code || '-'}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="typeNamePath" label="浼ゅ绫诲瀷" min-width="100px"></el-table-column>
+ <el-table-column prop="submitDate" label="涓婃姤鏃堕棿" min-width="150px"></el-table-column>
+ <el-table-column prop="status" label="鐘舵��" min-width="100px">
+ <template slot-scope="{row}">
+ <!-- <span :class="'statusInfo'+row.status" v-if="row.status ==0">寰呭鐞�</span>-->
+ <span :class="'statusInfo'+row.status" v-if="row.status ==3 ||row.status ==4||row.status ==5">宸插鐞�</span>
+ <span :class="'statusInfo'+row.status" v-else>澶勭悊涓�</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="memberType" label="娑夊強浜哄憳" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.memberType == 2">渚涘簲鍟�-{{row.memberNames}}</span>
+ <span v-else-if="row.memberType == 1">鍚屼簨-{{row.memberNames}}</span>
+ <span v-else>鏈汉</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="happenTime" label="鍙戠幇鏃堕棿" min-width="150px"></el-table-column>
+ <el-table-column prop="locationName" label="鍙戠敓鍦扮偣" min-width="200px"></el-table-column>
+ <el-table-column prop="remark" label="鍏蜂綋浣嶇疆" min-width="100px"></el-table-column>
+ <el-table-column prop="outJiuyi" label="灏卞尰鎯呭喌" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.outJiuyi == 0">闈炲閮ㄥ氨鍖�-
+ <span v-if="row.isYiwushi == 0">闈炲尰鍔″-
+ <span v-if="row.isHurted == 0">鏈彈浼�</span>
+ <span v-else>鍙椾激</span>
+ </span>
+ <span v-else>鍖诲姟瀹�</span>
+ </span>
+ <span v-else>澶栭儴灏卞尰</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="workRelated" label="鍜屽伐浣滅浉鍏�" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.workRelated == 1">鏄�</span>
+ <span v-else>鍚�</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="eventInfo" label="浜嬩欢璇存槑" min-width="200px" show-overflow-tooltip ></el-table-column>
+ <el-table-column prop="memberName" label="涓婃姤浜哄憳" min-width="150px">
+ <template slot-scope="{row}">
+ <span v-if="row.memberPhone" >{{row.memberName}} - {{row.memberPhone }}</span>
+ <span v-else >{{row.memberName}} </span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="150px"></el-table-column>
+ <el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="150px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:workorder:update', 'business:workorder:delete'])"
label="鎿嶄綔"
@@ -94,8 +114,8 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaWorkorderWindow.open('缂栬緫宸ュ崟淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:workorder:update']">缂栬緫</el-button>
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:workorder:delete']">鍒犻櫎</el-button>
+ <el-button type="text" @click="$refs.operaWorkorderWindow.open('SHE浜嬩欢宸ュ崟璇︽儏', row)" icon="el-icon-zoom-out" >鏌ョ湅璇︽儏</el-button>
+ <!--<el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:workorder:delete']">鍒犻櫎</el-button>-->
</template>
</el-table-column>
</el-table>
@@ -107,63 +127,44 @@
</pagination>
</template>
<!-- 鏂板缓/淇敼 -->
- <OperaWorkorderWindow ref="operaWorkorderWindow" @success="handlePageChange"/>
+ <OperaWorkorderDetailSheWindow ref="operaWorkorderWindow" @success="handlePageChange"/>
</TableLayout>
</template>
<script>
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
-import SearchFormCollapse from '@/components/common/SearchFormCollapse'
import Pagination from '@/components/common/Pagination'
-import OperaWorkorderWindow from '@/components/business/OperaWorkorderWindow'
+import OperaWorkorderDetailSheWindow from '@/components/business/OperaWorkorderDetailSheWindow'
+import { treeList } from '@/api/business/category'
+import {timeForMat} from "@/utils/util";
export default {
name: 'Workorder',
extends: BaseTable,
- components: { SearchFormCollapse, TableLayout, Pagination, OperaWorkorderWindow },
+ components: {TableLayout, Pagination, OperaWorkorderDetailSheWindow },
data () {
return {
// 鎼滅储
searchForm: {
- id: '',
- creator: '',
- createDate: '',
- editor: '',
- editDate: '',
- isdeleted: '',
- categoryId: '',
- remark: '',
- status: '',
- sortnum: '',
- type: '',
- memberId: '',
- companyId: '',
- submitDate: '',
- memberType: '',
- memberQwids: '',
- memberNames: '',
+ queryStartTime: null,
+ queryEndTime: null,
+ radio: null,
+ type: '0',
+ memberName: '',
+ memberCompanyId: '',
localtionId: '',
- outJiuyi: '',
- isYiwushi: '',
- isHurted: '',
- workRelated: '',
- eventInfo: '',
- emialMemberIds: '',
- qwnoticeMemberIds: '',
- happenTime: '',
- typeId: '',
- riskInfo: '',
- managerId: '',
- dealerId: '',
- dispatchTime: '',
- dispatchInfo: '',
- dealTime: '',
- dealInfo: '',
- problemId: '',
- problemNum: '',
- locationName: '',
- code: ''
- }
+ typeId: null,
+ typeIdPath: null,
+ code: '',
+ categoryList: []
+ },
+ categoryprops: {
+ label: 'name',
+ value: 'id',
+ checkStrictly: true,
+ lazyLoad: this.lazyLoad
+ },
+ categorys: []
}
},
created () {
@@ -173,7 +174,74 @@
'field.id': 'id',
'field.main': 'id'
})
+ this.loadCategorys()
this.search()
+ },
+ methods: {
+
+ changeRadio(e) {
+ if (e === '0') {
+ this.searchForm.queryStartTime = timeForMat(0)[0]
+ this.searchForm.queryEndTime = timeForMat(0)[1]
+ } else if (e === '1') {
+ this.searchForm.queryStartTime = timeForMat(6)[0]
+ this.searchForm.queryEndTime = timeForMat(6)[1]
+ } else if (e === '2') {
+ this.searchForm.queryStartTime = timeForMat(29)[0]
+ this.searchForm.queryEndTime = timeForMat(29)[1]
+ } else {
+ this.searchForm.radio = ''
+ }
+ if (this.searchForm.queryStartTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
+ this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ this.searchForm.queryStartTime = ''
+ return
+ }
+ this.search()
+ },
+ normalizeOptions(node) {
+ if (node.childList && !node.childList.length) {
+ // 鍘绘帀children=[]鐨刢hildren灞炴��
+ delete node.childList;
+ }
+ return {
+ id: node.idPath,
+ label: node.name,
+ children: node.childList,
+ };
+ },
+ handleChangeCategory (value) {
+ if (this.searchForm.categoryList && this.searchForm.categoryList.length >= 1) {
+ this.searchForm.typeId = this.searchForm.categoryList[this.searchForm.categoryList.length - 1]
+ }
+ },
+ loadCategorys () {
+ treeList({ type: 0 })
+ .then(res => {
+ if (res && res.length > 0) {
+ res[0].fsStatus = 1
+ this.categorys = this.getCategoryTree(res)
+ }
+ })
+ },
+ getCategoryTree (tree) {
+ if (tree == null) {
+ return []
+ }
+ return tree.map(item => {
+ const newItem = { ...item }
+ if (newItem) {
+ newItem.children = newItem.childList
+ }
+ if (item.children && item.children.length === 0) {
+ this.$delete(newItem, 'children')
+ } else {
+ newItem.children = this.getCategoryTree(newItem.children)
+ }
+ // newItem.disabled = false
+ return newItem
+ })
+ }
}
}
</script>
--
Gitblit v1.9.3