From f9ff65aefcdf4097fbba923c3bb4d0164d4a5327 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 08 一月 2026 14:57:52 +0800
Subject: [PATCH] 军泰伟业 1.协同办公bug修改
---
src/views/productionManagement/productionReporting/index.vue | 2 +-
src/components/PIMTable/PIMTable.vue | 2 +-
src/views/collaborativeApproval/approvalProcess/index.vue | 21 +++++++++++++++++++--
src/views/collaborativeApproval/noticeManagement/index.vue | 10 ++++++++++
4 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/components/PIMTable/PIMTable.vue b/src/components/PIMTable/PIMTable.vue
index 1fa1695..9dcd440 100644
--- a/src/components/PIMTable/PIMTable.vue
+++ b/src/components/PIMTable/PIMTable.vue
@@ -40,7 +40,7 @@
:fixed="item.fixed"
:label="item.label"
:prop="item.prop"
- show-overflow-tooltip
+ :show-overflow-tooltip="item.dataType !== 'action'"
:align="item.align"
:sortable="!!item.sortable"
:type="item.type"
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index 78d21fb..a55c82c 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -32,7 +32,7 @@
<div class="table_list">
<PIMTable
rowKey="id"
- :column="tableColumn"
+ :column="tableColumnCopy"
:tableData="tableData"
:page="page"
:isSelection="true"
@@ -51,7 +51,7 @@
<script setup>
import FileList from "./fileList.vue";
import { Search } from "@element-plus/icons-vue";
-import {onMounted, ref} from "vue";
+import {onMounted, ref, computed} from "vue";
import {ElMessageBox} from "element-plus";
import InfoFormDia from "@/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue";
import ApprovalDia from "@/views/collaborativeApproval/approvalProcess/components/approvalDia.vue";
@@ -76,6 +76,23 @@
},
});
const { searchForm } = toRefs(data);
+const tableColumnCopy = computed(()=>{
+ if(!tableColumn.value||!tableColumn.value.length){
+ return []
+ }
+ let tabIndex = -1;
+ tableColumn.value.map((item,_index) => {
+ if(props.approveType != 4&&item.prop == 'price'){
+ tabIndex = _index
+ }
+ })
+ if(tabIndex != -1){
+ tableColumn.value.splice(tabIndex, 1)
+ return tableColumn.value
+ }else{
+ return tableColumn.value
+ }
+})
const tableColumn = ref([
{
label: "瀹℃壒鐘舵��",
diff --git a/src/views/collaborativeApproval/noticeManagement/index.vue b/src/views/collaborativeApproval/noticeManagement/index.vue
index dcbbf65..14de5cf 100644
--- a/src/views/collaborativeApproval/noticeManagement/index.vue
+++ b/src/views/collaborativeApproval/noticeManagement/index.vue
@@ -601,6 +601,7 @@
color: #606266;
line-height: 1.6;
font-size: 14px;
+ word-wrap: break-word;
}
.card-footer {
@@ -691,6 +692,15 @@
border-left: 3px solid #409eff;
}
+.card-remark span {
+ flex: 1;
+ min-width: 0;
+ word-wrap: break-word;
+ word-break: break-all;
+ white-space: normal;
+ line-height: 1.5;
+}
+
.empty-state {
text-align: center;
padding: 60px 20px;
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index a08326a..2d5578b 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -247,7 +247,7 @@
label: "鎿嶄綔",
align: "center",
fixed: "right",
- width: 200,
+ width: 230,
operation: [
{
name: "鏌ョ湅鎶曞叆",
--
Gitblit v1.9.3