diff --git a/src/api/kanban/quality.js b/src/api/kanban/quality.js index 83545106..ab18d161 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 00000000..bfc7fd70 --- /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 79146fe3..1ea69d9b 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 15e44dfb..1d64a23a 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 0e7b8856..04d4e511 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 ab3559dd..7d16276f 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 44e3715b..eb520ffb 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 2c6784dc..01235391 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 {