diff --git a/src/api/mes/qc/pending.js b/src/api/mes/qc/pending.js
new file mode 100644
index 0000000..5fefefc
--- /dev/null
+++ b/src/api/mes/qc/pending.js
@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+// 查询待检验任务清单
+export function listPending(query) {
+ return request({
+ url: '/mes/qc/pending/list',
+ method: 'get',
+ params: query
+ })
+}
+
diff --git a/src/router/index.js b/src/router/index.js
index 9de281e..c39291a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -217,6 +217,35 @@ export const dynamicRoutes = [
meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
}
]
+ },
+ {
+ path: '/mes/qc/pendinginspect/add',
+ component: Layout,
+ hidden: true,
+ permissions: ['mes:qc:pending'],
+ children: [
+ {
+ path: 'iqc',
+ component: () => import('@/views/mes/qc/iqc/iqc'),
+ name: 'iqcadd',
+ props: true,
+ meta: {title: '来料检验', activeMenu: '/mes/qc/pendinginspect/iqc'}
+ },
+ {
+ path: 'pqc',
+ component: () => import('@/views/mes/qc/pendinginspect/pqc'),
+ name: 'pqcadd',
+ props: true,
+ meta: {title: '过程检验', activeMenu: '/mes/qc/pendinginspect/pqc'}
+ },
+ {
+ path: 'oqc',
+ component: () => import('@/views/mes/qc/oqc/index'),
+ name: 'oqcadd',
+ props: true,
+ meta: {title: '出厂检验', activeMenu: '/mes/qc/pendinginspect/oqc'}
+ }
+ ]
}
]
diff --git a/src/views/mes/qc/pendinginspect/index.vue b/src/views/mes/qc/pendinginspect/index.vue
new file mode 100644
index 0000000..41ce265
--- /dev/null
+++ b/src/views/mes/qc/pendinginspect/index.vue
@@ -0,0 +1,176 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 来料检验
+ 过程检验
+ 出货检验
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 物料与供应商
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 检测情况
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 检测项
+
+
+
+
+
+
+ 返回
+ 保 存
+ 完成
+ 取 消
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/mes/qc/pendinginspect/oqc.vue b/src/views/mes/qc/pendinginspect/oqc.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/mes/qc/pendinginspect/pqc.vue b/src/views/mes/qc/pendinginspect/pqc.vue
new file mode 100644
index 0000000..a918d5a
--- /dev/null
+++ b/src/views/mes/qc/pendinginspect/pqc.vue
@@ -0,0 +1,373 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 检测项
+
+
+
+
+
+ 返回
+ 保 存
+ 完成
+ 取 消
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/mes/wm/warehouse/index.vue b/src/views/mes/wm/warehouse/index.vue
index 59d4bbb..217ad7b 100644
--- a/src/views/mes/wm/warehouse/index.vue
+++ b/src/views/mes/wm/warehouse/index.vue
@@ -53,7 +53,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['wm:warehouse:remove']"
+ v-hasPermi="['mes:wm:warehouse:remove']"
>删除
diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue
index ab5e72f..1dbad4b 100644
--- a/src/views/system/user/authRole.vue
+++ b/src/views/system/user/authRole.vue
@@ -109,7 +109,7 @@ export default {
},
/** 关闭按钮 */
close() {
- const obj = { path: "/system/user" };
+ const obj = { path: "/user/user" };
this.$tab.closeOpenPage(obj);
},
},