suojin
/
jonhon-mes-web
25
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

仓库问题修改

Browse Source
dev-scheduling
zhangdi 2 weeks ago
parent 4f1621c7c2
commit 6ac659ffac
11 changed files with 413 additions and 255 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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. 198
      src/views/warehouseManagement/additionalPlan/components/purchase.vue
  9. 139
      src/views/warehouseManagement/warehouseRequest/components/processDialog.vue
  10. 86
      src/views/warehouseManagement/warehouseRequest/components/record.vue
  11. 74
      src/views/warehouseManagement/warehouseRequest/components/request.vue

10
src/api/storeManagement/additionalPlan.js
Unescape View File

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

17
src/api/storeManagement/warehouseRequest.js
Unescape View File

@ -32,3 +32,20 @@ export const batchRequest = data =>
method: 'post', method: 'post',
data 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
});

5
src/views/flowManagement/addDialog.vue
Unescape View File

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

2
src/views/flowManagement/managementOfKeyTasks.vue
Unescape View File

@ -18,7 +18,7 @@
<el-button type="text" @click="handleView(row)" v-if="permission.managementOfKeyTasks_details"> <el-button type="text" @click="handleView(row)" v-if="permission.managementOfKeyTasks_details">
详情 详情
</el-button> </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)"> @click="handleEdit(row)">
修改 修改
</el-button> </el-button>

4
src/views/productionSchedulingPlan/basic/components/addEquipment.vue
Unescape View File

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

32
src/views/productionSchedulingPlan/basic/equipmentCapacity.vue
Unescape View File

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

95
src/views/warehouseManagement/additionalPlan/components/details.vue
Unescape View File

@ -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>

198
src/views/warehouseManagement/additionalPlan/components/purchase.vue
Unescape View File

