From dd1bb5e756d7dbebf0140deb8e2510c1cbbd81db Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 17 七月 2024 11:20:49 +0800
Subject: [PATCH] 工单阈值字段定义，菜单样式回滚
---
src/views/system/work-order/index.vue | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index b7f4051..acce881 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -12,8 +12,7 @@
</el-form-item>
<el-form-item label="鏁呴殰绫诲瀷" prop="workOrderNo">
<el-select v-model="queryParams.errorType" placeholder="鏁呴殰绫诲瀷" clearable @clear="handleQuery">
- <el-option label="甯傛斂鏂藉伐" value="甯傛斂鏂藉伐"></el-option>
- <el-option label="璁惧閬楀け" value="璁惧閬楀け"></el-option>
+ <el-option v-for="item, index in errorTypeOptions" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="瀹℃牳鐘舵��" prop="status">
@@ -49,12 +48,12 @@
type="primary"
plain
size="mini"
- @click="batchAuditingVisible = true"
+ @click="batchAuditingVisible = true; batchAuditingWorkOrder = {}"
v-hasPermi="['work:order:audit']"
>鎵归噺瀹℃牳</el-button>
</el-col>
</el-row>
-
+
<el-row :gutter="20">
<el-col :xl="6" :lg="8" :md="12" :sm="24" v-for="item in workOrderList" :key="item.id" style="margin-bottom: 20px;">
<el-card :body-style="{ padding: '0px',display: 'flex' }">
@@ -200,9 +199,9 @@
<el-dialog title="杩愮淮鎵归噺瀹℃牳" :visible.sync="batchAuditingVisible" width="500px" append-to-body>
<el-form ref="batchAuditingWorkOrder" :model="batchAuditingWorkOrder" label-width="80px" :rules="batchAuditingRules">
- <el-form-item label="宸ュ崟缂栧彿" prop="ids">
- <el-select v-model="batchAuditingWorkOrder.ids" placeholder="璇烽�夋嫨宸ュ崟" multiple clearable>
- <el-option v-for="item in workOrderList" :key="item.id" :label="item.workOrderNo" :value="item.id" />
+ <el-form-item label="鏁呴殰绫诲瀷" prop="errorType">
+ <el-select v-model="batchAuditingWorkOrder.errorType" placeholder="鏁呴殰绫诲瀷">
+ <el-option v-for="item, index in errorTypeOptions" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="瀹℃牳璇存槑" prop="auditingRemark">
@@ -247,9 +246,10 @@
<div class="y-item-1">
<div class="flow-item-x">
鐜板満鎯呭喌锛�
- <el-tooltip class="item" effect="dark" :content="item.ywCondition" placement="top">
- <el-tag size="small" class="line-limit-length">{{ item.ywCondition }}</el-tag>
- </el-tooltip>
+ <div v-html="item.ywCondition"></div>
+<!-- <el-tooltip class="item" effect="dark" :content="item.ywCondition" placement="top">-->
+<!-- <el-tag size="small" class="line-limit-length">{{ item.ywCondition }}</el-tag>-->
+<!-- </el-tooltip>-->
</div>
<!-- <div class="flow-item-x">
<el-tag size="small" v-for="file in item.ywProofMaterials != null ? item.ywProofMaterials.split(',') : item.ywProofMaterials" :key="file" @click="handleDownload(file)">{{ file.substring(file.lastIndexOf("/") + 1) }}</el-tag>
@@ -316,12 +316,14 @@
<script>
import { listWorkOrder, getWorkOrder, delWorkOrder, addWorkOrder, updateWorkOrder, auditing, batchAuditing, ywCondition, getYwCondition, getYwConditionList, getYwAuditingList } from "@/api/platform/work-order";
import { addReport } from "@/api/platform/report";
+import { getDicts } from "@/api/system/dict/data";
export default {
name: "Work-order",
components: {
},
data() {
return {
+ errorTypeOptions: [],
ywConditions: [],
batchAuditingVisible: false,
batchAuditingWorkOrder: {},
@@ -424,8 +426,8 @@
},
// 鎵归噺瀹℃牳鏍￠獙
batchAuditingRules: {
- ids: [
- { required: true, message: "璇烽�夋嫨瑕佸鏍哥殑宸ュ崟", trigger: "blur" }
+ errorType: [
+ { required: true, message: "璇烽�夋嫨鏁呴殰绫诲瀷", trigger: "blur" }
],
}
};
@@ -597,6 +599,10 @@
this.total = response.total;
this.loading = false;
});
+ // 鑾峰彇鏁呴殰绫诲瀷
+ getDicts("error_type").then(response => {
+ this.errorTypeOptions = response.data;
+ });
},
// 鍙栨秷鎸夐挳
cancel() {
--
Gitblit v1.8.0