From fc757b7e8dd314e0ea58de4b3605eb4bf9d68364 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 09 七月 2024 09:26:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/work-order/index.vue | 86 +++++++++++++++++++++++++++++++++++-------
1 files changed, 71 insertions(+), 15 deletions(-)
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index 14f07aa..121c94d 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -12,12 +12,11 @@
</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">
- <el-select v-model="queryParams.status" placeholder="瀹℃牳鐘舵��" clearable @clear="handleQuery">
+ <el-select v-model="queryParams.status" placeholder="瀹℃牳鐘舵��" @change="handleQuery">
<el-option label="宸蹭笅鍙�" value="DISTRIBUTED"></el-option>
<el-option label="杩愮淮宸插鐞�" value="YW_HANDLE"></el-option>
<el-option label="瀹℃牳閫氳繃" value="AUDITING_SUCCESS"></el-option>
@@ -43,6 +42,18 @@
</el-form-item>
</el-form>
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ size="mini"
+ @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' }">
@@ -140,12 +151,14 @@
<el-form-item label="杩愮淮浜哄憳" prop="ywPeopleName">
<el-input v-model="auditingForm.ywPeopleName" disabled />
</el-form-item>
- <el-form-item label="鐜板満鎯呭喌" v-if="auditingForm.condition">
- <span v-html="auditingForm.condition"></span>
- </el-form-item>
- <el-form-item label="浣愯瘉鏉愭枡" v-if="auditingForm.proofMaterials">
- <el-link v-for="item in auditingForm.proofMaterials != null ? auditingForm.proofMaterials.split(',') : auditingForm.proofMaterials" :underline="false" :key="item.id" @click="handleDownload(item)">{{ item.substring(item.lastIndexOf("/") + 1) }}</el-link>
- </el-form-item>
+ <div v-for="obj, index in ywConditions" :key="index">
+ <el-form-item :label="'鐜板満鎯呭喌' + (index + 1)" v-if="obj.ywCondition">
+ <span v-html="obj.ywCondition"></span>
+ </el-form-item>
+ <el-form-item label="浣愯瘉鏉愭枡" v-if="obj.ywProofMaterials">
+ <el-link v-for="item in obj.ywProofMaterials != null ? obj.ywProofMaterials.split(',') : obj.ywProofMaterials" :underline="false" :key="item.id" @click="handleDownload(item)">{{ item.substring(item.lastIndexOf("/") + 1) }}</el-link>
+ </el-form-item>
+ </div>
<el-form-item label="瀹℃牳缁撴灉" prop="auditingResult">
<el-radio v-model="auditingForm.auditingResult" label="AUDITING_SUCCESS">閫氳繃</el-radio>
<el-radio v-model="auditingForm.auditingResult" label="AUDITING_FAIL">椹冲洖</el-radio>
@@ -184,9 +197,26 @@
</div>
</el-dialog>
+ <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="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">
+ <el-input v-model="batchAuditingWorkOrder.auditingRemark" type="textarea" maxlength="30" show-word-limit />
+ </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>
+ </div>
+ </el-dialog>
+
<!-- 杩囩▼鍥� -->
- <el-dialog title="杩囩▼鍥�" :visible.sync="flowOpen" width="1200px" :close-on-click-modal="false" append-to-body>
+ <el-dialog title="杩囩▼鍥�" :visible.sync="flowOpen" width="1200px" append-to-body>
<div>
<el-steps :active="ywAuditingList.length != 0 ? 3 : ywHandleList.length != 0 ? 2 : 1" :space="500">
<el-step title="浜х敓宸ュ崟">
@@ -283,14 +313,19 @@
}
</style>
<script>
-import { listWorkOrder, getWorkOrder, delWorkOrder, addWorkOrder, updateWorkOrder,auditing, ywCondition, getYwCondition, getYwConditionList, getYwAuditingList } from "@/api/platform/work-order";
+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: {},
ywHandleList: [],
ywAuditingList: [],
reportFormRules: {
@@ -388,12 +423,32 @@
{ required: true, message: "杩愮淮妫�娴嬬粨鏋滀笉鑳戒负绌�", trigger: "blur" }
],
},
+ // 鎵归噺瀹℃牳鏍￠獙
+ batchAuditingRules: {
+ errorType: [
+ { required: true, message: "璇烽�夋嫨鏁呴殰绫诲瀷", trigger: "blur" }
+ ],
+ }
};
},
created() {
this.getList();
},
methods: {
+ // 鎵归噺瀹℃牳
+ batchAuditing(result) {
+ this.batchAuditingWorkOrder.auditingResult = result;
+ this.$refs["batchAuditingWorkOrder"].validate(valid => {
+ if (valid) {
+ batchAuditing(this.batchAuditingWorkOrder).then(res => {
+ this.batchAuditingWorkOrder = {};
+ this.batchAuditingVisible = false;
+ this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ this.getList();
+ })
+ }
+ })
+ },
/** 涓嬭浇鎸夐挳鎿嶄綔 */
handleDownload (data) {
this.$download.resource(data);
@@ -420,10 +475,7 @@
handleAuditing(row) {
this.auditingForm = row;
getYwCondition(row.id).then(response => {
- if (response.data) {
- this.auditingForm.condition = response.data.ywCondition;
- this.auditingForm.proofMaterials = response.data.ywProofMaterials;
- }
+ this.ywConditions = response.data;
this.auditingOpen = true;
});
},
@@ -546,6 +598,10 @@
this.total = response.total;
this.loading = false;
});
+ // 鑾峰彇鏁呴殰绫诲瀷
+ getDicts("error_type").then(response => {
+ this.errorTypeOptions = response.data;
+ });
},
// 鍙栨秷鎸夐挳
cancel() {
--
Gitblit v1.8.0