物流管理问题修改

dev-scheduling
zhangdi 3 weeks ago
parent 78077b794e
commit bc1d5dee13
  1. 28
      src/api/logisticsManagement/siteBasic.js
  2. 261
      src/views/logisticsManagement/siteBasic.vue
  3. 216
      src/views/logisticsManagement/storagelocationBasic.vue
  4. 2
      src/views/processManagement/components/processMainte/partDetails.vue
  5. 17
      src/views/processManagement/components/processMainte/processPlanning.vue
  6. 2
      src/views/processManagement/components/processMainte/reworkProcessPlanning.vue

@ -0,0 +1,28 @@
import request from '@/axios';
// 站点列表查询
export const getStationList = (current, size, params) => {
return request({
url: '/blade-desk/station/getStationList',
method: 'get',
params: {
...params,
current,
size,
},
});
};
// 库位管理
export const getLocationLis = (current, size, params) => {
return request({
url: '/blade-desk/location/getLocationList',
method: 'get',
params: {
...params,
current,
size,
},
});
};

@ -0,0 +1,261 @@
<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 #stationStatus="scope">
<el-tag v-if="scope.row.stationStatus == '0'" type="success">空闲</el-tag>
<el-tag v-if="scope.row.stationStatus == '1'" type="danger">占用</el-tag>
</template>
</avue-crud>
</basic-container>
</template>
<script>
import { getStationList } from '@/api/logisticsManagement/siteBasic';
export default {
components: {},
data() {
return {
form: {},
selectionList: [],
query: {},
loading: false,
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',
menu: false,
gridBtn: false,
searchMenuPosition: 'right',
align: 'center',
column: [
{
label: '作业中心',
prop: 'wcName',
search: false,
sortable: true,
span: 12,
display:false,
},
{
label: '作业中心',
prop: 'wcId',
search: true,
sortable: true,
span: 12,
filterable: true,
hide:true,
type: "select",
dicUrl:"/api/blade-desk/BA/WorkCenter/listForSelect",
props:{
label:'wcName',
value:'id'
}
},
{
label: '站点名称',
prop: 'stationName',
search: true,
sortable: true,
span: 12,
},
{
label: '站点码',
prop: 'stationCode',
search: true,
sortable: true,
span: 12,
},
{
label: '站点状态',
prop: 'stationStatus',
search: true,
sortable: true,
span: 12,
type: 'select',
dicData: [
{
label: '占用',
value: 1,
},
{
label: '空闲',
value: 0,
},
],
},
{
label: '站点位置',
prop: 'stationPosition',
search: true,
sortable: true,
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;
getStationList(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>
d

@ -0,0 +1,216 @@
<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 #locationStatus="scope">
<el-tag v-if="scope.row.locationStatus == '0'" type="success">空闲</el-tag>
<el-tag v-if="scope.row.locationStatus == '1'" type="danger">占用</el-tag>
</template>
</avue-crud>
</basic-container>
</template>
<script>
import { getLocationLis } from '@/api/logisticsManagement/siteBasic';
export default {
components: {},
data() {
return {
form: {},
selectionList: [],
query: {},
loading: false,
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',
menu: false,
column: [
{
label: '库位编码',
prop: 'locationCode',
search: true,
sortable: true,
span: 12,
},
{
label: '库位状态',
prop: 'locationStatus',
search: true,
sortable: true,
span: 12,
type: 'select',
dicData: [
{ label: '占用', value: '1' },
{ label: '空闲', value: '0' },
],
},
],
},
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;
getLocationLis(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;
}
);
},
},
mounted() {},
};
</script>
d

@ -555,7 +555,7 @@
</el-table-column>
<el-table-column prop="tool" label="量具"> </el-table-column>
<el-table-column prop="toolSize" label="量具尺寸"></el-table-column>
<el-table-column prop="toolInfo" label="图纸尺寸"></el-table-column>
<el-table-column prop="toolSize" label="图纸尺寸"></el-table-column>
</el-table>
<el-table :data="form4.tableData4" style="width: 100%" v-if="activeName == '4'" border>
<el-table-column prop="moldCode" label="对应工装"> </el-table-column>

@ -166,7 +166,7 @@
<el-option
v-for="(item, index) in processSetOption"
:key="index"
:label="item.name"
:label="`${item.code}-${item.name}`"
:value="item.id"
></el-option>
</el-select>
@ -189,7 +189,7 @@
<el-option
v-for="(item, index) in craftAbilityOption"
:key="index"
:label="item.caName"
:label="`${item.caCode}-${item.caName}`"
:value="item.id"
></el-option>
</el-select>
@ -197,9 +197,9 @@
</template>
</el-table-column>
<el-table-column prop="proDes" label="工序描述">
<template #header>
<!-- <template #header>
<span><i style="color: red">*</i>工序描述</span>
</template>
</template> -->
<template #default="scope">
<el-form-item :prop="`tableData1[${scope.$index}].proDes`" :rules="formRules1.proDes">
<el-input v-model="scope.row.proDes" placeholder="请输入"></el-input>
@ -264,7 +264,7 @@
<el-option
v-for="(item, index) in projectOptions"
:key="index"
:label="item.name"
:label="`${item.code}-${item.name}`"
:value="item.id"
></el-option>
</el-select>
@ -388,10 +388,10 @@
></el-input>
</template>
</el-table-column>
<el-table-column prop="toolInfo" label="图纸尺寸">
<el-table-column prop="toolSize" label="图纸尺寸">
<template #default="scope">
<el-input
v-model="scope.row.toolInfo"
v-model="scope.row.toolSize"
placeholder="请输入"
style="width: 100%"
></el-input>
@ -569,7 +569,7 @@ export default {
formRules1: {
ppsId: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }],
caId: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }],
proDes: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }],
// proDes: [{ required: true, message: '', trigger: ['change', 'submit'] }],
isMain: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }],
processNo: [{ required: true, message: '请输入', trigger: ['change', 'submit'] }],
},
@ -1180,6 +1180,7 @@ export default {
_tempId: this.tempId, //
id: null,
processNo: this.getProcessNo(this.form1.tableData1),
isMain:'0'
});
}
if (this.activeName == '2') {

@ -428,7 +428,7 @@
<el-table-column prop="date" label="图纸尺寸">
<template #default="scope">
<el-input
v-model="scope.row.toolInfo"
v-model="scope.row.toolSize"
placeholder="请输入"
style="width: 100%"
></el-input>

Loading…
Cancel
Save