@ -1,43 +1,39 @@
<template> <template>
<avue-crud <div>
:option="option" <avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
:table-loading="loading" @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
:data="data" @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
v-model="form" <template #menu-left>
v-model:page="page" <!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete">删 除
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> --> </el-button> -->
</template> </template>
<template #menu-right> <template #menu-right>
<!-- <el-button type="success" icon="el-icon-upload" @click="handleImport">批量发送 <!-- <el-button type="success" icon="el-icon-upload" @click="handleImport">批量发送
</el-button> --> </el-button> -->
</template> </template>
<template #menu> <template #menu="scope">
<el-button type="text" size="mini" @click="render(scope.row)">提交</el-button> <el-button type="text" @click="detailsFn(scope.row)">详情</el-button>
</template> <!-- <el-button type="text" @click="render(scope.row)">提交</el-button> -->
</avue-crud> </template>
</avue-crud>
<detailsDialog v-if="detailsShow" :showDialog="detailsShow" :rowItem="rowItem" @closeDialog="closeDialog"></detailsDialog>
</div>
</template> </template>
<script> <script>
import {getTrackList} from "@/api/storeManagement/additionalPlan" import { getTrackList } from "@/api/storeManagement/additionalPlan"
import detailsDialog from "./details.vue"
export default { export default {
components: { detailsDialog },
data() { data() {
return { return {
detailsShow:false,
formData: { formData: {
method: "mes_request_stocks", method: "mes_request_stocks",
date: [], date: [],
}, },
loading:false, loading: false,
selectionList: [], selectionList: [],
option: { option: {
height: "auto", height: "auto",
@ -52,8 +48,8 @@ export default {
tree: false, tree: false,
border: true, border: true,
index: true, index: true,
selection: true, selection: false,
viewBtn: true, viewBtn: false,
editBtn: false, editBtn: false,
delBtn: false, delBtn: false,
addBtn: false, addBtn: false,
@ -64,8 +60,8 @@ export default {
editBtnIcon: " ", editBtnIcon: " ",
viewBtnText: "详情", viewBtnText: "详情",
labelWidth: 120, labelWidth: 120,
menuWidth: 120, menuWidth: 80,
searchLabelWidth:100, searchLabelWidth: 100,
dialogWidth: 1040, dialogWidth: 1040,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
@ -75,14 +71,13 @@ export default {
columnSort: true, columnSort: true,
excelBtn: true, excelBtn: true,
columnSort: true, columnSort: true,
index: false,
showOverflowTooltip: true, showOverflowTooltip: true,
menu: false, menu: true,
searchLabelPosition: "left", searchLabelPosition: "left",
searchLabelWidth: 'auto', searchLabelWidth: 'auto',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: "left", menuAlign: "center",
gridBtn: false, gridBtn: false,
searchMenuPosition: "right", searchMenuPosition: "right",
align: "center", align: "center",
@ -97,16 +92,6 @@ export default {
width: 140, width: 140,
// searchLabelWidth: 140, // searchLabelWidth: 140,
}, },
// {
// label: "上报单号", //可点击 点击跳转展示 老mes的额外计划详情页面
// prop: "boCode",
// search: true,
// sortable: true,
// filter: true,
// span: 12,
// width: 140,
// // searchLabelWidth: 140,
// },
{ {
label: "物料编号", label: "物料编号",
prop: "goodsCode", prop: "goodsCode",
@ -169,36 +154,36 @@ export default {
{ {
label: "批料状态", label: "批料状态",
prop: "batchStatus", prop: "batchStatus",
type:"select", type: "select",
search: true, search: true,
sortable: true, sortable: true,
filter: true, filter: true,
span: 12, span: 12,
width: 140, width: 140,
dicData:[ dicData: [
{label:'新建',value:'新建'}, { label: '新建', value: '新建' },
{label:'未批料',value:'未批料'}, { label: '未批料', value: '未批料' },
{label:'部分批料',value:'部分批料'}, { label: '部分批料', value: '部分批料' },
{label:'全部批料',value:'全部批料'}, { label: '全部批料', value: '全部批料' },
{label:'物资取消',value:'物资取消'}, { label: '物资取消', value: '物资取消' },
{label:'车间取消',value:'车间取消'}, { label: '车间取消', value: '车间取消' },
{label:'完工取消',value:'完工取消'}, { label: '完工取消', value: '完工取消' },
] ]
}, },
{ {
label: "领料状态", label: "领料状态",
prop: "pickStatus", prop: "pickStatus",
type:"select", type: "select",
search: true, search: true,
sortable: true, sortable: true,
filter: true, filter: true,
span: 12, span: 12,
width: 140, width: 140,
dicData:[ dicData: [
{label:'新建',value:'新建'}, { label: '新建', value: '新建' },
{label:'未领',value:'未领'}, { label: '未领', value: '未领' },
{label:'领取部分',value:'领取部分'}, { label: '领取部分', value: '领取部分' },
{label:'已领',value:'已领'}, { label: '已领', value: '已领' },
] ]
}, },
{ {
@ -216,8 +201,8 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
filter: true, filter: true,
format:"YYYY-MM-DD", format: "YYYY-MM-DD",
valueFormat:"YYYY-MM-DD", valueFormat: "YYYY-MM-DD",
span: 12, span: 12,
width: 140, width: 140,
type: 'date', type: 'date',
@ -244,46 +229,46 @@ export default {
span: 12, span: 12,
width: 140, width: 140,
}, },
{
label: '采购部门',
prop: 'purchaseDeptName',
// bind: 'buyDept.deptName',
search: false,
sortable: true,
filter: true,
span: 12,
width: 140,
},
{
label: '需求部门',
prop: 'requireDeptName',
// bind: 'needDept.deptName',
search: true,
sortable: true,
filter: true,
span: 12,
width: 140,
searchOrder: 16,
},
{ {
label: "采购员", label: '采购部门',
prop: "buyManName", prop: 'purchaseDeptName',
// bind: "buyMan.userName", // bind: 'buyDept.deptName',
search: false,
sortable: true,
filter: true,
span: 12,
width: 140,
},
{
label: '需求部门',
prop: 'requireDeptName',
// bind: 'needDept.deptName',
search: true, search: true,
sortable: true, sortable: true,
filter: true, filter: true,
span: 12, span: 12,
width: 140, width: 140,
searchOrder: 16,
}, },
// {
// label: "采购员",
// prop: "buyManName",
// // bind: "buyMan.userName",
// search: true,
// sortable: true,
// filter: true,
// span: 12,
// width: 140,
// },
{ {
label: "申报日期", label: "申报日期",
prop: "declareDate", prop: "declareDate",
search: true, search: true,
sortable: true, sortable: true,
filter: true, filter: true,
format:"YYYY-MM-DD", format: "YYYY-MM-DD",
valueFormat:"YYYY-MM-DD", valueFormat: "YYYY-MM-DD",
span: 12, span: 12,
width: 140, width: 140,
type: 'date', type: 'date',
@ -321,7 +306,7 @@ export default {
}, },
], ],
}, },
query:{}, query: {},
form: {}, form: {},
page: { page: {
pageSize: 10, pageSize: 10,
@ -331,6 +316,15 @@ export default {
}; };
}, },
methods: { methods: {
// 详情
detailsFn(row) {
this.detailsShow = true
this.rowItem = row
},
closeDialog(){
this.detailsShow = false
this.onLoad(this.page)
},
handleDelete() { handleDelete() {
if (this.selectionList.length === 0) { if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据"); this.$message.warning("请选择至少一条数据");
@ -340,19 +334,19 @@ export default {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}).then(() => {}); }).then(() => { });
}, },
// 多选 // 多选
selectionChange(list) { selectionChange(list) {
this.selectionList = list; this.selectionList = list;
}, },
searchChange(params, done){ searchChange(params, done) {
this.query = params; this.query = params;
this.page.currentPage = 1 this.page.currentPage = 1
this.onLoad(this.page, params) this.onLoad(this.page, params)
done() done()
}, },
searchReset(){ searchReset() {
this.query = {} this.query = {}
this.onLoad() this.onLoad()
}, },
@ -366,18 +360,18 @@ export default {
this.loading = true; this.loading = true;
let params = { let params = {
...this.query, ...this.query,
startNeedDate:this.query.needDate && this.query.needDate.length != 0 && this.query.needDate[0], startNeedDate: this.query.needDate && this.query.needDate.length != 0 && this.query.needDate[0],
endNeedDate:this.query.needDate && this.query.needDate.length != 0 && this.query.needDate[1], endNeedDate: this.query.needDate && this.query.needDate.length != 0 && this.query.needDate[1],
startDeclareDate:this.query.declareDate && this.query.declareDate.length != 0 && this.query.declareDate[0], startDeclareDate: this.query.declareDate && this.query.declareDate.length != 0 && this.query.declareDate[0],
endDeclareDate:this.query.declareDate && this.query.declareDate.length != 0 && this.query.declareDate[1], endDeclareDate: this.query.declareDate && this.query.declareDate.length != 0 && this.query.declareDate[1],
} }
let {needDate,declareDate,...searchParams} = params let { needDate, declareDate, ...searchParams } = params
console.log('searchParams',searchParams) console.log('searchParams', searchParams)
getTrackList({ getTrackList({
current:this.page.currentPage, current: this.page.currentPage,
size:this.page.pageSize, size: this.page.pageSize,
...searchParams ...searchParams
}).then(res =>{ }).then(res => {
this.data = res.data.data.records this.data = res.data.data.records
this.page.total = res.data.data.total this.page.total = res.data.data.total
this.loading = false this.loading = false

139
src/views/warehouseManagement/warehouseRequest/components/processDialog.vue
Unescape View File

@ -1,72 +1,79 @@
<template> <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-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 :data="tableData" @select="selectChange" style="margin-top:10px;">
<el-table-column type="selection" width="55px"></el-table-column> <el-table-column type="selection" width="55px"></el-table-column>
<el-table-column label="采购单号" prop="boCode" align="center"></el-table-column> <el-table-column label="采购单号" prop="boCode" align="center"></el-table-column>
<el-table-column label="采购数量" prop="buyQty" align="center"></el-table-column> <el-table-column label="采购数量" prop="buyQty" align="center"></el-table-column>
<el-table-column label="已提请数量" prop="drawQuantity" align="center"></el-table-column> <el-table-column label="已提请数量" prop="drawQuantity" align="center"></el-table-column>
<el-table-column label="提请数量" prop="requestQty" align="center"> <el-table-column label="提请数量" prop="requestQty" align="center">
<template #default="scope"> <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"
</template> :controls-position="right"></el-input-number>
</el-table-column> </template>
</el-table> </el-table-column>
<template #footer> </el-table>
<span class="dialog-footer"> <template #footer>
<el-button @click="closeDialog">取 消</el-button> <span class="dialog-footer">
<el-button type="primary" @click="submit">确 定</el-button> <el-button @click="closeDialog">取 消</el-button>
</span> <el-button type="primary" @click="submit" :loading="submitLoading">确 定</el-button>
</template> </span>
</el-dialog> </template>
</el-dialog>
</template> </template>
<script> <script>
import {batchRequest} from "@/api/storeManagement/warehouseRequest" import { batchRequest, update } from "@/api/storeManagement/warehouseRequest"
export default { export default {
props: { props: {
showDialog: { showDialog: {
type: Boolean, type: Boolean,
default: false default: false
}, },
list:{ list: {
type: Array, type: Array,
default: [] default: []
}, },
type:{ type: {
type: String, type: String,
default: '' default: ''
},
title: {
type: String,
default: '仓库提请'
} }
}, },
data() { data() {
return { return {
openShow:false, submitLoading:false,
tableData:[] openShow: false,
tableData: []
} }
}, },
mounted(){ mounted() {
this.openShow = this.showDialog this.openShow = this.showDialog
this.list.forEach(item=>{ this.list.forEach(item => {
this.tableData.push({ this.tableData.push({
...item, ...item,
_select:false, _select: false,
// drawQuantity:0, // drawQuantity:0,
requestQty:1 requestQty: 1
}) })
}) })
console.log('table-------',this.tableData) console.log('table-------', this.tableData)
}, },
methods: { methods: {
closeDialog(val) { closeDialog(val) {
this.openShow = false this.openShow = false
this.$emit('closeDialog', val) this.$emit('closeDialog', val)
}, },
selectChange(list, row){ selectChange(list, row) {
row._select = !row._select; row._select = !row._select;
}, },
deleteRow(){ deleteRow() {
let data = this.tableData.filter(item => item._select) let data = this.tableData.filter(item => item._select)
if(data.length == 0){ if (data.length == 0) {
this.$message.warning('请至少选择一条数据') this.$message.warning('请至少选择一条数据')
return return
} }
@ -78,49 +85,63 @@ export default {
this.tableData = this.tableData.filter(item => !item._select) this.tableData = this.tableData.filter(item => !item._select)
}) })
}, },
submit(){ submit() {
let isFalse = false let isFalse = false
this.tableData.map((item,index) =>{ this.tableData.map((item, index) => {
if(item.requestQty + item.drawQuantity > item.buyQty){ if (item.requestQty + item.drawQuantity > item.buyQty) {
this.$message.error(`第${index+1}行数据超出采购数量`) this.$message.error(`第${index + 1}行数据超出采购数量`)
isFalse = true isFalse = true
} }
}) })
if(isFalse) return if (isFalse) return
let data = [] let data = []
this.tableData.map(item =>{ this.tableData.map(item => {
if(this.type == 'request'){ if (this.type == 'request') {
data.push({ data.push({
requestQty:item.requestQty, requestQty: item.requestQty,
drawQuantity:item.drawQuantity, drawQuantity: item.drawQuantity,
// boCode:item.boCode, // boCode:item.boCode,
buyQty:item.buyQty, buyQty: item.buyQty,
boId:item.id, boId: item.id,
}) })
}else{ } else {
data.push({ data.push({
requestQty:item.requestQty, requestQty: item.requestQty,
drawQuantity:item.drawQuantity, drawQuantity: item.drawQuantity,
// boCode:item.boCode, // boCode:item.boCode,
buyQty:item.buyQty, buyQty: item.buyQty,
id:item.id, id: item.id,
boId:item.boId, boId: item.boId,
}) })
} }
}) })
batchRequest(data).then(res =>{ this.submitLoading = true
if(res.data.code === 200){ if (this.type == 'request') {
this.$message.success('提请成功') batchRequest(data).then(res => {
this.closeDialog(true) 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> </script>
<style> <style></style>
</style>

86
src/views/warehouseManagement/warehouseRequest/components/record.vue
Unescape View File

@ -12,7 +12,9 @@
</template> </template>
<template #menu="scope"> <template #menu="scope">
<!-- 待审核之前都能修改 同步erp修改数据 --> <!-- 待审核之前都能修改 同步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> --> <!-- <el-button type="text" v-if="scope.row.approvalStatus == 0" @click="handeExamine(scope.row)">审批</el-button> -->
</template> </template>
@ -31,11 +33,12 @@
</span> </span>
</template> </template>
</el-dialog> </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> </div>
</template> </template>
<script> <script>
import {getRecords,approve} from "@/api/storeManagement/warehouseRequest" import { getRecords, approve, del } from "@/api/storeManagement/warehouseRequest"
import processDialog from './processDialog.vue' import processDialog from './processDialog.vue'
export default { export default {
components: { components: {
@ -44,9 +47,9 @@ export default {
data() { data() {
return { return {
selectionList: [], selectionList: [],
selectList:[], selectList: [],
loading:false, loading: false,
query:{}, query: {},
option: { option: {
height: 'auto', height: 'auto',
calcHeight: 32, calcHeight: 32,
@ -70,10 +73,10 @@ export default {
viewBtnIcon: ' ', viewBtnIcon: ' ',
delBtnIcon: ' ', delBtnIcon: ' ',
editBtnIcon: ' ', editBtnIcon: ' ',
editBtn:false, editBtn: false,
viewBtnText: '详情', viewBtnText: '详情',
labelWidth: 120, labelWidth: 120,
menuWidth: 80, menuWidth: 120,
dialogWidth: 1040, dialogWidth: 1040,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
@ -89,7 +92,7 @@ export default {
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: 'center', menuAlign: 'center',
menu:true, menu: true,
gridBtn: false, gridBtn: false,
searchMenuPosition: 'right', searchMenuPosition: 'right',
align: 'center', align: 'center',
@ -201,15 +204,15 @@ export default {
dicData: [ dicData: [
{ {
label: '审批中', label: '审批中',
value:0 value: 0
}, },
{ {
label: '审批通过', label: '审批通过',
value:1 value: 1
}, },
{ {
label: '审批驳回', label: '审批驳回',
value:10 value: 10
} }
] ]
}, },
@ -272,10 +275,10 @@ export default {
total: 0, total: 0,
}, },
isOpen: false, isOpen: false,
approveDialog:false, approveDialog: false,
auditForm:{}, auditForm: {},
auditRules:{ auditRules: {
approvalResult:[{ required: true, message: '请选择是否通过审核', trigger: 'blur' }] approvalResult: [{ required: true, message: '请选择是否通过审核', trigger: 'blur' }]
}, },
} }
}, },
@ -286,7 +289,7 @@ export default {
}, },
closeDialog(val) { closeDialog(val) {
this.isOpen = false this.isOpen = false
if(val){ if (val) {
this.onLoad() this.onLoad()
} }
}, },
@ -302,36 +305,55 @@ export default {
}).then(() => { }).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) { selectionChange(list) {
this.selectionList = list; this.selectionList = list;
}, },
searchChange(params, done){ searchChange(params, done) {
this.query = params; this.query = params;
this.page.currentPage = 1; this.page.currentPage = 1;
this.onLoad() this.onLoad()
done() done()
}, },
searchReset(){ searchReset() {
this.query = {} this.query = {}
this.onLoad() this.onLoad()
}, },
currentChange(currentPage){ currentChange(currentPage) {
this.page.currentPage = currentPage; this.page.currentPage = currentPage;
}, },
sizeChange(pageSize){ sizeChange(pageSize) {
this.page.pageSize = pageSize; this.page.pageSize = pageSize;
}, },
handeExamine(row){ handeExamine(row) {
this.auditForm = {} this.auditForm = {}
this.auditForm.id = row.id this.auditForm.id = row.id
this.approveDialog = true this.approveDialog = true
}, },
submit(){ submit() {
this.$refs.auditForm.validate(valid => { this.$refs.auditForm.validate(valid => {
if(valid){ if (valid) {
approve({...this.auditForm}).then(res =>{ approve({ ...this.auditForm }).then(res => {
if(res.data.code == 200){ if (res.data.code == 200) {
this.$message.success('审批成功') this.$message.success('审批成功')
this.approveDialog = false this.approveDialog = false
this.onLoad() this.onLoad()
@ -344,15 +366,15 @@ export default {
this.loading = true this.loading = true
let param = { let param = {
...this.query, ...this.query,
startCreateTime:this.query && this.query.createTime && this.query.createTime.length != 0 && this.query.createTime[0], startCreateTime: this.query && this.query.createTime && this.query.createTime.length != 0 && this.query.createTime[0],
endCreateTime:this.query && this.query.createTime && this.query.createTime.length != 0 && this.query.createTime[1], endCreateTime: this.query && this.query.createTime && this.query.createTime.length != 0 && this.query.createTime[1],
} }
if(param.createTime) delete param.createTime if (param.createTime) delete param.createTime
getRecords({ getRecords({
current:this.page.currentPage, current: this.page.currentPage,
size:this.page.pageSize, size: this.page.pageSize,
...param ...param
}).then(res =>{ }).then(res => {
this.data = res.data.data.records this.data = res.data.data.records
this.page.total = res.data.data.total this.page.total = res.data.data.total
this.loading = false this.loading = false

74
src/views/warehouseManagement/warehouseRequest/components/request.vue
Unescape View File

@ -18,7 +18,8 @@
</template> </template>
</avue-crud> </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-dialog width="30%" v-model="approveDialog" title="审批">
<el-form :model="auditForm" :rules="auditRules" ref="auditForm"> <el-form :model="auditForm" :rules="auditRules" ref="auditForm">
<el-form-item label="是否审核通过" prop="approvalResult"> <el-form-item label="是否审核通过" prop="approvalResult">
@ -36,7 +37,7 @@
</div> </div>
</template> </template>
<script> <script>
import {getList,approve} from "@/api/storeManagement/warehouseRequest" import { getList, approve } from "@/api/storeManagement/warehouseRequest"
import processDialog from './processDialog.vue' import processDialog from './processDialog.vue'
export default { export default {
components: { components: {
@ -45,9 +46,9 @@ export default {
data() { data() {
return { return {
selectionList: [], selectionList: [],
selectList:[], selectList: [],
loading:false, loading: false,
query:{}, query: {},
option: { option: {
height: 'auto', height: 'auto',
calcHeight: 32, calcHeight: 32,
@ -96,24 +97,14 @@ export default {
isOpen: false, isOpen: false,
moldAddMore: false, moldAddMore: false,
column: [ column: [
// {
// label: '提请单号',
// prop: 'reqCode',
// search: true,
// sortable: true,
// filter: true,
// span: 12,
// width: 120,
// },
{ {
label: '采购单号', label: '采购单号',
prop: 'boCode', prop: 'boCode',
// bind: 'stBuyOrder.boCode',
search: true, search: true,
sortable: true, sortable: true,
filter: true, filter: true,
span: 12, span: 12,
width:120,
}, },
{ {
@ -123,7 +114,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
filter: true, filter: true,
width:180, width: 180,
span: 12, span: 12,
}, },
@ -135,6 +126,7 @@ export default {
sortable: true, sortable: true,
filter: true, filter: true,
span: 12, span: 12,
width:120,
}, },
{ {
@ -145,6 +137,7 @@ export default {
sortable: true, sortable: true,
filter: true, filter: true,
span: 12, span: 12,
width:120,
}, },
{ {
label: '物料规格', label: '物料规格',
@ -154,6 +147,7 @@ export default {
sortable: true, sortable: true,
filter: true, filter: true,
span: 12, span: 12,
width:120,
}, },
{ {
label: '采购数量', label: '采购数量',
@ -163,6 +157,7 @@ export default {
sortable: true, sortable: true,
filter: true, filter: true,
span: 12, span: 12,
width:120,
}, },
{ {
label: '已批数量',//erp已经审核通过的总数 label: '已批数量',//erp已经审核通过的总数
@ -171,6 +166,7 @@ export default {
sortable: true, sortable: true,
filter: true, filter: true,
span: 12, span: 12,
width:120,
}, },
{ {
@ -180,6 +176,7 @@ export default {
sortable: true, sortable: true,
filter: true, filter: true,
span: 12, span: 12,
width:120,
}, },
{ {
label: '已提请数量',//已提交 erp未审批数量 label: '已提请数量',//已提交 erp未审批数量
@ -188,6 +185,7 @@ export default {
sortable: true, sortable: true,
filter: true, filter: true,
span: 12, span: 12,
width:120,
}, },
{ {
label: '生产标识', label: '生产标识',
@ -197,6 +195,7 @@ export default {
sortable: true, sortable: true,
filter: true, filter: true,
span: 12, span: 12,
width:120,
}, },
{ {
@ -211,6 +210,7 @@ export default {
searchRange: true, searchRange: true,
startPlaceholder: '开始时间', startPlaceholder: '开始时间',
endPlaceholder: "结束时间", endPlaceholder: "结束时间",
width:120
}, },
@ -225,20 +225,20 @@ export default {
total: 0, total: 0,
}, },
isOpen: false, isOpen: false,
approveDialog:false, approveDialog: false,
auditForm:{}, auditForm: {},
auditRules:{ auditRules: {
approvalResult:[{ required: true, message: '请选择是否通过审核', trigger: 'blur' }] approvalResult: [{ required: true, message: '请选择是否通过审核', trigger: 'blur' }]
}, },
} }
}, },
methods: { methods: {
batchMaintain(row) { batchMaintain(row) {
if(row){ if (row) {
this.selectList = [row] this.selectList = [row]
this.isOpen = true this.isOpen = true
}else{ } else {
if(this.selectionList.length == 0){ if (this.selectionList.length == 0) {
this.$message.error('请至少选择一条数据') this.$message.error('请至少选择一条数据')
return return
} }
@ -249,7 +249,7 @@ export default {
}, },
closeDialog(val) { closeDialog(val) {
this.isOpen = false this.isOpen = false
if(val){ if (val) {
this.onLoad() this.onLoad()
} }
}, },
@ -269,32 +269,32 @@ export default {
selectionChange(list) { selectionChange(list) {
this.selectionList = list; this.selectionList = list;
}, },
searchChange(params, done){ searchChange(params, done) {
this.query = params; this.query = params;
this.page.currentPage = 1; this.page.currentPage = 1;
this.onLoad() this.onLoad()
done() done()
}, },
searchReset(){ searchReset() {
this.query = {} this.query = {}
this.onLoad() this.onLoad()
}, },
currentChange(currentPage){ currentChange(currentPage) {
this.page.currentPage = currentPage this.page.currentPage = currentPage
}, },
sizeChange(pageSize){ sizeChange(pageSize) {
this.page.pageSize = pageSize this.page.pageSize = pageSize
}, },
handeExamine(row){ handeExamine(row) {
this.auditForm = {} this.auditForm = {}
this.auditForm.id = row.id this.auditForm.id = row.id
this.approveDialog = true this.approveDialog = true
}, },
submit(){ submit() {
this.$refs.auditForm.validate(valid => { this.$refs.auditForm.validate(valid => {
if(valid){ if (valid) {
approve({...this.auditForm}).then(res =>{ approve({ ...this.auditForm }).then(res => {
if(res.data.code == 200){ if (res.data.code == 200) {
this.$message.success('审批成功') this.$message.success('审批成功')
this.approveDialog = false this.approveDialog = false
this.onLoad() this.onLoad()
@ -306,10 +306,10 @@ export default {
onLoad() { onLoad() {
this.loading = true this.loading = true
getList({ getList({
current:this.page.currentPage, current: this.page.currentPage,
size:this.page.pageSize, size: this.page.pageSize,
...this.query ...this.query
}).then(res =>{ }).then(res => {
this.data = res.data.data.records this.data = res.data.data.records
this.page.total = res.data.data.total this.page.total = res.data.data.total
this.loading = false this.loading = false

Write Preview
Loading…
Cancel
Save