|
|
|
|
@ -30,8 +30,8 @@
|
|
|
|
|
</div> |
|
|
|
|
<!-- 头部右侧按钮模块 --> |
|
|
|
|
<div class="avue-crud__right"> |
|
|
|
|
<!-- <el-button icon="el-icon-search" @click="onLoad" >全部</el-button> |
|
|
|
|
<el-button icon="el-icon-refresh" @click="getStockUp('2')" >已备货</el-button> |
|
|
|
|
<!-- <el-button icon="el-icon-search" @click="onLoad" >全部</el-button>--> |
|
|
|
|
<!-- <el-button icon="el-icon-refresh" @click="getStockUp('2')" >已备货</el-button> |
|
|
|
|
<el-button icon="el-icon-search" @click="getStockUp('1')" >待备货</el-button>--> |
|
|
|
|
|
|
|
|
|
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button> |
|
|
|
|
@ -95,8 +95,8 @@
|
|
|
|
|
</el-option> |
|
|
|
|
</el-select> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="备货区域" :label-width="formLabelWidth" @change="getForklift($event,'3')"> |
|
|
|
|
<el-select v-model="form.goodsAreaId" clearable placeholder="请选择备货区编号"> |
|
|
|
|
<el-form-item label="备货区域" :label-width="formLabelWidth" > |
|
|
|
|
<el-select v-model="form.goodsAreaId" clearable placeholder="请选择备货区编号" @change="getForklift($event,'3')"> |
|
|
|
|
<el-option |
|
|
|
|
v-for="item in goodsAreaIdData" |
|
|
|
|
:key="item.dictKey" |
|
|
|
|
@ -211,6 +211,7 @@ import option from "@/option/distribution/distributionStockup";
|
|
|
|
|
import { mapGetters } from "vuex"; |
|
|
|
|
import { getListTeam } from '@/api/basicdata/basicdataTeamGroup'; |
|
|
|
|
import dayjs from 'dayjs'; |
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
|
|
|
|
|
|
export default { |
|
|
|
|
data () { |
|
|
|
|
@ -247,19 +248,36 @@ export default {
|
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'stockupStatus', |
|
|
|
|
prop: 'stockupStatusName', |
|
|
|
|
label: '备货状态', |
|
|
|
|
type: 3, |
|
|
|
|
values: '', |
|
|
|
|
width: '180', |
|
|
|
|
checkarr: [], |
|
|
|
|
checkarr: [ |
|
|
|
|
{ |
|
|
|
|
label: '未备货', |
|
|
|
|
value: '1', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '待备货', |
|
|
|
|
value: '2', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '备货中', |
|
|
|
|
value: '3', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '已备货', |
|
|
|
|
value: '4', |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'stockupArea', |
|
|
|
|
label: '备货区', |
|
|
|
|
type: 3, |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '180', |
|
|
|
|
checkarr: [], |
|
|
|
|
@ -267,12 +285,21 @@ export default {
|
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'assignStatus', |
|
|
|
|
prop: 'assignStatusName', |
|
|
|
|
label: '指派状态', |
|
|
|
|
type: 3, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
checkarr: [ |
|
|
|
|
{ |
|
|
|
|
label: '未指派', |
|
|
|
|
value: '1', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '已指派', |
|
|
|
|
value: '2', |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
@ -286,21 +313,31 @@ export default {
|
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
// { |
|
|
|
|
// prop: 'goodsAreaId', |
|
|
|
|
// label: '备货区编号', |
|
|
|
|
// type: 2, |
|
|
|
|
// values: '', |
|
|
|
|
// width: '150', |
|
|
|
|
// checkarr: [], |
|
|
|
|
// fixed: false, |
|
|
|
|
// sortable: true, |
|
|
|
|
// head: true, |
|
|
|
|
// }, |
|
|
|
|
{ |
|
|
|
|
prop: 'goodsAreaId', |
|
|
|
|
label: '备货区编号', |
|
|
|
|
prop: 'forkliftName', |
|
|
|
|
label: '叉车司机', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'forklift', |
|
|
|
|
label: '叉车司机', |
|
|
|
|
type: 2, |
|
|
|
|
prop: 'typeServiceName', |
|
|
|
|
label: '服务类型', |
|
|
|
|
type: 3, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
@ -308,7 +345,7 @@ export default {
|
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'loader', |
|
|
|
|
prop: 'loaderName', |
|
|
|
|
label: '装卸班组', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
@ -383,12 +420,12 @@ export default {
|
|
|
|
|
forkliftData: [], |
|
|
|
|
loaderData: [], |
|
|
|
|
goodsAreaIdData: [], |
|
|
|
|
distributionType: [], |
|
|
|
|
deptId: '', |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
mounted () { |
|
|
|
|
this.init(); |
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
/** |
|
|
|
|
* 初始化获取本地缓存的编辑隐藏的列表 |
|
|
|
|
* 固定搭配，不能更改 |
|
|
|
|
@ -480,7 +517,16 @@ export default {
|
|
|
|
|
}, |
|
|
|
|
selectsc(index, row) { |
|
|
|
|
console.log(index, row); |
|
|
|
|
this.query[row.prop] = index; |
|
|
|
|
if(row.prop =='typeServiceName'){ |
|
|
|
|
this.query['typeService'] = index; |
|
|
|
|
}else if(row.prop =='stockupStatusName'){ |
|
|
|
|
this.query["stockupStatus"] = index; |
|
|
|
|
}else if(row.prop =='assignStatusName'){ |
|
|
|
|
this.query["assignStatus"] = index; |
|
|
|
|
}else{ |
|
|
|
|
this.query[row.prop] = index; |
|
|
|
|
} |
|
|
|
|
// this.query[row.prop] = index; |
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
}, |
|
|
|
|
timesc(index, row) { |
|
|
|
|
@ -496,7 +542,17 @@ export default {
|
|
|
|
|
}, |
|
|
|
|
inputsc(index, row) { |
|
|
|
|
console.log(index, row); |
|
|
|
|
this.query[row.prop] = index; |
|
|
|
|
/* if(row.prop =='typeServiceName'){ |
|
|
|
|
this.query['typeService'] = index; |
|
|
|
|
}else if(row.prop =='stockupStatusName'){ |
|
|
|
|
this.query["stockupStatus"] = index; |
|
|
|
|
}else if(row.prop =='assignStatusName'){ |
|
|
|
|
this.query["assignStatus"] = index; |
|
|
|
|
}else{ |
|
|
|
|
this.query[row.prop] = index; |
|
|
|
|
}*/ |
|
|
|
|
this.query[row.prop] = index; |
|
|
|
|
|
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
}, |
|
|
|
|
//查询备货 |
|
|
|
|
@ -611,16 +667,27 @@ export default {
|
|
|
|
|
this.$message.warning("请选择至少一条数据"); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
this.dialogFormCustomer = true; |
|
|
|
|
this.getFork(); |
|
|
|
|
this.getTeam() |
|
|
|
|
|
|
|
|
|
let a = false ; |
|
|
|
|
this.selectionList.some(i =>{ |
|
|
|
|
if(i.assignStatus == "2"){ |
|
|
|
|
a = true; |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
// = this.selectionList.findIndex(i => i.assignStatus == 2); |
|
|
|
|
if(!a){ |
|
|
|
|
this.dialogFormCustomer = true; |
|
|
|
|
this.getFork(); |
|
|
|
|
this.getTeam() |
|
|
|
|
}else{ |
|
|
|
|
this.$message.warning("已指派，请勿重复指派！！！") |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
//确定指派 |
|
|
|
|
callFordelivery(){ |
|
|
|
|
this.form.ids = this.ids; |
|
|
|
|
console.log("数据》》》",this.form); |
|
|
|
|
/* addAssign(this.form).then(res =>{ |
|
|
|
|
addAssign(this.form).then(res =>{ |
|
|
|
|
this.$message({ |
|
|
|
|
type: "success", |
|
|
|
|
message: "操作成功！" |
|
|
|
|
@ -628,10 +695,19 @@ export default {
|
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
this.dialogFormCustomer = false; |
|
|
|
|
}) |
|
|
|
|
*/ |
|
|
|
|
}, |
|
|
|
|
init () { |
|
|
|
|
this.height = this.setPx(document.body.clientHeight - 340); |
|
|
|
|
getDictionaryBiz('distribution_type').then(res => { |
|
|
|
|
// console.log("8908098080",res.data.data); |
|
|
|
|
this.distributionType = res.data.data; |
|
|
|
|
this.columnList[8].checkarr =res.data.data.map(item=>{ |
|
|
|
|
item.value=item.dictKey |
|
|
|
|
item.label=item.dictValue |
|
|
|
|
return item |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
}, |
|
|
|
|
searchHide () { |
|
|
|
|
this.search = !this.search; |
|
|
|
|
@ -756,20 +832,22 @@ export default {
|
|
|
|
|
let a = await getUser(i.forkliftId); |
|
|
|
|
i.forkliftId =a.data.data.name; |
|
|
|
|
}*/ |
|
|
|
|
|
|
|
|
|
let s =this.distributionType.find(d => d.dictKey == i.typeService); |
|
|
|
|
console.log("sssss",s); |
|
|
|
|
i.typeServiceName = s.dictValue; |
|
|
|
|
i.loader = i.groupName; |
|
|
|
|
i.stockupArea = i.headline; |
|
|
|
|
if(i.assignStatus == '2'){ |
|
|
|
|
i.assignStatus = '已指派'; |
|
|
|
|
i.assignStatusName = '已指派'; |
|
|
|
|
}else{ |
|
|
|
|
i.assignStatus = '未指派'; |
|
|
|
|
i.assignStatusName = '未指派'; |
|
|
|
|
} |
|
|
|
|
if(i.stockupStatus == '2'){ |
|
|
|
|
i.stockupStatus = '待备货'; |
|
|
|
|
i.stockupStatusName = '待备货'; |
|
|
|
|
}else if(i.stockupStatus == '3'){ |
|
|
|
|
i.stockupStatus = '已备货'; |
|
|
|
|
i.stockupStatusName = '已备货'; |
|
|
|
|
}else{ |
|
|
|
|
i.stockupStatus = '未备货'; |
|
|
|
|
i.stockupStatusName = '未备货'; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
this.selectionClear(); |
|
|
|
|
|
