From c44c76ea3e1f6b70bb84bdde85ffd1b389e5b8f4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 23 四月 2025 10:58:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/workorderDbh.vue | 54 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/admin/src/views/business/workorderDbh.vue b/admin/src/views/business/workorderDbh.vue
index c4a78c2..4be20da 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,21 @@
</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="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,9 +64,11 @@
<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-else-if="row.status ==3 ||row.status ==4||row.status ==5">宸插鐞�</span>
- <span :class="'statusInfo'+row.status" v-else>澶勭悊涓�</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="submitDate" label="涓婃姤鏃堕棿" min-width="150px"></el-table-column>
@@ -70,8 +81,7 @@
<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="memberNames" label="閫氱煡浜�" min-width="100px"></el-table-column>
+ <el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="150px"></el-table-column>this绠′粬浜�
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="150px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:workorder:update', 'business:workorder:delete'])"
@@ -103,6 +113,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,
@@ -111,6 +122,9 @@
return {
// 鎼滅储
searchForm: {
+ queryStartTime: null,
+ queryEndTime: null,
+ radio: null,
type: '3',
memberName: '',
memberCompanyId: '',
@@ -140,6 +154,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