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/workorderDcaChild.vue | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/business/workorderDcaChild.vue b/admin/src/views/business/workorderDcaChild.vue
index 4238c5b..f79c433 100644
--- a/admin/src/views/business/workorderDcaChild.vue
+++ b/admin/src/views/business/workorderDcaChild.vue
@@ -24,10 +24,22 @@
</el-select>
</el-form-item>
<el-form-item label="涓婃姤浜哄憳" prop="memberName">
- <el-input v-model="searchForm.memberName" style="width: 120px" 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" 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"
@@ -62,7 +74,7 @@
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>
@@ -71,9 +83,6 @@
<template slot-scope="{row}"> {{row.typeName}}/{{row.categoryName}}
</template>
</el-table-column>
-<!--
- <el-table-column prop="categoryName" label="浜岀骇涓婚" min-width="100px"></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}">
@@ -82,9 +91,15 @@
<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="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>
@@ -142,6 +157,7 @@
categoryId: '',
typeId: '',
code: '',
+ status: null,
categoryList: []
},
categoryprops: {
--
Gitblit v1.9.3