From 78b84ce853f9947beb4c3d244666b623d1f9f035 Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Wed, 18 Sep 2024 11:30:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.staging | 2 +- package.json | 5 +-- src/layout/components/Sidebar/Logo.vue | 4 +-- src/views/index_v1.vue | 2 +- .../finishproduct/BottomRightTable1.vue | 1 - src/views/login.vue | 2 +- src/views/mes/monthProductionSut/index.vue | 20 ++++++++++- src/views/mes/prepare/index.vue | 31 +++++++++-------- src/views/mobile/dailyReport/index.vue | 34 +++++++++++++++++++ vue.config.js | 3 +- 11 files changed, 78 insertions(+), 28 deletions(-) create mode 100644 src/views/mobile/dailyReport/index.vue diff --git a/.env.development b/.env.development index 456802b..1cce8b9 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 榄菊管理系统 +VUE_APP_TITLE = 榄菊生产管理系统 # 开发环境配置 ENV = 'development' diff --git a/.env.staging b/.env.staging index 471773d..8c0be33 100644 --- a/.env.staging +++ b/.env.staging @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 榄菊管理系统 +VUE_APP_TITLE = 榄菊生产管理系统 NODE_ENV = production diff --git a/package.json b/package.json index 60d05e1..0b90b1d 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "license": "MIT", "scripts": { "###": "高版本node请使用如下配置启动 SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve", - "dev": "vue-cli-service serve", + "dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve", "build:prod": "vue-cli-service build", "build:stage": "vue-cli-service build --mode staging", "preview": "node build/index.js --preview", @@ -46,14 +46,12 @@ "highlight.js": "9.18.5", "js-beautify": "1.13.0", "js-cookie": "3.0.1", - "jsbarcode": "^3.11.6", "jsencrypt": "3.0.0-rc.1", "less": "^3.9.0", "less-loader": "^5.0.0", "moment": "^2.29.4", "nprogress": "0.2.0", "print-js": "^1.6.0", - "qrcode": "^1.5.4", "quill": "1.3.7", "screenfull": "5.0.2", "sortablejs": "1.10.2", @@ -64,7 +62,6 @@ "vue-cropper": "0.5.5", "vue-meta": "2.4.0", "vue-router": "3.4.9", - "vue-seamless-scroll": "^1.1.23", "vuedraggable": "2.24.3", "vuex": "3.6.0", "xlsx": "^0.17.0" diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 5481b1b..b257c16 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -35,8 +35,8 @@ export default { }, data() { return { - title: '管理系统', - logo: logoImg + title: '榄菊生产管理系统', + // logo: logoImg } } } diff --git a/src/views/index_v1.vue b/src/views/index_v1.vue index d2d2ec6..405cb9e 100644 --- a/src/views/index_v1.vue +++ b/src/views/index_v1.vue @@ -25,7 +25,7 @@ - + diff --git a/src/views/kanban/finishproduct/BottomRightTable1.vue b/src/views/kanban/finishproduct/BottomRightTable1.vue index 0075416..228babf 100644 --- a/src/views/kanban/finishproduct/BottomRightTable1.vue +++ b/src/views/kanban/finishproduct/BottomRightTable1.vue @@ -76,7 +76,6 @@ export default { width: calc(~"100% + 10px"); height: 100%; margin: 0 -5px; - .border-box-content { padding: 20px; diff --git a/src/views/login.vue b/src/views/login.vue index 8a26445..30ea557 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -161,7 +161,7 @@ export default { justify-content: end; align-items: center; height: 100%; - background-image: url("../assets/images/login-background.jpg"); + background-image: url("../assets/images/login-background-none.jpg"); background-size: cover; } .title { diff --git a/src/views/mes/monthProductionSut/index.vue b/src/views/mes/monthProductionSut/index.vue index fdfc1de..a50e14e 100644 --- a/src/views/mes/monthProductionSut/index.vue +++ b/src/views/mes/monthProductionSut/index.vue @@ -13,7 +13,19 @@ 搜索 - + + + 导出 + + + @@ -326,6 +338,12 @@ export default { handleQuery() { this.getList(); + }, + /** 导出按钮操作 */ + handleExport() { + this.download('mes/reportWork/getmonthProductionSut/export', { + ...this.queryParams + }, `汇总报表_${new Date().getTime()}.xlsx`) } } }; diff --git a/src/views/mes/prepare/index.vue b/src/views/mes/prepare/index.vue index 16759a7..68061b9 100644 --- a/src/views/mes/prepare/index.vue +++ b/src/views/mes/prepare/index.vue @@ -272,7 +272,7 @@ - + @@ -508,7 +508,7 @@ export default { // 遍历this.printData.workTable for (let i = 0; i < this.printData.workTable.length; i += (i==0?this.fenyeNumber:this.fenyeNumberTwo)) { - + // 使用slice方法从当前索引i开始切割，切割长度为10（如果剩余元素少于10，则切割剩余所有元素） let chunk = this.printData.workTable.slice(i, i + (i==0?this.fenyeNumber:this.fenyeNumberTwo)); // 将切割后的数组添加到chunkedArray中 @@ -518,7 +518,7 @@ export default { this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格 this.newWorkerLoading = false // 设置加载状态为false，表示加载完成 - this.generateBarcode(this.printData.productDate); //条码 根据打印日期生成 + this.generateBarcode(this.printData.printDate); //条码 根据打印日期生成 }) }, @@ -656,16 +656,16 @@ export default { diff --git a/src/views/cs/index2.vue b/src/views/cs/index2.vue new file mode 100644 index 0000000..f6510fe --- /dev/null +++ b/src/views/cs/index2.vue @@ -0,0 +1,472 @@ + + + From 33b4b43a064397f7819b0809ca43df01ff0aab2d Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Mon, 28 Oct 2024 17:41:54 +0800 Subject: [PATCH 3/4] =?UTF-8?q?wms=E5=87=BA=E5=BA=93=E5=8D=95=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/outorderzsmx/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/outorderzsmx/index.vue b/src/views/wms/outorderzsmx/index.vue index 124e152..b707401 100644 --- a/src/views/wms/outorderzsmx/index.vue +++ b/src/views/wms/outorderzsmx/index.vue @@ -2,7 +2,7 @@
- From 3bfe45100f39133d5233546950e01eaf79bf396a Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 28 Oct 2024 18:01:52 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/quality/inventoryReport.js | 8 ++ src/views/mes/prepare/index.vue | 18 +-- src/views/quality/inventoryReport/index.vue | 130 +++++++++++++++++- src/views/quality/llAnalysisReport/index.vue | 6 + src/views/quality/productReport/index.vue | 8 ++ src/views/quality/qcInventory/index.vue | 26 +++- .../quality/qcTableCheckDevelop/index.vue | 7 + src/views/quality/qcTableXJ/index.vue | 4 +- src/views/quality/qcWarehousing/index.vue | 8 ++ src/views/quality/sjAnalysisReport/index.vue | 6 + src/views/quality/unqualified/index.vue | 11 +- 11 files changed, 208 insertions(+), 24 deletions(-) diff --git a/src/api/quality/inventoryReport.js b/src/api/quality/inventoryReport.js index c6ea8d1..03ba0a2 100644 --- a/src/api/quality/inventoryReport.js +++ b/src/api/quality/inventoryReport.js @@ -91,3 +91,11 @@ export function getCkeckProjectList(query) { params: query }); } +// 仓库质量巡查记录 +export function printXJRecordList(query) { + return request({ + url: '/quality/qcInventoryReport/printXJRecordList', + method: 'get', + params: query + }); +} \ No newline at end of file diff --git a/src/views/mes/prepare/index.vue b/src/views/mes/prepare/index.vue index 25bace1..ec654a2 100644 --- a/src/views/mes/prepare/index.vue +++ b/src/views/mes/prepare/index.vue @@ -508,16 +508,16 @@ export default { this.printData.pageNo = response.data.mesPrepareDetailList.length; let chunkedArray = []; - // 遍历this.printData.workTable - for (let i = 0; i < this.printData.workTable.length; i += (i==0?this.fenyeNumber:this.fenyeNumberTwo)) { + // 遍历this.printData.workTable + for (let i = 0; i < this.printData.workTable.length; i += (i==0?this.fenyeNumber:this.fenyeNumberTwo)) { - - // 使用slice方法从当前索引i开始切割，切割长度为10（如果剩余元素少于10，则切割剩余所有元素） - let chunk = this.printData.workTable.slice(i, i + (i==0?this.fenyeNumber:this.fenyeNumberTwo)); - // 将切割后的数组添加到chunkedArray中 - chunkedArray.push(chunk); - } - this.printData.workTable = chunkedArray; + + // 使用slice方法从当前索引i开始切割，切割长度为10（如果剩余元素少于10，则切割剩余所有元素） + let chunk = this.printData.workTable.slice(i, i + (i==0?this.fenyeNumber:this.fenyeNumberTwo)); + // 将切割后的数组添加到chunkedArray中 + chunkedArray.push(chunk); + } + this.printData.workTable = chunkedArray; this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格 this.newWorkerLoading = false // 设置加载状态为false，表示加载完成 diff --git a/src/views/quality/inventoryReport/index.vue b/src/views/quality/inventoryReport/index.vue index ec84e38..7c3a089 100644 --- a/src/views/quality/inventoryReport/index.vue +++ b/src/views/quality/inventoryReport/index.vue @@ -76,6 +76,16 @@ v-hasPermi="['quality:inventoryReport:export']" >导出 + + 巡检记录 + @@ -242,11 +252,66 @@
+ + +
+ + + +
+ + + + + +

