From 541a28fcba2bf2479a271a32626a317a54dad900 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 27 Aug 2024 11:41:39 +0800 Subject: [PATCH 1/8] zxl --- src/api/kanban/quality.js | 12 +- src/api/quality/defectClass.js | 44 +++ src/api/quality/defectType.js | 7 + src/views/kanban/quality/kanban1.vue | 2 +- src/views/kanban/quality/kanban2.vue | 13 +- src/views/mes/dailyReportNew/index.vue | 5 + src/views/mes/mesLine/index.vue | 8 + src/views/mes/prepare/index.vue | 20 +- src/views/quality/defectType/codeContent.vue | 296 +++++++++++++++++++ src/views/quality/defectType/index.vue | 110 ++++--- src/views/quality/qcProduce/index.vue | 1 - src/views/quality/qcTableCheckHz/index.vue | 17 +- src/views/system/user/index.vue | 14 +- 13 files changed, 480 insertions(+), 69 deletions(-) create mode 100644 src/api/quality/defectClass.js create mode 100644 src/views/quality/defectType/codeContent.vue diff --git a/src/api/kanban/quality.js b/src/api/kanban/quality.js index 8354510..ab18d16 100644 --- a/src/api/kanban/quality.js +++ b/src/api/kanban/quality.js @@ -23,7 +23,7 @@ export function getOverallInfo(data) { data: data, }); } -// 来料--异常分布 过程检验--当日不良占比类型 +// 巡检检验--当日不良占比类型 export function getCheckProjectsPie(data) { return request({ url: '/quality/qcInterface/getCheckProjectsPie', @@ -31,6 +31,16 @@ export function getCheckProjectsPie(data) { data: data }); } + +// 来料--异常分布 过程检验--当日不良占比类型 +export function getCheckProjectsPieLL(data) { + return request({ + url: '/quality/qcInterface/getCheckProjectsPieLL', + method: 'post', + data: data + }); +} + // 来料--供应商产品数量不良TOP5来料--供应商产品批次不良TOP5 export function getSupplierBadTOP5(data) { return request({ diff --git a/src/api/quality/defectClass.js b/src/api/quality/defectClass.js new file mode 100644 index 0000000..bfc7fd7 --- /dev/null +++ b/src/api/quality/defectClass.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询故障类型-缺陷描述分类列表 +export function listClass(query) { + return request({ + url: '/quality/defectClass/list', + method: 'get', + params: query + }); +} + +// 查询故障类型-缺陷描述分类详细 +export function getClass(id) { + return request({ + url: '/quality/defectClass/' + id, + method: 'get' + }); +} + +// 新增故障类型-缺陷描述分类 +export function addClass(data) { + return request({ + url: '/quality/defectClass', + method: 'post', + data: data + }); +} + +// 修改故障类型-缺陷描述分类 +export function updateClass(data) { + return request({ + url: '/quality/defectClass', + method: 'put', + data: data + }); +} + +// 删除故障类型-缺陷描述分类 +export function delClass(id) { + return request({ + url: '/quality/defectClass/' + id, + method: 'delete' + }); +} diff --git a/src/api/quality/defectType.js b/src/api/quality/defectType.js index 79146fe..1ea69d9 100644 --- a/src/api/quality/defectType.js +++ b/src/api/quality/defectType.js @@ -48,3 +48,10 @@ export function getDefectTypeListByDefectType(defectType) { method: 'get', }); } + +export function getCheckTypes() { + return request({ + url: '/quality/defectType/getCheckTypes', + method: 'get' + }); +} \ No newline at end of file diff --git a/src/views/kanban/quality/kanban1.vue b/src/views/kanban/quality/kanban1.vue index 15e44df..1d64a23 100644 --- a/src/views/kanban/quality/kanban1.vue +++ b/src/views/kanban/quality/kanban1.vue @@ -157,7 +157,7 @@
-
产品不同工序异常对比
+
产品不合格率同期对比
diff --git a/src/views/kanban/quality/kanban2.vue b/src/views/kanban/quality/kanban2.vue index 0e7b885..04d4e51 100644 --- a/src/views/kanban/quality/kanban2.vue +++ b/src/views/kanban/quality/kanban2.vue @@ -166,7 +166,7 @@ import { getBoardFactory, getOverallInfo, - getCheckProjectsPie, + getCheckProjectsPieLL, getSupplierBadTOP5, getSupplierNoOkList, getDictData, @@ -312,7 +312,7 @@ export default { getdatalist() { const _this = this; getOverallInfo({ - ymdType: moment().format(_this.selectxtclasses), + ymdType: _this.selectxtclasses, typeCode: 'material', factoryCode: 'ds_' + _this.selectxt, }).then((response) => { @@ -320,8 +320,8 @@ export default { _this.ordermessage = response; } }); - getCheckProjectsPie({ - ymdType: moment().format(_this.selectxtclasses), + getCheckProjectsPieLL({ + ymdType: _this.selectxtclasses, typeCode: 'material', factoryCode: 'ds_' + _this.selectxt, }).then((response) => { @@ -337,7 +337,7 @@ export default { } }); getSupplierBadTOP5({ - ymdType: moment().format(_this.selectxtclasses), + ymdType: _this.selectxtclasses, typeCode: 'material', factoryCode: 'ds_' + _this.selectxt, }).then((response) => { @@ -366,7 +366,7 @@ export default { }); this.orderdetail = [] getSupplierNoOkList({ - ymdType: moment().format(_this.selectxtclasses), + ymdType: _this.selectxtclasses, typeCode: 'material', factoryCode: 'ds_' + _this.selectxt, }).then((response) => { @@ -386,7 +386,6 @@ export default { var tick = "../../../static/img/icon-dingdan1.d5172b23.png"; console.log(tick) - // let bjlxChartData = { areaName: ['苍南县', '瓯江口', '鹿城区', '龙湾区'], eventCount: [30, 3, 3, 3] }; let bjlxChartData = _this.optionDatalist3[0] let max = 100; var maxArr = []; diff --git a/src/views/mes/dailyReportNew/index.vue b/src/views/mes/dailyReportNew/index.vue index ab3559d..7d16276 100644 --- a/src/views/mes/dailyReportNew/index.vue +++ b/src/views/mes/dailyReportNew/index.vue @@ -131,6 +131,11 @@ label="人均效率达成率" width="120"> + + + + + + + + + +
确 定 diff --git a/src/views/mes/prepare/index.vue b/src/views/mes/prepare/index.vue index 44e3715..eb520ff 100644 --- a/src/views/mes/prepare/index.vue +++ b/src/views/mes/prepare/index.vue @@ -271,12 +271,12 @@ - +
- - + + 发料人: @@ -303,7 +303,6 @@ import { listPrepare, getPrepare, delPrepare, addPrepare, updatePrepare } from " import {printPrepareByCode,printPrepareXByCode} from "@/api/mes/prepareDetail"; import moment from "moment/moment"; import JsBarcode from 'jsbarcode'; - // import { listPrepareDetail, getPrepareDetail, delPrepareDetail, addPrepareDetail, updatePrepareDetail } from "@/api/mes/prepareDetail"; // import Detail from "./prepareDetail.vue"; export default { @@ -408,9 +407,9 @@ export default { created() { this.getList(); }, - mounted() { - this.generateBarcode(); - }, + mounted() { + this.generateBarcode(); + }, methods: { //产品编码格式化 productCodeFormate(row, column, cellValue){ @@ -432,7 +431,7 @@ export default { header: params.header, // '表单', targetStyles: ['*'], style: ` - + body {margin: 5mm;padding: 0;} .fy{page-break-after: always;} `, @@ -523,8 +522,8 @@ export default { //打印条码 generateBarcode(barcode){ - JsBarcode("#barcode", barcode, { - format: "CODE128", + JsBarcode("#barcode", barcode, { + format: "CODE128", height:75, width:2, displayValue: true, @@ -655,6 +654,7 @@ export default { \ No newline at end of file + diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 2c6784d..0123539 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -310,6 +310,18 @@ + + + + + + + @@ -365,7 +377,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css"; export default { name: "User", - dicts: ['sys_normal_disable', 'sys_user_sex'], + dicts: ['sys_normal_disable', 'sys_user_sex','m_type'], components: { Treeselect }, data() { return { From 034bf85448f9989aee9a7e6b3eee728f00db77ae Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 27 Aug 2024 12:03:01 +0800 Subject: [PATCH 2/8] =?UTF-8?q?zxl=E5=8A=A0PC=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/plan/workorder/printID.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/plan/workorder/printID.vue b/src/views/plan/workorder/printID.vue index a3f4b6d..81b7540 100644 --- a/src/views/plan/workorder/printID.vue +++ b/src/views/plan/workorder/printID.vue @@ -54,8 +54,9 @@
产品名称: {{ item.productName }}

批次号: {{ item.batchCode }}

生产日期: {{ item.productDateStr }}

-
板次: {{ item.palletNo }}

-
数量: {{ item.batchQuantity }}
+
板次: {{ item.palletNo }}
+
数量: {{ item.batchQuantity }} + PC数量: {{ item.umrez }}

 From 21b0fc26dade169f0f7c02dd64a6dd8f6ef30ca6 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 27 Aug 2024 13:25:54 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=A0=87=E8=AF=86=E5=8D=A1=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/plan/workorder/printID.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/plan/workorder/printID.vue b/src/views/plan/workorder/printID.vue index 81b7540..5c9559e 100644 --- a/src/views/plan/workorder/printID.vue +++ b/src/views/plan/workorder/printID.vue @@ -55,8 +55,8 @@
批次号: {{ item.batchCode }}

生产日期: {{ item.productDateStr }}

板次: {{ item.palletNo }}
-
数量: {{ item.batchQuantity }} - PC数量: {{ item.umrez }}

+
数量: {{ item.batchQuantity }} {{ item.unit }} + 子单数量: {{ item.umrez }} PC

 From 0cbc9f5e854a89d9ad8d8be2d9e8cb75c37d7b34 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 27 Aug 2024 13:26:49 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=A0=87=E8=AF=86=E5=8D=A1=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/plan/workorder/printID.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/plan/workorder/printID.vue b/src/views/plan/workorder/printID.vue index 5c9559e..eee1517 100644 --- a/src/views/plan/workorder/printID.vue +++ b/src/views/plan/workorder/printID.vue @@ -54,7 +54,7 @@
产品名称: {{ item.productName }}

批次号: {{ item.batchCode }}

生产日期: {{ item.productDateStr }}

-
板次: {{ item.palletNo }}
+
板次: {{ item.palletNo }}

数量: {{ item.batchQuantity }} {{ item.unit }} 子单数量: {{ item.umrez }} PC

 From ad5f2dae9f046fdeea835f6924d7524d83ca0e74 Mon Sep 17 00:00:00 2001 From: guoshuang Date: Tue, 27 Aug 2024 14:41:51 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E9=A2=86=E6=96=99=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/prepare/index.vue | 73 +++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 27 deletions(-) diff --git a/src/views/mes/prepare/index.vue b/src/views/mes/prepare/index.vue index eb520ff..5a9e31c 100644 --- a/src/views/mes/prepare/index.vue +++ b/src/views/mes/prepare/index.vue @@ -226,14 +226,14 @@
-
+
@@ -256,22 +256,22 @@
+ border style="width: 100%;"> - - - - - + + + + + - - + +
@@ -310,7 +310,8 @@ export default { // components: {Detail}, data() { return { - fenyeNumber:13, + fenyeNumber:2, + fenyeNumberTwo:4, shengchan:true, newWorkerLoading: false, refreshNewWorkerTable:true, @@ -431,9 +432,11 @@ export default { header: params.header, // '表单', targetStyles: ['*'], style: ` - - body {margin: 5mm;padding: 0;} + + body {margin: 3mm;padding: 0;} .fy{page-break-after: always;} + table { border-collapse: collapse; } table, th, td { border: 2px solid black; } + .el-table .cell{padding-left:5px;padding-right:5px;} `, ignoreElements: params.ignore || [], // ['no-print'] properties: params.properties || null @@ -463,9 +466,9 @@ export default { let chunkedArray = []; // 遍历this.printData.workTable - for (let i = 0; i < this.printData.workTable.length; i += this.fenyeNumber) { + 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 + this.fenyeNumber); + let chunk = this.printData.workTable.slice(i, i + (i==0?this.fenyeNumber:this.fenyeNumberTwo)); // 将切割后的数组添加到chunkedArray中 chunkedArray.push(chunk); } @@ -506,9 +509,9 @@ export default { let chunkedArray = []; // 遍历this.printData.workTable - for (let i = 0; i < this.printData.workTable.length; i += this.fenyeNumber) { + 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 + this.fenyeNumber); + let chunk = this.printData.workTable.slice(i, i + (i==0?this.fenyeNumber:this.fenyeNumberTwo)); // 将切割后的数组添加到chunkedArray中 chunkedArray.push(chunk); } @@ -653,8 +656,25 @@ export default { };