Эх сурвалжийг харах

修改响应式,添加翻译

yangg 11 сар өмнө
parent
commit
9cceedaac8
34 өөрчлөгдсөн 320 нэмэгдсэн , 298 устгасан
  1. 5 5
      src/components/TableLayout/index.vue
  2. 5 5
      src/components/TableSearch/index.vue
  3. 1 3
      src/components/layout/Header.vue
  4. 2 2
      src/components/layout/Sidebar.vue
  5. 1 0
      src/layouts/app-layout.vue
  6. 3 0
      src/locales/en.json
  7. 13 9
      src/permission.js
  8. 14 1
      src/router/index.ts
  9. 1 9
      src/stores/index.ts
  10. 34 27
      src/views/companyMent/administratorManage.vue
  11. 1 1
      src/views/companyMent/branch.vue
  12. 4 4
      src/views/goods/SKUList.vue
  13. 3 3
      src/views/package/packagePermissions.vue
  14. 5 5
      src/views/setting/companyList.vue
  15. 3 3
      src/views/setting/roleManage.vue
  16. 81 98
      src/views/stock/addInventory.vue
  17. 3 3
      src/views/stock/addOutbound.vue
  18. 4 4
      src/views/stock/goodsInventory.vue
  19. 3 3
      src/views/stock/goodsInventoryAdd.vue
  20. 3 3
      src/views/stock/goodsInventoryLoss.vue
  21. 3 3
      src/views/stock/goodsInventoryLossAdd.vue
  22. 10 10
      src/views/stock/goodsLend.vue
  23. 61 45
      src/views/stock/goodsTransfer.vue
  24. 2 2
      src/views/stock/goodsUnderstock.vue
  25. 2 2
      src/views/stock/goodsUnderstockAdd.vue
  26. 4 4
      src/views/stock/outbound.vue
  27. 3 4
      src/views/stock/warehouseList.vue
  28. 7 7
      src/views/stock/warehouseLocation.vue
  29. 22 17
      src/views/stock/warehousing.vue
  30. 4 4
      src/views/templateManage/accountTemplate.vue
  31. 4 4
      src/views/templateManage/emailtemplate.vue
  32. 4 4
      src/views/templateManage/smsTemplate.vue
  33. 4 4
      src/views/templateManage/systemMessage.vue
  34. 1 0
      vite.config.ts

+ 5 - 5
src/components/TableLayout/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="containers dark:!bg-[#060818] p-3" v-loading="loading">
+  <div class="containers dark:!bg-[#060818] p-3 grid xl:grid-cols-1" v-loading="loading">
     <!-- 操作提示 -->
     <div class="tips-info dark:!bg-[#060818]" v-if="tips">
       <slot name="tips"></slot>
@@ -12,7 +12,7 @@
     <el-table
       :max-height="height"
       v-bind="$attrs"
-      v-on="$listeners"
+      v-on="$attrs"
       ref="table"
       align="center"
       :data="tableData"
@@ -20,7 +20,7 @@
       :stripe="stripe"
       :header-cell-style="{ textAlign: 'center' }"
       :cell-style="{ textAlign: 'center' }"
-      :style="{ width: '100%', minHeight: height + 'px' }"
+      :style="{ width:'100%', minHeight: height + 'px' }"
       @selection-change="selectionChange"
       class="dark:!bg-[#060818]"
       highlight-current-row
@@ -174,9 +174,9 @@ li {
   overflow-x: auto;
 }
 
