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

修改区域价格

dev-warehouse
caoyizhong 2 years ago
parent
d34f428c5b
commit
1c2f227d40
5 changed files with 188 additions and 109 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. 9
      src/api/basicdata/basicZonePrice.js
  2. 8
      src/option/basicdata/basicZonePrice.js
  3. 11
      src/router/views/index.js
  4. 111
      src/views/basicdata/brand/basicZonePrice.vue
  5. 158
      src/views/basicdata/brand/basicZonePriceFrom.vue

9
src/api/basicdata/basicZonePrice.js
Unescape View File

@ -21,6 +21,15 @@ export const getDetail = (id) => {
}
})
}
export const getDetailOwn = (id) => {
return request({
url: '/api/logpm-basicdata/basicdataZonePrice/detailOwn',
method: 'get',
params: {
id
}
})
}
export const remove = (ids) => {
return request({

8
src/option/basicdata/basicZonePrice.js
Unescape View File

@ -84,13 +84,13 @@ export default {
hide: true,
},
{
label: "品牌",
prop: "brand",
label: "品类",
prop: "brandName",
search: true,
},
{
label: "始发仓",
prop: "beginGranary",
prop: "beginName",
search: true,
},
{
@ -100,7 +100,7 @@ export default {
},
{
label: "末端仓",
prop: "goalGranary",
prop: "endName",
search: true,
},
{

11
src/router/views/index.js
Unescape View File

@ -254,12 +254,17 @@ export default [
children: [
{
path: '/basicdata/brand/basicZonePriceFrom',
name: '新增',
name: '区域价格新增',
meta: {
i18n: 'dict',
},
props: route => ({ name: route.query.name,
id: route.query.id}),
props: route => (
{
name: route.query.name,
id: route.query.id ,
type: route.query.type
}
),
component: () =>
import(/* webpackChunkName: "views" */ '@/views/basicdata/brand/basicZonePriceFrom.vue'),
},

111
src/views/basicdata/brand/basicZonePrice.vue
Unescape View File

@ -192,14 +192,14 @@
<!-- <el-form-item label="区/县" prop="district">-->
<!-- <el-input v-model="form.district" placeholder="请输入区/县"/>-->
<!-- </el-form-item>-->
<el-form-item label="货物类型" prop="brand">
<el-form-item label="品类" prop="brand">
<!-- <el-input v-model="form.brand" placeholder="请输入品牌"/>-->
<el-select style="width: 100%"
v-model="form.brand"
filterable
remote
reserve-keyword
placeholder="货物类型"
placeholder="品类"
:remote-method="remoteMethod"
:loading="loading"
>
@ -620,45 +620,64 @@ export default {
path:"/basicdata/brand/basicZonePriceFrom",
query: {
id : '',
name : '新增'
name : '新增',
type: 0
}
});
},
handleEdit (row) {
this.title = '编辑'
this.box = true
getDetail(row.id).then(res => {
this.form = res.data.data;
let a= [];
if(!!this.form.province){
a.push(res.data.data.province);
a.push(res.data.data.city);
a.push(res.data.data.district);
// this.title = '编辑'
// this.box = true
// getDetail(row.id).then(res => {
// this.form = res.data.data;
// let a= [];
// if(!!this.form.province){
// a.push(res.data.data.province);
// a.push(res.data.data.city);
// a.push(res.data.data.district);
// }
// this.form.province = a;
// this.form.goalGranary = row.name;
// this.form.brand = row.brandName;
// });
this.$router.push({
path:"/basicdata/brand/basicZonePriceFrom",
query: {
id : row.id,
name : '编辑 — '+row.brandName,
type: 2
}
this.form.province = a;
this.form.goalGranary = row.name;
this.form.brand = row.brandName;
});
},
handleView (row) {
console.log("row>>>>>>>>",row);
this.title = '查看'
this.view = true;
this.box = true;
getDetail(row.id).then(res => {
this.form = res.data.data;
let a= [];
if(!!this.form.province){
a.push(res.data.data.province);
a.push(res.data.data.city);
a.push(res.data.data.district);
// console.log("row>>>>>>>>",row);
// this.title = '查看'
// this.view = true;
// this.box = true;
// getDetail(row.id).then(res => {
// this.form = res.data.data;
// let a= [];
// if(!!this.form.province){
// a.push(res.data.data.province);
// a.push(res.data.data.city);
// a.push(res.data.data.district);
// }
// this.form.province = a;
// this.form.goalGranary = row.name;
// this.form.brand = row.brandName;
// });
this.$router.push({
path:"/basicdata/brand/basicZonePriceFrom",
query: {
id : row.id,
name : '查看 — '+row.brandName,
type: 1
}
this.form.province = a;
this.form.goalGranary = row.name;
this.form.brand = row.brandName;
});
},
handleDelete () {
if (this.selectionList.length === 0) {
@ -751,8 +770,26 @@ export default {
this.page.total = data.total;
this.data = data.records;
let dz ="";
console.log("this.optioner>>>>>>>>data.records>>>>>>");
let mdz ="";
data.records.forEach(it =>{
if(!!it.provinceEnd){
let arrshe = this.optioner.filter((i) => {
return it.provinceEnd == i.value;
});
let moshi = arrshe[0].children.filter((i) => {
return it.cityEnd == i.value;
});
if(!!it.districtEnd){
let moqu = moshi[0].children.filter((i) => {
return it.districtEnd == i.value;
});
mdz = arrshe[0].label+"/"+moshi[0].label+"/"+moqu[0].label;
}else{
mdz = arrshe[0].label+"/"+moshi[0].label
}
it.provinceEnd = mdz;
}
let arrsheng = this.optioner.filter((i) => {
return it.province == i.value;
});
@ -760,12 +797,14 @@ export default {
let arrshi = arrsheng[0].children.filter((i) => {
return it.city == i.value;
});
// console.log("========",JSON.parse(JSON.stringify(arrsheng)) );
let arrqu = arrshi[0].children.filter((i) => {
return it.district == i.value;
});
// console.log("========",JSON.parse(JSON.stringify(arrsheng)) );
dz = arrsheng[0].label+"/"+arrshi[0].label+"/"+arrqu[0].label;
if(!!it.district){
let arrqu = arrshi[0].children.filter((i) => {
return it.district == i.value;
});
dz = arrsheng[0].label+"/"+arrshi[0].label+"/"+arrqu[0].label;
}else{
dz = arrsheng[0].label+"/"+arrshi[0].label;
}
it.province = dz;
})
this.loading = false;

158
src/views/basicdata/brand/basicZonePriceFrom.vue
Unescape View File

@ -6,7 +6,7 @@
<el-col :span="10">
<el-form-item label="始发仓地址" prop="province" >
<!-- <el-input v-model="form.province" placeholder="请输入省"/>-->
<el-cascader :options="optioner" v-model="form.province" style="width: 100%;" :props="{ checkStrictly: true }" popper-class='ca' @change="monitor">
<el-cascader :options="optioner" v-model="form.province" style="width: 100%;" :props="{ checkStrictly: true }" popper-class='ca' @change="monitor($event,1)">
<template #default="{ node, data }">
<span>{{ data.label }}</span>
<span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
@ -60,7 +60,7 @@
:loading="loading"
>
<el-option
v-for="item in optionser"
v-for="item in goalSer"
:key="item.id"
:label="item.name"
:value="item.id"
@ -71,7 +71,7 @@
<el-col :span="10">
<el-form-item label="货物类型" prop="brand">
<el-cascader :props="propsType" style="width: 100%"></el-cascader>
<el-cascader :props="propsType" style="width: 100%" v-model="form.brand"></el-cascader>
<!-- <el-select style="width: 100%"-->
<!-- v-model="form.brand"-->
@ -130,7 +130,7 @@
</template>
<script>
import { getList, getDetail, add, update, remove } from "@/api/basicdata/basicZonePrice";
import { getList, getDetail, add, update, remove,getDetailOwn } from "@/api/basicdata/basicZonePrice";
import { getListBinName} from "@/api/basicdata/basicdataWarehouse";
import {getListName} from "@/api/basicdata/basicBrand";
import option from "@/option/basicdata/basicZonePrice";
@ -147,22 +147,33 @@ export default {
name: "basicZonePriceFrom",
data () {
return {
// 分页信息
page: {
currentPage: 1,
pageSize: 10,
total: 40
},
propsType: {
lazy: true,
lazyLoad (node, resolve) {
const { level } = node;
setTimeout(() => {
let ids =0;
const nodes = Array.from({ length: level + 1 })
setTimeout(async () => {
// console.log("node/////////",node);
const parentId = node.level === 0 ? 1 : node.data.value;
// console.log("par",parentId);
let shuju = await getDeptLazyTree(parentId);
// console.log(")))))))))))",shuju);
const nodes = Array.from(shuju.data.data)
.map(item => ({
value: ++ids,
label: `选项${ids}`,
leaf: level >= 2
value: item.id,
label: item.title,
leaf: !item.hasChildren
}));
// console.log("////////////",nodes);
// 通过调用resolve将子节点数据返回，通知组件数据加载完成
resolve(nodes);
}, 1000);
}, 500);
}
},
optionProps:{
@ -173,6 +184,7 @@ export default {
checkStrictly:true,
expandTrigger: 'hover' //设置鼠标悬浮展开，如果点击展开的话，会出现点击父节点后选择器直接关闭，不能选择子节点了
},
treeId: '',
cascaderKey : 1,//防止搜索选项清空数据后出现报错,在加载级联选择器数据的时候+1
height: 0,
// 弹框标题
@ -198,12 +210,7 @@ export default {
costListName:[], //字典
costWraeList:[], //字典
costWraeListName:[], //字典
// 分页信息
page: {
currentPage: 1,
pageSize: 10,
total: 40
},
// 表单数据
form: {},
pan: false,
@ -216,6 +223,7 @@ export default {
optioner:[], //始发仓地址
optionsr:[],//品牌
optionser:[], //始发仓
goalSer:[], //目的仓
rules: {
province: [
{ required: true, message: '请选择地址', trigger: 'blur' },
@ -244,7 +252,7 @@ export default {
},
watch: {
'form.province'() {
console.log("监听到了====");
// console.log("监听到了====");
if (this.$refs.refHandle) {
this.$refs.refHandle.dropDownVisible = false; //监听值发生变化就关闭它
}
@ -257,16 +265,24 @@ export default {
this.onLoad(this.page);
}
})
// getListCo(this.page.currentPage, this.page.pageSize, values).then(res =>{
//
// })
console.log("this.$route.query.type",this.$route.query.type);
if(this.$route.query.type == 0){
}else if(this.$route.query.type == 1){
//查看
this.handleView(this.$route.query.id);
}else if(this.$route.query.type == 2){
//修改
this.handleEdit(this.$route.query.id);
}
},
mounted () {
this.init();
},
computed: {
...mapGetters(["permission"]),
...mapGetters(["permission",'tagWel','tagList']),
ids () {
let ids = [];
this.selectionList.forEach(ele => {
@ -276,10 +292,8 @@ export default {
}
},
methods: {
//关闭浮层
hideCascaderInp(){
this.$refs.cascaderRef.value.togglePopperVisible(false)
},
@ -292,15 +306,14 @@ export default {
this.drawer = true;
},
textWarebox(e,index) {
console.log(e,index)
this.costWraeList[index] = e;
},
textbox(e,index) {
console.log(e,index)
this.costList[index] = e;
},
handleCheckedCities(value) {
console.log(value);
if(value.length < 1){
this.costWraeList = [];
}
@ -357,22 +370,24 @@ export default {
this.optionsr = [];
}
},
monitor(row){
console.log("执行了===",row);
this.warehouse(row);
monitor(row,num){
// console.log("执行了===",row,num);
this.warehouse(row,num);
},
//查询仓库
warehouse(row){
//查询始发仓库
async warehouse(row,num){
let a ={
province_code : row.length > 0 ? row[0] : null,
city_code : row.length > 1 ? row[1] : null,
code : row.length > 2 ? row[1] : null,
}
let co = getListCopy(this.page.currentPage, this.page.pageSize,a );
console.log("co>>>",co);
this.optionser = co.data.data.records.filter((item) => {
return item.name.toLowerCase().includes(query.toLowerCase())
})
let co =await getListCopy(this.page.currentPage, this.page.pageSize,a );
if(num == 1){
this.optionser = co.data.data.records;
}else{
this.goalSer = co.data.data.records;
}
},
remoteMethodBin(query){
@ -416,23 +431,25 @@ export default {
this.onLoad(this.page);
},
bianLier(costListName,clientType,costList,fei){
// console.log(">>>>>>>>>",costListName,clientType,costList,fei);
console.log(">>>>>>>>>",costListName,clientType,costList,fei);
this.pan = false;
// fei = [];
for (let i = 0;i< costListName.length;i++){
if(!costList){ this.pan = true; return }
let zhi = costList[i];
if(!zhi){
this.pan = true;
continue;
}
clientType.forEach( it =>{
if(it.dictValue == costListName[i]){
for(let a = 0;a<clientType.length;a++){
if(clientType[a].dictValue == costListName[i]){
// console.log("进来了",it.dictValue , costListName[i]);
//2.添加
fei.set(it.dictKey,zhi)
let zhi = costList[a];
if(!zhi){
this.pan = true;
continue;
}else{
//2.添加
fei.set(clientType[a].dictKey,zhi);
}
}
})
}
}
},
@ -440,17 +457,10 @@ export default {
this.$refs[from].validate(async (valid) => {
if (valid) {
if (!this.form.id) {
// console.log("提交的数据》》》",this.form);
let fei = new Map();
await this.bianLier(this.costListName,this.clientType,this.costList,fei);
this.bianLier(this.costListName,this.clientType,this.costList,fei);
this.form.fei = Object.fromEntries(fei);
// console.log("fei",fei);
this.form.freightMark = undefined;
// let feishi = new Map();
// await this.bianli(this.costWraeListName,this.wareType,this.costWraeList,feishi);
// this.form.feishi = Object.fromEntries(feishi);
// // console.log("feishi",feishi);
// this.form.warehousingTimeStatus = undefined;
if(this.pan){
this.$message.warning("请填写完整已勾选的数据费用");
return
@ -458,6 +468,11 @@ export default {
this.form.city = this.form.province[1];
this.form.district = this.form.province[2];
this.form.province = this.form.province[0];
this.form.cityEnd = this.form.provinceEnd[1];
this.form.districtEnd = this.form.provinceEnd[2];
this.form.provinceEnd = this.form.provinceEnd[0];
this.form.brandList = this.form.brand.join(",");
this.form.brand = this.form.brand[this.form.brand.length-1];
console.log("提交的数据》》》",this.form);
add(this.form).then(() => {
this.box = false;
@ -466,6 +481,9 @@ export default {
type: "success",
message: "操作成功!"
});
this.contextmenuFlag = false;
this.$store.commit('DEL_TAG_CURRENT');
this.$router.push(this.tagWel);
});
} else {
this.form.city = this.form.province[1];
@ -508,7 +526,7 @@ export default {
handleEdit (row) {
this.title = '编辑'
this.box = true
getDetail(row.id).then(res => {
getDetail(row).then(res => {
this.form = res.data.data;
let a= [];
if(!!this.form.province){
@ -517,26 +535,34 @@ export default {
a.push(res.data.data.district);
}
this.form.province = a;
this.form.goalGranary = row.name;
this.form.brand = row.brandName;
// this.form.goalGranary = row.name;
// this.form.brand = row.brandName;
});
},
handleView (row) {
console.log("row>>>>>>>>",row);
this.title = '查看'
// console.log("row>>>>>>>>",row);
this.view = true;
this.box = true;
getDetail(row.id).then(res => {
getDetailOwn(row).then(res => {
this.form = res.data.data;
// console.log(" res.data.data;",res.data.data);
let a= [];
let b= [];
if(!!this.form.province){
a.push(res.data.data.province);
a.push(res.data.data.city);
a.push(res.data.data.district);
}
if(!!this.form.province){
b.push(res.data.data.provinceEnd);
b.push(res.data.data.cityEnd);
b.push(res.data.data.districtEnd);
}
this.form.province = a;
this.form.goalGranary = row.name;
this.form.brand = row.brandName;
this.form.provinceEnd = b;
this.form.beginGranary = this.form.beginName;
this.form.goalGranary = this.form.endName;
this.form.brand = this.form.brandList.split(",");
});
},
handleDelete () {

Write Preview
Loading…
Cancel
Save