仓库问题修改

dev-scheduling
zhangdi 2 weeks ago
parent 4f1621c7c2
commit 6ac659ffac
  1. 10
      src/api/storeManagement/additionalPlan.js
  2. 17
      src/api/storeManagement/warehouseRequest.js
  3. 5
      src/views/flowManagement/addDialog.vue
  4. 2
      src/views/flowManagement/managementOfKeyTasks.vue
  5. 4
      src/views/productionSchedulingPlan/basic/components/addEquipment.vue
  6. 32
      src/views/productionSchedulingPlan/basic/equipmentCapacity.vue
  7. 95
      src/views/warehouseManagement/additionalPlan/components/details.vue
  8. 82
      src/views/warehouseManagement/additionalPlan/components/purchase.vue
  9. 35
      src/views/warehouseManagement/warehouseRequest/components/processDialog.vue
  10. 30
      src/views/warehouseManagement/warehouseRequest/components/record.vue
  11. 24
      src/views/warehouseManagement/warehouseRequest/components/request.vue

@ -91,3 +91,13 @@ export const del = params => {
params
});
};
// 查询详情 stBuyOrder/detail
export const detailData = params => {
return request({
url: '/api/blade-wms/stBuyOrder/detail',
method: 'get',
params
});
};

@ -32,3 +32,20 @@ export const batchRequest = data =>
method: 'post',
data
});
// 删除
export const del = params =>
request({
url: '/api/blade-wms/stWmsRequest/remove',
method: 'post',
params
});
// 更新
export const update = data =>
request({
url: '/api/blade-wms/stWmsRequest/update',
method: 'post',
data
});

