Merge remote-tracking branch 'origin/dev' into dev

web/.env.development

@@ -2,7 +2,7 @@ ENV = 'development'
 
 VITE_CLI_PORT = 8080
 VITE_SERVER_PORT = 8220
-VITE_BASE_API = /api
+VITE_BASE_API = /ap
 VITE_FILE_API = /api
 VITE_BASE_PATH = http://192.168.110.218
 VITE_POSITION = close

web/src/api/inventory.js

@@ -0,0 +1,41 @@
+import service from '@/utils/request'
+// .................................商品栏
+// 查询所有商品
+export const queryAllCommodity = () => {
+  return service({
+    url: '/commodity/queryAllCommodity',
+    method: 'get'
+  })
+}
+
+// 查询商品列表
+export const queryCommodityList = () => {
+  return service({
+    url: '/commodity/queryCommodityList',
+    method: 'post'
+  })
+}
+
+// 新增商品
+export const createCommodity = () => {
+  return service({
+    url: '/commodity/createCommodity',
+    method: 'post'
+  })
+}
+
+// 修改商品
+export const updateCommodity = () => {
+  return service({
+    url: '/commodity/updateCommodity',
+    method: 'put'
+  })
+}
+
+// 删除商品
+export const deleteCommodity = () => {
+  return service({
+    url: '/commodity/deleteCommodity',
+    method: 'delete'
+  })
+}

web/src/pinia/cost/cost.js

@@ -9,7 +9,7 @@ export const payData = defineStore('expenses', () => {
       if (res.code === 0) {
         projectCostList.length = 0
         const list = res.data.list === null ? [] : res.data.list
-        console.log(list)
+        console.log('查询项目费用', list)
         projectCostList.push(...list)
         costListTotal.value = res.data.total
       }

web/src/pinia/modules/user.js

@@ -1,5 +1,6 @@
 import { login, getUserInfo, setSelfInfo } from '@/api/user'
 import { jsonInBlacklist } from '@/api/jwt'
+
 import router from '@/router/index'
 import { ElLoading, ElMessage } from 'element-plus'
 import { defineStore } from 'pinia'

web/src/view/approve/flowManage/flowManage.vue

@@ -577,7 +577,7 @@ const changeProcessSwitch = (val) => {
 <style scoped>
 .box{
   width: 1550px;
-  height: 700px;
+  height: 750px;
   background-color: #ffffff;
   padding: 20px;
 }

web/src/view/finance/financeAnalysis/components/hour.vue

@@ -68,6 +68,7 @@
         <el-table
           :data="hour.timeList"
           stripe
+          height="495px"
         >
           <el-table-column
             label="工作人员"

web/src/view/finance/financeAnalysis/components/payment.vue

@@ -43,6 +43,7 @@
           <el-table
             :data="pay.paymentList"
             stripe
+            height="495px"
           >
             <el-table-column
               label="收款时间"

web/src/view/finance/financeAnalysis/components/projectCost.vue

@@ -143,6 +143,7 @@
           :data="costData.projectCostList"
           stripe
           border
+          height="495px"
         >
           <el-table-column
             label="人员名称"

web/src/view/inventory/commodity/commodity.vue

@@ -0,0 +1,11 @@
+<script setup>
+
+</script>
+
+<template>
+  <div>商品管理</div>
+</template>
+
+<style scoped lang="scss">
+
+</style>

web/src/view/layout/aside/index.vue

@@ -40,6 +40,7 @@ import { useUserStore } from '@/pinia/modules/user'
 import { useRouterStore } from '@/pinia/modules/router'
 
 defineOptions({
+  // eslint-disable-next-line vue/no-reserved-component-names
   name: 'Aside',
 })
 
@@ -48,7 +49,6 @@ const router = useRouter()
 
 const userStore = useUserStore()
 const routerStore = useRouterStore()
-
 const theme = ref({})
 
 const getTheme = () => {