diff --git a/src/assets/images/scjk.png b/src/assets/images/scjk.png
new file mode 100644
index 0000000..59360e8
Binary files /dev/null and b/src/assets/images/scjk.png differ
diff --git a/src/components/workorderSelect/single.vue b/src/components/workorderSelect/single.vue
index 66d90df..72e7495 100644
--- a/src/components/workorderSelect/single.vue
+++ b/src/components/workorderSelect/single.vue
@@ -74,7 +74,7 @@
-
+
diff --git a/src/router/index.js b/src/router/index.js
index af60a5c..12e4010 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -61,6 +61,19 @@ export const constantRoutes = [
component: () => import("@/views/error/401"),
hidden: true,
},
+ // {
+ // path: "",
+ // component: Layout,
+ // redirect: "index",
+ // children: [
+ // {
+ // path: "index",
+ // component: () => import("@/views/index"),
+ // name: "Index",
+ // meta: { title: "首页", icon: "dashboard", affix: true },
+ // },
+ // ],
+ // },
{
path: "",
component: Layout,
@@ -68,9 +81,9 @@ export const constantRoutes = [
children: [
{
path: "index",
- component: () => import("@/views/index"),
+ component: () => import("@/views/mes/pro/production/index"),
name: "Index",
- meta: { title: "首页", icon: "dashboard", affix: true },
+ // meta: { title: "首页", icon: "dashboard", affix: true },
},
],
},
@@ -180,7 +193,7 @@ export const dynamicRoutes = [
path: "/mes/pro/schedule",
component: Layout,
hidden: true,
- permissions: ['mes:pro:protask:edit'],
+ permissions: ["mes:pro:protask:edit"],
children: [
{
path: "ganttedit",
@@ -211,43 +224,43 @@ export const dynamicRoutes = [
permissions: ["tool:gen:edit"],
children: [
{
- path: 'index/:tableId(\\d+)',
- component: () => import('@/views/tool/gen/editTable'),
- name: 'GenEdit',
- meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
- }
- ]
+ path: "index/:tableId(\\d+)",
+ component: () => import("@/views/tool/gen/editTable"),
+ name: "GenEdit",
+ meta: { title: "修改生成配置", activeMenu: "/tool/gen" },
+ },
+ ],
},
{
- path: '/mes/qc/pendinginspect/add',
+ path: "/mes/qc/pendinginspect/add",
component: Layout,
hidden: true,
- permissions: ['mes:qc:pending'],
+ permissions: ["mes:qc:pending"],
children: [
{
- path: 'iqc',
- component: () => import('@/views/mes/qc/pendinginspect/iqc'),
- name: 'iqcadd',
+ path: "iqc",
+ component: () => import("@/views/mes/qc/pendinginspect/iqc"),
+ name: "iqcadd",
props: true,
- meta: {title: '来料检验', activeMenu: '/mes/qc/pendinginspect/iqc'}
+ meta: { title: "来料检验", activeMenu: "/mes/qc/pendinginspect/iqc" },
},
{
- path: 'pqc',
- component: () => import('@/views/mes/qc/pendinginspect/pqc'),
- name: 'pqcadd',
+ path: "pqc",
+ component: () => import("@/views/mes/qc/pendinginspect/pqc"),
+ name: "pqcadd",
props: true,
- meta: {title: '过程检验', activeMenu: '/mes/qc/pendinginspect/pqc'}
+ meta: { title: "过程检验", activeMenu: "/mes/qc/pendinginspect/pqc" },
},
{
- path: 'oqc',
- component: () => import('@/views/mes/qc/oqc/index'),
- name: 'oqcadd',
+ path: "oqc",
+ component: () => import("@/views/mes/qc/oqc/index"),
+ name: "oqcadd",
props: true,
- meta: {title: '出厂检验', activeMenu: '/mes/qc/pendinginspect/oqc'}
- }
- ]
- }
-]
+ meta: { title: "出厂检验", activeMenu: "/mes/qc/pendinginspect/oqc" },
+ },
+ ],
+ },
+];
// 防止连续点击多次路由报错
let routerPush = Router.prototype.push;
@@ -262,6 +275,6 @@ export default new Router({
});
export function resetRouter() {
- const newRouter = createRouter()
- Router.matcher = newRouter.matcher // 重制 router
+ const newRouter = createRouter();
+ Router.matcher = newRouter.matcher; // 重制 router
}
diff --git a/src/views/mes/pro/production/components/complete.vue b/src/views/mes/pro/production/components/complete.vue
new file mode 100644
index 0000000..45e11cb
--- /dev/null
+++ b/src/views/mes/pro/production/components/complete.vue
@@ -0,0 +1,288 @@
+
+
+
+
+
+
diff --git a/src/views/mes/pro/production/components/defective.vue b/src/views/mes/pro/production/components/defective.vue
new file mode 100644
index 0000000..893ffa7
--- /dev/null
+++ b/src/views/mes/pro/production/components/defective.vue
@@ -0,0 +1,190 @@
+
+
+
+
+
+
diff --git a/src/views/mes/pro/production/components/ticket.vue b/src/views/mes/pro/production/components/ticket.vue
new file mode 100644
index 0000000..c48575c
--- /dev/null
+++ b/src/views/mes/pro/production/components/ticket.vue
@@ -0,0 +1,171 @@
+
+
+
+
+
+
diff --git a/src/views/mes/pro/production/index.vue b/src/views/mes/pro/production/index.vue
new file mode 100644
index 0000000..64add2b
--- /dev/null
+++ b/src/views/mes/pro/production/index.vue
@@ -0,0 +1,540 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/mes/pro/schedule/index.vue b/src/views/mes/pro/schedule/index.vue
index debdabf..fed54a2 100644
--- a/src/views/mes/pro/schedule/index.vue
+++ b/src/views/mes/pro/schedule/index.vue
@@ -109,7 +109,7 @@
-
+
@@ -218,7 +218,7 @@
-
+
diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue
index 65c7fb2..0eaf3cf 100644
--- a/src/views/mes/pro/workorder/index.vue
+++ b/src/views/mes/pro/workorder/index.vue
@@ -160,7 +160,7 @@
-
+
@@ -323,8 +323,8 @@
-
-
+
+