From 17d7043f10d55429db919238fe639bff1b51ec0e Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期五, 07 二月 2025 15:59:37 +0800 Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1 --- admin/src/views/workorder/components/detail.vue | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/admin/src/views/workorder/components/detail.vue b/admin/src/views/workorder/components/detail.vue index 5b4caa0..22fccbd 100644 --- a/admin/src/views/workorder/components/detail.vue +++ b/admin/src/views/workorder/components/detail.vue @@ -1,5 +1,5 @@ <template> - <GlobalWindow width="960px" title="宸ュ崟璇︽儏" :visible.sync="visible" :confirm-working="isWorking" @close="close" + <GlobalWindow width="100%" title="宸ュ崟璇︽儏" :visible.sync="visible" :confirm-working="isWorking" @close="close" @confirm="confirm"> <div class="main"> <div class="title"> @@ -11,7 +11,7 @@ <div class="status gray" v-if="info.dealStatus == 2">宸插鐞�</div> </div> </div> - <el-button>鏌ョ湅闂涓婃姤</el-button> + <el-button v-if="info.origin === 1" @click="openWT">鏌ョ湅闂涓婃姤</el-button> </div> <div class="main_content"> <div class="list"> @@ -26,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> @@ -167,19 +172,24 @@ </template> </el-form> </div> + <!-- 闂涓婃姤璇︽儏 --> + <problemReportingDetails ref="problemReportingDetails" /> </GlobalWindow> </template> <script> import GlobalWindow from '@/components/common/GlobalWindow' import BaseOpera from '@/components/base/BaseOpera' +import problemReportingDetails from './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 dayjs from 'dayjs' export default { components: { - GlobalWindow + GlobalWindow, + problemReportingDetails }, extends: BaseOpera, data() { @@ -212,6 +222,12 @@ this.getStaff() }, methods: { + openWT() { + getByWorkorderId(this.id) + .then(res => { + this.$refs.problemReportingDetails.open('闂涓婃姤璇︽儏', res) + }) + }, confirm() { this.$refs['form'].validate((valid) => { if (valid) { -- Gitblit v1.9.3