From a2299a6d4a6f99e9c11132138f5d3e9ec68f03ea Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 19:19:34 +0800
Subject: [PATCH] 开发更新
---
admin/src/views/workorder/components/detail.vue | 128 +++++++++++++++++++++++++++++-------------
1 files changed, 89 insertions(+), 39 deletions(-)
diff --git a/admin/src/views/workorder/components/detail.vue b/admin/src/views/workorder/components/detail.vue
index f2e7d5f..039bad0 100644
--- a/admin/src/views/workorder/components/detail.vue
+++ b/admin/src/views/workorder/components/detail.vue
@@ -1,14 +1,17 @@
<template>
- <GlobalWindow width="960px" title="宸ュ崟璇︽儏" :visible.sync="visible" :confirm-working="isWorking" @close="close"
- @confirm="confirm">
+ <GlobalWindow width="100%" title="宸ュ崟璇︽儏" :withFooter="withFooter" :visible.sync="visible" :confirm-working="isWorking"
+ @confirm="confirm" @close="closeView">
<div class="main">
<div class="title">
- <span>宸ュ崟璇︽儏</span>
- <div>
- <div class="status primaryColor" v-if="info.dealStatus == 0 || info.dealStatus == null">寰呮寚娲�</div>
- <div class="status green" v-if="info.dealStatus == 1">宸叉寚娲�</div>
- <div class="status gray" v-if="info.dealStatus == 2">宸插鐞�</div>
+ <div class="title_left">
+ <span>宸ュ崟璇︽儏</span>
+ <div>
+ <div class="status primaryColor" v-if="info.dealStatus == 0 || info.dealStatus == null">寰呮寚娲�</div>
+ <div class="status green" v-if="info.dealStatus == 1">宸叉寚娲�</div>
+ <div class="status gray" v-if="info.dealStatus == 2">宸插鐞�</div>
+ </div>
</div>
+ <el-button v-if="info.origin === 1 && isShow" @click="openWT">鏌ョ湅闂涓婃姤</el-button>
</div>
<div class="main_content">
<div class="list">
@@ -23,6 +26,11 @@
<div class="item">
<div class="la">宸ュ崟鍒嗙被</div>
<div class="val">{{ info.categoryName }}</div>
+ </div>
+ <div class="item">
+ <div class="la">鏉ユ簮</div>
+ <div class="val" v-if="info.origin === 0">鑷缓</div>
+ <div class="val" v-if="info.origin === 1">闂杞伐鍗�</div>
</div>
<div class="item">
<div class="la">涓婃姤浜�</div>
@@ -163,6 +171,8 @@
</div>
</template>
</el-form>
+ <!-- 闂涓婃姤璇︽儏 -->
+ <ProblemReportingDetails ref="problem_Reporting_Details" @close="closeDetails" />
</div>
</GlobalWindow>
</template>
@@ -170,19 +180,24 @@
<script>
import GlobalWindow from '@/components/common/GlobalWindow'
import BaseOpera from '@/components/base/BaseOpera'
+// import ProblemReportingDetails from './problemReportingDetails'
+// import ProblemReportingDetails from '@/views/workorder/components/problemReportingDetails'
import { detailById, dispatchOrder, dealOrder } from '@/api/workorder/ywWorkorder'
+import { getByWorkorderId } from '@/api/ywProblem'
import { getUserList } from '@/api/system/user'
import { Message, Loading } from 'element-ui'
+import { mapState } from 'vuex'
import dayjs from 'dayjs'
export default {
+ name: 'detail',
components: {
- GlobalWindow
+ GlobalWindow,
+ ProblemReportingDetails: () => import('./problemReportingDetails')
},
extends: BaseOpera,
data() {
return {
id: '',
- visible: false,
param: {
dealType: 0
},
@@ -198,17 +213,49 @@
uploadData: {
folder: 'YW_WORKORDER_FILE'
},
+ isShow: true,
+ test: false
}
},
computed: {
userInfo() {
return this.$store.state.userInfo
+ },
+ withFooter() {
+ if (this.info) {
+ return this.info.dealStatus === 0 || (this.info.dealStatus === 1 && (this.userInfo.id === this.info.dealUserId));
+ } else {
+ return false;
+ }
}
},
created() {
this.getStaff()
},
methods: {
+ closeDetails() {
+ console.log('1')
+ this.test = false
+ },
+ closeView() {
+ this.$emit('close')
+ this.visible = false
+ },
+ open (title, target, show) {
+ this.title = title
+ this.isShow = show
+ this.id = target.workorderId
+ this.getDetail()
+ },
+ openWT() {
+ getByWorkorderId(this.id)
+ .then(res => {
+ this.test = true
+ this.$nextTick(() => {
+ this.$refs.problem_Reporting_Details.open('闂涓婃姤璇︽儏', res, false)
+ })
+ })
+ },
confirm() {
this.$refs['form'].validate((valid) => {
if (valid) {
@@ -238,6 +285,7 @@
if (this.info.dealStatus == 1) {
this.$set(this.param, 'getDate', dayjs().format('YYYY-MM-DD HH:mm:ss'))
}
+ this.visible = true
})
},
getStaff() {
@@ -308,39 +356,41 @@
padding-top: 20px;
.title {
- font-weight: 500;
- font-size: 18px;
- color: $primary-color;
+
margin-bottom: 10px;
display: flex;
align-items: center;
-
- .status {
- padding: 0 12px;
- height: 24px;
- line-height: 24px;
- border-radius: 2px;
- border: 1px solid #00BA92;
- color: #00BA92;
- font-weight: 400;
- font-size: 12px;
- margin-left: 10px;
- }
-
- .primaryColor {
- border: 1px solid rgba(63, 126, 239, .2);
- background-color: rgba(63, 126, 239, .2);
- }
-
- .green {
- background-color: rgba(83, 183, 148, .2);
- border: 1px solid rgba(83, 183, 148, .2);
- }
-
- .gray {
- color: #333333;
- background-color: rgba(128, 128, 128, .2);
- border: 1px solid rgba(128, 128, 128, .2);
+ justify-content: space-between;
+ .title_left {
+ display: flex;
+ align-items: center;
+ font-weight: 500;
+ font-size: 18px;
+ color: $primary-color;
+ .status {
+ padding: 0 12px;
+ height: 24px;
+ line-height: 24px;
+ border-radius: 2px;
+ border: 1px solid #00BA92;
+ color: #00BA92;
+ font-weight: 400;
+ font-size: 12px;
+ margin-left: 10px;
+ }
+ .primaryColor {
+ border: 1px solid rgba(63, 126, 239, .2);
+ background-color: rgba(63, 126, 239, .2);
+ }
+ .green {
+ background-color: rgba(83, 183, 148, .2);
+ border: 1px solid rgba(83, 183, 148, .2);
+ }
+ .gray {
+ color: #333333;
+ background-color: rgba(128, 128, 128, .2);
+ border: 1px solid rgba(128, 128, 128, .2);
+ }
}
}
--
Gitblit v1.9.3