生产管理接口联调

dev-scheduling
zhangdi 3 months ago
parent ab1e38f191
commit 8240e39355
  1. 2
      src/api/productionManagement/frontTooling.js
  2. 2
      src/views/productionManagement/blbWorkOrder/components/glass.vue
  3. 2
      src/views/productionManagement/blbWorkOrder/components/others.vue
  4. 207
      src/views/productionManagement/frontTooling.vue
  5. 2
      src/views/productionManagement/productionMonitoring.vue
  6. 2
      src/views/productionManagement/sinTerWorkOrder/index.vue
  7. 33
      src/views/productionSchedulingPlan/schedulingDashboard/container.vue
  8. 214
      src/views/workbench/afterPlaReceive/index.vue
  9. 214
      src/views/workbench/taskCope/index.vue
  10. 214
      src/views/workbench/workReport/index.vue

@ -2,7 +2,7 @@ import request from '@/axios';
//列表接口
export const getList = (current, size, params) => {
return request({
url: '/blade-desk/sjWorkOrder/queryByReadStatus',
url: '/blade-desk//sjWorkOrder/queryByReadStatus',
method: 'get',
params: {
...params,

@ -571,7 +571,7 @@ export default {
getList(
page.currentPage,
page.pageSize,
Object.assign(params, this.query, { yieldType: '3' })
Object.assign(params, this.query, { yieldType: '12003' })
).then(res => {
this.data = res.data.data.records;
this.loading = false;

@ -571,7 +571,7 @@ export default {
getList(
page.currentPage,
page.pageSize,
Object.assign(params, this.query, { yieldType: '4,5,6' })
Object.assign(params, this.query, { yieldType: '12004,12005,12006' })
).then(res => {
this.data = res.data.data.records;
this.loading = false;

@ -45,7 +45,6 @@ export default {
calcHeight: 32,
rowKey: 'rlsId',
tip: false,
size: 'medium',
simplePage: true,
searchShow: true,
searchMenuSpan: 6,
@ -89,57 +88,28 @@ export default {
column: [
{
label: '准备状态',
prop: 'readStatusTiTle',
prop: 'readStatus',
type: 'select',
width: 200,
search: true,
sortable: true,
overHidden: true,
rules: [
{
required: true,
message: '请输入准备状态',
trigger: 'blur',
},
],
dicData: [
{
value: 1,
label: '已准备',
},
],
},
{
label: '生产计划号',
prop: 'poCode',
bind: 'pjYieldOrder.poCode',
prop: 'ypCode',
width: 200,
search: false,
sortable: true,
overHidden: true,
rules: [
{
required: true,
message: '请输入生产计划号',
trigger: 'blur',
},
],
},
{
label: '生产订单号',
prop: 'yoCode',
bind: 'pjYieldOrder.yoCode',
width: 200,
search: false,
sortable: true,
overHidden: true,
rules: [
{
required: true,
message: '请输入生产订单号',
trigger: 'blur',
},
],
},
{
label: '车间订单号',
@ -148,45 +118,22 @@ export default {
search: true,
sortable: true,
overHidden: true,
rules: [
{
required: true,
message: '请输入车间订单号',
trigger: 'blur',
},
],
},
{
label: '零件号',
prop: 'partCode',
bind: 'pjYieldOrder.partCode',
width: 200,
search: true,
sortable: true,
overHidden: true,
rules: [
{
required: true,
message: '请输入零件号',
trigger: 'blur',
},
],
},
{
label: '零件名称',
prop: 'partName',
bind: 'pjYieldOrder.partName',
width: 200,
search: true,
sortable: true,
overHidden: true,
rules: [
{
required: true,
message: '请输入零件名称',
trigger: 'blur',
},
],
},
{
label: '流程卡号',
@ -195,13 +142,6 @@ export default {
search: true,
sortable: true,
overHidden: true,
rules: [
{
required: true,
message: '请输入流程卡号',
trigger: 'blur',
},
],
},
{
label: '批次号',
@ -210,45 +150,22 @@ export default {
search: true,
sortable: true,
overHidden: true,
rules: [
{
required: true,
message: '请输入批次号',
trigger: 'blur',
},
],
},
{
label: '镀种信息',
prop: 'plate',
bind: 'pjYieldOrder.plate',
width: 200,
search: true,
sortable: true,
overHidden: true,
rules: [
{
required: true,
message: '请输入镀种信息',
trigger: 'blur',
},
],
},
{
label: '生产标识',
prop: 'prodIdent',
bind: 'pjYieldOrder.prodIdent',
width: 200,
search: true,
sortable: true,
overHidden: true,
rules: [
{
required: true,
message: '请输入生产标识',
trigger: 'blur',
},
],
},
{
label: '生产数量',
@ -257,29 +174,14 @@ export default {
search: false,
sortable: true,
overHidden: true,
rules: [
{
required: true,
message: '请输入生产数量',
trigger: 'blur',
},
],
},
{
label: '面积(dm²)',
prop: 'poArea',
bind: 'pjYieldOrder.poArea',
width: 200,
search: false,
sortable: true,
overHidden: true,
rules: [
{
required: true,
message: '请输入面积(dm²)',
trigger: 'blur',
},
],
},
{
label: '订单优先级',
@ -289,13 +191,7 @@ export default {
search: true,
sortable: true,
overHidden: true,
rules: [
{
required: true,
message: '请输入订单优先级',
trigger: 'blur',
},
],
dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
props: {
label: 'dictValue',
@ -304,7 +200,7 @@ export default {
},
{
label: '计划下达时间',
prop: 'createTime',
prop: 'releaseDate',
type: 'date',
searchRange: true,
startPlaceholder: '开始时间',
@ -313,13 +209,6 @@ export default {
search: true,
sortable: true,
overHidden: true,
rules: [
{
required: true,
message: '请输入计划下达时间',
trigger: 'blur',
},
],
},
{
label: '需求交期',
@ -332,13 +221,6 @@ export default {
search: true,
sortable: true,
overHidden: true,
rules: [
{
required: true,
message: '请输入需求交期',
trigger: 'blur',
},
],
},
{
label: '石墨模具号',
@ -347,13 +229,6 @@ export default {
search: false,
sortable: true,
overHidden: true,
rules: [
{
required: true,
message: '请输入石墨模具号',
trigger: 'blur',
},
],
},
{
label: '库位号',
@ -362,13 +237,6 @@ export default {
search: false,
sortable: true,
overHidden: true,
rules: [
{
required: true,
message: '请输入库位号',
trigger: 'blur',
},
],
},
{
label: '待出库数量',
@ -377,13 +245,6 @@ export default {
search: false,
sortable: true,
overHidden: true,
rules: [
{
required: true,
message: '请输入待出库数量',
trigger: 'blur',
},
],
},
{
label: '玻璃饼',
@ -392,13 +253,6 @@ export default {
search: false,
sortable: true,
overHidden: true,
rules: [
{
required: true,
message: '请输入玻璃饼',
trigger: 'blur',
},
],
},
{
label: '待出库数量',
@ -407,13 +261,6 @@ export default {
search: false,
sortable: true,
overHidden: true,
rules: [
{
required: true,
message: '请输入待出库数量',
trigger: 'blur',
},
],
},
{
label: '压饼模具号',
@ -422,13 +269,6 @@ export default {
search: false,
sortable: true,
overHidden: true,
rules: [
{
required: true,
message: '请输入压饼模具号',
trigger: 'blur',
},
],
},
{
label: '库位号',
@ -437,13 +277,6 @@ export default {
search: false,
sortable: true,
overHidden: true,
rules: [
{
required: true,
message: '请输入库位号',
trigger: 'blur',
},
],
},
{
label: '待出库数量',
@ -452,13 +285,6 @@ export default {
search: false,
sortable: true,
overHidden: true,
rules: [
{
required: true,
message: '请输入待出库数量',
trigger: 'blur',
},
],
},
{
label: '备注',
@ -467,13 +293,6 @@ export default {
search: false,
sortable: true,
overHidden: true,
rules: [
{
required: true,
message: '请输入备注',
trigger: 'blur',
},
],
},
],
},
@ -532,17 +351,13 @@ export default {
this.$refs.crud.toggleSelection();
},
onLoad(page, params = {}) {
// this.loading = true;
// getList(
// page.currentPage,
// page.pageSize,
// Object.assign(params, this.query, { yieldType: '1' })
// ).then(res => {
// this.data = res.data.data.records;
// this.loading = false;
// this.page.total = res.data.data.total;
// this.selectionClear();
// });
this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
this.data = res.data.data.records;
this.loading = false;
this.page.total = res.data.data.total;
this.selectionClear();
});
},
},
};

@ -731,7 +731,7 @@ export default {
getList(
page.currentPage,
page.pageSize,
Object.assign(params, this.query, { yieldType: '1' })
Object.assign(params, this.query, { yieldType: '12001' })
).then(res => {
this.data = res.data.data.records;
this.loading = false;

@ -615,7 +615,7 @@ export default {
getList(
page.currentPage,
page.pageSize,
Object.assign(params, this.query, { yieldType: '2' })
Object.assign(params, this.query, { yieldType: '12002' })
).then(res => {
this.data = res.data.data.records;
this.loading = false;

@ -938,17 +938,25 @@ export default {
}
},
updateTime(type) {
//
const today = new Date();
const endDay = new Date(today);
endDay.setDate(today.getDate() + 2);
// YYYY-MM-DD
const startDate = today.toISOString().split('T')[0];
const endDate = endDay.toISOString().split('T')[0];
this.formLabelAlign.timeRange = [startDate, endDate];
this.handleLegendChange(type);
const startDate = new Date(today);
startDate.setDate(today.getDate() - 3); // 3
const endDate = new Date(today);
endDate.setDate(today.getDate() + 3); // 3
// YYYY-MM-DD
const format = date => date.toISOString().split('T')[0];
this.formLabelAlign.timeRange = [format(startDate), format(endDate)];
//
if (type === 'reset') {
this.legendStatus.completed = false;
this.legendStatus.processing = true;
this.legendStatus.pending = true;
this.handleLegendChange('reset');
} else {
this.handleLegendChange(); //
}
},
//
handleLegendChange(type) {
@ -964,7 +972,6 @@ export default {
this.formLabelAlign.planStatusList.push('1');
}
if (type == 'reset') {
}
this.getData();
@ -1181,7 +1188,7 @@ export default {
woReleaseMap[order.woCode] = order.receiveTime;
});
// 3. tasks receiveTime
// 3. tasks receiveTime
tasks.sort((a, b) => {
const dateA = new Date(woReleaseMap[a.woCode] || '1970-01-01');
const dateB = new Date(woReleaseMap[b.woCode] || '1970-01-01');
@ -1298,7 +1305,7 @@ export default {
receiveTime: '', //
partCode: '', //
batchNo: '', //
planStatusList: ['1','2','3'],
planStatusList: ['1', '2', '3'],
};
this.legendStatus.completed = false;
this.legendStatus.processing = true;

@ -0,0 +1,214 @@
<template>
<basic-container>
<avue-crud
:option="option"
:table-loading="loading"
:data="data"
v-model="form"
v-model:page="page"
ref="crud"
@row-del="rowDel"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
>
<template #menu-left> </template>
<template #menu-right> </template>
<template #menu="{ row }"> </template>
<template #heatTreat="scope"> </template>
</avue-crud>
</basic-container>
</template>
<script>
// import {
// getListPersonAbility,
// removePersonAbility,
// addPersonAbility,
// updatePersonAbility,
// } from '@/api/productionSchedulingPlan/scheduling';
export default {
components: {},
data() {
return {
form: {},
selectionList: [],
query: {},
loading: true,
page: {
pageSize: 10,
currentPage: 1,
total: 0,
},
option: {
columnSort: true,
tip: false,
height: 'auto',
calcHeight: 32,
simplePage: false,
searchShow: true,
searchMenuSpan: 6,
searchIcon: true,
searchIndex: 3,
tree: false,
border: true,
index: true,
selection: false,
addBtn: false,
editBtn: false,
viewBtn: false,
delBtn: false,
editBtnText: '修改',
labelWidth: 120,
menuWidth: 80,
dialogWidth: 900,
dialogClickModal: false,
searchEnter: true,
excelBtn: false,
filterBtn: true,
searchShowBtn: false,
excelBtn: true,
showOverflowTooltip: true,
addBtnIcon: ' ',
viewBtnIcon: ' ',
delBtnIcon: ' ',
editBtnIcon: ' ',
gridBtn: false,
searchLabelPosition: 'left',
searchGutter: 24,
searchSpan: 6,
menuAlign: 'left',
gridBtn: false,
searchMenuPosition: 'right',
align: 'center',
column: [
{
label: '配套人',
prop: 'partCode',
bind: 'dsPart.partCode',
search: true,
sortable: true,
width: 150,
span: 12,
},
{
label: '配套时间',
prop: 'partName',
bind: 'dsPart.partName',
search: true,
sortable: true,
width: 150,
span: 12,
},
],
},
data: [],
};
},
methods: {
rowSave(row, done, loading) {
// addPersonAbility(row).then(
// () => {
// this.onLoad(this.page);
// this.$message({
// type: 'success',
// message: '!',
// });
// done();
// },
// error => {
// window.console.log(error);
// loading();
// }
// );
},
rowUpdate(row, index, done, loading) {
// updatePersonAbility(row).then(
// () => {
// this.onLoad(this.page);
// this.$message({
// type: 'success',
// message: '!',
// });
// done();
// },
// error => {
// window.console.log(error);
// loading();
// }
// );
},
rowDel(row) {
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
// return removePersonAbility(row.id);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
});
},
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
done();
},
selectionChange(list) {
this.selectionList = list;
},
selectionClear() {
this.selectionList = [];
this.$refs.crud.toggleSelection();
},
currentChange(currentPage) {
this.page.currentPage = currentPage;
},
sizeChange(pageSize) {
this.page.pageSize = pageSize;
},
refreshChange() {
this.onLoad(this.page, this.query);
},
handleChange(file, fileList) {
// proxy.$Export.xlsx(file.raw).then((data) => {
// data.value = data.results;
// });
this.$message({
type: 'success',
message: '操作成功!',
});
},
onLoad(page, params = {}) {
this.loading = true;
// getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
// this.data = res.data.data.records;
// this.loading = false;
// this.page.total = res.data.data.total;
// this.selectionClear();
// });
},
},
mounted() {},
};
</script>

@ -0,0 +1,214 @@
<template>
<basic-container>
<avue-crud
:option="option"
:table-loading="loading"
:data="data"
v-model="form"
v-model:page="page"
ref="crud"
@row-del="rowDel"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
>
<template #menu-left> </template>
<template #menu-right> </template>
<template #menu="{ row }"> </template>
<template #heatTreat="scope"> </template>
</avue-crud>
</basic-container>
</template>
<script>
// import {
// getListPersonAbility,
// removePersonAbility,
// addPersonAbility,
// updatePersonAbility,
// } from '@/api/productionSchedulingPlan/scheduling';
export default {
components: {},
data() {
return {
form: {},
selectionList: [],
query: {},
loading: true,
page: {
pageSize: 10,
currentPage: 1,
total: 0,
},
option: {
columnSort: true,
tip: false,
height: 'auto',
calcHeight: 32,
simplePage: false,
searchShow: true,
searchMenuSpan: 6,
searchIcon: true,
searchIndex: 3,
tree: false,
border: true,
index: true,
selection: false,
addBtn: false,
editBtn: false,
viewBtn: false,
delBtn: false,
editBtnText: '修改',
labelWidth: 120,
menuWidth: 80,
dialogWidth: 900,
dialogClickModal: false,
searchEnter: true,
excelBtn: false,
filterBtn: true,
searchShowBtn: false,
excelBtn: true,
showOverflowTooltip: true,
addBtnIcon: ' ',
viewBtnIcon: ' ',
delBtnIcon: ' ',
editBtnIcon: ' ',
gridBtn: false,
searchLabelPosition: 'left',
searchGutter: 24,
searchSpan: 6,
menuAlign: 'left',
gridBtn: false,
searchMenuPosition: 'right',
align: 'center',
column: [
{
label: '配套人',
prop: 'partCode',
bind: 'dsPart.partCode',
search: true,
sortable: true,
width: 150,
span: 12,
},
{
label: '配套时间',
prop: 'partName',
bind: 'dsPart.partName',
search: true,
sortable: true,
width: 150,
span: 12,
},
],
},
data: [],
};
},
methods: {
rowSave(row, done, loading) {
// addPersonAbility(row).then(
// () => {
// this.onLoad(this.page);
// this.$message({
// type: 'success',
// message: '!',
// });
// done();
// },
// error => {
// window.console.log(error);
// loading();
// }
// );
},
rowUpdate(row, index, done, loading) {
// updatePersonAbility(row).then(
// () => {
// this.onLoad(this.page);
// this.$message({
// type: 'success',
// message: '!',
// });
// done();
// },
// error => {
// window.console.log(error);
// loading();
// }
// );
},
rowDel(row) {
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
// return removePersonAbility(row.id);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
});
},
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
done();
},
selectionChange(list) {
this.selectionList = list;
},
selectionClear() {
this.selectionList = [];
this.$refs.crud.toggleSelection();
},
currentChange(currentPage) {
this.page.currentPage = currentPage;
},
sizeChange(pageSize) {
this.page.pageSize = pageSize;
},
refreshChange() {
this.onLoad(this.page, this.query);
},
handleChange(file, fileList) {
// proxy.$Export.xlsx(file.raw).then((data) => {
// data.value = data.results;
// });
this.$message({
type: 'success',
message: '操作成功!',
});
},
onLoad(page, params = {}) {
this.loading = true;
// getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
// this.data = res.data.data.records;
// this.loading = false;
// this.page.total = res.data.data.total;
// this.selectionClear();
// });
},
},
mounted() {},
};
</script>

@ -0,0 +1,214 @@
<template>
<basic-container>
<avue-crud
:option="option"
:table-loading="loading"
:data="data"
v-model="form"
v-model:page="page"
ref="crud"
@row-del="rowDel"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
>
<template #menu-left> </template>
<template #menu-right> </template>
<template #menu="{ row }"> </template>
<template #heatTreat="scope"> </template>
</avue-crud>
</basic-container>
</template>
<script>
// import {
// getListPersonAbility,
// removePersonAbility,
// addPersonAbility,
// updatePersonAbility,
// } from '@/api/productionSchedulingPlan/scheduling';
export default {
components: {},
data() {
return {
form: {},
selectionList: [],
query: {},
loading: true,
page: {
pageSize: 10,
currentPage: 1,
total: 0,
},
option: {
columnSort: true,
tip: false,
height: 'auto',
calcHeight: 32,
simplePage: false,
searchShow: true,
searchMenuSpan: 6,
searchIcon: true,
searchIndex: 3,
tree: false,
border: true,
index: true,
selection: false,
addBtn: false,
editBtn: false,
viewBtn: false,
delBtn: false,
editBtnText: '修改',
labelWidth: 120,
menuWidth: 80,
dialogWidth: 900,
dialogClickModal: false,
searchEnter: true,
excelBtn: false,
filterBtn: true,
searchShowBtn: false,
excelBtn: true,
showOverflowTooltip: true,
addBtnIcon: ' ',
viewBtnIcon: ' ',
delBtnIcon: ' ',
editBtnIcon: ' ',
gridBtn: false,
searchLabelPosition: 'left',
searchGutter: 24,
searchSpan: 6,
menuAlign: 'left',
gridBtn: false,
searchMenuPosition: 'right',
align: 'center',
column: [
{
label: '配套人',
prop: 'partCode',
bind: 'dsPart.partCode',
search: true,
sortable: true,
width: 150,
span: 12,
},
{
label: '配套时间',
prop: 'partName',
bind: 'dsPart.partName',
search: true,
sortable: true,
width: 150,
span: 12,
},
],
},
data: [],
};
},
methods: {
rowSave(row, done, loading) {
// addPersonAbility(row).then(
// () => {
// this.onLoad(this.page);
// this.$message({
// type: 'success',
// message: '!',
// });
// done();
// },
// error => {
// window.console.log(error);
// loading();
// }
// );
},
rowUpdate(row, index, done, loading) {
// updatePersonAbility(row).then(
// () => {
// this.onLoad(this.page);
// this.$message({
// type: 'success',
// message: '!',
// });
// done();
// },
// error => {
// window.console.log(error);
// loading();
// }
// );
},
rowDel(row) {
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
// return removePersonAbility(row.id);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
});
},
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
done();
},
selectionChange(list) {
this.selectionList = list;
},
selectionClear() {
this.selectionList = [];
this.$refs.crud.toggleSelection();
},
currentChange(currentPage) {
this.page.currentPage = currentPage;
},
sizeChange(pageSize) {
this.page.pageSize = pageSize;
},
refreshChange() {
this.onLoad(this.page, this.query);
},
handleChange(file, fileList) {
// proxy.$Export.xlsx(file.raw).then((data) => {
// data.value = data.results;
// });
this.$message({
type: 'success',
message: '操作成功!',
});
},
onLoad(page, params = {}) {
this.loading = true;
// getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
// this.data = res.data.data.records;
// this.loading = false;
// this.page.total = res.data.data.total;
// this.selectionClear();
// });
},
},
mounted() {},
};
</script>
Loading…
Cancel
Save