From 83fc835c51bd70755738998ec0734a50742ad9fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’> Date: Fri, 15 Dec 2023 16:27:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 5 +- src/api/base/qualityHotMaterial.js | 26 +- src/api/base/qualityInspectionBoxBtn.js | 6 +- src/api/report/production.js | 18 +- src/assets/icons/svg/noStandards.svg | 1 + src/assets/icons/svg/standards.svg | 1 + .../qualityInspectionBoxBtn/dialogForm.vue | 4 +- .../qualityInspectionBoxBtn/index.vue | 9 +- src/views/quality/base/mixins/basic-page.js | 6 +- .../base/qualityHotMaterial/add-or-updata.vue | 370 ++++++++++++++---- .../quality/base/qualityHotMaterial/index.vue | 23 +- .../report/productionMonthReport/index.vue | 4 +- .../productionShipmentsReport/index.vue | 224 ++++++----- .../report/productionWeekReport/index.vue | 6 +- .../report/productionYearReport/index.vue | 6 +- 15 files changed, 501 insertions(+), 208 deletions(-) create mode 100644 src/assets/icons/svg/noStandards.svg create mode 100644 src/assets/icons/svg/standards.svg diff --git a/.env.dev b/.env.dev index 233c342e..22e87a41 100644 --- a/.env.dev +++ b/.env.dev @@ -1,7 +1,7 @@ ### # @Author: Do not edit # @Date: 2023-08-29 09:40:39 - # @LastEditTime: 2023-12-13 16:52:10 + # @LastEditTime: 2023-12-15 15:24:52 # @LastEditors: zhp # @Description: ### @@ -13,7 +13,7 @@ VUE_APP_TITLE = MES系统 # 芋道管理系统/开发环境 # VUE_APP_BASE_API = 'http://100.64.0.26:48082' -# VUE_APP_BASE_API = 'http://192.168.0.33:48082' +VUE_APP_BASE_API = 'http://192.168.0.33:48082' # VUE_APP_BASE_API = 'http://192.168.4.173:48080' # VUE_APP_BASE_API = 'http://192.168.2.173:48080' # VUE_APP_BASE_API = 'http://192.168.1.49:48082' @@ -21,6 +21,7 @@ VUE_APP_TITLE = MES系统 # VUE_APP_BASE_API = 'http://192.168.4.159:48080' # VUE_APP_BASE_API = 'http://192.168.1.56:48082' # VUE_APP_BASE_API = 'http://192.168.1.62:48082' +# VUE_APP_BASE_API = 'http://192.168.1.78:48082' # 积木报表指向地址 VUE_APP_JIMU_API = 'http://192.168.0.33:48082' diff --git a/src/api/base/qualityHotMaterial.js b/src/api/base/qualityHotMaterial.js index 23ceeeb1..b665f1dc 100644 --- a/src/api/base/qualityHotMaterial.js +++ b/src/api/base/qualityHotMaterial.js @@ -2,7 +2,7 @@ /* * @Author: zhp * @Date: 2023-11-06 15:38:12 - * @LastEditTime: 2023-12-08 16:08:35 + * @LastEditTime: 2023-12-15 15:29:16 * @LastEditors: zhp * @Description: */ @@ -99,3 +99,27 @@ export function getMaterialCheckList(query) { params: query }) } + +export function createQualityHotMaterialDet(query){ + return request({ + url: '/base/quality-hot-material-det/create', + method: 'post', + data: query + }) +} + +export function updateQualityHotMaterialDet(query){ + return request({ + url: '/base/quality-hot-material-det/listbyfilter', + method: 'put', + data: query + }) +} + +export function getQualityHotMaterialDetList(query){ + return request({ + url: '/base/quality-hot-material-det/listbyfilter', + method: 'get', + params: query + }) +} diff --git a/src/api/base/qualityInspectionBoxBtn.js b/src/api/base/qualityInspectionBoxBtn.js index 45998d1a..18954b61 100644 --- a/src/api/base/qualityInspectionBoxBtn.js +++ b/src/api/base/qualityInspectionBoxBtn.js @@ -1,7 +1,7 @@ /* * @Author: zhp * @Date: 2023-12-04 14:10:37 - * @LastEditTime: 2023-12-13 16:03:46 + * @LastEditTime: 2023-12-14 10:06:03 * @LastEditors: zhp * @Description: */ @@ -19,7 +19,7 @@ export function createQualityInspectionBoxBtn(data) { // 更新安灯按钮16键对应 export function updateQualityInspectionBoxBtn(data) { return request({ - url: '/base/quality-inspection-box-btn/update', + url: '/base/quality-inspection-box-btn/updateBatch', method: 'put', data: data }) @@ -44,7 +44,7 @@ export function getQualityInspectionBoxBtn(id) { // 获得安灯按钮16键对应分页 export function getQualityInspectionBoxBtnPage(query) { return request({ - url: '/base/quality-inspection-box-btn/page', + url: '/base/quality-inspection-box-btn/listGroupByLineSection', method: 'get', params: query }) diff --git a/src/api/report/production.js b/src/api/report/production.js index aecf5bda..adaf9d14 100644 --- a/src/api/report/production.js +++ b/src/api/report/production.js @@ -1,7 +1,7 @@ /* * @Author: zhp * @Date: 2023-12-12 13:49:02 - * @LastEditTime: 2023-12-13 15:52:11 + * @LastEditTime: 2023-12-14 14:21:43 * @LastEditors: zhp * @Description: */ @@ -39,3 +39,19 @@ export function getAutoDeliveDataList(query) { data: query, }) } + +export function updateAutoDeliveDataList(query) { + return request({ + url: '/base/report-auto-delive/update', + method: 'put', + data: query, + }) +} + +export function updateSumAutoDeliveDataList(query) { + return request({ + url: '/base/report-auto-delive/updatePlus', + method: 'put', + data: query, + }) +} diff --git a/src/assets/icons/svg/noStandards.svg b/src/assets/icons/svg/noStandards.svg new file mode 100644 index 00000000..2e70ef07 --- /dev/null +++ b/src/assets/icons/svg/noStandards.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/standards.svg b/src/assets/icons/svg/standards.svg new file mode 100644 index 00000000..bb02bee3 --- /dev/null +++ b/src/assets/icons/svg/standards.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/quality/base/basicData/qualityInspectionBoxBtn/dialogForm.vue b/src/views/quality/base/basicData/qualityInspectionBoxBtn/dialogForm.vue index d81dd42e..f4876355 100644 --- a/src/views/quality/base/basicData/qualityInspectionBoxBtn/dialogForm.vue +++ b/src/views/quality/base/basicData/qualityInspectionBoxBtn/dialogForm.vue @@ -142,7 +142,9 @@ export default { console.log(obj); this.visible = true; // if(obj.id) - this.dataForm.id = obj.id ? obj.id : "" + if (obj) { + this.dataForm.id = obj.id ? obj.id : "" + } this.$nextTick(() => { this.$refs["dataForm"].resetFields() if (obj) { diff --git a/src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue b/src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue index a6949f3e..59b9c492 100644 --- a/src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue +++ b/src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue @@ -10,8 +10,8 @@ - + { + this.$refs.addOrUpdate.init(); + }); break; case 'export': this.handleExport(); diff --git a/src/views/quality/base/mixins/basic-page.js b/src/views/quality/base/mixins/basic-page.js index b661a271..898b1f57 100644 --- a/src/views/quality/base/mixins/basic-page.js +++ b/src/views/quality/base/mixins/basic-page.js @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2022-08-24 11:19:43 * @LastEditors: zhp - * @LastEditTime: 2023-12-13 16:19:04 + * @LastEditTime: 2023-12-14 09:36:05 * @Description: */ export default { @@ -54,10 +54,10 @@ export default { this.getDataList(); }, // 新增 / 修改 - addOrUpdateHandle(id) { + addOrUpdateHandle() { this.addOrUpdateVisible = true; this.$nextTick(() => { - this.$refs.addOrUpdate.init(id); + this.$refs.addOrUpdate.init(); }); }, cancel(id) { diff --git a/src/views/quality/base/qualityHotMaterial/add-or-updata.vue b/src/views/quality/base/qualityHotMaterial/add-or-updata.vue index e3f14998..774bd37f 100644 --- a/src/views/quality/base/qualityHotMaterial/add-or-updata.vue +++ b/src/views/quality/base/qualityHotMaterial/add-or-updata.vue @@ -1,7 +1,7 @@ @@ -13,26 +13,28 @@
+ label-width="auto"> - - + + - - + + - + @@ -40,28 +42,79 @@ - + - - + + - + + + 检测结果 + + + 合格 + 不合格 + + + + + + {{ item.name }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -483,7 +483,7 @@ export default { await updateProductionDataList(updateArr), ]); if (result[0] == true && result[1] == true) { - console.log(res) + // console.log(res) this.disabled = true this.isSave = false this.getDataList() diff --git a/src/views/report/productionShipmentsReport/index.vue b/src/views/report/productionShipmentsReport/index.vue index e296bbb9..61420ce4 100644 --- a/src/views/report/productionShipmentsReport/index.vue +++ b/src/views/report/productionShipmentsReport/index.vue @@ -1,7 +1,7 @@ @@ -24,100 +24,132 @@ color: '#606266' }"> - + - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

备注：

@@ -143,8 +175,8 @@