@ -565,9 +565,8 @@ export default {
type: 'warning',
})
.then(() => {
addProcess({
updateProcess({
...submitData,
approvalStatus: this.isStatusEdit ? this.rowItem.approvalStatus : 1,
})
.then(res => {
this.$message.success('提交成功');
@ -581,7 +580,7 @@ export default {
.catch(() => { });
} else {
if (this.rowItem.approvalStatus == 2) {
this.rowItem.approvalStatus = 1;
this.rowItem.approvalStatus = 0;
}
updateProcess({
...submitData,

@ -18,7 +18,7 @@
<el-button type="text" @click="handleView(row)" v-if="permission.managementOfKeyTasks_details">
详情
</el-button>
<el-button type="text" v-if="row.approvalStatus != 8 && permission.managementOfKeyTasks_edit"
<el-button type="text" v-if="(row.approvalStatus != 8 &&row.approvalStatus != 1)&& permission.managementOfKeyTasks_edit"
@click="handleEdit(row)">
修改
</el-button>

@ -183,7 +183,7 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column align="center" label="指定使用" width="150">
<!-- <el-table-column align="center" label="指定使用" width="150">
<template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].assignUse`">
<el-input v-model="scope.row.assignUse" placeholder="请输入内容"></el-input>
@ -196,7 +196,7 @@
<el-input v-model="scope.row.remarks" placeholder="请输入内容"></el-input>
</el-form-item>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
</el-form>

@ -284,22 +284,22 @@ export default {
],
},
{
label: '指定使用',
prop: 'assignUse',
search: false,
sortable: 'custom',
span: 12,
width: 120,
},
{
label: '备注',
prop: 'remarks',
search: false,
sortable: 'custom',
span: 12,
width: 180,
},
// {
// label: '使',
// prop: 'assignUse',
// search: false,
// sortable: 'custom',
// span: 12,
// width: 120,
// },
// {
// label: '',
// prop: 'remarks',
// search: false,
// sortable: 'custom',
// span: 12,
// width: 180,
// },
],
},

@ -0,0 +1,95 @@
<template>
<el-dialog title="详情" append-to-body :modelValue="openShow" width="30%" @close="closeDialog">
<avue-form ref="form" v-model="form" :option="option"></avue-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="closeDialog"> </el-button>
</span>
</template>
</el-dialog>
</template>
<script>
import { detailData } from "@/api/storeManagement/additionalPlan"
export default {
props: {
showDialog: {
type: Boolean,
default: false,
},
rowItem: {
type: Object,
default: {},
}
},
data() {
return {
openShow: false,
form: {},
option: {
submitBtn: false,
emptyBtn: false,
labelWidth: 'auto',
column: [
{
label: '采购部计划员名称',
prop: 'planBuyManName',
span: 24,
disabled: true,
},
{
label: '需求状态',
prop: 'needStatus',
span: 24,
disabled: true,
},
{
label: 'erp采购单号',
prop: 'erpBuyCode',
span: 24,
disabled: true,
},
{
label: '采购员名称',
prop: 'buyManName',
span: 24,
disabled: true,
},
],
},
};
},
mounted() {
this.openShow = this.showDialog;
this.init()
},
methods: {
init() {
detailData({ id: this.rowItem.id }).then(res => {
this.form = res.data.data;
});
},
closeDialog() {
this.openShow = false;
this.$emit('closeDialog');
},
submit() {
this.$refs.form.validate(async valid => {
if (valid) {
// let params = {
// id: this.$route.query.id,
// approvalStatus: '',
// };
// updateProcess(params).then((res) => {
// if (res.code == 200) {
// this.$message.success('');
// this.closeDialog();
// }
// });
}
});
},
},
};
</script>
<style lang="scss" scoped></style>

@ -1,20 +1,8 @@
<template>
<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"
>
<div>
<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>
<!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete">
</el-button> -->
@ -23,16 +11,24 @@
<!-- <el-button type="success" icon="el-icon-upload" @click="handleImport">批量发送
</el-button> -->
</template>
<template #menu>
<el-button type="text" size="mini" @click="render(scope.row)">提交</el-button>
<template #menu="scope">
<el-button type="text" @click="detailsFn(scope.row)">详情</el-button>
<!-- <el-button type="text" @click="render(scope.row)">提交</el-button> -->
</template>
</avue-crud>
<detailsDialog v-if="detailsShow" :showDialog="detailsShow" :rowItem="rowItem" @closeDialog="closeDialog"></detailsDialog>
</div>
</template>
<script>
import { getTrackList } from "@/api/storeManagement/additionalPlan"
import detailsDialog from "./details.vue"
export default {
components: { detailsDialog },
data() {
return {
detailsShow:false,
formData: {
method: "mes_request_stocks",
date: [],
@ -52,8 +48,8 @@ export default {
tree: false,
border: true,
index: true,
selection: true,
viewBtn: true,
selection: false,
viewBtn: false,
editBtn: false,
delBtn: false,
addBtn: false,
@ -64,7 +60,7 @@ export default {
editBtnIcon: " ",
viewBtnText: "详情",
labelWidth: 120,
menuWidth: 120,
menuWidth: 80,
searchLabelWidth: 100,
dialogWidth: 1040,
dialogClickModal: false,
@ -75,14 +71,13 @@ export default {
columnSort: true,
excelBtn: true,
columnSort: true,
index: false,
showOverflowTooltip: true,
menu: false,
menu: true,
searchLabelPosition: "left",
searchLabelWidth: 'auto',
searchGutter: 24,
searchSpan: 6,
menuAlign: "left",
menuAlign: "center",
gridBtn: false,
searchMenuPosition: "right",
align: "center",
@ -97,16 +92,6 @@ export default {
width: 140,
// searchLabelWidth: 140,
},
// {
// label: "", // mes
// prop: "boCode",
// search: true,
// sortable: true,
// filter: true,
// span: 12,
// width: 140,
// // searchLabelWidth: 140,
// },
{
label: "物料编号",
prop: "goodsCode",
@ -266,16 +251,16 @@ export default {
searchOrder: 16,
},
{
label: "采购员",
prop: "buyManName",
// bind: "buyMan.userName",
search: true,
sortable: true,
filter: true,
span: 12,
width: 140,
},
// {
// label: "",
// prop: "buyManName",
// // bind: "buyMan.userName",
// search: true,
// sortable: true,
// filter: true,
// span: 12,
// width: 140,
// },
{
label: "申报日期",
prop: "declareDate",
@ -331,6 +316,15 @@ export default {
};
},
methods: {
//
detailsFn(row) {
this.detailsShow = true
this.rowItem = row
},
closeDialog(){
this.detailsShow = false
this.onLoad(this.page)
},
handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");

@ -1,5 +1,5 @@
<template>
<el-dialog title="仓库提请" append-to-body :modelValue="openShow" width="70%" @close="closeDialog" >
<el-dialog :title="title" append-to-body :modelValue="openShow" width="70%" @close="closeDialog">
<el-button type="danger" size="mini" @click="deleteRow()" v-if="tableData.length > 1">删除一行</el-button>
<el-table :data="tableData" @select="selectChange" style="margin-top:10px;">
<el-table-column type="selection" width="55px"></el-table-column>
@ -8,21 +8,22 @@
<el-table-column label="已提请数量" prop="drawQuantity" align="center"></el-table-column>
<el-table-column label="提请数量" prop="requestQty" align="center">
<template #default="scope">
<el-input-number v-model="scope.row.requestQty" :min="1" :controls-position="right"></el-input-number>
<el-input-number v-model="scope.row.requestQty" :min="1"
:controls-position="right"></el-input-number>
</template>
</el-table-column>
</el-table>
<template #footer>
<span class="dialog-footer">
<el-button @click="closeDialog"> </el-button>
<el-button type="primary" @click="submit"> </el-button>
<el-button type="primary" @click="submit" :loading="submitLoading"> </el-button>
</span>
</template>
</el-dialog>
</template>
<script>
import {batchRequest} from "@/api/storeManagement/warehouseRequest"
import { batchRequest, update } from "@/api/storeManagement/warehouseRequest"
export default {
props: {
showDialog: {
@ -36,10 +37,16 @@ export default {
type: {
type: String,
default: ''
},
title: {
type: String,
default: '仓库提请'
}
},
data() {
return {
submitLoading:false,
openShow: false,
tableData: []
}
@ -109,18 +116,32 @@ export default {
}
})
this.submitLoading = true
if (this.type == 'request') {
batchRequest(data).then(res => {
if (res.data.code === 200) {
this.$message.success('提请成功')
this.submitLoading = false
this.closeDialog(true)
}
}).catach(err => {
this.submitLoading = false
})
} else {
update(data[0]).then(res => {
if (res.data.code === 200) {
this.$message.success('提请成功')
this.closeDialog(true)
}
}).catach(err => {
this.submitLoading = false
})
}
},
},
}
</script>
<style>
</style>
<style></style>

@ -12,7 +12,9 @@
</template>
<template #menu="scope">
<!-- 待审核之前都能修改 同步erp修改数据 -->
<el-button type="text" v-if="scope.row.erpApprovalStatus == -1" @click="batchMaintain(scope.row)">修改</el-button>
<el-button type="text" v-if="scope.row.erpApprovalStatus == -1"
@click="batchMaintain(scope.row)">修改</el-button>
<el-button type="text" v-if="scope.row.erpApprovalStatus == -1" @click="delFn(scope.row)">删除</el-button>
<!-- <el-button type="text" v-if="scope.row.approvalStatus == 0" @click="handeExamine(scope.row)">审批</el-button> -->
</template>
@ -31,11 +33,12 @@
</span>
</template>
</el-dialog>
<processDialog :showDialog="isOpen" v-if="isOpen" type="edit" :list="selectList" @closeDialog="closeDialog"></processDialog>
<processDialog :showDialog="isOpen" :title="'修改'" v-if="isOpen" type="edit" :list="selectList" @closeDialog="closeDialog">
</processDialog>
</div>
</template>
<script>
import {getRecords,approve} from "@/api/storeManagement/warehouseRequest"
import { getRecords, approve, del } from "@/api/storeManagement/warehouseRequest"
import processDialog from './processDialog.vue'
export default {
components: {
@ -73,7 +76,7 @@ export default {
editBtn: false,
viewBtnText: '详情',
labelWidth: 120,
menuWidth: 80,
menuWidth: 120,
dialogWidth: 1040,
dialogClickModal: false,
searchEnter: true,
@ -302,6 +305,25 @@ export default {
}).then(() => {
})
},
delFn(row) {
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
this.loading = true
del({ ids: row.id }).then(res => {
this.$message({
message: '删除成功',
type: 'success'
});
this.onLoad(this.page)
}).catch(() => {
this.loading = false
})
})
},
//
selectionChange(list) {
this.selectionList = list;

@ -18,7 +18,8 @@
</template>
</avue-crud>
<processDialog :showDialog="isOpen" type="request" v-if="isOpen" :list="selectList" @closeDialog="closeDialog"></processDialog>
<processDialog :showDialog="isOpen" type="request" v-if="isOpen" :list="selectList" @closeDialog="closeDialog">
</processDialog>
<el-dialog width="30%" v-model="approveDialog" title="审批">
<el-form :model="auditForm" :rules="auditRules" ref="auditForm">
<el-form-item label="是否审核通过" prop="approvalResult">
@ -96,24 +97,14 @@ export default {
isOpen: false,
moldAddMore: false,
column: [
// {
// label: '',
// prop: 'reqCode',
// search: true,
// sortable: true,
// filter: true,
// span: 12,
// width: 120,
// },
{
label: '采购单号',
prop: 'boCode',
// bind: 'stBuyOrder.boCode',
search: true,
sortable: true,
filter: true,
span: 12,
width:120,
},
{
@ -135,6 +126,7 @@ export default {
sortable: true,
filter: true,
span: 12,
width:120,
},
{
@ -145,6 +137,7 @@ export default {
sortable: true,
filter: true,
span: 12,
width:120,
},
{
label: '物料规格',
@ -154,6 +147,7 @@ export default {
sortable: true,
filter: true,
span: 12,
width:120,
},
{
label: '采购数量',
@ -163,6 +157,7 @@ export default {
sortable: true,
filter: true,
span: 12,
width:120,
},
{
label: '已批数量',//erp
@ -171,6 +166,7 @@ export default {
sortable: true,
filter: true,
span: 12,
width:120,
},
{
@ -180,6 +176,7 @@ export default {
sortable: true,
filter: true,
span: 12,
width:120,
},
{
label: '已提请数量',// erp
@ -188,6 +185,7 @@ export default {
sortable: true,
filter: true,
span: 12,
width:120,
},
{
label: '生产标识',
@ -197,6 +195,7 @@ export default {
sortable: true,
filter: true,
span: 12,
width:120,
},
{
@ -211,6 +210,7 @@ export default {
searchRange: true,
startPlaceholder: '开始时间',
endPlaceholder: "结束时间",
width:120
},

Loading…
Cancel
Save