|
|
|
@ -1,35 +1,33 @@ |
|
|
|
<template> |
|
|
|
<template> |
|
|
|
<basic-container v-loading="loadingObj.list" element-loading-text="正在加载中..."> |
|
|
|
<basic-container v-loading="loadingObj.list" element-loading-text="正在加载中..."> |
|
|
|
<div v-h5uShow="details.search"> |
|
|
|
<div v-h5uShow="details.search"> |
|
|
|
<!-- 查询模块 --> |
|
|
|
<!-- 查询模块 --> |
|
|
|
<el-form :inline="true" :model="Topquery" class="header_search"> |
|
|
|
<el-form :inline="true" :model="Topquery" class="header_search"> |
|
|
|
<el-form-item label="仓库:"> |
|
|
|
<el-form-item label="仓库:"> |
|
|
|
<el-select |
|
|
|
<el-select |
|
|
|
v-model="details.query.warehouseId" |
|
|
|
v-model="details.query.warehouseId" |
|
|
|
multiple |
|
|
|
multiple |
|
|
|
collapse-tags |
|
|
|
collapse-tags |
|
|
|
class="w100" |
|
|
|
class="w100" |
|
|
|
clearable |
|
|
|
clearable |
|
|
|
placeholder="请选择仓库" |
|
|
|
placeholder="请选择仓库" |
|
|
|
filterable |
|
|
|
filterable |
|
|
|
> |
|
|
|
> |
|
|
|
<el-option |
|
|
|
<el-option |
|
|
|
v-for="value in warehouseList" |
|
|
|
v-for="value in warehouseList" |
|
|
|
:key="value.value" |
|
|
|
:key="value.value" |
|
|
|
:label="value.label" |
|
|
|
:label="value.label" |
|
|
|
:value="value.label" |
|
|
|
:value="value.label" |
|
|
|
/> |
|
|
|
/> |
|
|
|
</el-select> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
</el-form-item> |
|
|
|
<!-- 查询按钮 --> |
|
|
|
<!-- 查询按钮 --> |
|
|
|
<el-form-item class="el-btn"> |
|
|
|
<el-form-item class="el-btn"> |
|
|
|
<el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button> |
|
|
|
<el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button> |
|
|
|
<el-button icon="el-icon-delete" @click="searchReset">清 空</el-button> |
|
|
|
<el-button icon="el-icon-delete" @click="searchReset">清 空</el-button> |
|
|
|
</el-form-item> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
</el-form> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<!-- 头部右侧按钮模块 --> |
|
|
|
<!-- 头部右侧按钮模块 --> |
|
|
|
<div> |
|
|
|
<div> |
|
|
|
@ -41,12 +39,23 @@ |
|
|
|
<div> |
|
|
|
<div> |
|
|
|
<div class="el_top_btn"> |
|
|
|
<div class="el_top_btn"> |
|
|
|
<div> |
|
|
|
<div> |
|
|
|
<el-button type="primary" v-if="accessControl.warehouseWarehouse_add" @click="newlyadd" icon="el-icon-plus">新 增</el-button> |
|
|
|
<el-button |
|
|
|
<el-button type="primary" v-if="accessControl.warehouseWarehouse_delete" icon="el-icon-delete" @click="DeleteInformationAll" |
|
|
|
type="primary" |
|
|
|
|
|
|
|
v-if="accessControl.warehouseWarehouse_add" |
|
|
|
|
|
|
|
@click="newlyadd" |
|
|
|
|
|
|
|
icon="el-icon-plus" |
|
|
|
|
|
|
|
>新 增</el-button |
|
|
|
|
|
|
|
> |
|
|
|
|
|
|
|
<el-button |
|
|
|
|
|
|
|
type="primary" |
|
|
|
|
|
|
|
v-if="accessControl.warehouseWarehouse_delete" |
|
|
|
|
|
|
|
icon="el-icon-delete" |
|
|
|
|
|
|
|
@click="DeleteInformationAll" |
|
|
|
>批量删除</el-button |
|
|
|
>批量删除</el-button |
|
|
|
> |
|
|
|
> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="avue-crud__right"> |
|
|
|
<div class="avue-crud__right"> |
|
|
|
|
|
|
|
<el-button icon="Download" @click="handleExportData" circle></el-button> |
|
|
|
<el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button> |
|
|
|
<el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button> |
|
|
|
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button> |
|
|
|
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button> |
|
|
|
<el-button icon="Search" @click="searchHide" circle></el-button> |
|
|
|
<el-button icon="Search" @click="searchHide" circle></el-button> |
|
|
|
@ -74,9 +83,21 @@ |
|
|
|
@click="Expandconfiguration(slotProps.scope.row)" |
|
|
|
@click="Expandconfiguration(slotProps.scope.row)" |
|
|
|
>扩展配置</el-text |
|
|
|
>扩展配置</el-text |
|
|
|
> |
|
|
|
> |
|
|
|
<el-text v-if="accessControl.warehouseWarehouse_view"click="view(slotProps.scope)">查看</el-text> |
|
|
|
<el-text |
|
|
|
<el-text v-if="accessControl.warehouseWarehouse_edit" @click="edit(slotProps.scope)">编辑</el-text> |
|
|
|
v-if="accessControl.warehouseWarehouse_view" |
|
|
|
<el-text v-if="accessControl.warehouseWarehouse_delete" @click="DeleteInformation(slotProps.scope)">删除</el-text> |
|
|
|
click="view(slotProps.scope)" |
|
|
|
|
|
|
|
>查看</el-text |
|
|
|
|
|
|
|
> |
|
|
|
|
|
|
|
<el-text |
|
|
|
|
|
|
|
v-if="accessControl.warehouseWarehouse_edit" |
|
|
|
|
|
|
|
@click="edit(slotProps.scope)" |
|
|
|
|
|
|
|
>编辑</el-text |
|
|
|
|
|
|
|
> |
|
|
|
|
|
|
|
<el-text |
|
|
|
|
|
|
|
v-if="accessControl.warehouseWarehouse_delete" |
|
|
|
|
|
|
|
@click="DeleteInformation(slotProps.scope)" |
|
|
|
|
|
|
|
>删除</el-text |
|
|
|
|
|
|
|
> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
@ -511,7 +532,11 @@ |
|
|
|
</el-select> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="默认库位" v-if="Expandconfigurationform.isAutoWarehouse"> |
|
|
|
<el-form-item label="默认库位" v-if="Expandconfigurationform.isAutoWarehouse"> |
|
|
|
<el-input v-model="Expandconfigurationform.defaultAllocation" style="width: 240px" placeholder="请输入默认库位" /> |
|
|
|
<el-input |
|
|
|
|
|
|
|
v-model="Expandconfigurationform.defaultAllocation" |
|
|
|
|
|
|
|
style="width: 240px" |
|
|
|
|
|
|
|
placeholder="请输入默认库位" |
|
|
|
|
|
|
|
/> |
|
|
|
</el-form-item> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="是否干线上传装车图片"> |
|
|
|
<el-form-item label="是否干线上传装车图片"> |
|
|
|
<el-select |
|
|
|
<el-select |
|
|
|
@ -611,9 +636,10 @@ import { Delete, Download, Plus, ZoomIn } from '@element-plus/icons-vue'; |
|
|
|
import { ElMessage, ElMessageBox } from 'element-plus'; |
|
|
|
import { ElMessage, ElMessageBox } from 'element-plus'; |
|
|
|
import { compressImageBlob } from '@/components/IMGcompressor/imgcompressor.js'; |
|
|
|
import { compressImageBlob } from '@/components/IMGcompressor/imgcompressor.js'; |
|
|
|
import { useStore } from 'vuex'; |
|
|
|
import { useStore } from 'vuex'; |
|
|
|
|
|
|
|
import { exportExcel } from '@/utils/exportData'; |
|
|
|
const $useStore = useStore(); |
|
|
|
const $useStore = useStore(); |
|
|
|
const accessControl = $useStore.getters.permission; |
|
|
|
const accessControl = $useStore.getters.permission; |
|
|
|
console.log(accessControl.Expand_configuration,'accessControl'); |
|
|
|
console.log(accessControl.Expand_configuration, 'accessControl'); |
|
|
|
|
|
|
|
|
|
|
|
const dataRwo = ref({}); //当前行数据 |
|
|
|
const dataRwo = ref({}); //当前行数据 |
|
|
|
const props = { multiple: true }; |
|
|
|
const props = { multiple: true }; |
|
|
|
@ -794,20 +820,19 @@ const searchChangeS = () => { |
|
|
|
Topquery.value = {}; |
|
|
|
Topquery.value = {}; |
|
|
|
onLoad(); |
|
|
|
onLoad(); |
|
|
|
}; |
|
|
|
}; |
|
|
|
const searchChange=()=>{ |
|
|
|
const searchChange = () => { |
|
|
|
console.log(details.query,'details.query'); |
|
|
|
console.log(details.query, 'details.query'); |
|
|
|
let data= { |
|
|
|
let data = { |
|
|
|
warehouseNames:details.query.warehouseId.map(item=>item).join(',') |
|
|
|
warehouseNames: details.query.warehouseId.map(item => item).join(','), |
|
|
|
} |
|
|
|
}; |
|
|
|
onLoad(data); |
|
|
|
onLoad(data); |
|
|
|
console.log(data,'data'); |
|
|
|
console.log(data, 'data'); |
|
|
|
|
|
|
|
}; |
|
|
|
} |
|
|
|
|
|
|
|
// 清空 |
|
|
|
// 清空 |
|
|
|
const searchReset=()=>{ |
|
|
|
const searchReset = () => { |
|
|
|
details.query.warehouseId=[] |
|
|
|
details.query.warehouseId = []; |
|
|
|
onLoad(); |
|
|
|
onLoad(); |
|
|
|
} |
|
|
|
}; |
|
|
|
const areaoptions = ref([]); //地区 |
|
|
|
const areaoptions = ref([]); //地区 |
|
|
|
// 地区获取 |
|
|
|
// 地区获取 |
|
|
|
const initialization = () => { |
|
|
|
const initialization = () => { |
|
|
|
@ -864,8 +889,8 @@ const details = reactive({ |
|
|
|
/** 包明细 */ |
|
|
|
/** 包明细 */ |
|
|
|
packageOrderListlVisited: false, |
|
|
|
packageOrderListlVisited: false, |
|
|
|
}, |
|
|
|
}, |
|
|
|
warehouseOption:[], |
|
|
|
warehouseOption: [], |
|
|
|
search:false, |
|
|
|
search: false, |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
const { |
|
|
|
const { |
|
|
|
@ -940,7 +965,6 @@ const MyWareh = () => { |
|
|
|
}); |
|
|
|
}); |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
MyWareh(); //获取仓库列表 |
|
|
|
MyWareh(); //获取仓库列表 |
|
|
|
const Setheight = () => { |
|
|
|
const Setheight = () => { |
|
|
|
const _node = document.querySelector('.tableNode'); |
|
|
|
const _node = document.querySelector('.tableNode'); |
|
|
|
@ -1040,7 +1064,7 @@ const onLoad = val => { |
|
|
|
}; |
|
|
|
}; |
|
|
|
onLoad(); |
|
|
|
onLoad(); |
|
|
|
const searchHide = () => { |
|
|
|
const searchHide = () => { |
|
|
|
details.search=!details.search |
|
|
|
details.search = !details.search; |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
// 每页多少条 |
|
|
|
// 每页多少条 |
|
|
|
@ -1213,12 +1237,21 @@ const Expandconfiguration = async row => { |
|
|
|
let data = { |
|
|
|
let data = { |
|
|
|
warehouseId: row.id, |
|
|
|
warehouseId: row.id, |
|
|
|
}; |
|
|
|
}; |
|
|
|
Expandconfigurationform.value.defaultAllocation = '' |
|
|
|
Expandconfigurationform.value.defaultAllocation = ''; |
|
|
|
details.loadingObj.list = true; //加载中 |
|
|
|
details.loadingObj.list = true; //加载中 |
|
|
|
let _res = await $_warehouseConfig(data); |
|
|
|
let _res = await $_warehouseConfig(data); |
|
|
|
|
|
|
|
|
|
|
|
if (_res.data.code == 200) { |
|
|
|
if (_res.data.code == 200) { |
|
|
|
const { id, isStrictLoading, isAutoRelease,isAutoWarehouse,defaultAllocation,isTrunklineLoadingPhoto,isTrunklineStartPhoto,isTrunklineUnloadPhoto} = _res.data.data; |
|
|
|
const { |
|
|
|
|
|
|
|
id, |
|
|
|
|
|
|
|
isStrictLoading, |
|
|
|
|
|
|
|
isAutoRelease, |
|
|
|
|
|
|
|
isAutoWarehouse, |
|
|
|
|
|
|
|
defaultAllocation, |
|
|
|
|
|
|
|
isTrunklineLoadingPhoto, |
|
|
|
|
|
|
|
isTrunklineStartPhoto, |
|
|
|
|
|
|
|
isTrunklineUnloadPhoto, |
|
|
|
|
|
|
|
} = _res.data.data; |
|
|
|
dialogExpandconfiguration.value = true; |
|
|
|
dialogExpandconfiguration.value = true; |
|
|
|
let form = Expandconfigurationform.value; |
|
|
|
let form = Expandconfigurationform.value; |
|
|
|
form.id = id; //id |
|
|
|
form.id = id; //id |
|
|
|
@ -1226,11 +1259,9 @@ const Expandconfiguration = async row => { |
|
|
|
form.isAutoRelease = isAutoRelease; //是否自动释放 |
|
|
|
form.isAutoRelease = isAutoRelease; //是否自动释放 |
|
|
|
form.isAutoWarehouse = isAutoWarehouse; //是否自动释放 |
|
|
|
form.isAutoWarehouse = isAutoWarehouse; //是否自动释放 |
|
|
|
form.defaultAllocation = defaultAllocation; //库位名字 |
|
|
|
form.defaultAllocation = defaultAllocation; //库位名字 |
|
|
|
form.isTrunklineLoadingPhoto = isTrunklineLoadingPhoto;//是否干线上传装车图片 |
|
|
|
form.isTrunklineLoadingPhoto = isTrunklineLoadingPhoto; //是否干线上传装车图片 |
|
|
|
form.isTrunklineStartPhoto = isTrunklineStartPhoto;//是否干线上传发车图片 |
|
|
|
form.isTrunklineStartPhoto = isTrunklineStartPhoto; //是否干线上传发车图片 |
|
|
|
form.isTrunklineUnloadPhoto = isTrunklineUnloadPhoto;//是否干线上传卸车图片 |
|
|
|
form.isTrunklineUnloadPhoto = isTrunklineUnloadPhoto; //是否干线上传卸车图片 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
console.log(_res, '_res'); |
|
|
|
console.log(_res, '_res'); |
|
|
|
} catch (err) { |
|
|
|
} catch (err) { |
|
|
|
@ -1244,7 +1275,7 @@ const Expandconfigurationsubmit = async () => { |
|
|
|
try { |
|
|
|
try { |
|
|
|
let data = { |
|
|
|
let data = { |
|
|
|
...Expandconfigurationform.value, |
|
|
|
...Expandconfigurationform.value, |
|
|
|
warehouseId:dataRwo.value.id, |
|
|
|
warehouseId: dataRwo.value.id, |
|
|
|
id: Expandconfigurationform.value.id, |
|
|
|
id: Expandconfigurationform.value.id, |
|
|
|
}; |
|
|
|
}; |
|
|
|
Expandconfigurationloading.value = true; |
|
|
|
Expandconfigurationloading.value = true; |
|
|
|
@ -1348,8 +1379,8 @@ const newlyaddSubmit = () => { |
|
|
|
data.cityCode = Addform.value['addressInfo'][1]; //仓库地区-市 |
|
|
|
data.cityCode = Addform.value['addressInfo'][1]; //仓库地区-市 |
|
|
|
data.code = Addform.value['addressInfo'][2]; //仓库地区-区 |
|
|
|
data.code = Addform.value['addressInfo'][2]; //仓库地区-区 |
|
|
|
data.departmentName = department.value.label; //部门 |
|
|
|
data.departmentName = department.value.label; //部门 |
|
|
|
data.longitude = data.address[0] |
|
|
|
data.longitude = data.address[0]; |
|
|
|
data.latitude=data.address[1] |
|
|
|
data.latitude = data.address[1]; |
|
|
|
if (dialogTitle.value == '编辑') { |
|
|
|
if (dialogTitle.value == '编辑') { |
|
|
|
data.id = dataRwo.value.id; |
|
|
|
data.id = dataRwo.value.id; |
|
|
|
$_Postupdate(data) |
|
|
|
$_Postupdate(data) |
|
|
|
@ -1367,9 +1398,7 @@ const newlyaddSubmit = () => { |
|
|
|
.catch(error => { |
|
|
|
.catch(error => { |
|
|
|
console.log(error); |
|
|
|
console.log(error); |
|
|
|
}) |
|
|
|
}) |
|
|
|
.finally(() => { |
|
|
|
.finally(() => {}); |
|
|
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
} else { |
|
|
|
} else { |
|
|
|
// 新增 |
|
|
|
// 新增 |
|
|
|
$_basicdataWarehousesave(data) |
|
|
|
$_basicdataWarehousesave(data) |
|
|
|
@ -1387,16 +1416,17 @@ const newlyaddSubmit = () => { |
|
|
|
.catch(error => { |
|
|
|
.catch(error => { |
|
|
|
console.log(error); |
|
|
|
console.log(error); |
|
|
|
}) |
|
|
|
}) |
|
|
|
.finally(() => { |
|
|
|
.finally(() => {}); |
|
|
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
return; |
|
|
|
return; |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
// 编辑信息 |
|
|
|
/** 导出表格数据 */ |
|
|
|
|
|
|
|
const handleExportData = () => { |
|
|
|
|
|
|
|
exportExcel(details.columnList, details.data, '仓库信息 - ' + new Date().getTime()); |
|
|
|
|
|
|
|
}; |
|
|
|
</script> |
|
|
|
</script> |
|
|
|
|
|
|
|
|
|
|
|
<style scoped lang="scss"> |
|
|
|
<style scoped lang="scss"> |
|
|
|
|
