Merge branch 'dev' into 'master'

Dev

See merge request !69

src/common/api/sys/factory.js

+import axios from '../axios'
+
+export function updateSysmenu({ id, status }) {
+  return axios.get('sysFactoryMenu/update-status?id=' + id + '&status=' + status)
+}
+export function getAllMenusTree() {
+  return axios.get('sysFactoryMenu/get-all-menus-tree')
+}
+export function addMenu(data) {
+  return axios.post('sysFactoryMenu/add', data)
+}
+
+export function updateMenu(data) {
+  return axios.post('sysFactoryMenu/update', data)
+}
+
+export function deleteMenu(id) {
+  return axios.post(`sysFactoryMenu/delete/${id}`)
+}

src/router/index.js

@@ -4,6 +4,7 @@ import HomeView from '../views/home/HomeView.vue'
 import SaasManage from '@/views/saasManage/indexPage.vue'
 import LoginPage from '@/views/LoginPage.vue'
 import menuPage from '@/views/menu.vue'
+import factoryMenuPage from '@/views/factoryMenu.vue'
 import TaskManage from '@/views/taskManage/index.vue'
 import HomePage from '@/views/homePage/index.vue'
 import { getToken } from '@/utils/auth'
@@ -40,7 +41,13 @@ const routes = [
         path: '/saas/menu',
         component: menuPage,
         name: 'saasMenu',
-        meta: { title: '菜单管理' }
+        meta: { title: 'ERP菜单管理' }
+      },
+            {
+        path: '/saas/factoryMenu',
+        component: factoryMenuPage,
+        name: 'factoryMenu',
+        meta: { title: 'FACTORY菜单管理' }
       },
       {
         path: '/saas/taskManage',

src/views/home/navMenu.vue

@@ -222,6 +222,14 @@ export default {
           children: []
         },
         {
+          id: 2,
+          path: '',
+          label: 'FACTORY菜单管理',
+          icon: 'el-icon-menu',
+          index: '/saas/factoryMenu',
+          children: []
+        },
+        {
           id: 4,
           path: '',
           label: '工单管理',

src/views/menu.vue

@@ -391,13 +391,15 @@ export default {
         this.isEdit = false
       } else {
         this.isEdit = true
-        if (item.excludeNamespace && item.excludeNamespace.length > 0) {
-          item.excludeNamespace = item.excludeNamespace.split(',')
+        // 浅拷贝，避免 resetForm 时修改到 sourceData 中的原始数据
+        const formData = { ...item }
+        if (formData.excludeNamespace && formData.excludeNamespace.length > 0) {
+          formData.excludeNamespace = formData.excludeNamespace.split(',')
         }
-        if (item.includeNamespace && item.includeNamespace.length > 0) {
-          item.includeNamespace = item.includeNamespace.split(',')
+        if (formData.includeNamespace && formData.includeNamespace.length > 0) {
+          formData.includeNamespace = formData.includeNamespace.split(',')
         }
-        this.editForm = item
+        this.editForm = formData
       }
       // getApplication().then((res) => {
       //   if (res.code === 200) {