From 4ca2aeafbb3c753d98ba849fa5ebf817049b5803 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 02 九月 2025 11:49:13 +0800
Subject: [PATCH] 合并冲突
---
src/views/procurementManagement/procurementInvoiceLedger/index.vue | 14 ++------------
src/router/index.js | 23 +++++++++++++++--------
src/views/inventoryManagement/dispatchLog/index.vue | 7 -------
3 files changed, 17 insertions(+), 27 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 5913c56..9cfde33 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -97,14 +97,21 @@
redirect: 'noredirect',
children: [
{
- path: 'profile',
- component: () => import('@/views/system/user/profile/index'),
- name: 'Profile',
- meta: { title: '涓汉涓績', icon: 'user' }
- }
- ]
- }
-]
+ path: "profile",
+ component: () => import("@/views/system/user/profile/index"),
+ name: "Profile",
+ meta: { title: "涓汉涓績", icon: "user" },
+ },
+ ],
+ },
+ {
+ path: "/device-info",
+ component: () => import("@/views/equipmentManagement/deviceInfo/index.vue"),
+ hidden: true,
+ name: "DeviceInfo",
+ meta: { title: "璁惧淇℃伅", icon: "monitor" },
+ },
+];
// 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇
export const dynamicRoutes = [
diff --git a/src/views/inventoryManagement/dispatchLog/index.vue b/src/views/inventoryManagement/dispatchLog/index.vue
index 2f12a60..177868d 100644
--- a/src/views/inventoryManagement/dispatchLog/index.vue
+++ b/src/views/inventoryManagement/dispatchLog/index.vue
@@ -19,7 +19,6 @@
<!-- <el-button type="primary" @click="openForm('add')">鏂板</el-button> -->
<el-button @click="handleOut">瀵煎嚭</el-button>
<el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
- <el-button type="primary" plain @click="handlePrint">鎵撳嵃</el-button>
</div>
</div>
<div class="table_list">
@@ -37,12 +36,6 @@
>
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
- <el-table-column
- label="鍑哄簱缂栧彿"
- prop="code"
- min-width="250"
- show-overflow-tooltip
- />
<el-table-column
label="鍑哄簱鏃ユ湡"
prop="createTime"
diff --git a/src/views/procurementManagement/procurementInvoiceLedger/index.vue b/src/views/procurementManagement/procurementInvoiceLedger/index.vue
index 8ad8799..439837b 100644
--- a/src/views/procurementManagement/procurementInvoiceLedger/index.vue
+++ b/src/views/procurementManagement/procurementInvoiceLedger/index.vue
@@ -172,11 +172,6 @@
width: 240,
},
{
- label: "浜у搧澶х被",
- prop: "productCategory",
- width: 150,
- },
- {
label: "瑙勬牸鍨嬪彿",
prop: "specificationModel",
width: 150,
@@ -195,17 +190,12 @@
},
},
{
- label: "鏈鏉ョエ鏁�",
- prop: "ticketsNum",
- width: 110,
- },
- {
- label: "鏉ョエ鏃ユ湡",
+ label: "寮�绁ㄦ棩鏈�",
prop: "createdAt",
width: 110,
},
{
- label: "鏉ョエ閲戦(鍏�)",
+ label: "寮�绁ㄩ噾棰�",
prop: "ticketsAmount",
width: 200,
formatData: (cell) => {
--
Gitblit v1.9.3