-@media (max-width: 768px) {
+/* @media (max-width: 768px) {
   .el-table th, .el-table td {
     white-space: nowrap;
   }
-}
+} */
 </style>

+ 5 - 5
src/components/TableSearch/index.vue

@@ -19,15 +19,15 @@
           <el-popover placement="top" width="160" v-model:visible="visibleDelPopover">
             <p>确定要清空表单吗?</p>
             <div style="text-align: right; margin: 0">
-              <el-button size="mini" type="text" @click="visibleDelPopover = false">取消</el-button>
-              <el-button type="primary" size="mini" @click="handleCleanForm">确定</el-button>
+              <el-button size="small" link @click="visibleDelPopover = false">取消</el-button>
+              <el-button type="primary" size="small" @click="handleCleanForm">确定</el-button>
             </div>
             <template #reference>
-              <el-button size="mini" type="text" class="clean-form">清空</el-button>
+              <el-button size="small" link class="clean-form">清空</el-button>
             </template>
           </el-popover>
-          <el-button size="mini" type="text" @click="popoverVisible = false">取消</el-button>
-          <el-button type="primary" size="mini" @click="advancedSearch">确定</el-button>
+          <el-button size="small" link @click="popoverVisible = false">取消</el-button>
+          <el-button type="primary" size="small" @click="advancedSearch">确定</el-button>
         </div>
         <template #reference>
           <el-button size="small" style="margin-left: 10px">高级搜索</el-button>

+ 1 - 3
src/components/layout/Header.vue

@@ -234,7 +234,7 @@
                   <li class="border-t border-white-light dark:border-white-light/10">
                     <a class="text-danger !py-3 dark:hover:text-white" @click="handleLogoutClick">
                       <icon-logout class="w-4.5 h-4.5 ltr:mr-2 rtl:ml-2 rotate-90 shrink-0" />
-                      退出
+                      {{$t('logout')}}
                     </a>
                   </li>
                 </ul>
@@ -300,7 +300,6 @@ const founder = computed(() => store.state.user.user.founder);
 const currentFlag = computed(() => {
   return `/assets/images/flags/${i18n.locale.toUpperCase()}.svg`;
 });
-console.log(store.state.user.user);
 const countNot = ref(0);
 /* 获取账号未读消息 */
 const GET_countNot = () => {
@@ -426,7 +425,6 @@ const toggleTheme = (theme) => {
   store.dispatch('toggleTheme', theme);
 };
 const closes = () => {
-  console.log('001');
 };
 const handleLogoutClick = () => {
   ElMessageBox.confirm('确定退出吗?', '提示', {

+ 2 - 2
src/components/layout/Sidebar.vue

@@ -1,8 +1,8 @@
 <template>
   <div :class="{ 'dark text-white-dark': store.state.semidark }">
-    <nav class="sidebar fixed min-h-screen h-full top-0 bottom-0 w-[260px] shadow-[5px_0_25px_0_rgba(94,92,154,0.1)] z-50 transition-all duration-300">
+    <nav class="sidebar fixed min-h-screen h-full top-0 bottom-0 w-[260px] shadow-[5px_0_25px_0_rgba(94,92,154,0.1)] z-50 transition-all duration-300 "><!-- mt-5 -->
       <div class="bg-white dark:bg-[#0e1726] h-full">
-        <div class="flex justify-between items-center px-4 py-3">
+        <div class="flex justify-between items-center px-2 py-1">
           <router-link to="/dashboard" class="main-logo flex items-center shrink-0">
             <img class="w-full h-12 ml-[5px] flex-none" src="https://www.raycos.com.cn/theme/m049/images/logo.png" alt="" />
             <!-- <span class="text-2xl ltr:ml-1.5 rtl:mr-1.5 font-semibold align-middle lg:inline dark:text-white-light">V3Studio</span> -->

+ 1 - 0
src/layouts/app-layout.vue

@@ -1,5 +1,6 @@
 <template>
     <!--  BEGIN MAIN CONTAINER  -->
+      <!-- <div>112</div> -->
     <div class="relative">
         <!-- sidebar menu overlay -->
         <div class="fixed inset-0 bg-[black]/60 z-50 lg:hidden" :class="{ hidden: !store.state.sidebar }"

+ 3 - 0
src/locales/en.json

@@ -179,6 +179,9 @@
     "tabs": "Tabs",
     "error": "Error",
     
+    "info": "Personal Information",
+    "edit_password": "Change Password",
+    "logout": "Log Out",
     "login": "Login",
     "lockscreen": "Lockscreen",
     "password_recovery": "Password Recovery",

+ 13 - 9
src/permission.js

@@ -34,11 +34,12 @@ router.beforeEach(async (to, from, next) => {
   } else {
     store.dispatch("setMainLayout", 'app');
   }
-  next(true);
+ /*  next(true); */
   const refreshToken = Storage.getItem('admin_refresh_token')
   if (refreshToken) {
     if ((to.path === '/login' || to.path === '/boxed-signup') && store.getters.addRouters.length) {
-      toFirstRoute(router, next)
+      return next(toFirstRoute(router))
+      /* toFirstRoute(router, next) */
      /*  NProgress.done() */
     } else {
       if (store.getters.addRouters.length === 0) {
@@ -49,29 +50,32 @@ router.beforeEach(async (to, from, next) => {
           if (routers.length) {
             const paths = router.getRoutes().map(item => item.path)
             if (paths.includes(to.path)) {
-              next({ ...to, replace: true })
+              return  next({ ...to, replace: true })
             } else {
-              toFirstRoute(router, next)
+              return  next(toFirstRoute(router))
+              /* toFirstRoute(router, next) */
             }
           } else {
-            next('/404')
+            return next('/404')
           }
         } catch {
           await store.dispatch('fedLogoutAction')
           ElMessage.error('验证失败,请重新登录')
           const toPath = Storage.getItem('admin_franchise') ? '/boxed-signup' : '/login'
-          window.location.replace(router.resolve(toPath).href)
+          return next(toPath)
+          /* const toPath = Storage.getItem('admin_franchise') ? '/boxed-signup' : '/login'
+          window.location.replace(router.resolve(toPath).href) */
         }
       } else {
-        next()
+        return next()
       }
     }
   } else {
     if (whiteList.includes(to.path)) {
-      next()
+      return  next()
     } else {
       const toPath = Storage.getItem('admin_franchise') ? '/boxed-signup' : '/login'
-      next(toPath)
+      return next(toPath)
     /*   NProgress.done() */
     }
   }

+ 14 - 1
src/router/index.ts

@@ -21,13 +21,26 @@ const router = createRouter({
 
 const asyncRouterMap: RouteRecordRaw[] = [
     {
+        path: '/',
+        component: () => import('@/views/index.vue'),
+        redirect: '/dashboard',
+        children: [
+            { 
+                path: 'dashboard', 
+                component: () => import('@/views/index.vue'), 
+                name: 'dashboard', 
+                meta: { title: 'home', icon: 'dashboard', layout: 'app' } 
+            }
+        ]
+    },
+   /*  {
         path: '/',
         redirect: '/dashboard',
         name: 'dashboard',
         children: [
             { path: 'dashboard', component: () => import('@/views/index.vue'), name: 'dashboard', meta: { title: 'home', icon: 'dashboard', layout: 'app' } }
         ]
-    },
+    }, */
     {
         path: '/stock',
         redirect: '/stock',

+ 1 - 9
src/stores/index.ts

@@ -24,10 +24,6 @@ export interface State {
     semidark: boolean;
     superMenu: string;
     companId: string;
-    tagsView: {
-        visitedViews: any[];
-        cachedViews: any[];
-    };
 }
 
 // 定义 Getters 类型
@@ -66,11 +62,7 @@ const store = createStore<State>({
         isShowMainLoader: true,
         semidark: false,
         superMenu: 'super',
-        companId: "",
-        tagsView: {
-            visitedViews: [],
-            cachedViews: []
-        }
+        companId: ""
     },
     mutations: {
         setMainLayout(state, payload) {

+ 34 - 27
src/views/companyMent/administratorManage.vue

@@ -4,13 +4,13 @@
       <template #toolbar>
         <div class="inner-toolbar w-11/12 flex justify-between">
           <div class="toolbar-btns">
-            <el-button size="mini" v-if="store.state.user.user.founder!==1" type="primary" icon="el-icon-circle-plus-outline"  @click="handleAddAdmin"
+            <el-button size="small" v-if="store.state.user.user.founder !== 1" type="primary" icon="el-icon-circle-plus-outline" @click="handleAddAdmin"
               >添加</el-button
             >
           </div>
           <div class="toolbar-search">
             <en-table-search @search="searchEvent" placeholder="请输入关键字" @advancedSearch="advancedSearchEvent" advanced>
-             <!--  <template #advanced-content>v-if="checkPermission(['administratorManage:add'])"
+              <!--  <template #advanced-content>v-if="checkPermission(['administratorManage:add'])"
                 <el-form ref="advancedForm" :model="advancedForm" label-width="90px">
                   <el-form-item label="状态">
                     <el-select v-model="advancedForm.user_state">
@@ -40,22 +40,20 @@
         <el-table-column prop="role_name" label="所属角色" />
         <el-table-column label="操作" width="200px">
           <template #default="scope">
-            <el-button size="mini" type="primary" v-if="store.state.user.user.founder!==1"  @click="handleEditAdmin(scope.$index, scope.row)"
-              >编辑</el-button
-            >
+            <el-button size="small" type="primary" v-if="store.state.user.user.founder !== 1" @click="handleEditAdmin(scope.$index, scope.row)">编辑</el-button>
             <!-- v-if="checkPermission(['administratorManage:edit'])" -->
             <el-button
-              size="mini"
+              size="small"
               type="danger"
-              v-if="scope.row.user_state === 0 && store.state.user.user.founder!==1"
+              v-if="scope.row.user_state === 0 && store.state.user.user.founder !== 1"
               @click="handleDeleteAdmin(scope.$index, scope.row)"
               >删除</el-button
             >
             <!-- && checkPermission(['administratorManage:del']) && checkPermission(['administratorManage:restore'])-->
             <el-button
-              size="mini"
+              size="small"
               type="success"
-              v-if="scope.row.user_state !== 0 && store.state.user.user.founder!==1"
+              v-if="scope.row.user_state !== 0 && store.state.user.user.founder !== 1"
               @click="handleRestoreAdmin(scope.$index, scope.row)"
               >恢复</el-button
             >
@@ -63,17 +61,27 @@
         </el-table-column>
       </template>
       <template #pagination>
-        <el-pagination
+        <!-- <el-pagination
           v-if="tableData"
+          v-model:current-page="tableData.page_no"
+          v-model:page-size="tableData.page_size"
+          :page-sizes="[10, 20, 50, 100]"
+          :total="tableData.data_total"
+          layout="total, sizes, prev, pager, next, jumper"
           @size-change="handlePageSizeChange"
           @current-change="handlePageCurrentChange"
-          :current-page="tableData.page_no"
+        >
+        </el-pagination> -->
+        <el-pagination
+          v-if="tableData"
+          v-model:current-page="tableData.page_no"
+          v-model:page-size="tableData.page_size"
           :page-sizes="[10, 20, 50, 100]"
-          :page-size="tableData.page_size"
-          layout="total, sizes, prev, pager, next, jumper"
           :total="tableData.data_total"
-        >
-        </el-pagination>
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handlePageSizeChange"
+          @current-change="handlePageCurrentChange"
+        />
       </template>
     </en-table-layout>
     <el-dialog
@@ -174,7 +182,7 @@ const params: Params = {
   page_size: 10,
   user_state: 0,
   keyword: '',
-  company_id:  store.state.companId,
+  company_id: store.state.companId,
 };
 /* const params = reactive({
   page_no: 1,
@@ -191,8 +199,8 @@ const adminForm = ref<any>({
   id: '',
   role_id: '',
   face: '',
-  phone:"",
-  email:""
+  phone: '',
+  email: '',
 });
 const adminFormRef = ref();
 const advancedForm = ref<any>({
@@ -258,7 +266,7 @@ watch(dialogVisible, (newVal) => {
 
 onMounted(() => {
   GET_AdministratorList();
-  API_Auth.getRoleList({ page_size: 10000 ,company_id: store.state.companId,}).then((response) => {
+  API_Auth.getRoleList({ page_size: 10000, company_id: store.state.companId }).then((response) => {
     rolesOptions.value = response.data;
   });
   GET_DeptList();
@@ -279,7 +287,7 @@ const advancedSearchEvent = () => {
 };
 /* 处理树形数据 */
 let buildTree = function buildTree(list, parent_id) {
-  const tree:any = [];
+  const tree: any = [];
   for (let i = 0; i < list.length; i++) {
     if (list[i].parent_id === parent_id) {
       const node = {
@@ -300,7 +308,7 @@ let buildTree = function buildTree(list, parent_id) {
   return tree;
 };
 const GET_DeptList = () => {
-  API_Setting.getDeptList({company_id: store.state.companId,}).then((response) => {
+  API_Setting.getDeptList({ company_id: store.state.companId }).then((response) => {
     deptList.value = buildTree(response, '0');
   });
 };
@@ -335,12 +343,11 @@ const handleAddAdmin = () => {
     founder: 0,
     real_name: '',
     password: '',
-    username:"",
-    nickname:"",
-    role_id:"",
-    
+    username: '',
+    nickname: '',
+    role_id: '',
   });
-  fileList.value= [];
+  fileList.value = [];
   dialogVisible.value = true;
 };
 
@@ -380,7 +387,7 @@ const submitAdminForm = () => {
     if (valid) {
       const { id } = adminForm.value;
       const params = { ...adminForm.value };
-      if (params.password) params.password = params.password//md5();
+      if (params.password) params.password = params.password; //md5();
       if (!params.real_name) delete params.real_name;
       params.role_id === '超级人员' ? (params.role_id = 0) : null;
       if (id) {

+ 1 - 1
src/views/companyMent/branch.vue

@@ -4,7 +4,7 @@
       <div class="toolbar">
         <div class="inner-toolbar">
           <div class="toolbar-btns">
-            <el-button size="mini" v-if="checkPermission(['branch:add'])&& store.state.user.user.founder!==1" type="primary" @click="handleAddBranch">新增</el-button>
+            <el-button size="small" v-if="checkPermission(['branch:add'])&& store.state.user.user.founder!==1" type="primary" @click="handleAddBranch">新增</el-button>
           </div>
         </div>
       </div>

+ 4 - 4
src/views/goods/SKUList.vue

@@ -4,7 +4,7 @@
       <template #toolbar>
         <div class="inner-toolbar w-11/12 flex justify-between">
           <div class="toolbar-btns">
-            <el-button size="mini" v-if="checkPermission(['warehouse:add'])&& store.state.user.user.founder!==1" type="primary" @click="handleAddWarehouse">新增</el-button>
+            <el-button size="small" v-if="checkPermission(['warehouse:add'])&& store.state.user.user.founder!==1" type="primary" @click="handleAddWarehouse">新增</el-button>
           </div>
           <div class="toolbar-search">
             <en-table-search @search="searchEvent" placeholder="请输入关键字搜索" />
@@ -27,9 +27,9 @@
 
         <el-table-column label="操作">
           <template #default="scope">
-            <el-button size="mini" v-if="checkPermission(['warehouse:update'])" @click="handleView(scope.row)">查看</el-button>
-            <el-button size="mini" v-if="checkPermission(['warehouse:update'])&& store.state.user.user.founder!==1" @click="handleEditWarehouse(scope.$index, scope.row)">编辑</el-button>
-            <el-button type="success" size="mini" v-if="checkPermission(['removeAreaType:delete'])&& store.state.user.user.founder!==1" @click="handleDelGoods(scope.row)">删除</el-button>
+            <el-button size="small" v-if="checkPermission(['warehouse:update'])" @click="handleView(scope.row)">查看</el-button>
+            <el-button size="small" v-if="checkPermission(['warehouse:update'])&& store.state.user.user.founder!==1" @click="handleEditWarehouse(scope.$index, scope.row)">编辑</el-button>
+            <el-button type="success" size="small" v-if="checkPermission(['removeAreaType:delete'])&& store.state.user.user.founder!==1" @click="handleDelGoods(scope.row)">删除</el-button>
             <!--<el-button size="mini" v-if="checkPermission(['warehouse:update'])" @click="handleRenew(scope.$index, scope.row)">续费</el-button> -->
           </template>
         </el-table-column>

+ 3 - 3
src/views/package/packagePermissions.vue

@@ -3,7 +3,7 @@
       <template #toolbar>
         <div class="inner-toolbar w-11/12 flex justify-between">
           <div class="toolbar-btns">
-            <el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" v-if="checkPermission(['roleManage:add'])" @click="handleAddRole"
+            <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" v-if="checkPermission(['roleManage:add'])" @click="handleAddRole"
               >添加</el-button
             >
           </div>
@@ -18,8 +18,8 @@
         <el-table-column prop="role_describe" label="角色描述" />
         <el-table-column label="操作">
           <template #default="scope">
-            <el-button size="mini" type="primary" @click="handleEditRole(scope.row)" v-if="checkPermission(['roleManage:edit'])">编辑</el-button>
-            <el-button size="mini" type="danger" @click="handleDeleteRole(scope.row)" v-if="checkPermission(['roleManage:del'])">删除</el-button>
+            <el-button size="small" type="primary" @click="handleEditRole(scope.row)" v-if="checkPermission(['roleManage:edit'])">编辑</el-button>
+            <el-button size="small" type="danger" @click="handleDeleteRole(scope.row)" v-if="checkPermission(['roleManage:del'])">删除</el-button>
           </template>
         </el-table-column>
       </template>

+ 5 - 5
src/views/setting/companyList.vue

@@ -4,7 +4,7 @@
       <template #toolbar>
         <div class="inner-toolbar w-11/12 flex justify-between">
           <div class="toolbar-btns">
-            <el-button size="mini" v-if="checkPermission(['warehouse:add'])" type="primary" @click="handleAddWarehouse">新增</el-button>
+            <el-button size="small" v-if="checkPermission(['warehouse:add'])" type="primary" @click="handleAddWarehouse">新增</el-button>
           </div>
           <div class="toolbar-search">
             <en-table-search @search="searchEvent" placeholder="请输入关键字搜索" />
@@ -37,10 +37,10 @@
 
         <el-table-column label="操作" width="300">
           <template #default="scope">
-            <el-button size="mini" v-if="checkPermission(['warehouse:update'])" @click="getBranch('compan', scope.row)">查看</el-button>
-            <el-button size="mini" v-if="checkPermission(['warehouse:update'])" @click="handleEditWarehouse(scope.$index, scope.row)">编辑</el-button>
-            <el-button size="mini" v-if="checkPermission(['warehouse:update'])" @click="handleRenew(scope.$index, scope.row)">续费</el-button>
-            <el-button size="mini" class="mt-1" v-if="scope.row.status !== 1" @click="handleBranch(scope.$index, scope.row)">审核</el-button>
+            <el-button size="small" v-if="checkPermission(['warehouse:update'])" @click="getBranch('compan', scope.row)">查看</el-button>
+            <el-button size="small" v-if="checkPermission(['warehouse:update'])" @click="handleEditWarehouse(scope.$index, scope.row)">编辑</el-button>
+            <el-button size="small" v-if="checkPermission(['warehouse:update'])" @click="handleRenew(scope.$index, scope.row)">续费</el-button>
+            <el-button size="small" class="mt-1" v-if="scope.row.status !== 1" @click="handleBranch(scope.$index, scope.row)">审核</el-button>
           </template>
         </el-table-column>
       </template>

+ 3 - 3
src/views/setting/roleManage.vue

@@ -3,7 +3,7 @@
     <template #toolbar>
       <div class="inner-toolbar w-11/12 flex justify-between">
         <div class="toolbar-btns">
-          <el-button size="mini" type="primary" :icon="CirclePlus" v-if="checkPermission(['roleManage:add'])&& store.state.user.user.founder!==1" @click="handleAddRole"
+          <el-button size="small" type="primary" :icon="CirclePlus" v-if="checkPermission(['roleManage:add'])&& store.state.user.user.founder!==1" @click="handleAddRole"
             >添加</el-button
           >
         </div>
@@ -18,8 +18,8 @@
       <el-table-column prop="role_describe" label="角色描述" />
       <el-table-column label="操作">
         <template #default="scope">
-          <el-button size="mini" type="primary" @click="handleEditRole(scope.row)" v-if="checkPermission(['roleManage:edit'])&& store.state.user.user.founder!==1">编辑</el-button>
-          <el-button size="mini" type="danger" @click="handleDeleteRole(scope.row)" v-if="checkPermission(['roleManage:del'])&& store.state.user.user.founder!==1">删除</el-button>
+          <el-button size="small" type="primary" @click="handleEditRole(scope.row)" v-if="checkPermission(['roleManage:edit'])&& store.state.user.user.founder!==1">编辑</el-button>
+          <el-button size="small" type="danger" @click="handleDeleteRole(scope.row)" v-if="checkPermission(['roleManage:del'])&& store.state.user.user.founder!==1">删除</el-button>
         </template>
       </el-table-column>
     </template>

+ 81 - 98
src/views/stock/addInventory.vue

@@ -1,53 +1,54 @@
 <template>
-  <div class="bg-in-stock">
+  <div class="bg-in-stock dark:!bg-[#060818]">
     <el-form ref="goodsExchangeAddFormRef" :model="goodsExchangeAddForm" :rules="goodsExchangeAddFormRule" label-width="160px" inline class="change-form">
-      <el-form-item
-        label="订单编号:"
-        prop="order_id"
-        class="change-form-item"
-        v-if="goodsExchangeAddForm.sn && (goodsExchangeAddForm.type == 'SALE_AFTER' || goodsExchangeAddForm.type == 'HAIL_ENTRY')"
-      >
-        {{ goodsExchangeAddForm.sn }}
-      </el-form-item>
-      <el-form-item prop="warehouse_id" :label="$t('warehousing')+$t('warechouse')+':'" class="change-form-item">
-        <el-select v-model="goodsExchangeAddForm.warehouse_id" clearable :disabled="type === 'view'">
-          <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('type')+':'" prop="type" class="change-form-item">
-        <el-select
-          v-model="goodsExchangeAddForm.type"
-          filterable
-          allow-create
-          clearable
-          default-first-option
-          :disabled="type === 'view' || orderType || goodsExchangeAddForm.type == 'SALE_AFTER' || goodsExchangeAddForm.type == 'HAIL_ENTRY'"
-        >
-          <el-option
-            v-for="item in typeList"
-            :key="item.id"
-            :label="item.label"
-            :value="item.value"
-            :disabled="item.value == 'TRANSFER_ENTRY' || item.value == 'HAIL_ENTRY' || item.value == 'SALE_AFTER'"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('notes')+':'" prop="change_desc" class="change-form-item" style="width: 61%">
-        <el-input
-          style="flex: 1"
-          v-model="goodsExchangeAddForm.memo"
-          type="textarea"
-          :disabled="type === 'view' || type === 'audit'"
-          :autosize="{ minRows: 3, maxRows: 4 }"
-          :placeholder="$t('place')"
-        ></el-input>
-      </el-form-item>
+      <el-row class="flex flex-wrap">
+        <el-col :xs="24" :sm="12" :md="8" :lg="8" class="mb-4">
+          <el-form-item prop="warehouse_id" :label="$t('warehousing') + $t('warechouse') + ':'" class="change-form-item">
+            <el-select v-model="goodsExchangeAddForm.warehouse_id" clearable :disabled="type === 'view'" class="w-full">
+              <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="12" :md="8" :lg="8" class="mb-4">
+          <el-form-item :label="$t('type') + ':'" prop="type" class="change-form-item">
+            <el-select
+              v-model="goodsExchangeAddForm.type"
+              filterable
+              allow-create
+              clearable
+              default-first-option
+              :disabled="type === 'view' || orderType || goodsExchangeAddForm.type == 'SALE_AFTER' || goodsExchangeAddForm.type == 'HAIL_ENTRY'"
+              class="w-full"
+            >
+              <el-option
+                v-for="item in typeList"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+                :disabled="item.value == 'TRANSFER_ENTRY' || item.value == 'HAIL_ENTRY' || item.value == 'SALE_AFTER'"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="24" :md="16" :lg="16" class="mb-4">
+          <el-form-item :label="$t('notes') + ':'" prop="change_desc" class="change-form-item w-full">
+            <el-input
+              v-model="goodsExchangeAddForm.memo"
+              type="textarea"
+              :disabled="type === 'view' || type === 'audit'"
+              :autosize="{ minRows: 3, maxRows: 4 }"
+              :placeholder="$t('place')"
+              class="w-full"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <div class="mx">
-        <h3>{{$t('goods_inventory')}}:</h3>
-        <el-button class="button" size="mini" type="primary" v-if="type !== 'view' && type !== 'audit'" @click="scanCode">{{$t('scan_code')}}</el-button>
+        <h3>{{ $t('goods_inventory') }}:</h3>
+        <el-button class="button" size="small" type="primary" v-if="type !== 'view' && type !== 'audit'" @click="scanCode">{{ $t('scan_code') }}</el-button>
         <el-button
           class="button"
-          size="mini"
+          size="small"
           type="primary"
           v-if="
             type !== 'view' &&
@@ -57,10 +58,10 @@
             goodsExchangeAddForm.type !== 'SALE_AFTER'
           "
           @click="handleSelectWarehouseEntryBatch"
-          >{{$t('select')}}</el-button
+          >{{ $t('select') }}</el-button
         >
-      </div>
-      <div style="width: 100%; display: block">
+      </div><!-- style="width: 100%; display: block" -->
+      <div class="w-full" >
         <el-form-item style="width: 100%">
           <el-table
             :data="goodsExchangeAddForm.product_list"
@@ -75,15 +76,12 @@
                   <div>
                     <p v-for="item in scope.row.area_stock_list" :key="item.id">{{ item.warehouse_area_name }}</p>
                   </div>
-                  <span slot="reference" v-if="scope.row.area_stock_list.length !== 0">{{ scope.row.area_stock_list[0].warehouse_area_name }}</span>
+                  <template #reference>
+                    <span v-if="scope.row.area_stock_list.length !== 0">{{ scope.row.area_stock_list[0].warehouse_area_name }}</span>
+                  </template>
                 </el-popover>
               </template>
             </el-table-column>
-            <!-- <el-table-column label="商品编号">
-              <template #default="scope">
-                {{ scope.row.goods_vo.sn }}
-              </template>
-            </el-table-column> -->
             <el-table-column :label="$t('goods_name')">
               <template #default="scope">
                 {{ scope.row.product_vo.name }}
@@ -92,26 +90,11 @@
             <el-table-column label="sku">
               <template #default="scope">
                 {{ scope.row.product_vo.sku }}
-                <!-- <span v-if="id">{{ scope.row.product_vo.sku }}</span>
-                <span v-else>{{ scope.row.product_vo.sku }}</span> -->
               </template>
             </el-table-column>
-            <!-- <el-table-column label="序列号">
-              <template #default="scope">
-                <div class="sn-code-container">
-                  <span v-for="item in scope.row.sn_code_list" :key="item.id">
-                    <p>{{ item.sn_code }}</p>
-                  </span>
-                </div>
-              </template>
-            </el-table-column> -->
-            <!-- <el-table-column prop="product_vo.spec_name" label="规格型号" v-if="id"> </el-table-column>
-            <el-table-column prop="product_vo.spec_name" label="规格型号" v-else> </el-table-column> -->
             <el-table-column :label="$t('goods_unit')">
               <template #default="scope">
                 {{ scope.row.product_vo.unit }}
-                <!--    <span v-if="id">{{ scope.row.product_vo.unit }}</span>
-                <span v-else>{{ scope.row.product_vo.unit }}</span> -->
               </template>
             </el-table-column>
             <el-table-column :label="$t('warehousing_num')">
@@ -183,7 +166,7 @@
               "
             >
               <template #default="scope">
-                <el-button size="mini" type="danger" @click="goodsExchangeAddForm.product_list.splice(scope.$index, 1)">{{$t('delete')}}</el-button>
+                <el-button size="small" type="danger" @click="goodsExchangeAddForm.product_list.splice(scope.$index, 1)">{{ $t('delete') }}</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -202,23 +185,23 @@
         "
         type="primary"
         @click="savegoodsExchangeAddForm"
-        >{{$t('save')}}
+        >{{ $t('save') }}
       </el-button>
       <el-button v-if="type !== 'view' && type !== 'detail' && checkPermission(['warehouseEntry:update'])" type="primary" @click="submitgoodsExchangeAddForm"
-        >{{$t('warehousing')}}
+        >{{ $t('warehousing') }}
       </el-button>
-      <el-button @click="printIng" v-if="type == 'audit'">{{$t('print')}}</el-button>
-      <el-button @click="toBack()">{{$t('return')}}</el-button>
+      <el-button @click="printIng" v-if="type == 'audit'">{{ $t('print') }}</el-button>
+      <el-button @click="toBack()">{{ $t('return') }}</el-button>
     </div>
     <el-dialog :title="$t('prompt')" v-model="dialogVisible" width="30%">
-      <el-form :model="goodsExchangeAddForm" label-width="120px" inline style="width: 900px">
+      <el-form :model="goodsExchangeAddForm" label-width="120px" inline ><!-- style="width: 900px" -->
         <el-form-item :label="$t('reject')" prop="reject_reason">
           <el-input v-model="goodsExchangeAddForm.reject_reason" type="textarea" :minlength="0" :maxlength="100"></el-input>
         </el-form-item>
       </el-form>
       <template #footer>
-        <el-button @click="dialogVisible = false">{{$t('cancel')}}</el-button>
-        <el-button type="primary" @click="handleRejectGoodsExchange()">{{$t('submit')}}</el-button>
+        <el-button @click="dialogVisible = false">{{ $t('cancel') }}</el-button>
+        <el-button type="primary" @click="handleRejectGoodsExchange()">{{ $t('submit') }}</el-button>
       </template>
     </el-dialog>
     <el-dialog :title="$t('scan_code')" v-model="scanDialogVisible" width="30%" :close-on-click-modal="false">
@@ -231,10 +214,10 @@
         </el-form-item>
       </el-form>
     </el-dialog>
-    <el-dialog :title="$t('warehousing')+$t('goods_info')" v-model="goodsVisible" width="1000px" @close="closeGoosData">
+    <el-dialog :title="$t('warehousing') + $t('goods_info')" v-model="goodsVisible" width="1000px" @close="closeGoosData">
       <div style="display: flex; align-items: center; justify-content: flex-end; padding: 10px 0">
-        <span>{{$t('search')+$t('goods_info')}}:</span><el-input v-model="params.keyWord" style="width: 200px; margin-right: 5px"></el-input>
-        <el-button @click="searchGoodEvent"> {{$t('search')}} </el-button>
+        <span>{{ $t('search') + $t('goods_info') }}:</span><el-input v-model="params.keyWord" style="width: 200px; margin-right: 5px"></el-input>
+        <el-button @click="searchGoodEvent"> {{ $t('search') }} </el-button>
       </div>
       <el-table :data="goodsData.records" border style="width: 100%" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" />
@@ -259,8 +242,8 @@
       >
       </el-pagination>
       <template #footer>
-        <el-button @click="closeGoosData">{{$t('cancel')}}</el-button>
-        <el-button type="primary" @click="submitGoosData()">{{$t('submit')}}</el-button>
+        <el-button @click="closeGoosData">{{ $t('cancel') }}</el-button>
+        <el-button type="primary" @click="submitGoosData()">{{ $t('submit') }}</el-button>
       </template>
     </el-dialog>
     <el-dialog title="订单列表" v-model="orderVisible" width="1000px" @close="closeGoosData">
@@ -317,7 +300,7 @@ import * as API_BasicSetting from '@/api/basicSetting';
   import * as API_order from '@/api/order';
   import * as API_Goods from '@/api/goods';
   import * as API_CollectingAccount from '@/api/collectingAccount'; */
-  import { useI18n } from 'vue-i18n';
+import { useI18n } from 'vue-i18n';
 
 const { t } = useI18n();
 
@@ -344,8 +327,8 @@ let goodsExchangeAddForm = reactive({
 });
 
 const goodsExchangeAddFormRule = {
-  warehouse_id: [{ required: true, message: t('change')+t('warehousing')+t('warechouse'), trigger: 'change' }],
-  type: [{ required: true, message: t('change')+t('warehousing')+t('type'), trigger: 'change' }],
+  warehouse_id: [{ required: true, message: t('change') + t('warehousing') + t('warechouse'), trigger: 'change' }],
+  type: [{ required: true, message: t('change') + t('warehousing') + t('type'), trigger: 'change' }],
 };
 
 const params = reactive({
@@ -522,7 +505,7 @@ const submitGoosData = () => {
     });
     goodsVisible.value = false;
   } else {
-    ElMessage.error(t('change')+t('goods_info')+'!');
+    ElMessage.error(t('change') + t('goods_info') + '!');
   }
 };
 
@@ -533,7 +516,7 @@ const closeGoosData = () => {
 const inputRef = ref();
 const scanCode = () => {
   if (!goodsExchangeAddForm.warehouse_id) {
-    ElMessage.error(t('change')+t('warechouse')+'!');
+    ElMessage.error(t('change') + t('warechouse') + '!');
     return;
   }
   scanDialogVisible.value = true;
@@ -544,7 +527,7 @@ const scanCode = () => {
 
 const handleSelectWarehouseEntryBatch = () => {
   if (!goodsExchangeAddForm.warehouse_id) {
-    ElMessage.error(t('change')+t('warechouse')+'!');
+    ElMessage.error(t('change') + t('warechouse') + '!');
     return;
   }
   API_GoodsExchange.getGoodsInfo(params, goodsExchangeAddForm.warehouse_id, 'le').then((res) => {
@@ -559,7 +542,7 @@ const savegoodsExchangeAddForm = () => {
       const params = { ...goodsExchangeAddForm };
       params.save_or_submit = 'save';
       if (!params.product_list.length) {
-        ElMessage.error(t('change')+t('goods_info')+'!');
+        ElMessage.error(t('change') + t('goods_info') + '!');
         return;
       }
       params.product_list.forEach((el) => {
@@ -569,12 +552,12 @@ const savegoodsExchangeAddForm = () => {
       });
       if (type.value == 'edit') {
         API_GoodsExchange.editWarehouseEntry(route.query.id, params).then((response) => {
-          ElMessage.success(t('edit_success')+'!');
+          ElMessage.success(t('edit_success') + '!');
           router.push({ name: 'goodsExchange' });
         });
       } else {
         API_GoodsExchange.warehouseEntry(params).then(() => {
-          ElMessage.success(t('sub_success')+'!');
+          ElMessage.success(t('sub_success') + '!');
           router.push({ name: 'goodsExchange' });
         });
       }
@@ -588,7 +571,7 @@ const submitgoodsExchangeAddForm = () => {
       const params = { ...goodsExchangeAddForm };
       params.save_or_submit = 'submit';
       if (!params.product_list.length) {
-        ElMessage.error(t('change')+t('goods_info')+'!');
+        ElMessage.error(t('change') + t('goods_info') + '!');
         return;
       }
       params.product_list.forEach((el) => {
@@ -598,12 +581,12 @@ const submitgoodsExchangeAddForm = () => {
       });
       if (type.value == 'edit') {
         API_GoodsExchange.editWarehouseEntry(route.query.id, params).then((response) => {
-          ElMessage.success(t('edit_success')+'!');
+          ElMessage.success(t('edit_success') + '!');
           router.push({ name: 'goodsExchange' });
         });
       } else {
         API_GoodsExchange.warehouseEntry(params).then(() => {
-          ElMessage.success(t('sub_success')+'!');
+          ElMessage.success(t('sub_success') + '!');
           router.push({ name: 'goodsExchange' });
         });
       }
@@ -658,15 +641,15 @@ onMounted(() => {
 }
 
 .change-form {
-  display: flex;
+  /* display: flex;
   justify-content: flex-start;
   align-items: flex-start;
-  flex-wrap: wrap;
-  min-width: 900px;
+  flex-wrap: wrap; 
+  min-width: 900px;*/
 }
 
 .change-form .change-form-item {
-  width: 30%;
+  width: 100%;
   margin: 0 10px 20px 0;
   display: flex;
   flex-direction: row;

+ 3 - 3
src/views/stock/addOutbound.vue

@@ -30,8 +30,8 @@
       </el-form-item>
       <div class="mx">
         <h3>{{$t('goods_inventory')}}</h3>
-        <el-button class="button" size="mini" type="primary" v-if="type !== 'view' && type !== 'audit'" @click="scanCode">{{$t('scan_code')}}</el-button>
-        <el-button class="button" size="mini" type="primary" v-if="type !== 'view' && type !== 'audit'" @click="handleSelectWarehouseEntryBatch"
+        <el-button class="button" size="small" type="primary" v-if="type !== 'view' && type !== 'audit'" @click="scanCode">{{$t('scan_code')}}</el-button>
+        <el-button class="button" size="small" type="primary" v-if="type !== 'view' && type !== 'audit'" @click="handleSelectWarehouseEntryBatch"
           >{{$t('select')}}</el-button
         >
       </div>
@@ -112,7 +112,7 @@
             </el-table-column>
             <el-table-column width="200" :label="$t('operate')" v-if="type !== 'view' && type !== 'audit'">
               <template #default="scope">
-                <el-button size="mini" type="danger" @click="goodsExchangeAddForm.product_list.splice(scope.$index, 1)">{{$t('delete')}}</el-button>
+                <el-button size="small" type="danger" @click="goodsExchangeAddForm.product_list.splice(scope.$index, 1)">{{$t('delete')}}</el-button>
               </template>
             </el-table-column>
           </el-table>

+ 4 - 4
src/views/stock/goodsInventory.vue

@@ -46,7 +46,7 @@
         <div class="inner-toolbar">
           <div class="toolbar-btns">
             <!-- v-if="checkPermission(['goodsInventory:add'])" type="primary" -->
-            <el-button size="mini" v-if="store.state.user.user.founder!==1" @click="handleAddGoodsInventory">{{$t('add')}}</el-button>
+            <el-button size="small" v-if="store.state.user.user.founder!==1" @click="handleAddGoodsInventory">{{$t('add')}}</el-button>
           </div>
         </div>
       </template>
@@ -70,11 +70,11 @@
         <el-table-column :label="$t('operate')" width="450">
           <template #default="scope">
             <!-- v-if="checkPermission(['goodsInventoryCheck'])" -->
-            <el-button size="mini" @click="handleCheckGoodsInventory(scope.row)">{{$t('view')}}</el-button>
+            <el-button size="small" @click="handleCheckGoodsInventory(scope.row)">{{$t('view')}}</el-button>
             <!--  && checkPermission(['goodsInventoryEdit']) -->
-            <el-button v-if="scope.row.status == 'NOT_HANDLE'&& store.state.user.user.founder!==1" size="mini" @click="handleEditGoodsInventory(scope.row)">{{$t('edit')}}</el-button>
+            <el-button v-if="scope.row.status == 'NOT_HANDLE'&& store.state.user.user.founder!==1" size="small" @click="handleEditGoodsInventory(scope.row)">{{$t('edit')}}</el-button>
             <!--  && checkPermission(['goodsInventory:sync']) -->
-            <el-button type="mini" size="mini" v-if="scope.row.status == 'NOT_HANDLE'&& store.state.user.user.founder!==1" @click="handleSubmitGoodsInventory(scope.row)">{{$t('synchronous')}}</el-button>
+            <el-button type="mini" size="small" v-if="scope.row.status == 'NOT_HANDLE'&& store.state.user.user.founder!==1" @click="handleSubmitGoodsInventory(scope.row)">{{$t('synchronous')}}</el-button>
           </template>
         </el-table-column>
       </template>

+ 3 - 3
src/views/stock/goodsInventoryAdd.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="bg-in-stock" v-loading="loading">
+  <div class="bg-in-stock dark:!bg-[#060818]" v-loading="loading">
     <el-form ref="goodsInventoryAddFormRef" :model="goodsInventoryAddForm" :rules="goodsInventoryAddFormRule" label-width="120px" inline class="change-form">
       <h3 style="width: 100%">{{ $t('inventory') }}</h3>
       <el-form-item :label="$t('inventorySn')" prop="sn" v-if="type === 'edit' || type === 'view'" class="change-form-item">
@@ -191,7 +191,7 @@
       </el-form>
     </el-dialog>
     <el-dialog :title="$t('prompt')" v-model="dialogVisible" width="30%">
-      <el-form ref="goodsInventoryAddForm" :model="goodsInventoryAddForm" label-width="120px" inline style="width: 900px">
+      <el-form ref="goodsInventoryAddForm" :model="goodsInventoryAddForm" label-width="120px" inline ><!-- style="width: 900px" -->
         <el-form-item :label="$t('reject')" prop="reject_reason" required="true">
           <el-input v-model="goodsInventoryAddForm.reject_reason" type="textarea" :minlength="0" :maxlength="100"></el-input>
         </el-form-item>
@@ -680,7 +680,7 @@ const GET_goodsInventoryAddDetail = () => {
   justify-content: flex-start;
   align-items: flex-start;
   flex-wrap: wrap;
-  min-width: 900px;
+  /* min-width: 900px; */
 }
 
 .change-form .change-form-item {

+ 3 - 3
src/views/stock/goodsInventoryLoss.vue

@@ -45,7 +45,7 @@
         <div class="inner-toolbar">
           <div class="toolbar-btns">
             <!-- v-if="checkPermission(['goodsInventoryLoss:add'])" -->
-            <el-button size="mini" type="primary" v-if="store.state.user.user.founder !== 1" @click="handleAddGoodsInventoryLoss">{{ $t('add') }}</el-button>
+            <el-button size="small" type="primary" v-if="store.state.user.user.founder !== 1" @click="handleAddGoodsInventoryLoss">{{ $t('add') }}</el-button>
           </div>
         </div>
       </template>
@@ -67,11 +67,11 @@
         <el-table-column :label="$t('operate')" width="450">
           <template #default="scope">
             <!-- v-if="checkPermission(['goodsInventoryLossDetail'])" -->
-            <el-button type="mini" size="mini" @click="handleDetailGoodsInventoryLoss(scope.row)">{{ $t('view') }}</el-button>
+            <el-button type="mini" size="small" @click="handleDetailGoodsInventoryLoss(scope.row)">{{ $t('view') }}</el-button>
             <!--  && checkPermission(['goodsInventoryLossEdit']) -->
             <el-button
               type="mini"
-              size="mini"
+              size="small"
               v-if="scope.row.status == 'NOT_HANDLE' && store.state.user.user.founder !== 1"
               @click="handleSubmitGoodsInventoryLoss(scope.row)"
               >{{ $t('review') }}</el-button

+ 3 - 3
src/views/stock/goodsInventoryLossAdd.vue

@@ -65,10 +65,10 @@
       </el-form-item>
       <div class="mx">
         <h3>{{$t('goods_inventory')}}</h3>
-        <el-button v-if="type !== 'examine' && type !== 'audit' && type !== 'view'" class="button" size="mini" type="primary" @click="scanCode"
+        <el-button v-if="type !== 'examine' && type !== 'audit' && type !== 'view'" class="button" size="small" type="primary" @click="scanCode"
           >录入SKU</el-button
         >
-        <el-button v-if="type !== 'view' && type !== 'examine'" class="button" size="mini" type="primary" @click="handleSelectWarehouseEntryBatch">{{$t('select')}}</el-button>
+        <el-button v-if="type !== 'view' && type !== 'examine'" class="button" size="small" type="primary" @click="handleSelectWarehouseEntryBatch">{{$t('select')}}</el-button>
       </div>
       <div style="width: 100%; display: block">
         <el-form-item style="width: 100%">
@@ -132,7 +132,7 @@
             </el-table-column>
             <el-table-column :label="$t('operate')" v-if="type !== 'view' && type !== 'audit' && type !== 'examine'">
               <template #default="scope">
-                <el-button size="mini" type="danger" @click="goodsInventoryAddForm.product_list.splice(scope.$index, 1)">{{$t('delete')}}</el-button>
+                <el-button size="small" type="danger" @click="goodsInventoryAddForm.product_list.splice(scope.$index, 1)">{{$t('delete')}}</el-button>
               </template>
             </el-table-column>
           </el-table>

+ 10 - 10
src/views/stock/goodsLend.vue

@@ -4,10 +4,10 @@
       <template #toolbar>
         <div class="inner-toolbar w-11/12 flex justify-between">
           <div class="toolbar-btns">
-            <el-button size="mini" v-if="store.state.user.user.founder !== 1" type="primary" @click="handleAddGoodsLend">{{ $t('add') }}</el-button>
+            <el-button size="small" v-if="store.state.user.user.founder !== 1" type="primary" @click="handleAddGoodsLend">{{ $t('add') }}</el-button>
             <!-- <el-button
               type="success"
-              size="mini"
+              size="small"
               v-if="store.state.user.user.founder!==1"
               @click="handleConfirmGoodsLend"
               :disabled="multipleSelection.length === 0"
@@ -15,7 +15,7 @@
             > -->
           </div>
           <div class="toolbar-search dark:!bg-[#060818]">
-            <en-table-search @search="searchEvent" @advancedSearch="advancedSearchEvent" :placeholder="$t('place')+$t('warechouse_sn')" advanced advancedWidth="465">
+            <en-table-search @search="searchEvent" @advancedSearch="advancedSearchEvent" :placeholder="$t('place')+$t('warechouse_sn')" advanced >
             </en-table-search>
           </div>
         </div>
@@ -32,18 +32,18 @@
         <el-table-column prop="bind_num" :label="$t('warechouse_sku')" />
         <el-table-column :label="$t('operate')" width="250">
           <template #default="scope">
-            <!-- <el-button size="mini" v-if="checkPermission(['inventoryItem'])" @click="introGoodsLend(scope.row)">查看</el-button>
-            <el-button size="mini" v-if="checkPermission(['bindAreaStock:update'])" @click="AddGoodsLend(scope.row)">绑定商品</el-button> -->
-            <el-button size="mini" v-if="store.state.user.user.founder !== 1" @click="handleEditGoodsLend(scope.row)">{{ $t('edit') }}</el-button>
+            <!-- <el-button size="small" v-if="checkPermission(['inventoryItem'])" @click="introGoodsLend(scope.row)">查看</el-button>
+            <el-button size="small" v-if="checkPermission(['bindAreaStock:update'])" @click="AddGoodsLend(scope.row)">绑定商品</el-button> -->
+            <el-button size="small" v-if="store.state.user.user.founder !== 1" @click="handleEditGoodsLend(scope.row)">{{ $t('edit') }}</el-button>
             <el-button
               type="success"
-              size="mini"
+              size="small"
               style="margin-top: 5px"
               v-if="store.state.user.user.founder !== 1"
               @click="handleReturnGoodsLend(scope.row)"
               >{{ $t('delete') }}</el-button
             >
-            <!--  <el-button type="primary" v-if="store.state.user.user.founder!==1" size="mini" style="margin-top: 5px" @click="handlePrintGoodsLendDialog(scope.row)">{{$t('print')}}</el-button> -->
+            <!--  <el-button type="primary" v-if="store.state.user.user.founder!==1" size="small" style="margin-top: 5px" @click="handlePrintGoodsLendDialog(scope.row)">{{$t('print')}}</el-button> -->
           </template>
         </el-table-column>
       </template>
@@ -64,11 +64,11 @@
     </en-table-layout>
 
     <el-dialog :title="$t('print')" v-model="dialogVisible" width="940px" center @close="handleCancle">
-      <el-button size="mini" type="primary" @click="handlePrintGoodsLend" class="print">{{ $t('print') }}</el-button>
+      <el-button size="small" type="primary" @click="handlePrintGoodsLend" class="print">{{ $t('print') }}</el-button>
       <div id="deliverySheet" style="width: 900px">
         <div class="tips-t" v-for="(item, index) in codeList" :key="index">
           <div>
-            <barcode :value="item" height="20" format="CODE128" fontSize="20"></barcode>
+          <!--   <barcode :value="item" height="20" format="CODE128" fontSize="20"></barcode> -->
           </div>
         </div>
       </div>

+ 61 - 45
src/views/stock/goodsTransfer.vue

@@ -1,41 +1,45 @@
 <template>
-  <div>
-    <div class="search bg-white p-3">
+  <div class="grid xl:grid-cols-1">
+    <div class="search bg-white p-3 grid xl:grid-cols-1">
       <el-form ref="advancedForm" :model="advancedForm" label-width="160px">
-        <el-row>
-          <el-col :span="6">
-            <el-form-item :label="$t('warechouse')">
-              <el-select v-model="advancedForm.warehouse_id" clearable>
+        <el-row :gutter="20">
+          <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6" class="mb-4">
+            <el-form-item :label="$t('warechouse') + ':'">
+              <el-select v-model="advancedForm.warehouse_id" clearable class="w-full">
                 <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item :label="$t('goods_sn')+'/'+'sku'">
-              <el-input v-model="advancedForm.keyword" clearable :placeholder="$t('place')+$t('content')" width="200px"></el-input>
+          <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6" class="mb-4">
+            <el-form-item :label="$t('goods_sn') + '/' + 'sku' + ':'">
+              <el-input v-model="advancedForm.keyword" clearable :placeholder="$t('place') + $t('content')" class="w-full"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <div class="flex justify-end">
-        <el-button class="mr-3" @click="advancedSearchEvent"> {{$t('search')}} </el-button>
+        <el-button class="mr-3" @click="advancedSearchEvent"> {{ $t('search') }} </el-button>
       </div>
     </div>
-    <en-table-layout :tableData="tableData.data" ref="table" :loading="loading"
-      @selection-change="handleSelectionChange">
+    <en-table-layout :tableData="tableData.data" ref="table" :loading="loading" @selection-change="handleSelectionChange">
       <template #toolbar>
         <div class="inner-toolbar">
           <div class="toolbar-btns">
-            <el-button size="mini" type="primary" v-if="checkPermission(['updateWarnStock:update']) && store.state.user.user.founder!==1" @click="handleSubmitGoodsTransfer">设置预警库存</el-button>
-            <!-- <el-button size="mini" type="primary" v-if="store.state.user.user.founder!==1" @click="checkExport">导出</el-button> -->
+            <el-button
+              size="small"
+              type="primary"
+              v-if="checkPermission(['updateWarnStock:update']) && store.state.user.user.founder !== 1"
+              @click="handleSubmitGoodsTransfer"
+              >设置预警库存</el-button
+            >
+            <!-- <el-button size="small" type="primary" v-if="store.state.user.user.founder!==1" @click="checkExport">导出</el-button> -->
           </div>
         </div>
       </template>
 
       <template #table-columns>
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="warehouse_name" :label="$t('warechouse_name')">
-        </el-table-column>
+        <el-table-column prop="warehouse_name" :label="$t('warechouse_name')"> </el-table-column>
         <!-- <el-table-column label="商品编号" prop="sn">
         </el-table-column>
         <el-table-column prop="type" label="类别">
@@ -46,53 +50,64 @@
         <el-table-column prop="product_name" :label="$t('goods_name')" />
         <el-table-column prop="type" label="sku">
           <template #default="scope">
-            {{ scope.row.product_vo ? scope.row.product_vo.sku : ''  }}
+            {{ scope.row.product_vo ? scope.row.product_vo.sku : '' }}
           </template>
         </el-table-column>
         <el-table-column prop="goods_unit" :label="$t('goods_unit')" />
         <el-table-column prop="actual_stock" :label="$t('goods_unit')">
           <template #default="scope">
-            <span :style="Number(scope.row.actual_stock)<Number(scope.row.warning_stock)?'color:red':''">{{ scope.row.actual_stock }}</span> 
+            <span :style="Number(scope.row.actual_stock) < Number(scope.row.warning_stock) ? 'color:red' : ''">{{ scope.row.actual_stock }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="usable_stock" :label="$t('usable_stock')" />
         <el-table-column prop="transit_stock" :label="$t('transit_stock')" />
         <el-table-column prop="locked_stock" :label="$t('locked_stock')" />
         <el-table-column prop="warning_stock" :label="$t('warning_stock')" />
-      <!--   <el-table-column label="操作" width="250">
+        <!--   <el-table-column label="操作" width="250">
           <template #default="scope">
-            <el-button type="success1" size="mini" v-if="checkPermission(['goodsTransfer:add']) && scope.row.transit_stock>0"
+            <el-button type="success1" size="small" v-if="checkPermission(['goodsTransfer:add']) && scope.row.transit_stock>0"
               @click="lookTransit(scope.row)">查看在途</el-button>
           </template>
         </el-table-column> -->
       </template>
 
       <template #pagination>
-        <el-pagination v-if="tableData" @size-change="handlePageSizeChange"
-          @current-change="handlePageCurrentChange" :current-page="tableData.page_no" :page-sizes="[50, 100]"
-          :page-size="tableData.page_size" layout="total, sizes, prev, pager, next, jumper" :total="tableData.data_total">
+        <el-pagination
+          v-if="tableData"
+          @size-change="handlePageSizeChange"
+          @current-change="handlePageCurrentChange"
+          :current-page="tableData.page_no"
+          :page-sizes="[50, 100]"
+          :page-size="tableData.page_size"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="tableData.data_total"
+        >
         </el-pagination>
       </template>
     </en-table-layout>
-    <el-dialog :title="$t('transitDetails')" v-model:visible="dialogVisible" append-to-body :close-on-click-modal="false"
-      :close-on-press-escape="false">
+    <el-dialog :title="$t('transitDetails')" v-model:visible="dialogVisible" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-table :data="transitDetails" border class="sku-table">
         <el-table-column prop="order_sn" :label="$t('order_sn')" />
         <el-table-column prop="num" :label="$t('transit_num')" />
         <el-table-column prop="end_time" :label="$t('return_date')" />
       </el-table>
     </el-dialog>
-    <el-dialog :title="$t('setNumber')" v-model:visible="numDialogVisible" append-to-body :close-on-click-modal="false"
-      :close-on-press-escape="false" width="30%">
-      <el-form ref="numAddForm" :model="numAddForm" :rules="numAddFormRule" label-width="160px" inline
-        class="change-form">
+    <el-dialog
+      :title="$t('setNumber')"
+      v-model:visible="numDialogVisible"
+      append-to-body
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="30%"
+    >
+      <el-form ref="numAddForm" :model="numAddForm" :rules="numAddFormRule" label-width="160px" inline class="change-form">
         <el-form-item :label="$('warningQuantity')" prop="num" class="change-form-item">
           <el-input v-model="numAddForm.num" :placeholder="$('place')"></el-input>
         </el-form-item>
       </el-form>
       <template #footer>
-        <el-button @click="numDialogVisible = false">{{$('cancel')}}</el-button>
-        <el-button @click="submitNum" type="primary">{{$('submit')}}</el-button>
+        <el-button @click="numDialogVisible = false">{{ $('cancel') }}</el-button>
+        <el-button @click="submitNum" type="primary">{{ $('submit') }}</el-button>
       </template>
     </el-dialog>
   </div>
@@ -100,9 +115,9 @@
 
 <script setup>
 import { ref, reactive, onMounted, watch } from 'vue';
-import * as API_GoodsTransfer from "@/api/goodsTransfer";
-import * as API_Setting from "@/api/setting";
-import * as API_BasicSetting from "@/api/basicSetting";
+import * as API_GoodsTransfer from '@/api/goodsTransfer';
+import * as API_Setting from '@/api/setting';
+import * as API_BasicSetting from '@/api/basicSetting';
 import { useStore } from 'vuex';
 import { useRouter, useRoute } from 'vue-router';
 import { ElMessageBox, ElMessage } from 'element-plus';
@@ -133,10 +148,11 @@ const numDialogVisible = ref(false);
 const numAddForm = reactive({});
 const stockListId = ref([]);
 const numAddFormRule = reactive({
-  num: [ {
+  num: [
+    {
       required: true,
       message: t('place') + t('warningQuantity'),
-      trigger: 'blur'
+      trigger: 'blur',
     },
     {
       validator: (rule, value, callback) => {
@@ -146,7 +162,7 @@ const numAddFormRule = reactive({
           callback();
         }
       },
-      trigger: "blur",
+      trigger: 'blur',
     },
   ],
 });
@@ -171,7 +187,7 @@ const GET_WarehouseList = () => {
 };
 
 const GET_DictDataInfo = () => {
-  API_Setting.getDictDataInfo("erp_goodstransfer_type").then((res) => {
+  API_Setting.getDictDataInfo('erp_goodstransfer_type').then((res) => {
     goodstransferType.value = res;
   });
 };
@@ -179,10 +195,10 @@ const GET_DictDataInfo = () => {
 const submitNum = () => {
   numAddForm.value.validate((valid) => {
     if (valid) {
-      API_GoodsTransfer.updateWarnStock({ stock_id: stockListId.value, warn_num: numAddForm.value.num }).then(res => {
+      API_GoodsTransfer.updateWarnStock({ stock_id: stockListId.value, warn_num: numAddForm.value.num }).then((res) => {
         numDialogVisible.value = false;
         numAddForm.value = {};
-        ElMessage.success(t('warning_stock')+t('set_success')+'!');
+        ElMessage.success(t('warning_stock') + t('set_success') + '!');
         GET_GoodsTransferList();
       });
     }
@@ -190,19 +206,19 @@ const submitNum = () => {
 };
 
 const handleDelGoodsTransfer = (row) => {
-  ElMessageBox.confirm("确定要删除这些库存吗?", "提示", { type: "warning" })
+  ElMessageBox.confirm('确定要删除这些库存吗?', '提示', { type: 'warning' })
     .then(() => {
       const ids = [row.id];
       API_GoodsTransfer.deleteGoodsTransfer({ ids }).then(() => {
-        ElMessage.success("删除成功!");
+        ElMessage.success('删除成功!');
         GET_GoodsTransferList();
       });
     })
-    .catch(() => { });
+    .catch(() => {});
 };
 
 const lookTransit = (row) => {
-  API_GoodsTransfer.transitDetail(row.id).then(res => {
+  API_GoodsTransfer.transitDetail(row.id).then((res) => {
     dialogVisible.value = true;
     transitDetails.value = res;
   });
@@ -214,7 +230,7 @@ const handleSubmitGoodsTransfer = () => {
 };
 
 const handleSelectionChange = (rows) => {
-  stockListId.value = rows.map(el => el.id);
+  stockListId.value = rows.map((el) => el.id);
 };
 
 const handlePageSizeChange = (size) => {

+ 2 - 2
src/views/stock/goodsUnderstock.vue

@@ -64,7 +64,7 @@
         <div class="inner-toolbar">
           <div class="toolbar-btns">
            <!--  v-if="checkPermission(['goodsUnderstock:add'])" -->
-            <el-button size="mini"  type="primary" v-if="store.state.user.user.founder!==1" @click="handleAddGoodsUnderstock">{{$t('add')}}</el-button>
+            <el-button size="small"  type="primary" v-if="store.state.user.user.founder!==1" @click="handleAddGoodsUnderstock">{{$t('add')}}</el-button>
           </div>
         </div>
       </template>
@@ -99,7 +99,7 @@
         </el-table-column>
         <el-table-column :label="$t('operate')" width="250">
           <template #default="scope">
-            <el-button size="mini" @click="handleSubmitGoodsTransfer(scope.row)">{{$t('view')}}</el-button
+            <el-button size="small" @click="handleSubmitGoodsTransfer(scope.row)">{{$t('view')}}</el-button
             ><!-- v-if="checkPermission(['goodsUnderstockDetail'])" -->
           </template>
         </el-table-column>

+ 2 - 2
src/views/stock/goodsUnderstockAdd.vue

@@ -38,7 +38,7 @@
       </el-form-item>
       <div class="mx">
         <h3>{{$t('goods_inventory')}}</h3>
-        <el-button class="button" size="mini" type="primary" v-if="type !== 'view'" @click="handleSelectWarehouseEntryBatch">选择</el-button>
+        <el-button class="button" size="small" type="primary" v-if="type !== 'view'" @click="handleSelectWarehouseEntryBatch">选择</el-button>
       </div>
       <div style="display: block">
         <el-table
@@ -83,7 +83,7 @@
           </el-table-column>
           <el-table-column :label="$t('operate')" v-if="type !== 'view'">
             <template #default="scope">
-              <el-button size="mini" type="danger" @click="GoodsTransferForm.product_list.splice(scope.$index, 1)">{{$t('delete')}}</el-button>
+              <el-button size="small" type="danger" @click="GoodsTransferForm.product_list.splice(scope.$index, 1)">{{$t('delete')}}</el-button>
             </template>
           </el-table-column>
         </el-table>

+ 4 - 4
src/views/stock/outbound.vue

@@ -61,10 +61,10 @@
       <template #toolbar>
         <div class="inner-toolbar">
           <div class="toolbar-btns">
-            <!-- <el-button size="mini" v-if="checkPermission(['addInventory']) && activeName === 'second'" type="primary" @click="handleAddGoodsExchange"
+            <!-- <el-button size="small" v-if="checkPermission(['addInventory']) && activeName === 'second'" type="primary" @click="handleAddGoodsExchange"
                 >新增入库</el-buttonv-if="checkPermission(['goodsExchangeAdd'])"
               > -->
-            <el-button size="mini" type="primary" v-if="store.state.user.user.founder!==1" @click="handleShiftGoodsExchange">{{$t('addOut')}}</el-button>
+            <el-button size="small" type="primary" v-if="store.state.user.user.founder!==1" @click="handleShiftGoodsExchange">{{$t('addOut')}}</el-button>
           </div>
         </div>
       </template>
@@ -115,10 +115,10 @@
         <el-table-column :label="$t('operate')" width="300">
           <template #default="scope">
             <!-- v-if="checkPermission(['checkInventory'])" -->
-            <el-button size="mini"  @click="handleAuditGoodsExchange(scope.row)">{{$('view')}}</el-button>
+            <el-button size="small"  @click="handleAuditGoodsExchange(scope.row)">{{$('view')}}</el-button>
             <!-- && checkPermission(['editInventory']) && checkPermission(['goodsExchangeEdit']) -->
             <el-button
-              size="mini"
+              size="small"
               v-if="scope.row.has_submit === 'N' && store.state.user.user.founder!==1"
               @click="handleEditGoodsExchange(scope.row)"
               >{{$('outBound')}}</el-button

+ 3 - 4
src/views/stock/warehouseList.vue

@@ -1,11 +1,11 @@
 <template>
-  <div>
+  <div class="grid xl:grid-cols-1">
     <en-table-layout :tableData="tableData.data" :loading="loading">
       <template #toolbar>
         <div class="inner-toolbar w-11/12 flex justify-between">
           <div class="toolbar-btns">
             <el-button
-              size="mini"
+              size="default"
               v-if="checkPermission(['warehouse:add']) && store.state.user.user.founder !== 1"
               type="primary"
               @click="handleAddWarehouse"
@@ -31,7 +31,7 @@
         <el-table-column :label="$t('operate')">
           <template #default="scope">
             <el-button
-              size="mini"
+              size="default"
               v-if="checkPermission(['warehouse:update']) && store.state.user.user.founder !== 1"
               @click="handleEditWarehouse(scope.$index, scope.row)"
               >{{ $t('edit') }}</el-button
@@ -239,7 +239,6 @@ const GET_WarehouseList = () => {
         return el;
       });
       tableData.value = response;
-      console.log(tableData.value);
     })
     .catch(() => {
       loading.value = false;

+ 7 - 7
src/views/stock/warehouseLocation.vue

@@ -5,7 +5,7 @@
         <div class="inner-toolbar">
           <div class="toolbar-btns">
             <!-- checkPermission(['createAreaType:add'])&& -->
-            <el-button size="mini" v-if="store.state.user.user.founder !== 1" type="primary" @click="handleAddGoodsLend">{{ $t('add') }}</el-button>
+            <el-button size="small" v-if="store.state.user.user.founder !== 1" type="primary" @click="handleAddGoodsLend">{{ $t('add') }}</el-button>
           </div>
           <div class="toolbar-search"></div>
         </div>
@@ -13,15 +13,15 @@
 
       <template #table-columns>
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="code" :label="$t('location_code')" />
-        <el-table-column prop="name" :label="$t('location_name')" />
-        <el-table-column prop="remark" :label="$t('notes')" />
-        <el-table-column :label="$t('operate')" width="250">
+        <el-table-column prop="code" :label="$t('location_code')"/>
+        <el-table-column prop="name" :label="$t('location_name')"/>
+        <el-table-column prop="remark" :label="$t('notes')"/>
+        <el-table-column :label="$t('operate')">
           <template #default="scope"
             ><!-- checkPermission(['updateAreaType:update'])&& -->
-            <el-button size="mini" v-if="store.state.user.user.founder !== 1" @click="handleEditGoodsLend(scope.row)">{{ $t('edit') }}</el-button
+            <el-button size="small" v-if="store.state.user.user.founder !== 1" @click="handleEditGoodsLend(scope.row)">{{ $t('edit') }}</el-button
             ><!-- checkPermission(['removeAreaType:delete'])&& -->
-            <el-button type="danger" size="mini" v-if="store.state.user.user.founder !== 1" @click="handleReturnGoodsLend(scope.row)">{{
+            <el-button type="danger" size="small" v-if="store.state.user.user.founder !== 1" @click="handleReturnGoodsLend(scope.row)">{{
               $t('delete')
             }}</el-button>
           </template>

+ 22 - 17
src/views/stock/warehousing.vue

@@ -3,11 +3,11 @@
     <!-- flex items-center -->
     <div class="search bg-white pt-2 dark:!bg-[#060818]">
       <el-form ref="advancedFormRef" :model="advancedForm" label-width="130px">
-        <el-row>
-          <el-col :span="activeName === 'first' ? 12 : 8">
+        <el-row :gutter="20">
+          <el-col :xs="24" :sm="24" :md="12" :lg="activeName === 'first' ? 12 : 8" :xl="activeName === 'first' ? 12 : 8" class="mb-4 mr-3">
             <el-form-item :label="$t('access_time')">
               <el-date-picker
-                class="dark:!bg-[#060818]"
+                class="w-full dark:!bg-[#060818]"
                 v-model="advancedForm.goodsExchange_time_range"
                 type="daterange"
                 align="center"
@@ -28,34 +28,39 @@
               ></el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8" class="mb-4 mr-3">
             <el-form-item :label="$t('warechouse')">
-              <el-select v-model="advancedForm.warehouse_id" clearable class="dark:!bg-[#060818]">
+              <el-select v-model="advancedForm.warehouse_id" clearable class="w-full dark:!bg-[#060818]">
                 <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :xs="24" :sm="24" :md="7" :lg="7" :xl="7" class="mb-4 mr-3">
             <el-form-item :label="$t('storage_type')">
-              <el-select v-model="advancedForm.type" clearable class="dark:!bg-[#060818]">
+              <el-select v-model="advancedForm.type" clearable class="w-full dark:!bg-[#060818]">
                 <el-option v-for="item in entryList" :key="item.id" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8" class="mb-4 mr-3">
             <el-form-item :label="$t('customer_name')">
-              <el-input v-model="advancedForm.customer_name" class="dark:!bg-[#060818]" clearable :placeholder="$t('change') + $t('customer_name')"></el-input>
+              <el-input
+                v-model="advancedForm.customer_name"
+                class="w-full dark:!bg-[#060818]"
+                clearable
+                :placeholder="$t('change') + $t('customer_name')"
+              ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8" class="mb-4 mr-3">
             <el-form-item :label="$t('phone')">
-              <el-input v-model="advancedForm.customer_phone" class="dark:!bg-[#060818]" clearable :placeholder="$t('change') + $t('phone')"></el-input>
+              <el-input v-model="advancedForm.customer_phone" class="w-full dark:!bg-[#060818]" clearable :placeholder="$t('change') + $t('phone')"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <div class="flex justify-end">
-        <el-button class="mr-3 dark:!bg-[#060818]" @click="advancedSearchEvent"> {{ $t('search') }} </el-button>
+      <div class="flex justify-end mr-8">
+        <el-button class="mr-3" @click="advancedSearchEvent"> {{ $t('search') }} </el-button>
       </div>
     </div>
 
@@ -63,7 +68,7 @@
       <template #toolbar>
         <div class="inner-toolbar">
           <div class="toolbar-btns">
-            <el-button size="mini" type="primary" v-if="store.state.user.user.founder !== 1" @click="handleAddGoodsExchange">{{
+            <el-button size="small" type="primary" v-if="store.state.user.user.founder !== 1" @click="handleAddGoodsExchange">{{
               $t('addInventory')
             }}</el-button>
           </div>
@@ -71,7 +76,7 @@
       </template>
 
       <template #table-columns>
-        <el-table-column type="selection" width="55" class="dark:!bg-[#060818]"/>
+        <el-table-column type="selection" width="55" class="dark:!bg-[#060818]" />
         <el-table-column prop="sn" :label="$t('warehousing_sn')">
           <template #default="scope">
             {{ scope.row.sn }}
@@ -105,10 +110,10 @@
         <el-table-column :label="$t('operate')">
           <template #default="scope">
             <!-- v-if="checkPermission(['checkInventory'])" -->
-            <el-button class="mr-1 mt-1" size="mini" @click="handleAuditGoodsExchange(scope.row)">{{ $t('view') }}</el-button>
+            <el-button class="mr-1 mt-1" size="small" @click="handleAuditGoodsExchange(scope.row)">{{ $t('view') }}</el-button>
             <!-- && checkPermission(['editInventory']) && checkPermission(['goodsExchangeEdit']) -->
             <el-button
-              size="mini"
+              size="small"
               class="!ml-0 mt-1"
               v-if="scope.row.has_submit === 'N' && store.state.user.user.founder !== 1"
               @click="handleEditGoodsExchange(scope.row)"

+ 4 - 4
src/views/templateManage/accountTemplate.vue

@@ -30,7 +30,7 @@
     <template #toolbar>
       <div class="inner-toolbar w-11/12 flex justify-between">
         <div class="toolbar-btns">
-          <el-button size="mini" type="primary" :icon="CirclePlus" v-if="checkPermission([''])" @click="handleAddRole">添加</el-button>
+          <el-button size="small" type="primary" :icon="CirclePlus" v-if="checkPermission([''])" @click="handleAddRole">添加</el-button>
         </div>
         <!-- <div class="toolbar-search">
                 <en-table-search @search="searchEvent" placeholder="请输入关键字" />
@@ -50,9 +50,9 @@
       </el-table-column>
       <el-table-column label="操作">
         <template #default="scope">
-          <el-button size="mini" @click="handleView(scope.row)" v-if="checkPermission([''])">查看</el-button>
-          <el-button size="mini" type="primary" @click="handleEditRole(scope.row)" v-if="checkPermission([''])">编辑</el-button>
-          <el-button size="mini" type="danger" @click="handleDeleteRole(scope.row)" v-if="checkPermission([''])">删除</el-button>
+          <el-button size="small" @click="handleView(scope.row)" v-if="checkPermission([''])">查看</el-button>
+          <el-button size="small" type="primary" @click="handleEditRole(scope.row)" v-if="checkPermission([''])">编辑</el-button>
+          <el-button size="small" type="danger" @click="handleDeleteRole(scope.row)" v-if="checkPermission([''])">删除</el-button>
         </template>
       </el-table-column>
     </template>

+ 4 - 4
src/views/templateManage/emailtemplate.vue

@@ -30,7 +30,7 @@
     <template #toolbar>
       <div class="inner-toolbar w-11/12 flex justify-between">
         <div class="toolbar-btns">
-          <el-button size="mini" type="primary" :icon="CirclePlus" v-if="checkPermission([''])" @click="handleAddRole">添加</el-button>
+          <el-button size="small" type="primary" :icon="CirclePlus" v-if="checkPermission([''])" @click="handleAddRole">添加</el-button>
         </div>
         <!-- <div class="toolbar-search">
               <en-table-search @search="searchEvent" placeholder="请输入关键字" />
@@ -50,9 +50,9 @@
       </el-table-column>
       <el-table-column label="操作">
         <template #default="scope">
-          <el-button size="mini" @click="handleView(scope.row)" v-if="checkPermission([''])">查看</el-button>
-          <el-button size="mini" type="primary" @click="handleEditRole(scope.row)" v-if="checkPermission([''])">编辑</el-button>
-          <el-button size="mini" type="danger" @click="handleDeleteRole(scope.row)" v-if="checkPermission([''])">删除</el-button>
+          <el-button size="small" @click="handleView(scope.row)" v-if="checkPermission([''])">查看</el-button>
+          <el-button size="small" type="primary" @click="handleEditRole(scope.row)" v-if="checkPermission([''])">编辑</el-button>
+          <el-button size="small" type="danger" @click="handleDeleteRole(scope.row)" v-if="checkPermission([''])">删除</el-button>
         </template>
       </el-table-column>
     </template>

+ 4 - 4
src/views/templateManage/smsTemplate.vue

@@ -30,7 +30,7 @@
     <template #toolbar>
       <div class="inner-toolbar w-11/12 flex justify-between">
         <div class="toolbar-btns">
-          <el-button size="mini" type="primary" :icon="CirclePlus" v-if="checkPermission([''])" @click="handleAddRole">添加</el-button>
+          <el-button size="small" type="primary" :icon="CirclePlus" v-if="checkPermission([''])" @click="handleAddRole">添加</el-button>
         </div>
         <!-- <div class="toolbar-search">
             <en-table-search @search="searchEvent" placeholder="请输入关键字" />
@@ -50,9 +50,9 @@
       </el-table-column>
       <el-table-column label="操作">
         <template #default="scope">
-          <el-button size="mini" @click="handleView(scope.row)" v-if="checkPermission([''])">查看</el-button>
-          <el-button size="mini" type="primary" @click="handleEditRole(scope.row)" v-if="checkPermission([''])">编辑</el-button>
-          <el-button size="mini" type="danger" @click="handleDeleteRole(scope.row)" v-if="checkPermission([''])">删除</el-button>
+          <el-button size="small" @click="handleView(scope.row)" v-if="checkPermission([''])">查看</el-button>
+          <el-button size="small" type="primary" @click="handleEditRole(scope.row)" v-if="checkPermission([''])">编辑</el-button>
+          <el-button size="small" type="danger" @click="handleDeleteRole(scope.row)" v-if="checkPermission([''])">删除</el-button>
         </template>
       </el-table-column>
     </template>

+ 4 - 4
src/views/templateManage/systemMessage.vue

@@ -30,7 +30,7 @@
     <template #toolbar>
       <div class="inner-toolbar w-11/12 flex justify-between">
         <div class="toolbar-btns">
-          <el-button size="mini" type="primary" :icon="CirclePlus" v-if="checkPermission([''])" @click="handleAddRole">添加</el-button>
+          <el-button size="small" type="primary" :icon="CirclePlus" v-if="checkPermission([''])" @click="handleAddRole">添加</el-button>
         </div>
         <!-- <div class="toolbar-search">
           <en-table-search @search="searchEvent" placeholder="请输入关键字" />
@@ -50,9 +50,9 @@
       </el-table-column>
       <el-table-column label="操作">
         <template #default="scope">
-          <el-button size="mini" @click="handleView(scope.row)" v-if="checkPermission([''])">查看</el-button>
-          <el-button size="mini" type="primary" @click="handleEditRole(scope.row)" v-if="checkPermission([''])">编辑</el-button>
-          <el-button size="mini" type="danger" @click="handleDeleteRole(scope.row)" v-if="checkPermission([''])">删除</el-button>
+          <el-button size="small" @click="handleView(scope.row)" v-if="checkPermission([''])">查看</el-button>
+          <el-button size="small" type="primary" @click="handleEditRole(scope.row)" v-if="checkPermission([''])">编辑</el-button>
+          <el-button size="small" type="danger" @click="handleDeleteRole(scope.row)" v-if="checkPermission([''])">删除</el-button>
         </template>
       </el-table-column>
     </template>

+ 1 - 0
vite.config.ts

@@ -32,6 +32,7 @@ export default defineConfig({
     },
     define: {
         __API_URL__: JSON.stringify(process.env.VITE_API_URL),
+        __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: 'false'
     },
     // 配置前端服务地址和端口
     server: {