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/workorderDca.vue | 78 +++++++++++++++++++++++++++++++--------
1 files changed, 62 insertions(+), 16 deletions(-)
diff --git a/admin/src/views/business/workorderDca.vue b/admin/src/views/business/workorderDca.vue
index 248222f..2d4faf3 100644
--- a/admin/src/views/business/workorderDca.vue
+++ b/admin/src/views/business/workorderDca.vue
@@ -3,8 +3,8 @@
<!-- 鎼滅储琛ㄥ崟 -->
<div slot="search-form">
<el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
- <el-form-item label="椋庨櫓绫诲瀷" prop="typeId">
- <el-select v-model="searchForm.typeId" @change="search">
+ <el-form-item label="瑙傚療涓婚" prop="typeId">
+ <el-select v-model="searchForm.typeId" @change="search" style="width: 120px">
<el-option clearable filterable
v-for="item in categorys"
:key="item.id"
@@ -14,12 +14,25 @@
</el-select>
</el-form-item>
<el-form-item label="涓婃姤浜哄憳" prop="memberName">
- <el-input v-model="searchForm.memberName" clearable placeholder="浜哄憳濮撳悕鎴栨墜鏈哄彿" @keypress.enter.native="search"></el-input>
-
-
+ <el-input v-model="searchForm.memberName" style="width: 120px" clearable placeholder="浜哄憳濮撳悕鎴栨墜鏈哄彿" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="宸ュ崟鍙�" prop="code">
- <el-input v-model="searchForm.code" clearable 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 style="width: 185px" 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 style="width: 185px" 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>
@@ -41,24 +54,33 @@
>
<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>
+ <span style="color: #2E68EC;cursor: pointer" @click="$refs.operaWorkorderWindow.open('DCA浜嬩欢宸ュ崟璁板綍璇︽儏', row)" >{{ row.code || '-'}}</span>
</template>
</el-table-column>
- <el-table-column prop="memberName" label="涓婃姤浜哄憳" min-width="100px">
- <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="100px"></el-table-column>
<el-table-column prop="typeName" label="瑙傚療涓婚" min-width="150px"></el-table-column>
<el-table-column prop="dcaYesNum" label="瑙傚療椤圭粺璁�" min-width="150px">
<template slot-scope="{row}">
<span style="color: #1562e2" >绗﹀悎锛歿{row.dcaYesNum}} 锛屼笉绗﹀悎锛�<span style="color:red;">{{row.dcaNoNum}}</span> </span>
</template>
</el-table-column>
+ <el-table-column prop="locationName" 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="submitDate" label="涓婃姤鏃堕棿" min-width="150px"></el-table-column>
<el-table-column prop="happenTime" label="鍙戠幇鏃堕棿" min-width="150px"></el-table-column>
+ <el-table-column prop="memberNames" label="閫氱煡浜�" min-width="150px"></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'])"
@@ -67,7 +89,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaWorkorderWindow.open('DCA浜嬩欢宸ュ崟璇︽儏', row)" icon="el-icon-zoom-out" >鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" @click="$refs.operaWorkorderWindow.open('DCA浜嬩欢宸ュ崟璁板綍璇︽儏', 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>
@@ -90,6 +112,7 @@
import Pagination from '@/components/common/Pagination'
import OperaWorkorderDetailDcaWindow from '@/components/business/OperaWorkorderDetailDcaWindow'
import { allList } from '@/api/business/category'
+import { timeForMat } from '@/utils/util'
export default {
name: 'Workorder',
extends: BaseTable,
@@ -98,11 +121,14 @@
return {
// 鎼滅储
searchForm: {
+ queryStartTime: null,
+ queryEndTime: null,
+ radio: null,
type: '1',
memberName: '',
memberCompanyId: '',
localtionId: '',
- typeId: '',
+ typeId: null,
code: '',
categoryList: []
},
@@ -126,6 +152,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()
+ },
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