From cf91288ecebb860a48f885261fb3620059fbfb16 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 26 四月 2024 13:45:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/work-order/index.vue | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index de65e22..401bf4b 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -43,11 +43,11 @@
</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" 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-row>
@@ -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 />
@@ -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;
},
// 瀹℃牳鎸夐挳
--
Gitblit v1.8.0