diff --git a/src/api/quality/inventoryReport.js b/src/api/quality/inventoryReport.js
new file mode 100644
index 0000000..f34d835
--- /dev/null
+++ b/src/api/quality/inventoryReport.js
@@ -0,0 +1,93 @@
+import request from '@/utils/request'
+
+// 查询来料报告列表
+export function listIncome(query) {
+ return request({
+ url: '/quality/qcInventoryReport/list',
+ method: 'get',
+ params: query
+ });
+}
+
+// 查询来料报告详细
+export function getIncome(recordId) {
+ return request({
+ url: '/quality/qcInventoryReport/' + recordId,
+ method: 'get'
+ });
+}
+
+// 新增来料报告
+export function addIncome(data) {
+ return request({
+ url: '/quality/qcInventoryReport',
+ method: 'post',
+ data: data
+ });
+}
+
+// 修改来料报告
+export function updateIncome(data) {
+ return request({
+ url: '/quality/qcInventoryReport',
+ method: 'put',
+ data: data
+ });
+}
+
+// 删除来料报告
+export function delIncome(recordId) {
+ return request({
+ url: '/quality/qcInventoryReport/' + recordId,
+ method: 'delete'
+ });
+}
+
+// 查询BOM物料管理列表
+export function getQcListBom(query) {
+ return request({
+ url: '/quality/qcInventoryReport/getQcListBom',
+ method: 'get',
+ params: query
+ });
+ }
+
+// 查询供应商管理列表
+export function getQcListSupplier(query) {
+ return request({
+ url: '/quality/qcInventoryReport/getQcListSupplier',
+ method: 'get',
+ params: query
+ });
+ }
+
+// 查询人员列表
+export function getQcListUser(query) {
+ return request({
+ url: '/quality/qcInventoryReport/getQcListUser',
+ method: 'get',
+ params: query
+ });
+ }
+
+//状态修改
+export function changeIncomeStatus(recordId, status) {
+ const data = {
+ recordId,
+ status
+ }
+ return request({
+ url: '/quality/qcInventoryReport/changeIncomeStatus',
+ method: 'put',
+ data: data
+ })
+ }
+
+// 查询检测项列表
+export function getCkeckProjectList(query) {
+ return request({
+ url: '/quality/qcInventoryReport/getCkeckProjectList',
+ method: 'get',
+ params: query
+ });
+ }
diff --git a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
index 4e5364d..2bf8489 100644
--- a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
+++ b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
@@ -127,8 +127,6 @@ export default {
},
// 查询参数
queryParams: {
- pageNum: 1,
- pageSize: 10,
groupName: null,
attr1: null,
factoryCode: null,
diff --git a/src/views/quality/inventoryReport/index.vue b/src/views/quality/inventoryReport/index.vue
new file mode 100644
index 0000000..1fbadd0
--- /dev/null
+++ b/src/views/quality/inventoryReport/index.vue
@@ -0,0 +1,570 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+ 打印
+
+
+
+
+
+
+
+
+
+
+ 中山榄菊日化实业有限公司
+
+
+
+
+ 库存检验报告
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+ {{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 合格
+
+
+ 不合格
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/quality/qcInventory/checkProjectType.vue b/src/views/quality/qcInventory/checkProjectType.vue
deleted file mode 100644
index a93c201..0000000
--- a/src/views/quality/qcInventory/checkProjectType.vue
+++ /dev/null
@@ -1,258 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 检测值
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 删除
-
-
- 提交
- 新增测量值
- 重置
-
-
-
-
-
-
diff --git a/src/views/quality/qcInventory/index.vue b/src/views/quality/qcInventory/index.vue
index b5b7864..fd67e60 100644
--- a/src/views/quality/qcInventory/index.vue
+++ b/src/views/quality/qcInventory/index.vue
@@ -12,7 +12,7 @@
@@ -47,7 +47,7 @@
/>
-
+
新增
@@ -100,7 +100,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['quality:qcIncome:edit']"
+ v-hasPermi="['quality:qcInventory:edit']"
>修改
+
-
+
-
+
@@ -226,10 +224,10 @@
-
-
-
-
+
+
+
+
@@ -240,24 +238,18 @@
-
-
-
+
+
-
-
-
-
-
@@ -268,43 +260,21 @@
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
+
@@ -318,12 +288,7 @@
-
-
-
-
-
-
+