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 | 127 +++++++++++++++++++++++++++++++-----------
1 files changed, 93 insertions(+), 34 deletions(-)
diff --git a/admin/src/views/business/workorderShe.vue b/admin/src/views/business/workorderShe.vue
index 4262d3b..7bee81a 100644
--- a/admin/src/views/business/workorderShe.vue
+++ b/admin/src/views/business/workorderShe.vue
@@ -3,19 +3,40 @@
<!-- 鎼滅储琛ㄥ崟 -->
<div slot="search-form">
<el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
- <el-form-item label="浼ゅ绫诲瀷" prop="typeId">
- <el-cascader v-model="searchForm.categoryList" :options="categorys" @change="handleChangeCategory" :show-all-levels="false"
- clearable filterable :props="categoryprops" >
- <template slot-scope="{ node, data }">
- <span>{{ data.name }}</span> <!-- 鑷畾涔夋樉绀哄唴瀹� -->
- </template>
- </el-cascader>
+ <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="涓婃姤浜哄憳" prop="memberName">
- <el-input v-model="searchForm.memberName" placeholder="浜哄憳濮撳悕鎴栨墜鏈哄彿" @keypress.enter.native="search"></el-input>
+ <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>
@@ -35,27 +56,20 @@
stripe
@selection-change="handleSelectionChange"
>
- <el-table-column prop="code" label="宸ュ崟鍙�" min-width="100px" fixed>
+ <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="typeName" label="浼ゅ绫诲瀷" min-width="100px"></el-table-column>
- <el-table-column prop="submitDate" label="涓婃姤鏃堕棿" min-width="100px"></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 v-if="row.status ==0">寰呭鐞�</span>
- <span v-else-if="row.status ==4">宸插鐞�</span>
- <span v-else-if="row.status ==3">宸插叧闂�</span>
- <span v-else>澶勭悊涓�</span>
+ <!-- <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="memberName" label="涓婃姤浜哄憳" min-width="100px">
- <template slot-scope="{row}">
- <span >{{row.memberName}} - {{row.memberPhone||''}}</span>
- </template>
- </el-table-column>
- <el-table-column prop="companyName" label="鎵�鍦ㄩ儴闂�" min-width="100px"></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>
@@ -63,17 +77,19 @@
<span v-else>鏈汉</span>
</template>
</el-table-column>
- <el-table-column prop="localtionName" label="鍙戠敓鍦扮偣" min-width="100px"></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 == 1">澶栭儴灏卞尰-
- <span v-if="row.isYiwushi == 1">鍖诲姟瀹�-
- <span v-if="row.isHurted == 1">鍙椾激</span>
- <span v-else>鏈彈浼�</span>
+ <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 v-else>鍖诲姟瀹�</span>
</span>
- <span v-else>闈炲閮ㄥ氨鍖�</span>
+ <span v-else>澶栭儴灏卞尰</span>
</template>
</el-table-column>
<el-table-column prop="workRelated" label="鍜屽伐浣滅浉鍏�" min-width="100px">
@@ -82,9 +98,15 @@
<span v-else>鍚�</span>
</template>
</el-table-column>
- <el-table-column prop="eventInfo" label="浜嬩欢璇存槑" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></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="鎿嶄綔"
@@ -92,7 +114,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaWorkorderWindow.open('SHE浜嬩欢宸ュ崟璇︽儏', row)" icon="el-icon-edit" >鏌ョ湅璇︽儏</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>
@@ -115,6 +137,7 @@
import Pagination from '@/components/common/Pagination'
import OperaWorkorderDetailSheWindow from '@/components/business/OperaWorkorderDetailSheWindow'
import { treeList } from '@/api/business/category'
+import {timeForMat} from "@/utils/util";
export default {
name: 'Workorder',
extends: BaseTable,
@@ -123,11 +146,15 @@
return {
// 鎼滅储
searchForm: {
+ queryStartTime: null,
+ queryEndTime: null,
+ radio: null,
type: '0',
memberName: '',
memberCompanyId: '',
localtionId: '',
- typeId: '',
+ typeId: null,
+ typeIdPath: null,
code: '',
categoryList: []
},
@@ -151,6 +178,38 @@
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]
--
Gitblit v1.9.3