From 47a9d0b2711203995fd5eeb00df1bebda7d63ad8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 21 三月 2024 10:27:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/work-order/index.vue | 320 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 299 insertions(+), 21 deletions(-)
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index 993fa72..a40125e 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -59,7 +59,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['x:work-order:remove']"
>鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
@@ -79,48 +78,56 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="宸ュ崟鍙�" align="center" prop="workOrderNo" width="170"/>
<el-table-column label="宸ュ崟鏉ユ簮" align="center" prop="source" width="170"/>
+ <el-table-column label="鏄惁鎶ュ" align="center" width="170">
+ <template slot-scope="scope">
+ <el-tag>宸叉姤澶�(浜嬪墠)</el-tag>
+ </template>
+ </el-table-column>
<el-table-column label="鏁呴殰绫诲瀷" align="center" prop="errorType" width="170"/>
<el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitName" width="150"/>
<el-table-column label="杩愮淮浜哄憳" align="center" prop="ywPeopleName" />
<el-table-column label="杩愮淮澶勭悊鏃堕棿" align="center" prop="ywHandleTime" width="180"/>
+ <el-table-column label="澶勭悊缁撴潫鏃堕棿" align="center" prop="ywHandleTime" width="180"/>
<el-table-column label="杩愮淮缁撴灉" align="center" prop="ywResult" />
<el-table-column label="杩愮淮鎯呭喌" align="center" prop="ywCondition" width="150"/>
- <el-table-column label="杩愮淮妫�娴嬬粨鏋�" align="center" prop="ywCheckResult" width="230"/>
+ <el-table-column label="杩愮淮妫�娴嬬粨鏋�" align="center" prop="ywCheckResult" width="200"/>
+ <el-table-column label="瀹℃牳閫氳繃鏃堕棿" align="center" prop="ywHandleTime" width="200"/>
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180"/>
<el-table-column label="鎿嶄綔" fixed="right" width="150" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
-<!-- <el-button-->
-<!-- size="mini"-->
-<!-- type="text"-->
-<!-- icon="el-icon-edit"-->
-<!-- @click="handleUpdate(scope.row)"-->
-<!-- v-hasPermi="['x:work-order:edit']"-->
-<!-- >淇敼</el-button>-->
<el-button
size="mini"
type="text"
@click="handleAuditing(scope.row)"
- v-hasPermi="['x:work-order:remove']"
+ v-hasPermi="['work:order:audit']"
>瀹℃牳</el-button>
<el-button
size="mini"
type="text"
@click="handleYwCondition(scope.row)"
- v-hasPermi="['x:work-order:remove']"
>杩愮淮鎯呭喌</el-button>
- <el-button
- size="mini"
- type="text"
- @click="handleYwResult(scope.row)"
- v-hasPermi="['x:work-order:remove']"
- >杩愮淮缁撴灉</el-button>
+<!-- <el-button-->
+<!-- size="mini"-->
+<!-- type="text"-->
+<!-- @click="handleYwResult(scope.row)"-->
+<!-- >杩愮淮缁撴灉</el-button>-->
<el-button
size="mini"
type="text"
@click="handleCheckResult(scope.row)"
- v-hasPermi="['x:work-order:remove']"
+ v-hasPermi="['work:order:result']"
>妫�娴嬬粨鏋�</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ @click="handleFlow(scope.row)"
+ >杩囩▼鍥�</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ @click="handleReport(scope.row)"
+ >浜嬪悗鎶ュ</el-button>
</template>
</el-table-column>
</el-table>
@@ -132,6 +139,35 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
+
+ <!-- 浜嬪悗鎶ュ -->
+ <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>
+ <el-form-item label="鎶ュ绫诲瀷">
+ <el-input v-model="reportForm.reportType" disabled />
+ </el-form-item>
+ <el-form-item label="鏁呴殰绫诲瀷" prop="errorType">
+ <el-select v-model="reportForm.errorType">
+ <el-option label="甯傛斂鏂藉伐" value="甯傛斂鏂藉伐"/>
+ <el-option label="璁惧鏁呴殰" value="璁惧鏁呴殰"/>
+ <el-option label="璁惧閬楀け" value="璁惧閬楀け"/>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎶ュ鍐呭" prop="reportContent">
+ <editor v-model="reportForm.reportContent" :min-height="192"/>
+ </el-form-item>
+ <el-form-item label="涓婃姤鏉愭枡" prop="reportMaterials">
+ <file-upload v-model="reportForm.reportMaterials"/>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitReportForm">鎻� 浜�</el-button>
+ <el-button @click="reportOpen = false">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
<el-dialog title="宸ュ崟瀹℃牳" :visible.sync="auditingOpen" width="500px" append-to-body>
<el-form ref="auditingForm" :model="auditingForm" :rules="auditingRules" label-width="80px">
@@ -168,6 +204,34 @@
</el-form-item>
<el-form-item label="杩愮淮浜哄憳" prop="ywPeopleName">
<el-input v-model="ywConditionForm.ywPeopleName" disabled />
+ </el-form-item>
+ <el-form-item label="鐜板満鍥剧墖" prop="picture">
+ <el-upload
+ class="avatar-uploader"
+ action="/dev-api/common/upload"
+ name="file"
+ :headers="{'Authorization': 'Bearer ' + getToken()}"
+ :on-success="pictureUploadSuccess"
+ :on-remove="pictureRemove"
+ :file-list="pictureList"
+ list-type="picture">
+ <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
+ <div slot="tip" class="el-upload__tip">鍙兘涓婁紶jpg/png鏂囦欢锛屼笖涓嶈秴杩�500kb</div>
+ </el-upload>
+ </el-form-item>
+ <el-form-item label="浣愯瘉鏉愭枡" prop="certificates">
+ <el-upload
+ class="avatar-uploader"
+ action="/dev-api/common/upload"
+ name="file"
+ :headers="{'Authorization': 'Bearer ' + getToken()}"
+ :on-success="certificateUploadSuccess"
+ :on-remove="certificateRemove"
+ :file-list="certificateList"
+ list-type="picture">
+ <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
+ <div slot="tip" class="el-upload__tip">鍙兘涓婁紶jpg/png鏂囦欢锛屼笖涓嶈秴杩�500kb</div>
+ </el-upload>
</el-form-item>
<el-form-item label="杩愮淮鎯呭喌" prop="ywCondition">
<el-input v-model="ywConditionForm.ywCondition" type="textarea" maxlength="150" show-word-limit/>
@@ -218,7 +282,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitYwResult">纭� 瀹�</el-button>
- <el-button @click="cancelYwResult">鍙� 娑�</el-button>
+ <el-button @click="cancelCheckResult">鍙� 娑�</el-button>
</div>
</el-dialog>
@@ -248,16 +312,168 @@
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
+
+
+ <!-- 杩囩▼鍥� -->
+ <el-dialog title="杩囩▼鍥�" :visible.sync="flowOpen" width="1200px" :close-on-click-modal="false" append-to-body>
+ <div>
+ <el-steps :active="2" :space="500">
+ <el-step title="浜х敓宸ュ崟">
+ <template slot="description">
+ <div>
+ <div class="flow-item-x">
+ 宸ュ崟鏉ユ簮锛�<el-tag type="danger" size="small">{{flowForm.source}}</el-tag>
+ </div>
+ <div class="flow-item-x">
+ 鏁呴殰绫诲瀷锛歿{flowForm.errorType}}
+ </div>
+ <div class="flow-item-x">
+ 杩愮淮鍗曚綅锛歿{flowForm.unitName}}
+ </div>
+ <div class="flow-item-x">
+ 鍒涘缓鏃堕棿锛歿{flowForm.createTime}}
+ </div>
+ <div class="flow-item-x">
+ 澶勭悊鏈熼檺锛�<el-tag type="danger" size="small">12灏忔椂</el-tag>
+ </div>
+ </div>
+ </template>
+ </el-step>
+ <el-step title="杩愮淮澶勭悊">
+ <template slot="description">
+ <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 >
+ 绗嚑娆★細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-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">鏈垚鍔熷鐞�</el-tag>
+ </div>
+ </div>
+ <div class="y-item-2">
+ <div >
+ {{flowForm.ywHandleTime}}
+ </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
+ </div>
+ </div>
+ </div>
+ </template>
+ </el-step>
+ </el-steps>
+ </div>
+ </el-dialog>
+
</div>
</template>
-
+<style scoped>
+.flow-item-x {
+ margin: 5px 0;
+}
+.y-item {
+ margin-bottom: 8px;
+ padding: 0 3px;
+ background-color: #d9d9d9;
+ display: flex;
+ flex-direction: row;
+ align-items: center
+}
+.y-item-2 {
+ flex: 1;
+}
+.y-item-1 {
+ flex: 2;
+}
+</style>
<script>
import { listWorkOrder, getWorkOrder, delWorkOrder, addWorkOrder, updateWorkOrder,auditing, ywCondition } from "@/api/platform/work-order";
-
export default {
name: "Work-order",
+ components: {
+ },
data() {
return {
+ reportFormRules: {
+ reportContent: [
+ { required: true, message: "鎶ュ鍐呭涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ reportMaterials: [
+ { required: true, message: "涓婃姤鏉愭枡涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ },
+ reportOpen: false,
+ reportForm: {
+ reportType: "浜嬪悗鎶ュ",
+ pointId: "鐞间簬闀�3琛�1鍙锋憚鍍忓ご",
+ errorType: "",
+ reportContent: "",
+ reportMaterials: ""
+ },
+ // 杩囩▼鍥�
+ flowOpen: false,
+ flowForm: {},
+ certificateList:[],
+ pictureList: [],
// 閬僵灞�
loading: true,
// 閫変腑鏁扮粍
@@ -337,6 +553,23 @@
this.getList();
},
methods: {
+ // 鎶ュ
+ submitReportForm() {
+ this.$refs["reportForm"].validate(valid => {
+ if (valid) {
+ addReport(this.form).then(response => {
+ this.$modal.msgSuccess("鎴愬姛鎻愪氦鎶ュ");
+ this.open = false;
+ this.getList();
+ });
+ }
+ });
+ },
+ // 浜嬪悗鎶ュ鎸夐挳
+ handleReport(row) {
+ this.reportForm.pointId = row.source;
+ this.reportOpen = true;
+ },
// 瀹℃牳鎸夐挳
handleAuditing(row) {
this.auditingForm = row;
@@ -357,6 +590,11 @@
this.checkResultForm = row;
this.checkResultOpen = true;
},
+ // 杩囩▼鍥炬煡鐪�
+ handleFlow(row) {
+ this.flowOpen = true;
+ this.flowForm = row;
+ },
// 鎻愪氦瀹℃牳
submitAuditing() {
this.$refs["auditingForm"].validate(valid => {
@@ -372,6 +610,32 @@
cancelAuditing() {
this.auditingForm = {};
this.auditingOpen = false;
+ },
+ pictureRemove(file, fileList) {
+ this.form.picture = null,
+
+ this.pictureList = this.pictureList.filter(item => item.name !== file.name)
+ },
+ certificateRemove(file, fileList) {
+ this.form.certificate = null,
+
+ this.certificateList = this.certificateList.filter(item => item.name !== file.name)
+ },
+ pictureUploadSuccess(response, file, fileList) {
+ this.form.picture = response.fileName,
+ this.pictureList.push({
+ name: response.originalFilename,
+ url: response.url,
+ fileName: response.fileName
+ })
+ },
+ certificateUploadSuccess(response, file, fileList) {
+ this.form.certificate = response.fileName,
+ this.certificateList.push({
+ name: response.originalFilename,
+ url: response.url,
+ fileName: response.fileName
+ })
},
// 鎻愪氦杩愮淮鎯呭喌
submitYwCondition() {
@@ -471,6 +735,20 @@
this.form = response.data;
this.open = true;
this.title = "淇敼杩愮淮宸ュ崟";
+ this.pictureList = JSON.parse(response.data.picture).map(item => {
+ return {
+ name: item,
+ url: process.env.VUE_APP_FILE_API + '/' + item,
+ fileName: item
+ }
+ })
+ this.certificateList = JSON.parse(row.certificate).map(item => {
+ return {
+ name: item,
+ url: process.env.VUE_APP_FILE_API + '/' + item,
+ fileName: item
+ }
+ })
});
},
/** 鎻愪氦鎸夐挳 */
--
Gitblit v1.8.0