From c42cf31ab43a4ec4aa78065e558b511e6dacd60a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 22 Jan 2026 09:13:54 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
index 0757422..c8ed5a9 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
@@ -11,27 +11,25 @@
<div class="gd-dialog-form">
<!-- 关联工单选择 -->
<div class="work-order-section">
- <div class="form-item-row">
- <span class="label required">选择工单:</span>
- <el-select
- class="gd-select"
- style="width: 150px"
- popper-class="gd-select-popper"
- v-model="selectedWorkOrderId"
- placeholder="请选择"
- clearable
- filterable
- :disabled="dialogMode !== 'add'"
- @change="handleWorkOrderChange"
- >
- <el-option v-for="item in workOrderList" :key="item.id" :label="item.workOrderName" :value="item.id" />
- </el-select>
- </div>
+ <div class="detail-title" :style="{marginBottom: 0,marginRight: pxToRem(10)}">选择工单</div>
+ <el-select
+ class="gd-select"
+ style="width: 150px"
+ popper-class="gd-select-popper"
+ v-model="selectedWorkOrderId"
+ placeholder="请选择"
+ clearable
+ filterable
+ :disabled="dialogMode !== 'add'"
+ @change="handleWorkOrderChange"
+ >
+ <el-option v-for="item in workOrderList" :key="item.id" :label="item.workOrderName" :value="item.id" />
+ </el-select>
</div>
<!-- 工单信息展示 -->
<div class="work-order-info" v-if="selectedWorkOrder">
- <el-row class="detail-row-view">
+ <el-row class="detail-row-view" >
<el-col :span="12">
<div class="info-item">
<span class="label">工单类型</span>
@@ -61,7 +59,7 @@
<!-- 子任务表格表单 -->
<div class="task-table-section">
- <div class="section-title">添加子任务:</div>
+ <div class="detail-title" :style="{marginTop: pxToRem(10)}">添加子任务</div>
<div class="task-table-container">
<el-table :data="taskList">
<el-table-column width="50" label="">
@@ -196,6 +194,7 @@
import { gdPatrolTaskSaveApi, gdFlyerPageApi, gdPatrolTaskAuditApi } from './inspectionRequestApi'
import { gdWorkOrderPageApi } from '../orderManage/orderManageApi'
import { gdManageDeviceListApi } from '../orderManage/gdManageDeviceApi'
+import { pxToRem } from '@/utils/rem'
// 初始化任务行
const initTaskRow = () => ({
@@ -354,4 +353,12 @@
defineExpose({ open })
</script>
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+.detail-row-view{
+ margin-top: 10px;
+}
+.work-order-section{
+ display: flex;
+ align-items: center;
+}
+</style>
--
Gitblit v1.9.3