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/workorderDcaChild.vue |   92 ++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 77 insertions(+), 15 deletions(-)

diff --git a/admin/src/views/business/workorderDcaChild.vue b/admin/src/views/business/workorderDcaChild.vue
index 5ee9752..f79c433 100644
--- a/admin/src/views/business/workorderDcaChild.vue
+++ b/admin/src/views/business/workorderDcaChild.vue
@@ -4,16 +4,18 @@
     <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="changeType" style="width: 120px">
+          <el-select v-model="searchForm.typeId" placeholder="涓�绾т富棰�" clearable @change="changeType" style="width: 120px">
           <el-option  clearable filterable
               v-for="item in categorys"
               :key="item.id"
               :label="item.name"
               :value="item.id">
           </el-option>
-          </el-select>-
-          <el-select v-model="searchForm.categoryId" @change="search" style="width: 120px">
-          <el-option  clearable filterable
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="categoryId">
+          <el-select v-model="searchForm.categoryId" clearable  placeholder="浜岀骇涓婚"  style="width: 120px"  @change="search" >
+          <el-option   filterable
               v-for="item in categorys1"
               :key="item.id"
               :label="item.name"
@@ -22,10 +24,37 @@
           </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: 150px"  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" style="width: 120px"  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>
@@ -45,31 +74,39 @@
         stripe
         @selection-change="handleSelectionChange"
       >
-        <el-table-column prop="code"  label="宸ュ崟鍙�" min-width="150px" fixed>
+        <el-table-column prop="code"  label="宸ュ崟鍙�" min-width="160px" fixed>
           <template slot-scope="{row}">
             <span style="color: #2E68EC;cursor: pointer" @click="$refs.operaWorkorderWindow.open('DCA浜嬩欢宸ュ崟璇︽儏', row)" >{{ row.code || '-'}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="typeName" label="瑙傚療涓婚" min-width="150px"></el-table-column>
-        <el-table-column prop="categoryName" label="浜岀骇瑙傚療涓婚" min-width="150px"></el-table-column>
-        <el-table-column prop="problemTitle" label="涓嶇鍚堥」" min-width="150px"></el-table-column>
+        <el-table-column prop="typeName" label="瑙傚療涓婚" min-width="100px">
+          <template slot-scope="{row}"> {{row.typeName}}/{{row.categoryName}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="problemTitle" label="涓嶇鍚堥」" min-width="250px"></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-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="locationName" label="浣嶇疆" min-width="150px"></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="memberName" label="涓婃姤浜哄憳" min-width="100px">
+        <el-table-column prop="eventInfo" 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>
+            <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="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'])"
@@ -101,6 +138,7 @@
 import Pagination from '@/components/common/Pagination'
 import OperaWorkorderDetailDcaInfoWindow from '@/components/business/OperaWorkorderDetailDcaInfoWindow'
 import { allList } from '@/api/business/category'
+import {timeForMat} from "@/utils/util";
 export default {
   name: 'Workorder',
   extends: BaseTable,
@@ -109,6 +147,9 @@
     return {
       // 鎼滅储
       searchForm: {
+        queryStartTime: null,
+        queryEndTime: null,
+        radio: null,
         type: '2',
         memberName: '',
         memberCompanyId: '',
@@ -116,6 +157,7 @@
         categoryId: '',
         typeId: '',
         code: '',
+        status: null,
         categoryList: []
       },
       categoryprops: {
@@ -139,6 +181,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()
+    },
     changeType(){
       this.search()
       this.categorys1 = []

--
Gitblit v1.9.3