From 398cfef8444ad62959e3e64c9edc03cbed87312e Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Tue, 21 Nov 2023 15:02:33 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E8=B4=A8=E6=A3=80=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/report/qualityInspection.js | 44 ++ src/views/base/processStation/index.vue | 4 +- src/views/base/productStation/index.vue | 6 +- .../base/qualityInspectionItem/index.vue | 24 +- .../report/inventoryStatistics/index.vue | 4 +- src/views/report/qualityInspection/index.vue | 453 ++++++++++++++++++ 6 files changed, 519 insertions(+), 16 deletions(-) create mode 100644 src/api/report/qualityInspection.js create mode 100644 src/views/report/qualityInspection/index.vue diff --git a/src/api/report/qualityInspection.js b/src/api/report/qualityInspection.js new file mode 100644 index 0000000..b61a435 --- /dev/null +++ b/src/api/report/qualityInspection.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询质检记录管理列表 +export function listQualityInspection(query) { + return request({ + url: '/report/qualityInspection/list', + method: 'get', + params: query + }) +} + +// 查询质检记录管理详细 +export function getQualityInspection(objId) { + return request({ + url: '/report/qualityInspection/' + objId, + method: 'get' + }) +} + +// 新增质检记录管理 +export function addQualityInspection(data) { + return request({ + url: '/report/qualityInspection', + method: 'post', + data: data + }) +} + +// 修改质检记录管理 +export function updateQualityInspection(data) { + return request({ + url: '/report/qualityInspection', + method: 'put', + data: data + }) +} + +// 删除质检记录管理 +export function delQualityInspection(objId) { + return request({ + url: '/report/qualityInspection/' + objId, + method: 'delete' + }) +} diff --git a/src/views/base/processStation/index.vue b/src/views/base/processStation/index.vue index 80203ab..8bf89d3 100644 --- a/src/views/base/processStation/index.vue +++ b/src/views/base/processStation/index.vue @@ -271,7 +271,9 @@ export default { }; }, created() { - this.queryParams.productLineCode = this.$route.params && this.$route.params.productLineCode; + if (!this.$route.params){ + this.queryParams.productLineCode = this.$route.params && this.$route.params.productLineCode; + } this.getList(); }, methods: { diff --git a/src/views/base/productStation/index.vue b/src/views/base/productStation/index.vue index 0867c4b..4f43788 100644 --- a/src/views/base/productStation/index.vue +++ b/src/views/base/productStation/index.vue @@ -276,8 +276,10 @@ export default { }; }, created() { - this.queryParams.parentId = this.$route.params && this.$route.params.productLineCode; - this.queryParams.processCode = this.$route.params && this.$route.params.processCode; + if (!this.$route.params){ + this.queryParams.parentId = this.$route.params && this.$route.params.productLineCode; + this.queryParams.processCode = this.$route.params && this.$route.params.processCode; + } this.getList(); findFactoryList().then(response => { this.factoryList = response.data; diff --git a/src/views/base/qualityInspectionItem/index.vue b/src/views/base/qualityInspectionItem/index.vue index 8cd815c..37d984e 100644 --- a/src/views/base/qualityInspectionItem/index.vue +++ b/src/views/base/qualityInspectionItem/index.vue @@ -185,15 +185,15 @@ >{{dict.label}} - - - {{dict.label}} - - + + + + + + + + + @@ -279,7 +279,7 @@ export default { { key: 2, label: `质检项名称`, visible: true }, { key: 3, label: `父级编号`, visible: true }, { key: 4, label: `物料大类`, visible: true }, - { key: 5, label: `物料小类`, visible: true }, + { key: 5, label: `物料小类`, visible: false }, { key: 6, label: `工厂编号`, visible: true }, { key: 7, label: `备注`, visible: true }, { key: 8, label: `启用标识`, visible: true }, @@ -322,8 +322,8 @@ export default { qualityDefectCode: null, qualityDefectName: null, parentId: null, - materialCategories: 0, - materialSubclass: 0, + materialCategories: '1', + materialSubclass: null, plantCode: null, remark: null, isFlag: 0, diff --git a/src/views/report/inventoryStatistics/index.vue b/src/views/report/inventoryStatistics/index.vue index f5875e6..a0e1183 100644 --- a/src/views/report/inventoryStatistics/index.vue +++ b/src/views/report/inventoryStatistics/index.vue @@ -120,6 +120,9 @@ export default { } }, created() { + if (!this.$route.params){ + this.queryParams.storeCode = this.$route.params && this.$route.params.storeCode; + } this.getList() findStoreList().then(response => { this.storeList = response.data @@ -135,7 +138,6 @@ export default { /** 查询货道信息列表 */ getList() { this.loading = true - this.queryParams.storeCode = this.$route.params && this.$route.params.storeCode; getInventoryStatistics(this.queryParams).then(response => { this.reportList = response.data this.pieChartData = response.data.map(item => ({ diff --git a/src/views/report/qualityInspection/index.vue b/src/views/report/qualityInspection/index.vue new file mode 100644 index 0000000..05df3f1 --- /dev/null +++ b/src/views/report/qualityInspection/index.vue @@ -0,0 +1,453 @@ + + +