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 | 243 ++++++++++++++++++++++++++++++------------------
1 files changed, 152 insertions(+), 91 deletions(-)
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index 1ccba98..acce881 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -12,8 +12,15 @@
</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="瀹℃牳鐘舵��" @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>
+ <el-option label="瀹℃牳涓嶉�氳繃" value="AUDITING_FAIL"></el-option>
</el-select>
</el-form-item>
<el-form-item label="杩愮淮澶勭悊鏃堕棿">
@@ -35,13 +42,25 @@
</el-form-item>
</el-form>
- <el-row>
- <el-col :span="8" v-for="item in workOrderList" :key="item" style="width: 390px;margin-left: 40px;margin-top:20px;">
- <el-card :body-style="{ padding: '0px' }">
+ <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' }">
<el-image :preview-src-list="['https://img2.baidu.com/it/u=68398439,1553004927&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=357']" fit="cover" src="https://img2.baidu.com/it/u=68398439,1553004927&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=357" class="image"/>
- <div style="padding-right: 10px;padding-top: 10px;float: right;">
+ <div style="padding-right: 10px;padding-top: 10px;">
<el-row>
- <el-col :span="24" class="time">鏁呴殰绫诲瀷锛�<el-tag size="small" type="danger">甯傛斂鏂藉伐</el-tag></el-col>
+ <el-col :span="24" class="time">鏁呴殰绫诲瀷锛�<el-tag size="small" type="danger">{{ item.errorType }}</el-tag></el-col>
</el-row>
<el-row class="work-order-item">
<el-col class="time" :span="24">杩愮淮浜哄憳锛歿{ item.ywPeopleName }}</el-col>
@@ -76,6 +95,7 @@
size="mini"
type="text"
@click="handleReport(item)"
+ v-hasPermi="['system:report:add']"
>浜嬪悗鎶ュ</el-button>
</el-row>
</div>
@@ -94,8 +114,8 @@
<!-- 浜嬪悗鎶ュ -->
<el-dialog title="浜嬪悗鎶ュ" :visible.sync="reportOpen" width="600px" append-to-body>
<el-form ref="reportForm" :model="reportForm" :rules="reportFormRules" label-width="80px">
- <el-form-item label="鐐逛綅" prop="pointId">
- <el-input v-model="reportForm.pointId" disabled />
+ <el-form-item label="鐐逛綅" prop="source">
+ <el-input v-model="reportForm.source" disabled />
</el-form-item>
<el-form-item label="鎶ュ绫诲瀷">
<el-input v-model="reportForm.reportType" disabled />
@@ -131,15 +151,17 @@
<el-form-item label="杩愮淮浜哄憳" prop="ywPeopleName">
<el-input v-model="auditingForm.ywPeopleName" disabled />
</el-form-item>
- <el-form-item label="鐜板満鎯呭喌">
- <el-input type="textarea" v-html="auditingForm.condition" disabled />
- </el-form-item>
- <el-form-item label="浣愯瘉鏉愭枡">
- <el-link v-for="item in auditingForm.proofMaterials != null ? auditingForm.proofMaterials.split(',') : auditingForm.proofMaterials" :underline="false" :key="item" @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="pass">閫氳繃</el-radio>
- <el-radio v-model="auditingForm.auditingResult" label="return">椹冲洖</el-radio>
+ <el-radio v-model="auditingForm.auditingResult" label="AUDITING_SUCCESS">閫氳繃</el-radio>
+ <el-radio v-model="auditingForm.auditingResult" label="AUDITING_FAIL">椹冲洖</el-radio>
</el-form-item>
<el-form-item label="瀹℃牳澶囨敞" prop="auditingRemark">
<el-input v-model="auditingForm.auditingRemark" type="textarea" maxlength="30" show-word-limit/>
@@ -152,7 +174,7 @@
</el-dialog>
<el-dialog title="杩愮淮鎯呭喌璁板綍" :visible.sync="ywConditionOpen" width="500px" append-to-body>
- <el-form ref="ywConditionForm" :model="ywConditionForm" :rules="ywConditionRules" label-width="80px">
+ <el-form ref="form" :model="form" :rules="ywConditionRules" label-width="80px">
<el-form-item label="宸ュ崟鍙�" prop="workOrderNo">
<el-input v-model="ywConditionForm.workOrderNo" disabled />
</el-form-item>
@@ -160,13 +182,13 @@
<el-input v-model="ywConditionForm.unitName" disabled />
</el-form-item>
<el-form-item label="杩愮淮浜哄憳" prop="ywPeopleName">
- <el-input v-model="ywConditionForm.ywPeopleName" />
+ <el-input v-model="ywConditionForm.ywPeopleName" disabled />
</el-form-item>
- <el-form-item label="鐜板満鎯呭喌" prop="reportContent">
- <editor v-model="form.condition" :min-height="192"/>
+ <el-form-item label="鐜板満鎯呭喌" prop="ywCondition">
+ <editor v-model="form.ywCondition" :min-height="192"/>
</el-form-item>
- <el-form-item label="浣愯瘉鏉愭枡" prop="reportMaterials">
- <file-upload v-model="form.proofMaterials"/>
+ <el-form-item label="浣愯瘉鏉愭枡" prop="ywProofMaterials">
+ <file-upload v-model="form.ywProofMaterials"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -175,11 +197,28 @@
</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="2" :space="500">
+ <el-steps :active="ywAuditingList.length != 0 ? 3 : ywHandleList.length != 0 ? 2 : 1" :space="500">
<el-step title="浜х敓宸ュ崟">
<template slot="description">
<div>
@@ -195,88 +234,55 @@
<div class="flow-item-x">
鍒涘缓鏃堕棿锛歿{flowForm.createTime}}
</div>
- <div class="flow-item-x">
- 澶勭悊鏈熼檺锛�<el-tag type="danger" size="small">12灏忔椂</el-tag>
+ <div class="flow-item-x" v-if="flowForm.processingPeriod">
+ 澶勭悊鏈熼檺锛�<el-tag type="danger" size="small">{{ flowForm.processingPeriod }}</el-tag>
</div>
</div>
</template>
</el-step>
<el-step title="杩愮淮澶勭悊">
<template slot="description">
- <div class="y-item">
+ <div class="y-item" v-for="(item, index) in ywHandleList" :key="index">
<div class="y-item-1">
<div class="flow-item-x">
- 杩愮淮鐘舵�侊細<el-tag type="danger" size="small">缁撴灉涓婃姤</el-tag>
+ 鐜板満鎯呭喌锛�
+ <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 type="danger" size="small">{{flowForm.ywPeopleName}}</el-tag>
- </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>
+ </div> -->
</div>
<div class="y-item-2">
<div >
- {{flowForm.ywHandleTime}}
+ {{ parseTime(item.createTime) }}
</div>
<div >
- 绗嚑娆★細1
+ 绗嚑娆★細{{ index + 1 }}
</div>
</div>
</div>
- <div class="y-item">
- <div class="y-item-1">
- <div class="flow-item-x">
- 杩愮淮鐘舵�侊細<el-tag type="danger" size="small">缁撴灉涓婃姤</el-tag>
- </div>
- <div class="flow-item-x">
- 杩愮淮浜哄憳锛�<el-tag type="danger" size="small">{{flowForm.ywPeopleName}}</el-tag>
- </div>
- </div>
- <div class="y-item-2">
- <div >
- {{flowForm.ywHandleTime}}
- </div>
- <div >
- 绗嚑娆★細2
- </div>
- </div>
- </div>
-
</template>
</el-step>
<el-step title="缁撴灉瀹℃牳">
<template slot="description">
- <div class="y-item">
+ <div class="y-item" v-for="(item, index) in ywAuditingList" :key="index">
<div class="y-item-1">
<div class="flow-item-x">
- 瀹℃牳缁撴灉锛�<el-tag type="danger" size="small">椹冲洖</el-tag>
+ 瀹℃牳缁撴灉锛�<el-tag :type="item.result == '瀹℃牳閫氳繃' ? 'success' : 'danger'" size="small">{{ item.result }}</el-tag>
</div>
<div class="flow-item-x">
- 瀹℃牳璇存槑锛�<el-tag type="danger" size="small">鏈垚鍔熷鐞�</el-tag>
+ 瀹℃牳璇存槑锛�<el-tag size="small" v-if="item.remark">{{ item.remark }}</el-tag>
</div>
</div>
<div class="y-item-2">
<div >
- {{flowForm.ywHandleTime}}
+ {{ parseTime(item.createTime) }}
</div>
<div >
- 绗嚑娆★細1
- </div>
- </div>
- </div>
- <div class="y-item">
- <div class="y-item-1">
- <div class="flow-item-x">
- 瀹℃牳鐘舵�侊細<el-tag type="info" size="small">瀹℃牳涓�</el-tag>
- </div>
- <div class="flow-item-x">
- 瀹℃牳璇存槑锛�
- </div>
- </div>
- <div class="y-item-2">
- <div >
- {{flowForm.ywHandleTime}}
- </div>
- <div >
- 绗嚑娆★細2
+ 绗嚑娆★細{{ index + 1 }}
</div>
</div>
</div>
@@ -308,13 +314,21 @@
}
</style>
<script>
-import { listWorkOrder, getWorkOrder, delWorkOrder, addWorkOrder, updateWorkOrder,auditing, ywCondition } 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: {
reportContent: [
{ required: true, message: "鎶ュ鍐呭涓嶈兘涓虹┖", trigger: "blur" }
@@ -326,7 +340,7 @@
reportOpen: false,
reportForm: {
reportType: "浜嬪悗鎶ュ",
- pointId: "鐞间簬闀�3琛�1鍙锋憚鍍忓ご",
+ pointId: "",
errorType: "",
reportContent: "",
reportMaterials: ""
@@ -366,6 +380,7 @@
ywHandleTime: null,
ywResult: null,
ywCondition: null,
+ status: ''
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -409,12 +424,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);
@@ -423,9 +458,9 @@
submitReportForm() {
this.$refs["reportForm"].validate(valid => {
if (valid) {
- addReport(this.form).then(response => {
+ addReport(this.reportForm).then(response => {
this.$modal.msgSuccess("鎴愬姛鎻愪氦鎶ュ");
- this.open = false;
+ this.reportOpen = false;
this.getList();
});
}
@@ -433,20 +468,24 @@
},
// 浜嬪悗鎶ュ鎸夐挳
handleReport(row) {
- this.reportForm.pointId = row.source;
+ this.reportForm.pointId = row.pointId;
+ this.reportForm.source = row.source;
this.reportOpen = true;
},
// 瀹℃牳鎸夐挳
handleAuditing(row) {
this.auditingForm = row;
- this.auditingForm.condition = '璁惧寮傚父閬尅锛岀幇鍦轰慨澶嶅畬鎴�'
- this.auditingForm.proofMaterials = '30璺敱閰嶇疆_20240411101816A008.png'
- this.auditingOpen = true;
+ getYwCondition(row.id).then(response => {
+ this.ywConditions = response.data;
+ this.auditingOpen = true;
+ });
},
// 杩愮淮鎯呭喌鎸夐挳
handleYwCondition(row) {
+ this.form = {};
this.ywConditionForm = row;
this.ywConditionOpen = true;
+ this.form.id = row.id;
},
// 杩愮淮缁撴灉鎸夐挳
handleYwResult(row) {
@@ -460,8 +499,18 @@
},
// 杩囩▼鍥炬煡鐪�
handleFlow(row) {
- this.flowOpen = true;
this.flowForm = row;
+ getYwAuditingList(row.id).then(response => {
+ if (response.data) {
+ this.ywAuditingList = response.data;
+ }
+ });
+ getYwConditionList(row.id).then(response => {
+ if (response.data) {
+ this.ywHandleList = response.data;
+ }
+ this.flowOpen = true;
+ });
},
// 鎻愪氦瀹℃牳
submitAuditing() {
@@ -470,6 +519,7 @@
auditing(this.auditingForm).then(res => {
this.auditingOpen = false;
this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ this.getList();
})
}
})
@@ -507,11 +557,12 @@
},
// 鎻愪氦杩愮淮鎯呭喌
submitYwCondition() {
- this.$refs["ywConditionForm"].validate(valid => {
+ this.$refs["form"].validate(valid => {
if (valid) {
- ywCondition(this.ywConditionForm).then(res => {
+ ywCondition(this.form).then(res => {
this.ywConditionOpen = false;
this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ this.getList();
})
}
})
@@ -540,14 +591,17 @@
getList() {
this.loading = true;
this.queryParams.params = {};
- if (null != this.daterangeYwHandleTime && '' != this.daterangeYwHandleTime) {
- this.queryParams["start"] = this.daterangeYwHandleTime[0];
- this.queryParams["end"] = this.daterangeYwHandleTime[1];
- }
+ this.queryParams["start"] = this.daterangeYwHandleTime ? this.daterangeYwHandleTime[0] : null;
+ this.queryParams["end"] = this.daterangeYwHandleTime ? this.daterangeYwHandleTime[1] : null;
+ if (this.queryParams["status"] == "") { this.queryParams["status"] = "DISTRIBUTED"; }
listWorkOrder(this.queryParams).then(response => {
this.workOrderList = response.data;
this.total = response.total;
this.loading = false;
+ });
+ // 鑾峰彇鏁呴殰绫诲瀷
+ getDicts("error_type").then(response => {
+ this.errorTypeOptions = response.data;
});
},
// 鍙栨秷鎸夐挳
@@ -673,4 +727,11 @@
height: 150px;
padding: 10px;
}
+
+.line-limit-length {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ width: 200px;
+}
</style>
--
Gitblit v1.8.0