java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

仓库所属部门、修改功能调整

dev-warehouse
kilo 2 years ago
parent
3bf2547043
commit
4311d2d778
6 changed files with 825 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/api/distribution/distributionStockArticle.js
  2. 7
      src/api/system/dept.js
  3. 17
      src/option/basicdata/basicdataWarehouse.js
  4. 765
      src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
  5. 1
      src/views/distribution/reservation/reservation.vue
  6. 62
      src/views/distribution/turndelivery/deliveryDiscuss.vue

10
src/api/distribution/distributionStockArticle.js
Unescape View File

@ -143,4 +143,14 @@ export const getStockAddValue = (id) => {
})
}
export const selectStockArticleAndParcel = (params) => {
return request({
url: '/api/logpm-distribution/distributionStockArticle/selectStockArticleAndParcel',
method: 'get',
params: {
...params,
}
})
}

7
src/api/system/dept.js
Unescape View File

@ -78,3 +78,10 @@ export const getDeptLazyTree = parentId => {
},
});
};
export const getDeptList = () => {
return request({
url: '/blade-system/dept/list',
method: 'get',
});
};

17
src/option/basicdata/basicdataWarehouse.js
Unescape View File

@ -352,6 +352,16 @@ export default {
editDisplay: false,
hide: true,
},
{
label: "所属部门",
prop: "departmentName",
type: "input",
span:12,
labelWidth:'120',
width:'120',
addDisplay: false,
editDisplay: false,
},
{
label: "所属部门",
prop: "department",
@ -365,6 +375,10 @@ export default {
label: "title",
value: "id"
},
hide: true,
addDisplay: true,
editDisplay: true,
viewDisplay: false,
lazy: true,
treeLoad: (node, resolve) => {
// console.log(">>>>>>>>>>",node);
@ -374,6 +388,8 @@ export default {
let code = data.id;
let list = [];
let callback = () => {
console.log(">>>>>>>>>>",node);
this.departmentName = data.title;
resolve((list || []).map(ele => {
return Object.assign(ele, {
leaf: level >= stop_level
@ -403,6 +419,7 @@ export default {
callback()
})
} else {
list = []
callback()
}

765
src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
Unescape View File

@ -44,7 +44,8 @@
<script>
import {getList, getDetail, add, update, remove} from "@/api/basicdata/basicdataWarehouse";
import option from "@/option/basicdata/basicdataWarehouse";
import {getDeptList} from "@/api/system/dept";
// import option from "@/option/basicdata/basicdataWarehouse";
import {mapGetters} from "vuex";
import {exportBlob} from "@/api/common";
import {getToken} from '@/utils/auth';
@ -52,6 +53,8 @@
import {dateNow} from "@/utils/date";
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
import { getListUser } from '@/api/distribution/distributionStockup';
import { getPostList } from '@/api/system/post';
export default {
data() {
@ -66,8 +69,723 @@
total: 0
},
selectionList: [],
option: option,
data: []
department:'',
option: {
height:'auto',
calcHeight: 30,
tip: false,
searchShow: true,
searchMenuSpan: 6,
border: true,
index: true,
menu:true,
viewBtn: true,
addBtn:true,
selection: true,
indexLabel:"序号",
indexWidth:'80',
dialogClickModal: false,
column: [
{
label: "租户号",
prop: "tenantId",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "创建人",
prop: "createUser",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "创建时间",
prop: "createTime",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "更新人",
prop: "updateUser",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "更新时间",
prop: "updateTime",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "状态",
prop: "status",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "是否已删除",
prop: "isDeleted",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "创建部门",
prop: "createDept",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "主键",
prop: "id",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "预留1",
prop: "reserve1",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "预留2",
prop: "reserve2",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "预留3",
prop: "reserve3",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "预留4",
prop: "reserve4",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "预留5",
prop: "reserve5",
type: "input",
viewDisplay: false,
addDisplay: false,
editDisplay: false,
hide: true,
},
{
label: "仓库名称",
prop: "name",
type: "input",
search:true,
rules:[{
required: true,
message: "请输入仓库名称",
trigger: "blur"
}],
span:12,
labelWidth:'120',
width:'120'
},
{
label: "仓库编码",
prop: "warehouseCode",
type: "input",
rules:[{
required: true,
message: "请输入仓库代码",
trigger: "blur"
}],
span:12,
labelWidth:'120',
width:'100'
},
{
label: "仓库简称",
prop: "abbreviation",
type: "input",
labelWidth:'120',
width:'100'
},
{
label: "联系人",
prop: "linkman",
type: "input",
search:true,
span:12,
labelWidth:'120',
width:'120',
rules:[{
required: true,
message: "请填写联系人",
trigger: "blur"
}],
},
{
label: "联系电话",
prop: "contactNumber",
type: "input",
search: true,
rules:[{
required: true,
message: "请填写联系电话",
trigger: "blur"
}],
span:12,
labelWidth:'120',
width:'120'
},
{
label: "事业线",
prop: "businessLine",
type: "input",
search:false,
span:12,
labelWidth:'120',
width:'90',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true
},
// {
// label: "配送商场",
// prop: "distributionMall",
// type: "input",
// span:12,
// labelWidth:'120',
// width:'100'
// },
{
label: "管理区域",
prop: "administrativeAreas",
type: "cascader",
search:true,
multiple:true,
span:12,
placeholder:'省/市/区',
dicUrl: '/blade-system/region/lazy-listAll',
checkStrictly:true,
// dicData:dicData ,
props: {
label:'label',
value:'value',
children:'children',
leaf:'leaf',
},
labelWidth:'120',
width:'100',
},
{
label: "职能类型",
prop: "functionType",
type: "select",
span:12,
labelWidth:'120',
width:'90',
search: true,
dicUrl: "/api/blade-system/dict-biz/dictionary?code=warehouse_function_type",
dataType: "number",
props:{
label: "dictValue",
value: "dictKey"
},
},
{
label: "仓库地址",
prop: "warehouseAddress",
type: "input",
span:12,
labelWidth:'120',
width:'180',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: false,
},
//数据库数据
{
label: '仓库地区',
prop: 'addressInfo',
type: "cascader",
search: true,
labelWidth:'120',
width:'180',
clearable:true,
placeholder:'省/市/区',
dicUrl: '/blade-system/region/lazy-listAll',
checkStrictly:true,
// dicData:dicData ,
props: {
label:'label',
value:'value',
children:'children',
leaf:'leaf',
},
addDisplay: true,
editDisplay: false,
viewDisplay: true,
hide: false,
},
//表单数据
{
label: "仓库地址",
prop: "address",
type: "map",
span:12,
labelWidth:'120',
width:'180',
params:{
zoom: 8,
//地图是否能够鼠拖移
zoomEnable: true,
//地图是否能够缩放
dragEnable: true,
value:''
},
rules:[{
required: true,
message: "请输入仓库地址",
trigger: "blur"
}],
clearable:false,
addDisplay: true,
editDisplay: true,
hide: true,
},
{
label: "经度",
prop: "longitude",
type: "input",
span:12,
labelWidth:'120',
width:'120',
addDisplay: false,
editDisplay: false,
hide: true,
},
{
label: "纬度",
prop: "latitude",
type: "input",
span:12,
labelWidth:'120',
width:'120',
addDisplay: false,
editDisplay: false,
hide: true,
},
{
label: "所属部门",
prop: "department",
type: "input",
span:12,
labelWidth:'120',
width:'120',
addDisplay: false,
editDisplay: false,
hide: true,
},
{
label: "所属部门",
prop: "departmentName",
search: true,
type: "tree",
span:12,
labelWidth:'120',
width:'100',
dicUrl: '/api/blade-system/dept/lazy-tree?parentId=0',
props:{
label: "title",
value: "title"
},
hide: false,
addDisplay: true,
editDisplay: true,
viewDisplay: false,
lazy: true,
checkStrictly:true,
treeLoad: (node, resolve) => {
let stop_level = 3;
let level = node.level; // 0
let data = node.data || {}
let code = data.id;
let list = [];
let callback = () => {
this.department = data.id;
console.log("this.department>>>>>>>>>",this.department);
resolve((list || []).map(ele => {
return Object.assign(ele, {
leaf: level >= stop_level
})
}));
}
if (level == 0) {
axios.get(`/api/blade-system/dept/lazy-tree?parentId=0`).then(res => {
list = res.data.data;
callback()
})
}
if (level == 1) {
axios.get(`/api/blade-system/dept/lazy-tree?parentId=${code}`).then(res => {
list = res.data.data;
callback()
})
} else if (level == 2) {
axios.get(`/api/blade-system/dept/lazy-tree?parentId=${code}`).then(res => {
list = res.data.data;
callback()
})
} else if (level == 3) {
axios.get(`/api/blade-system/dept/lazy-tree?parentId=${code}`).then(res => {
list = res.data.data;
callback()
})
} else {
list = []
callback()
}
},
},
{
label: "仓库类型",
prop: "warehouseType",
type: "select",
dicUrl: "/api/blade-system/dict-biz/dictionary?code=warehouse_type",
dataType: "number",
props:{
label: "dictValue",
value: "dictKey"
},
search:true,
span:12,
labelWidth:'120',
width:'100',
rules:[{
required: true,
message: "请选择仓库类型",
trigger: "change"
}],
},
{
label: "消防等级",
prop: "fireGrade",
type: "select",
search: true,
dicUrl: "/api/blade-system/dict-biz/dictionary?code=warehouse_grade",
props: {
label: "dictValue",
value: "dictKey"
},
span:12,
labelWidth:'120',
width:'100',
rules:[{
required: true,
message: "请选择消防等级",
trigger: "change"
}],
},
{
label: "是否有消防等级",
prop: "fireRatingNot",
type: "select",
dicUrl: "/api/blade-system/dict-biz/dictionary?code=yes_no",
props: {
label: "dictValue",
value: "dictKey"
},
span:12,
labelWidth:'120',
width:'130'
},
// {
// label: "商家仓",
// prop: "merchantFactory",
// type: "select",
// dicUrl: "/api/blade-system/dict-biz/dictionary?code=yes_no",
// props: {
// label: "dictValue",
// value: "dictKey"
// },
// span:12,
// labelWidth:'120',
// width:'90'
//
// },
{
label: "仓库结构",
prop: "warehouseStructure",
type: "select",
search: true,
dicUrl: "/api/blade-system/dict-biz/dictionary?code=warehouse_structure",
props: {
label: "dictValue",
value: "dictKey"
},
span:12,
labelWidth:'120',
width:'100',
rules:[{
required: true,
message: "请选择仓库结构",
trigger: "change"
}],
},
{
label: "是否高架",
prop: "elevatedNot",
type: "select",
dicUrl: "/api/blade-system/dict-biz/dictionary?code=yes_no",
props: {
label: "dictValue",
value: "dictKey"
},
span:12,
labelWidth:'120',
width:'100',
rules:[{
required: true,
message: "请选择是否为高架",
trigger: "change"
}],
},
{
label: "仓库层高",
prop: "storeyHeight",
type: "input",
span:12,
labelWidth:'120',
width:'120'
},
{
label: "电力类型",
prop: "powerCondition",
type: "select",
span:12,
labelWidth:'120',
search: true,
dicUrl: "/api/blade-system/dict-biz/dictionary?code=power_condition",
props: {
label: "dictValue",
value: "dictKey"
},
width:'100',
rules:[{
required: true,
message: "请选择用电类型",
trigger: "change"
}],
},
{
label: "租金单价",
prop: "unitPrice",
type: "input",
span:12,
labelWidth:'120',
width:'70'
},
{
label: "面积",
prop: "acreage",
type: "input",
span:12,
labelWidth:'120',
width:'70'
},
{ label: "开始时间",
prop: "startDate",
type: "date",
format:'YYYY-MM-DD',
valueFormat:'YYYY-MM-DD',
placeholder:'请选择租赁开始时间',
span:12,
labelWidth:'120',
width:'120',
viewDisplay: true,
addDisplay: false,
editDisplay: false,
hide: false,
},
{ label: "到期时间",
prop: "endDate",
type: "date",
format:'YYYY-MM-DD',
valueFormat:'YYYY-MM-DD',
placeholder:'请选择租赁结束时间',
span:12,
labelWidth:'120',
width:'120',
viewDisplay: true,
addDisplay: false,
editDisplay: false,
hide: false,
},
{
label: "租金类型",
prop: "rentType",
type: "select",
search: true,
dicUrl: "/api/blade-system/dict-biz/dictionary?code=rent_type",
props: {
label: "dictValue",
value: "dictKey"
},
span:12,
labelWidth:'120',
width:'100',
rules:[{
required: true,
message: "请选择租金类型",
trigger: "change"
}],
},
{
label: "仓库等级",
prop: "grade",
type: "select",
search: true,
dicUrl: "/api/blade-system/dict-biz/dictionary?code=warehouse_grade",
props: {
label: "dictValue",
value: "dictKey"
},
span:12,
labelWidth:'120',
width:'100',
rules:[{
required: true,
message: "请选择仓库等级",
trigger: "change"
}],
},
{
label: "管理费",
prop: "administrativeFee",
type: "input",
span:12,
labelWidth:'120',
width:'90'
},
{
label: "库位数",
prop: "seating",
type: "input",
span:12,
labelWidth:'120',
width:'90'
},
{
label: "日期范围",
prop: "daterange",
type: "daterange",
format:'YYYY-MM-DD',
valueFormat:'YYYY-MM-DD',
startPlaceholder: '租赁开始日期',
endPlaceholder: '租赁结束日期',
span:12,
labelWidth:'120',
width:'120',
search: true,
searchRange: true,
searchSpan: 12,
rules:[{
required: true,
message: "请选择租赁时间",
trigger: "change"
}],
viewDisplay: false,
addDisplay: true,
editDisplay: true,
hide: true,
},
{
label: "备注",
prop: "remarks",
type: "input",
span:12,
labelWidth:'120',
width:'70'
},
{
label: "收款码",
prop: "paymentCodeUrl",
type: "upload",
dataType: 'string',
listType: 'picture-img',
hide: true,
labelWidth:'150',
span:11,
multiple:false,
width:"200px",
align:'left',
action: '/blade-resource/oss/endpoint/put-file',
propsHttp: {
res: 'data',
url: 'link',
},
addDisplay: true,
viewDisplay: true,
editDisplay: true,
},
]
}
,
data: [],
//所属部门ID
deptList:[],
};
},
computed: {
@ -121,7 +839,16 @@
}
// 解析管理区域为省级划分、市级划分、区级划分，支持单点
if (!!this.form.administrativeAreas){
row.administrativeAreas = this.form.administrativeAreas.join(";")
console.log();
let str = [];
let kk= this.form.administrativeAreas;
kk.forEach(a=>{
str.push(a[a.length -1]);
})
row.administrativeAreas = str.join(",");
}
if (this.form.departmentName){
this.form.department = this.department;
}
console.log(row);
add(row).then(() => {
@ -137,8 +864,9 @@
});
},
rowUpdate(row, index, done, loading) {
console.log(">>>this.form",this.form);
//解析租赁日期，为开始租赁日期和租赁结束日期
let aa = this.form.administrativeAreas;
console.log("!!!!!!!!!",aa);
if (this.form.daterange){
let date =this.form.daterange
row.startDate = date[0];
@ -167,8 +895,20 @@
row.code = code[2];
}
}
//解析管理区域
// row.administrativeAreas = str.join(",");
console.log(this.form.administrativeAreas);
// 解析管理区域为省级划分、市级划分、区级划分，支持单点
console.log(">>>>>>>>>",row);
if (!!this.form.administrativeAreas){
let str = [];
this.form.administrativeAreas.forEach(a=>{
str.push(a[a.length -1]);
})
row.administrativeAreas = str.join(",");
}
if (this.form.departmentName){
this.form.department = this.department;
}
update(row).then(() => {
this.onLoad(this.page);
this.$message({
@ -255,10 +995,10 @@
if (!!data.startDate && !!data.endDate){
this.form.daterange.push(res.data.data.startDate,res.data.data.endDate)
}
console.log(">>>>>>>>>",this.form);
console.log('>>>>>>>>>',data);
if (!!data.administrativeAreas){
data.administrativeAreas = data.administrativeAreas.split(",");
}
this.form = res.data.data;
console.log("this.form>>>>>>",this.form);
});
}
done();
@ -362,11 +1102,10 @@
const data = res.data.data;
this.page.total = data.total;
//这里对管理区域进行数据拼接进行回显
console.log('>>>>>>>>>',data.records);
data.records.forEach(item=>{
let b = [];
item.administrativeAreas = item.administrativeAreas.split(";")
item.administrativeAreas = item.administrativeAreas.split(",")
console.log("=============>",item.administrativeAreas);
if (item.provinceCode){
b.push((item.provinceCode))
}

1
src/views/distribution/reservation/reservation.vue
Unescape View File

@ -971,7 +971,6 @@
},
//确定指派
callFordelivery() {
this.info.ids = this.ids;
this.goodsAreaIdData.forEach(item=>{
console.log(item);

62
src/views/distribution/turndelivery/deliveryDiscuss.vue
Unescape View File

@ -647,10 +647,10 @@
</el-form-item>
</el-dialog>
<el-dialog v-model="isShowPackage" title="包件信息" width="100%" :model="addvalue">
<el-dialog v-model="isShowPackage" title="包件信息" width="100%">
<!-- 列表模块 -->
<el-table
ref="table"
ref="packageList"
v-loading="loading"
@selection-change="selectionChange"
:data="packageData"
@ -663,9 +663,11 @@
v-if="option.selection"
width="55"
align="center"
></el-table-column>
>
<!-- <el-checkbox v-model="checked"></el-checkbox>-->
</el-table-column>
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
<el-table-column v-if="option.index" label="序号" type="index" width="60" align="center">
<el-table-column v-if="option.index" label="序号" type="index" width="60" align="center">
</el-table-column>
<template v-for="(item, index) in option.columnPackage">
<!-- table字段 -->
@ -786,9 +788,10 @@
import { stockUpInfo } from '@/api/basicdata/basicdataGoodsArea';
import { getVehicleList } from '@/api/basicdata/basicdataVehicle';
import { getDriverList } from '@/api/basicdata/basicdataDriverArtery';
import { selectStockArticleList } from '@/api/distribution/distributionStockArticle';
import { selectStockArticleAndParcel } from '@/api/distribution/distributionStockArticle';
import { getInventoryList } from '@/api/distribution/distributionStockList';
import { getDeliveryList ,updateDeliveryList} from '@/api/distribution/distributionDeliveryList';
import { mapGetters } from 'vuex';
export default {
data() {
@ -804,6 +807,7 @@
pageSize: 10,
total: 40
},
query:{},
aaa: true,
bbb: false,
@ -859,6 +863,7 @@
multipleTable: {},
driverList: [],
vehticleList: [],
packageList:[],
//订单数据
orderData:[],
//库存品数据
@ -886,8 +891,10 @@
tripartiteSourceData:[],
deliveryListId:'',
isDisable:false,
checked:true,
};
},
created() {
this.$watch(
() => this.$route.params,
@ -905,7 +912,16 @@
this.getvehicleData();
this.getMasterDriverData();
},
computed: {},
computed: {
...mapGetters(['permission']),
ids() {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(',');
}
},
mounted() {
this.onLoad(this.page);
@ -996,6 +1012,7 @@
},
selectionChange(list) {
this.selectionList = list;
console.log(">>>>>>>>>>",list);
},
//查询车辆信息
getvehicleData() {
@ -1039,18 +1056,16 @@
*/
viewStockArticlePackage(row){
this.isShowPackage = true;
// this.loading = true;
this.orderData.forEach(item=>{
if (item.id===row.id){
item.packageList = [];
}
})
getPackageList('1', '10', { stockArticleId: row.id }).then(res => {
const packages = res.data.data;
console.log('>>>>>>>', packages);
this.packageData = packages.records;
this.loading = false;
});
this.packageData = row.parcelListVOS;
// this.$refs.packageList.toggleRowSelection(this.packageData[0]);
// console.log("this.packageList",this.packageList);
// getPackageList('1', '10', { stockArticleId: row.id }).then(res => {
// const packages = res.data.data;
// console.log('>>>>>>>', packages);
// this.packageData = packages.records;
// this.loading = false;
// });
},
/**
* 提交包件信息
@ -1069,8 +1084,8 @@
}
})
});
this.isShowPackage = false;
console.log(this.orderData);
},
removeStockArticle(row) {
this.orderData.forEach((item, index) => {
@ -1460,15 +1475,16 @@
},
handleAddOrder() {
this.query.typeService=1;
let page =this.page;
this.query.genre = "1";
let params = {};
selectStockArticleList(page.currentPage,page.pageSize,Object.assign(params,this.query)).then(res=>{
selectStockArticleAndParcel(Object.assign(params,this.query)).then(res=>{
console.log(res.data.data);
const data = res.data.data;
data.records.forEach(item => {
data.forEach(item => {
item.reservationNum = item.handQuantity;
});
this.page.total = data.total;
this.stockArticleInfo = data.records;
this.stockArticleInfo = data;
this.loading = false;
this.selectionClear();
})

Write Preview
Loading…
Cancel
Save