From 032f47cfabb2d1960f8bb4774ea79a93e1709947 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 19 七月 2024 09:52:13 +0800
Subject: [PATCH] 工单下发页面按钮调整
---
src/views/system/work-order/index.vue | 45 +++++++++++++++++++++++++++------------------
1 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index b7f4051..64d5232 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.errorTypes" multiple 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">
@@ -210,8 +209,8 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="batchAuditing('AUDITING_SUCCESS')">瀹� 鏍�</el-button>
- <el-button type="danger" @click="batchAuditing('AUDITING_FAIL')">椹� 鍥�</el-button>
+ <el-button type="primary" @click="batchAuditing('AUDITING_SUCCESS')" size="small">閫� 杩�</el-button>
+ <el-button type="danger" @click="batchAuditing('AUDITING_FAIL')" size="small">椹� 鍥�</el-button>
</div>
</el-dialog>
@@ -247,9 +246,9 @@
<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>
+ <!-- <el-tooltip class="item" effect="dark" :content="item.ywCondition" placement="top"> -->
+ <span v-html="item.ywCondition"></span>
+ <!-- </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>
@@ -260,7 +259,7 @@
{{ parseTime(item.createTime) }}
</div>
<div >
- 绗嚑娆★細{{ index + 1 }}
+ 绗瑊{ index + 1 }}娆�
</div>
</div>
</div>
@@ -274,7 +273,7 @@
瀹℃牳缁撴灉锛�<el-tag :type="item.result == '瀹℃牳閫氳繃' ? 'success' : 'danger'" size="small">{{ item.result }}</el-tag>
</div>
<div class="flow-item-x">
- 瀹℃牳璇存槑锛�<el-tag size="small" v-if="item.remark">{{ item.remark }}</el-tag>
+ 瀹℃牳璇存槑锛�<span v-html="item.remark"></span>
</div>
</div>
<div class="y-item-2">
@@ -282,7 +281,7 @@
{{ parseTime(item.createTime) }}
</div>
<div >
- 绗嚑娆★細{{ index + 1 }}
+ 绗瑊{ index + 1 }}娆�
</div>
</div>
</div>
@@ -316,15 +315,21 @@
<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: {},
+ batchAuditingWorkOrder: {
+ errorTypes: [],
+ auditingRemark: '',
+ auditingResult: ''
+ },
ywHandleList: [],
ywAuditingList: [],
reportFormRules: {
@@ -424,8 +429,8 @@
},
// 鎵归噺瀹℃牳鏍￠獙
batchAuditingRules: {
- ids: [
- { required: true, message: "璇烽�夋嫨瑕佸鏍哥殑宸ュ崟", trigger: "blur" }
+ errorTypes: [
+ { required: true, message: "璇烽�夋嫨鏁呴殰绫诲瀷", trigger: "change" }
],
}
};
@@ -597,6 +602,10 @@
this.total = response.total;
this.loading = false;
});
+ // 鑾峰彇鏁呴殰绫诲瀷
+ getDicts("error_type").then(response => {
+ this.errorTypeOptions = response.data;
+ });
},
// 鍙栨秷鎸夐挳
cancel() {
--
Gitblit v1.8.0