From ff087240b3dee29ce4e14ad0836e76b9fdf312cf Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 19 八月 2025 09:28:07 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/lianhelihua_sh
---
admin/src/views/business/workorderDbh.vue | 68 +++++++++++++++++++++++++++++-----
1 files changed, 58 insertions(+), 10 deletions(-)
diff --git a/admin/src/views/business/workorderDbh.vue b/admin/src/views/business/workorderDbh.vue
index 36bcd57..2d2e4aa 100644
--- a/admin/src/views/business/workorderDbh.vue
+++ b/admin/src/views/business/workorderDbh.vue
@@ -4,12 +4,6 @@
<div slot="search-form">
<el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
<el-form-item label="椋庨櫓绫诲瀷" prop="typeIdPath">
-<!-- <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>-->
<treeselect
style="width: 150px"
v-model="searchForm.typeIdPath"
@@ -28,6 +22,33 @@
</el-form-item>
<el-form-item label="宸ュ崟鍙�" prop="code">
<el-input v-model="searchForm.code" clearable placeholder="璇疯緭鍏ュ伐鍗曞彿" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="鐘舵�佹弿杩�" prop="status">
+ <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨" clearable @change="search" >
+ <el-option label="寰呭垎閰峎TS" value="0"></el-option>
+<!--
+ <el-option label="寰呭垎閰嶄换鍔�" value="1"></el-option>
+-->
+ <el-option label="寰呭伐绋嬪笀澶勭悊" value="2"></el-option>
+ <el-option label="SHE鍏抽棴" value="3"></el-option>
+ <el-option label="WTS鍏抽棴" value="4"></el-option>
+ <el-option label="宸ョ▼甯堝叧闂�" value="5"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎻愪氦鏃堕棿" prop="queryStartTime">
+ <el-date-picker type="datetime" v-model="searchForm.queryStartTime" 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" 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>
@@ -55,17 +76,19 @@
<el-table-column prop="typeName" label="椋庨櫓绫诲瀷" min-width="100px"></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="statusInfo" label="鐘舵�佹弿杩�" min-width="100px">
+ <template slot-scope="{row}">
+ <span :class="'statusInfo'+row.status" >{{ row.statusName }}</span>
</template>
</el-table-column>
<el-table-column prop="submitDate" label="涓婃姤鏃堕棿" min-width="150px"></el-table-column>
<el-table-column prop="happenTime" label="鍙戠幇鏃堕棿" min-width="150px"></el-table-column>
<el-table-column prop="locationName" label="鍙戠敓鍦扮偣" min-width="150px"></el-table-column>
- <el-table-column prop="riskInfo" label="椋庨櫓鎻忚堪" min-width="200px"></el-table-column>
+ <el-table-column prop="riskInfo" label="椋庨櫓鎻忚堪" min-width="250px" 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>
@@ -104,6 +127,7 @@
import Pagination from '@/components/common/Pagination'
import OperaWorkorderDetailDbhWindow from '@/components/business/OperaWorkorderDetailDbhWindow'
import { treeList } from '@/api/business/category'
+import { timeForMat } from '@/utils/util'
export default {
name: 'Workorder',
extends: BaseTable,
@@ -112,6 +136,9 @@
return {
// 鎼滅储
searchForm: {
+ queryStartTime: null,
+ queryEndTime: null,
+ radio: null,
type: '3',
memberName: '',
memberCompanyId: '',
@@ -119,6 +146,7 @@
typeId: null,
typeIdPath: null,
code: '',
+ status: null,
categoryList: []
},
categoryprops: {
@@ -141,6 +169,26 @@
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灞炴��
--
Gitblit v1.9.3