From 77946261ec663aa1fe7f6f97e550532ed879f982 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 13:47:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/workorder/problemReporting.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/workorder/problemReporting.vue b/admin/src/views/workorder/problemReporting.vue
index 1de3fb4..867ce47 100644
--- a/admin/src/views/workorder/problemReporting.vue
+++ b/admin/src/views/workorder/problemReporting.vue
@@ -7,7 +7,7 @@
</el-form-item>
<el-form-item prop="dealStatus" label="澶勭悊鐘舵��">
<el-select v-model="searchForm.dealStatus">
- <el-option label="鏈鐞�" :value="0"></el-option>
+ <el-option label="寰呭鐞�" :value="0"></el-option>
<el-option label="宸茶浆宸ュ崟" :value="1"></el-option>
<el-option label="宸插叧闂�" :value="2"></el-option>
</el-select>
@@ -28,7 +28,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<el-table v-loading="isWorking.search" :data="tableData.list" stripe>
- <el-table-column prop="remark" label="鎻忚堪" min-width="70px"></el-table-column>
+ <el-table-column prop="content" label="鎻忚堪" min-width="70px"></el-table-column>
<el-table-column prop="position" label="浣嶇疆" min-width="100px"></el-table-column>
<el-table-column label="鐜板満鍥剧墖" min-width="100px">
<template slot-scope="{row}">
@@ -53,7 +53,7 @@
fixed="right">
<template slot-scope="{row}">
<el-button type="text" v-if="row.dealStatus === 0" @click="$refs.handleProblem.open('闂涓婃姤', row)">澶勭悊</el-button>
- <el-button type="text" @click="$refs.problemReportingDetails.open('闂涓婃姤璇︽儏', row)">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" @click="$refs.problemReportingDetails.open('闂涓婃姤璇︽儏', row, true)">鏌ョ湅璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
--
Gitblit v1.9.3