|
|
|
|
@ -32,8 +32,8 @@ |
|
|
|
|
:tree-options="treeOptions" :default-value="searchFrom.bigClassId.node"></SelectTree> |
|
|
|
|
</template> |
|
|
|
|
<template slot-scope="{row}" slot="timeRangeSearch"> |
|
|
|
|
<el-date-picker v-model="searchFrom.timeRange" type="daterange" range-separator="至" start-placeholder="开始日期" |
|
|
|
|
end-placeholder="结束日期"> |
|
|
|
|
<el-date-picker v-model="searchFrom.timeRange" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" |
|
|
|
|
end-placeholder="结束日期" > |
|
|
|
|
</el-date-picker> |
|
|
|
|
</template> |
|
|
|
|
<!-- <template slot-scope="scope" slot="menuLeft"> |
|
|
|
|
@ -91,6 +91,7 @@ |
|
|
|
|
import SelectTree from '../../components/selectTree/tree.vue' |
|
|
|
|
import { getReciviceList, getDetail, reciveGoods, returnGoods } from '@/api/goodsManagement/recivice' |
|
|
|
|
import { mapGetters } from "vuex"; |
|
|
|
|
import { dateFormat } from "../../util/date"; |
|
|
|
|
export default { |
|
|
|
|
components: { |
|
|
|
|
SelectTree |
|
|
|
|
@ -197,6 +198,7 @@ export default { |
|
|
|
|
refreshBtn: false, |
|
|
|
|
columnBtn: false, |
|
|
|
|
menuWidth: 200, |
|
|
|
|
searchEnter:true, |
|
|
|
|
column: [ |
|
|
|
|
{ |
|
|
|
|
label: "申领单号", |
|
|
|
|
@ -208,7 +210,7 @@ export default { |
|
|
|
|
label: "申领人", |
|
|
|
|
labelWidth: 120, |
|
|
|
|
prop: "applyUser", |
|
|
|
|
// search: true, |
|
|
|
|
search: true, |
|
|
|
|
overHidden: true, |
|
|
|
|
}, |
|
|
|
|
// |
|
|
|
|
@ -240,6 +242,7 @@ export default { |
|
|
|
|
labelWidth: 120, |
|
|
|
|
prop: "applyTypeNum", |
|
|
|
|
overHidden: true, |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "申领时间", |
|
|
|
|
@ -247,6 +250,34 @@ export default { |
|
|
|
|
prop: "applyTime", |
|
|
|
|
overHidden: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "申领时间", |
|
|
|
|
prop: "timeRange", |
|
|
|
|
type: "date", |
|
|
|
|
format: "yyyy-MM-dd", |
|
|
|
|
valueFormat: "yyyy-MM-dd", |
|
|
|
|
search: true, |
|
|
|
|
hide: true, |
|
|
|
|
viewDisplay: false, |
|
|
|
|
searchValue: dateFormat(new Date(), "yyyy-MM-dd"), |
|
|
|
|
searchClearable: false, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "仓库编号", |
|
|
|
|
labelWidth: 120, |
|
|
|
|
prop: "applyUser", |
|
|
|
|
search: true, |
|
|
|
|
hide: true, |
|
|
|
|
viewDisplay: false, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "物料名称", |
|
|
|
|
labelWidth: 120, |
|
|
|
|
prop: "applyUser", |
|
|
|
|
search: true, |
|
|
|
|
hide: true, |
|
|
|
|
viewDisplay: false, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "是否需要归还", |
|
|
|
|
labelWidth: 150, |
|
|
|
|
@ -537,14 +568,16 @@ export default { |
|
|
|
|
// { goodsId: 'WPID-001', goodsNo: 'WL-20240820-01', goodsName: '钻头', goodsTypeName: '耗材', majorTypeName: '开孔', brand: '德力西', model: '50mm', parameter: '', applyNumber: 30, applyTime: '2024-07-12', applyUser: '',isReturn:1, unit: '件', }, |
|
|
|
|
// { goodsId: 'WPID-002', goodsNo: 'WL-20240820-02', goodsName: '开孔器', goodsTypeName: '耗材', majorTypeName: '开孔', brand: '德力西', model: '50mm', parameter: '', applyNumber: 60, applyTime: '2024-07-12', applyUser: '',isReturn:2, unit: '件', }, |
|
|
|
|
// ] |
|
|
|
|
|
|
|
|
|
console.log('searchForm-------->', this.searchFrom) |
|
|
|
|
let query = { |
|
|
|
|
current: this.page.currentPage, |
|
|
|
|
size: this.page.pageSize, |
|
|
|
|
startTime: this.searchFrom.timeRange.length != 0 ? this.searchFrom.timeRange[0] : null, |
|
|
|
|
endTime: this.searchFrom.timeRange.length != 0 ? this.searchFrom.timeRange[1] : null, |
|
|
|
|
startTime: this.searchFrom.timeRange&&this.searchFrom.timeRange.length != 0 ? this.searchFrom.timeRange[0].toString()+ ' 00:00:00' : null, |
|
|
|
|
endTime: this.searchFrom.timeRange&&this.searchFrom.timeRange.length != 0 ? this.searchFrom.timeRange[1].toString() + ' 23:59:59' : null, |
|
|
|
|
isReturn: this.searchFrom.isReturn ? this.searchFrom.isReturn : null, |
|
|
|
|
dataType:this.dataTypes |
|
|
|
|
dataType:this.dataTypes, |
|
|
|
|
applyUser:this.searchFrom.applyUser |
|
|
|
|
} |
|
|
|
|
getReciviceList(query).then(res => { |
|
|
|
|
this.data = res.data.data.records |
|
|
|
|
|
