合并冲突

spring

2 天以前 4ca2aeafbb3c753d98ba849fa5ebf817049b5803

合并冲突

 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 = [

 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"

 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) => {