中山榄菊日化实业有限公司

+ + + + + +

仓库质量巡查记录

+ + + + + 巡检日期:{{printData.incomeTime}} + 条数:{{printData.pageNo}} + 编码:{{printData.fileNo}} + + + + + + + + + + + + + 审核: + 品管员:{{printData.checkManName}} + +
+
+ +
+ + 打 印 + + + diff --git a/src/views/quality/llAnalysisReport/index.vue b/src/views/quality/llAnalysisReport/index.vue index bed2721..b44e2db 100644 --- a/src/views/quality/llAnalysisReport/index.vue +++ b/src/views/quality/llAnalysisReport/index.vue @@ -43,6 +43,7 @@ 搜索 重置 + 导出 导出明细 @@ -499,6 +500,11 @@ export default { ...this.queryParams }, `incomeNoOkList_${new Date().getTime()}.xlsx`) }, + handleExportTable() { + this.download('quality/staticTable/exportIncomeTable', { + ...this.queryParams + }, `LLList_${new Date().getTime()}.xlsx`) + }, } }; diff --git a/src/views/quality/productReport/index.vue b/src/views/quality/productReport/index.vue index 5aeacf3..2260719 100644 --- a/src/views/quality/productReport/index.vue +++ b/src/views/quality/productReport/index.vue @@ -9,6 +9,14 @@ @keyup.enter.native="handleQuery" /> + + +
- + + + + + + + 搜索 重置 @@ -203,12 +219,12 @@ - + - + @@ -259,7 +275,7 @@ import ItemSelectProject from "../qcIncome/checkProjectType.vue"; import moment from 'moment'; import { getDefectTypeListByDefectType } from "@/api/quality/defectType.js"; export default { - name: "Inventory", + name: "QcInventory", components: {ItemPutInOrder,ItemSelectUser,ItemSelectProject}, dicts: ["unit","check_status","check_result"], data() { @@ -336,7 +352,7 @@ export default { { required: true, message: "单位不能为空", trigger: "blur" } ], supplierName: [ - { required: true, message: "供应商不能为空", trigger: "blur" } + { required: true, message: "仓库不能为空", trigger: "blur" } ], incomeTime: [ { required: true, message: "来料时间不能为空", trigger: "blur" } diff --git a/src/views/quality/qcTableCheckDevelop/index.vue b/src/views/quality/qcTableCheckDevelop/index.vue index 5264514..e113e73 100644 --- a/src/views/quality/qcTableCheckDevelop/index.vue +++ b/src/views/quality/qcTableCheckDevelop/index.vue @@ -43,6 +43,7 @@ 搜索 重置 + 导出 导出明细 @@ -495,6 +496,12 @@ export default { handleExport() { this.download('quality/staticTable/exportXJDetail', { ...this.queryParams + }, `XJDetialList_${new Date().getTime()}.xlsx`) + }, + + handleExportTable() { + this.download('quality/staticTable/exportXJTable', { + ...this.queryParams }, `XJList_${new Date().getTime()}.xlsx`) }, } diff --git a/src/views/quality/qcTableXJ/index.vue b/src/views/quality/qcTableXJ/index.vue index a74554c..ac80191 100644 --- a/src/views/quality/qcTableXJ/index.vue +++ b/src/views/quality/qcTableXJ/index.vue @@ -9,10 +9,10 @@ @keyup.enter.native="handleQuery" /> - + diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue index 20e2850..bc45dd4 100644 --- a/src/views/quality/qcWarehousing/index.vue +++ b/src/views/quality/qcWarehousing/index.vue @@ -47,6 +47,14 @@ @keyup.enter.native="handleQuery" /> + + +