From 8dc5f14cb31b82de76e7d5be262d1a9c5e6e994e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 24 八月 2024 18:44:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/work-order/index.vue | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index d2b73ee..e2eab08 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -12,9 +12,7 @@
</el-form-item>
<el-form-item label="鏁呴殰绫诲瀷" prop="errorTypeList">
<el-select v-model="queryParams.errorTypeList" multiple placeholder="鏁呴殰绫诲瀷" clearable @clear="handleQuery">
- <el-option v-for="dict in dict.type.error_type"
- :value="dict.value"
- :label="dict.label"/>
+ <el-option v-for="dict in dict.type.error_type" :value="dict.value" :key="dict.value" :label="dict.label" />
</el-select>
</el-form-item>
<el-form-item label="宸ュ崟鐘舵��" prop="status">
@@ -44,7 +42,7 @@
</el-col>
</el-row>
- <el-row v-if="workOrderList && workOrderList.length > 0" :gutter="20" v-loading="loading">
+ <el-row :gutter="20" v-loading="loading">
<el-col :xl="6" :lg="8" :md="12" :sm="24" v-for="item in workOrderList" :key="item.id">
<div class="my-col">
<div style="padding-left: 10px; padding-top: 8px">
@@ -130,7 +128,7 @@
</el-col>
</el-row>
- <el-empty v-else description="鏆傛棤鏁版嵁"></el-empty>
+ <el-empty v-if="empty" description="鏆傛棤鏁版嵁"></el-empty>
<pagination
v-show="total>0"
@@ -240,9 +238,7 @@
>
<el-form-item label="鏁呴殰绫诲瀷" prop="errorType">
<el-select v-model="batchAuditingWorkOrder.errorTypes" multiple placeholder="鏁呴殰绫诲瀷">
- <el-option v-for="(item, index) in errorTypeOptions" :label="item.dictLabel" :value="item.dictValue"
- :key="index"
- ></el-option>
+ <el-option v-for="dict in dict.type.error_type" :value="dict.value" :key="dict.value" :label="dict.label" />
</el-select>
</el-form-item>
<el-form-item label="瀹℃牳璇存槑" prop="auditingRemark">
@@ -381,7 +377,6 @@
getYwAuditingList
} from '@/api/platform/work-order'
import { addReport } from '@/api/platform/report'
-import { getDicts } from '@/api/system/dict/data'
export default {
name: 'Work-order',
@@ -389,8 +384,8 @@
components: {},
data() {
return {
+ empty: false,
openShowCurrent: null,
- errorTypeOptions: [],
ywConditions: [],
batchAuditingVisible: false,
batchAuditingWorkOrder: {
@@ -653,6 +648,7 @@
},
/** 鏌ヨ杩愮淮宸ュ崟鍒楄〃 */
getList() {
+ this.empty = false;
this.loading = true
this.queryParams.params = {}
this.queryParams['start'] = this.daterangeYwHandleTime ? this.daterangeYwHandleTime[0] : null
@@ -669,6 +665,9 @@
this.workOrderList = response.data
this.total = response.total
this.loading = false
+ if (this.total === 0) {
+ this.empty = true
+ }
})
},
// 鍙栨秷鎸夐挳
--
Gitblit v1.8.0