From ab8451762e77690642204e01c5e6f1c0104da92f Mon Sep 17 00:00:00 2001 From: shuishen <1109946754@qq.com> Date: Sat, 31 Jan 2026 17:52:42 +0800 Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web --- applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue | 1 + applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue | 2 +- .npmrc | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.npmrc b/.npmrc index e95db00..29e81ef 100644 --- a/.npmrc +++ b/.npmrc @@ -2,7 +2,7 @@ //center.javablade.com/api/packages/blade/npm/:_authToken=66c6549d47896da834ef4a84b5fcbf4763744b28 registry="https://registry.npmmirror.com" #依赖开启严格模式 -strict-peer-dependencies=true +strict-peer-dependencies=false # 自动安装对等依赖，无需手动安装 auto-install-peers=true # 允许所有包执行构建脚本（避免新依赖安装后无法运行）pnpm9的坑 diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue index c0724c1..0ef053d 100644 --- a/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue +++ b/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue @@ -8,6 +8,7 @@ :close-on-click-modal="false" > <div class="detail-container detail-container1" v-if="dialogReadonly"> + <div class="detail-title">异议详情</div> <el-row class="detail-row-view"> <el-col :span="12"> <div class="label">标题</div> diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue index 0e054c2..42cb618 100644 --- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue +++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue @@ -9,7 +9,7 @@ :close-on-click-modal="false" > <div class="content" style="display: flex"> - <div class="processBox" v-if="dialogMode !== 'add' && processList.length"> + <div class="processBox" v-if="dialogMode !== 'add'"> <div class="detail-title">工单记录</div> <div class="process"> <OrderStepBar :processList="processList" /> -- Gitblit v1.9.3