From 72f13e697d40c8fffc7aa0197fec4509bbe41569 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期一, 06 五月 2024 11:36:10 +0800
Subject: [PATCH] Merge branch 'master' into dev-threejs
---
src/views/system/work-order/index.vue | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index de65e22..14f07aa 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -43,13 +43,13 @@
</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="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>
@@ -84,6 +84,7 @@
size="mini"
type="text"
@click="handleReport(item)"
+ v-hasPermi="['system:report:add']"
>浜嬪悗鎶ュ</el-button>
</el-row>
</div>
@@ -102,8 +103,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 />
@@ -140,10 +141,10 @@
<el-input v-model="auditingForm.ywPeopleName" disabled />
</el-form-item>
<el-form-item label="鐜板満鎯呭喌" v-if="auditingForm.condition">
- <el-input type="textarea" v-html="auditingForm.condition" disabled />
+ <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" @click="handleDownload(item)">{{ item.substring(item.lastIndexOf("/") + 1) }}</el-link>
+ <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>
<el-form-item label="瀹℃牳缁撴灉" prop="auditingResult">
<el-radio v-model="auditingForm.auditingResult" label="AUDITING_SUCCESS">閫氳繃</el-radio>
@@ -211,7 +212,7 @@
</el-step>
<el-step title="杩愮淮澶勭悊">
<template slot="description">
- <div class="y-item" v-for="(item, index) in ywHandleList">
+ <div class="y-item" v-for="(item, index) in ywHandleList" :key="index">
<div class="y-item-1">
<div class="flow-item-x">
鐜板満鎯呭喌锛�
@@ -236,7 +237,7 @@
</el-step>
<el-step title="缁撴灉瀹℃牳">
<template slot="description">
- <div class="y-item" v-for="(item, index) in ywAuditingList">
+ <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="item.result == '瀹℃牳閫氳繃' ? 'success' : 'danger'" size="small">{{ item.result }}</el-tag>
@@ -403,7 +404,7 @@
if (valid) {
addReport(this.reportForm).then(response => {
this.$modal.msgSuccess("鎴愬姛鎻愪氦鎶ュ");
- this.open = false;
+ this.reportOpen = false;
this.getList();
});
}
@@ -411,7 +412,8 @@
},
// 浜嬪悗鎶ュ鎸夐挳
handleReport(row) {
- this.reportForm.pointId = row.source;
+ this.reportForm.pointId = row.pointId;
+ this.reportForm.source = row.source;
this.reportOpen = true;
},
// 瀹℃牳鎸夐挳
@@ -536,8 +538,8 @@
getList() {
this.loading = true;
this.queryParams.params = {};
- 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;
--
Gitblit v1.8.0