From d42961484401544a11382bf43888751c57e3db8a Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 2 Apr 2024 16:23:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/qms/inspectionTemplate/index.ts | 26 +-
.../inspectionTemplate/addForm.vue | 712 ++++++++++++++----
.../inspectionTemplate/index.vue | 95 +--
...ion.data.ts => inspectionTemplate.data.ts} | 207 +----
4 files changed, 610 insertions(+), 430 deletions(-)
rename src/views/qms/basicDataManage/inspectionTemplate/{agvLocationrelation.data.ts => inspectionTemplate.data.ts} (57%)
diff --git a/src/api/qms/inspectionTemplate/index.ts b/src/api/qms/inspectionTemplate/index.ts
index 78bc8235f..1c07a30d3 100644
--- a/src/api/qms/inspectionTemplate/index.ts
+++ b/src/api/qms/inspectionTemplate/index.ts
@@ -3,6 +3,28 @@ import request from '@/config/axios'
// 查询采样过程列表
-export const getInspectionProcessPage = async (params) => {
- return await request.get({ url: `/qms/inspection-process/page`})
+export const getListByTempleteCode = async (code) => {
+ return await request.get({ url: `/qms/inspection-process/getListByTempleteCode?code=`+code})
+}
+// 新增
+export const inspectionTemplateCreat = async (data) => {
+ return await request.post({ url: `/qms/programme-template/create`,data})
+}
+// 编辑
+export const inspectionTemplateUpdate = async (data) => {
+ return await request.put({ url: `/qms/programme-template/update`,data})
+}
+// 删除
+export const inspectionTemplateDelete = async (id) => {
+ return await request.delete({ url: `/qms/programme-template/delete?id=`+id})
+}
+// 列表
+export const inspectionTemplatePage = async (params) => {
+ if (params.isSearch) {
+ delete params.isSearch
+ const data = {...params}
+ return request.post({ url: '/wms/accountcalendar/senior', data })
+ } else {
+ return await request.get({ url: `/qms/programme-template/page`, params })
+ }
}
\ No newline at end of file
diff --git a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
index 930a4972b..d20c0ba3d 100644
--- a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
@@ -8,25 +8,25 @@
>
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-->
-
+
-
-
+
+
-
+
-
-
+
-
+
-
+
-
检验特性
-
+
-
+
-
+
-
-
-
+
+
-
+
+
-
-
-
+
+
-
+
+
-
-
-
+
+
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
+
-
+
-
+
-
-
-
+
+
-
+
+
@@ -240,12 +411,20 @@
+
+
diff --git a/src/layout/components/Menu/src/Menu.vue b/src/layout/components/Menu/src/Menu.vue
index 9033616fe..c6880f299 100644
--- a/src/layout/components/Menu/src/Menu.vue
+++ b/src/layout/components/Menu/src/Menu.vue
@@ -45,6 +45,26 @@ export default defineComponent({
unref(layout) === 'cutMenu' ? permissionStore.getMenuTabRouters : permissionStore.getRouters
)
+ const categoryRoutes = computed(() => {
+ const allRoutes = unref(layout) === 'cutMenu' ? permissionStore.getMenuTabRouters : permissionStore.getRouters
+ const categoryPath = appStore.getCategoryRoutePath
+ let findRoutes = allRoutes.find(item=>!item.meta.hidden&&item.path === categoryPath)
+ if(findRoutes){
+ findRoutes = JSON.parse(JSON.stringify(findRoutes))
+ findRoutes?.children?.forEach(item => {
+ item.path = findRoutes?.path+'/'+item.path
+ });
+ }
+ let homeRoute = allRoutes.find(item=>!item.meta.hidden&&item.path === '/')
+ if(categoryPath!=homeRoute?.path&&homeRoute){
+ homeRoute = JSON.parse(JSON.stringify(homeRoute))
+ homeRoute?.children?.forEach(item => {
+ item.path = homeRoute?.path+item.path
+ });
+ }
+ return categoryPath!=homeRoute?.path?[...homeRoute?.children||[],...findRoutes?.children||[]]:[...findRoutes?.children||[]]||homeRoute||[]
+ })
+
const collapse = computed(() => appStore.getCollapse)
const uniqueOpened = computed(() => appStore.getUniqueOpened)
@@ -95,7 +115,7 @@ export default defineComponent({
{{
default: () => {
const { renderMenuItem } = useRenderMenuItem(unref(menuMode))
- return renderMenuItem(unref(routers))
+ return appStore.getShowCategoryMenu?renderMenuItem(unref(categoryRoutes)):renderMenuItem(unref(routers))
}
}}
diff --git a/src/layout/components/useRenderLayout.tsx b/src/layout/components/useRenderLayout.tsx
index 2c5ae80d5..4d9ea8335 100644
--- a/src/layout/components/useRenderLayout.tsx
+++ b/src/layout/components/useRenderLayout.tsx
@@ -6,6 +6,7 @@ import { TagsView } from '@/layout/components/TagsView'
import { Logo } from '@/layout/components/Logo'
import AppView from './AppView.vue'
import ToolHeader from './ToolHeader.vue'
+import CategoryHeader from './CategoryHeader.vue'
import { ElScrollbar } from 'element-plus'
import { useDesign } from '@/hooks/web/useDesign'
import RouterSearch from '@/components/RouterSearch/index.vue'
@@ -111,6 +112,12 @@ export const useRenderLayout = () => {
]}
style="transition: all var(--transition-time-02);"
>
+ {appStore.getShowCategoryMenu?():undefined}