From 9e8d1bd0b6fb495920921214775b84d490e032a3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 06 九月 2024 16:43:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/work-order/index.vue | 91 ++++++++++++++++++++++++++++++++-------------
1 files changed, 65 insertions(+), 26 deletions(-)
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index 3ee036a..88584ac 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -11,7 +11,7 @@
/>
</el-form-item>
<el-form-item label="鏁呴殰绫诲瀷" prop="errorTypeList">
- <el-select v-model="queryParams.errorTypeList" multiple placeholder="鏁呴殰绫诲瀷" clearable @clear="handleQuery">
+ <el-select v-model="queryParams.errorTypeList" multiple @change="handleQuery" placeholder="鏁呴殰绫诲瀷" clearable @clear="handleQuery">
<el-option v-for="dict in dict.type.error_type" :value="dict.value" :key="dict.value" :label="dict.label" />
</el-select>
</el-form-item>
@@ -64,10 +64,21 @@
<div class="card">
<div class="card-left">
<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"
+ v-if="item.imgList && item.imgList.length > 0"
+ :preview-src-list="item.imgList"
+ fit="cover" :src="item.imgList[0]"
class="image"
- />
+ style="display: flex;justify-content: center;align-items: center;"
+ >
+ <div slot="error" class="image-slot">
+ <i class="el-icon-picture-outline">鍔犺浇澶辫触</i>
+ </div>
+ </el-image>
+ <el-image class="image" style="display: flex;justify-content: center;align-items: center;" v-else>
+ <div slot="error" class="image-slot">
+ <i class="el-icon-picture-outline" style="color: gray;font-size: 14px">鏈彇鍒板浘鐗�</i>
+ </div>
+ </el-image>
</div>
<div class="work-order">
<el-row class="work-order-item">
@@ -151,23 +162,26 @@
<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-form-item label="鏁呴殰绫诲瀷" prop="errorTypeList">
+ <el-select v-model="reportForm.errorTypeList" multiple>
+ <el-option v-for="dict in dict.type.report_error_type" :value="dict.value" :key="dict.value" :label="dict.label" />
</el-select>
+ </el-form-item>
+ <el-form-item label="鎶ュ鏃堕棿" prop="daterangeCreateTime">
+ <el-date-picker v-model="reportForm.daterangeCreateTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss"
+ range-separator="-" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡"
+ ></el-date-picker>
</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">
+ <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 @click="reportOpen = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="submitReportForm">鎻� 浜�</el-button>
+ <el-button type="primary" @click="submitReportForm">鎻愪氦瀹℃牳</el-button>
</div>
</el-dialog>
@@ -236,7 +250,7 @@
</div>
</el-dialog>
- <el-dialog title="杩愮淮鎵归噺瀹℃牳" :visible.sync="batchAuditingVisible" width="500px" append-to-body>
+ <el-dialog title="宸ュ崟鎵归噺瀹℃牳" :visible.sync="batchAuditingVisible" width="500px" append-to-body>
<el-form ref="batchAuditingWorkOrder" :model="batchAuditingWorkOrder" label-width="80px"
:rules="batchAuditingRules"
>
@@ -260,7 +274,7 @@
<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="浜х敓宸ュ崟">
+ <el-step :title="getTitle1()">
<template slot="description">
<div>
<div class="row flow-item-x">
@@ -286,7 +300,7 @@
</div>
</template>
</el-step>
- <el-step title="杩愮淮澶勭悊">
+ <el-step :title="getTitle2()">
<template slot="description">
<div style="max-height: 450px;overflow-y: scroll">
<div v-for="(item, index) in ywHandleList" :key="index">
@@ -433,7 +447,7 @@
export default {
name: 'Work-order',
- dicts: ['error_type'],
+ dicts: ['error_type', 'report_error_type'],
components: {},
data() {
return {
@@ -449,21 +463,32 @@
},
ywHandleList: [],
ywAuditingList: [],
+ beforeReportMsg: '',
+ afterReportMsg: '',
reportFormRules: {
reportContent: [
{ required: true, message: '鎶ュ鍐呭涓嶈兘涓虹┖', trigger: 'blur' }
],
reportMaterials: [
- { required: true, message: '涓婃姤鏉愭枡涓嶈兘涓虹┖', trigger: 'blur' }
- ]
+ { required: true, message: '鎶ュ鏉愭枡涓嶈兘涓虹┖', trigger: 'blur' }
+ ],
+ errorTypeList: [
+ { required: true, message: '璇烽�夋嫨鏁呴殰绫诲瀷', trigger: 'change' }
+ ],
+ daterangeCreateTime: [
+ { required: true, message: '璇烽�夋嫨鎶ュ鏃堕棿', trigger: 'change' }
+ ],
},
reportOpen: false,
reportForm: {
reportType: '浜嬪悗鎶ュ',
pointId: '',
- errorType: '',
+ errorTypeList: [],
reportContent: '',
- reportMaterials: ''
+ reportMaterials: '',
+ daterangeCreateTime: [],
+ beginCreateTime: null,
+ endCreateTime: null
},
// 杩囩▼鍥�
flowOpen: false,
@@ -546,7 +571,7 @@
// 杩愮淮鎯呭喌
ywData: {
content: '',
- fileList: ''
+ fileList: 'process.env.VUE_APP_BASE_API'
}
}
},
@@ -554,6 +579,12 @@
this.getList()
},
methods: {
+ getTitle1() {
+ return '浜х敓宸ュ崟' + (this.beforeReportMsg ? '(' + this.beforeReportMsg + ')' : '')
+ },
+ getTitle2() {
+ return '杩愮淮澶勭悊' + (this.afterReportMsg ? '(' + this.afterReportMsg + ')' : '')
+ },
openDrawer(item) {
this.ywData = {
content: '',
@@ -585,6 +616,10 @@
submitReportForm() {
this.$refs['reportForm'].validate(valid => {
if (valid) {
+ if (this.reportForm.daterangeCreateTime && this.reportForm.daterangeCreateTime.length > 0) {
+ this.reportForm.beginCreateTime = this.reportForm.daterangeCreateTime[0]
+ this.reportForm.endCreateTime = this.reportForm.daterangeCreateTime[1]
+ }
addReport(this.reportForm).then(response => {
this.$modal.msgSuccess('鎴愬姛鎻愪氦鎶ュ')
this.reportOpen = false
@@ -595,7 +630,7 @@
},
// 浜嬪悗鎶ュ鎸夐挳
handleReport(row) {
- this.reportForm.pointId = row.pointId
+ this.reportForm.pointId = row.serialNumber
this.reportForm.source = row.source
this.reportOpen = true
},
@@ -631,6 +666,8 @@
if (response.data) {
this.ywAuditingList = response.data.auditingList
this.ywHandleList = response.data.ywList
+ this.afterReportMsg = response.data.afterReportMsg
+ this.beforeReportMsg = response.data.beforeReportMsg
this.flowOpen = true
}
})
@@ -719,11 +756,13 @@
this.queryParams['end'] = this.daterangeYwHandleTime ? this.daterangeYwHandleTime[1] : null
listWorkOrder(this.queryParams).then(response => {
- // response.data.forEach(item => {
- // if (item.errorType) {
- // item.errorTypeList = item.errorTypeList.split(",")
- // }
- // })
+ response.data.forEach(item => {
+ if (item.imgList) {
+ item.imgList = item.imgList.map(img => {
+ return this.$img + img
+ })
+ }
+ })
this.workOrderList = response.data
this.total = response.total
this.loading = false
--
Gitblit v1.8.0