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" /> + + +