Skip to content

L
logistics-center
Commit 7a01f0e3 authored by 冯腾骁's avatar 冯腾骁
Browse files
Options

线上发货配置完善

parent 60dbcc31
Hide whitespace changes
Inline Side-by-side
Showing with 162 additions and 27 deletions
src/common/axiosSetting.js
View file @ 7a01f0e3
...@@ -56,12 +56,12 @@ AxiosIns.interceptors.response.use((response) => { ...@@ -56,12 +56,12 @@ AxiosIns.interceptors.response.use((response) => {
type: 'warning', type: 'warning',
showClose: true, showClose: true,
}); });
// if (msg == "REQUEST_TOKEN") { // cookie验证验权失败 if (msg == "REQUEST_TOKEN") { // cookie验证验权失败
// localStorage.$setLocalStorageByName('user', {}); //清空用户缓存 localStorage.$setLocalStorageByName('user', {}); //清空用户缓存
// setTimeout(() => { setTimeout(() => {
// router.push({path: '/login'}) router.push({path: '/login'})
// }, 1000) }, 1000)
// } }
} }
} catch (e) { } catch (e) {
......
src/views/deliveryChannelConfiguration/onlineDelivery.vue
View file @ 7a01f0e3
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<el-table-column prop="channelCode" label="物流渠道系统编码" sortable/> <el-table-column prop="channelCode" label="物流渠道系统编码" sortable/>
<el-table-column fixed="right" label="操作"> <el-table-column fixed="right" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="poi textButton" @click="editOnline(scope.row)">编辑</span> <span class="poi textButton" @click="openEdit(scope.row.id)">编辑</span>
<span class="poi textButton" @click="removeOnline(scope.row)">删除</span> <span class="poi textButton" @click="removeOnline(scope.row)">删除</span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -109,16 +109,16 @@ ...@@ -109,16 +109,16 @@
<el-option <el-option
v-for="item in deliveryTypeList" v-for="item in deliveryTypeList"
:key="item.id" :key="item.id"
:label="item.name" :label="item.id"
:value="item.id"> :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="maxWeight" label-width="130px" :required="true"> <el-form-item prop="channelName" label-width="130px" :required="true">
<span slot="label">渠道名称:</span> <span slot="label">渠道名称:</span>
<el-input v-model="insertOnlineParams.channelName" placeholder="请输入" class="pct75"></el-input> <el-input v-model="insertOnlineParams.channelName" placeholder="请输入" class="pct75"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="maxWeight" label-width="130px" :required="true"> <el-form-item prop="channelCode" label-width="130px" :required="true">
<span slot="label">渠道系统编码:</span> <span slot="label">渠道系统编码:</span>
<el-input v-model="insertOnlineParams.channelCode" placeholder="请输入" class="pct75"></el-input> <el-input v-model="insertOnlineParams.channelCode" placeholder="请输入" class="pct75"></el-input>
</el-form-item> </el-form-item>
...@@ -126,6 +126,71 @@ ...@@ -126,6 +126,71 @@
</el-form> </el-form>
</el-row> </el-row>
</el-dialog> </el-dialog>
<el-dialog
:visible="updateOnlineVisible"
title="新增平台发货渠道"
width="600px"
@close="updateOnlineVisible = false"
center>
<el-row>
<el-form label-position="right" label-width="130px" :model="updateOnlineParams">
<el-form-item prop="agentCode" label-width="130px" :required="true">
<span slot="label">平台代理编码:</span>
<el-select size="small" v-model="updateOnlineParams.agentCode" clearable placeholder="请选择">
<el-option
v-for="item in agentList"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="storeCode" label-width="130px" :required="true">
<span slot="label">仓库:</span>
<el-select size="small" v-model="updateOnlineParams.storeCode" clearable placeholder="请选择">
<el-option
v-for="item in storeCodeList"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="countryCode" label-width="130px" :required="true">
<span slot="label">订单国家编号:</span>
<el-input v-model="updateOnlineParams.countryCode" placeholder="请输入" class="pct75"></el-input>
</el-form-item>
<el-form-item prop="orderMinPrice" label-width="130px" :required="true">
<span slot="label">订单金额最小值:</span>
<el-input v-model="updateOnlineParams.orderMinPrice" placeholder="请输入" class="pct75"></el-input>
</el-form-item>
<el-form-item prop="orderMaxPrice" label-width="130px" :required="true">
<span slot="label">订单金额最大值:</span>
<el-input v-model="updateOnlineParams.orderMaxPrice" placeholder="请输入" class="pct75"></el-input>
</el-form-item>
<el-form-item prop="deliveryType" label-width="130px">
<span slot="label">发货类型:</span>
<el-select size="small" v-model="updateOnlineParams.deliveryType" clearable placeholder="请选择">
<el-option
v-for="item in deliveryTypeList"
:key="item.id"
:label="item.id"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="channelName" label-width="130px" :required="true">
<span slot="label">渠道名称:</span>
<el-input v-model="updateOnlineParams.channelName" placeholder="请输入" class="pct75"></el-input>
</el-form-item>
<el-form-item prop="channelCode" label-width="130px" :required="true">
<span slot="label">渠道系统编码:</span>
<el-input v-model="updateOnlineParams.channelCode" placeholder="请输入" class="pct75"></el-input>
</el-form-item>
<div class="discuss-buy" @click="editOnline">确认</div>
</el-form>
</el-row>
</el-dialog>
</el-col> </el-col>
</template> </template>
<script> <script>
...@@ -165,14 +230,26 @@ export default { ...@@ -165,14 +230,26 @@ export default {
{name: 'Vova', id: 'vova'}, {name: 'Vova', id: 'vova'},
{name: 'Wish', id: 'wish'}, {name: 'Wish', id: 'wish'},
], ],
deliveryTypeList: [], deliveryTypeList: [{id:'warehouse'},{id:'epc'},{id:'gc'},{id:'pcu'},{id:'alp'},{id:'internal'},{id:'we'},{id:'bigbag'}],
insertOnlineVisible: false, insertOnlineVisible: false,
updateOnlineVisible: false,
insertOnlineParams: { insertOnlineParams: {
agentCode: '', agentCode: '',
storeCode: '', storeCode: '',
countryCode: '', countryCode: '',
orderMinPrice: 0, orderMinPrice: 0,
orderMaxPrice: 9999999, orderMaxPrice: 99999,
deliveryType: '',
channelName: '',
channelCode: '',
id: '',
},
updateOnlineParams: {
agentCode: '',
storeCode: '',
countryCode: '',
orderMinPrice: 0,
orderMaxPrice: 99999,
deliveryType: '', deliveryType: '',
channelName: '', channelName: '',
channelCode: '', channelCode: '',
...@@ -186,6 +263,10 @@ export default { ...@@ -186,6 +263,10 @@ export default {
openInsert() { openInsert() {
this.insertOnlineVisible = true; this.insertOnlineVisible = true;
}, },
openEdit(id) {
this.findOnline(id);
this.updateOnlineVisible = true;
},
searchPage() { searchPage() {
this.onlineDeliveryParams.pageNo = 1 this.onlineDeliveryParams.pageNo = 1
this.getPage(); this.getPage();
...@@ -205,7 +286,7 @@ export default { ...@@ -205,7 +286,7 @@ export default {
insertOnline() { insertOnline() {
this.axios({ this.axios({
data: this.insertOnlineParams, data: this.insertOnlineParams,
url: 'logisticsConfig', url: 'logisticsConfig/onlineDelivery/insertOnlineDelivery',
method: 'post' method: 'post'
}).then(res => { }).then(res => {
if (res.success) { if (res.success) {
...@@ -222,7 +303,7 @@ export default { ...@@ -222,7 +303,7 @@ export default {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.axios({ this.axios({
url: 'logisticsConfig', url: 'logisticsConfig/onlineDelivery/removeOnlineDelivery',
method: 'post', method: 'post',
data: { data: {
id: item.id id: item.id
...@@ -240,27 +321,38 @@ export default { ...@@ -240,27 +321,38 @@ export default {
}).catch(() => { }).catch(() => {
}); });
}, },
findOnline(id) {
this.axios({
data: {id:id},
url: 'logisticsConfig/onlineDelivery/findOnlineDelivery',
method: 'post'
}).then(res => {
if (res.success) {
this.updateOnlineParams = res.module;
}
})
},
editOnline() { editOnline() {
this.axios({ this.axios({
data: this.insertOnlineParams, data: this.updateOnlineParams,
url: 'logisticsConfig', url: 'logisticsConfig/onlineDelivery/updateOnlineDelivery',
method: 'post' method: 'post'
}).then(res => { }).then(res => {
if (res.success) { if (res.success) {
this.$message("更新成功") this.$message("更新成功");
this.getChannelPage(); this.getPage();
} }
}) })
}, },
handleSizeChange(val) { handleSizeChange(val) {
let that = this; let that = this;
that.onlineDeliveryParams.pageSize = val; that.onlineDeliveryParams.pageSize = val;
this.searchPage(); this.getPage();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
let that = this; let that = this;
that.onlineDeliveryParams.pageNo = val; that.onlineDeliveryParams.pageNo = val;
this.searchPage(); this.getPage();
}, },
getStoreList() { getStoreList() {
this.axios({ this.axios({
......
src/views/logisticsConfiguration/companyChannels.vue
View file @ 7a01f0e3
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<el-table-column prop="contactWay" label="联系方式"/> <el-table-column prop="contactWay" label="联系方式"/>
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="poi textButton" @click="updateCompany(scope.row)">编辑</span> <span class="poi textButton" @click="openUpdateCompany(scope.row.id)">编辑</span>
<span class="poi textButton" @click="removeCompany(scope.row)">删除</span> <span class="poi textButton" @click="removeCompany(scope.row)">删除</span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -252,6 +252,26 @@ ...@@ -252,6 +252,26 @@
</el-form> </el-form>
</el-row> </el-row>
</el-dialog> </el-dialog>
<el-dialog
:visible="updateCompanyVisible"
title="录入物流公司"
width="600px"
@close="updateCompanyVisible = false"
center>
<el-row>
<el-form label-position="right" label-width="110px" :model="updateCompanyParams">
<el-form-item prop="contacts" label-width="100px" :required="true">
<span slot="label">联系人:</span>
<el-input v-model="updateCompanyParams.contacts" placeholder="请输入" class="pct75"></el-input>
</el-form-item>
<el-form-item prop="contactWay" label-width="100px" :required="true">
<span slot="label">联系方式:</span>
<el-input v-model="updateCompanyParams.contactWay" placeholder="请输入" class="pct75"></el-input>
</el-form-item>
<div class="discuss-buy" @click="updateCompany">确认</div>
</el-form>
</el-row>
</el-dialog>
</div> </div>
</div> </div>
</div> </div>
...@@ -293,8 +313,14 @@ export default { ...@@ -293,8 +313,14 @@ export default {
contacts: '', contacts: '',
contactWay: '' contactWay: ''
}, },
updateCompanyParams:{
id:'',
contacts: '',
contactWay: ''
},
insertCompanyVisible: false, insertCompanyVisible: false,
insertChannelVisible: false, insertChannelVisible: false,
updateCompanyVisible: false,
checkAllBizTag: false, checkAllBizTag: false,
bizTagList: [{name: '平台物流', id: 0}, bizTagList: [{name: '平台物流', id: 0},
{name: '普货', id: 1}, {name: '普货', id: 1},
...@@ -321,7 +347,7 @@ export default { ...@@ -321,7 +347,7 @@ export default {
}).then(res => { }).then(res => {
if (res.success) { if (res.success) {
res.module.forEach(x => { res.module.forEach(x => {
this.companyList.push({name:x.companyName,id:x.id}) this.companyList.push({name: x.companyName, id: x.id})
}) })
} }
}) })
...@@ -393,15 +419,27 @@ export default { ...@@ -393,15 +419,27 @@ export default {
} }
}) })
}, },
findCompany(id){
this.axios({
data: {id:id},
url: 'logisticsConfig/logisticsCompany/findCompany',
method: 'post'
}).then(res => {
if (res.success) {
this.updateCompanyParams = res.module;
}
})
},
updateCompany() { updateCompany() {
this.axios({ this.axios({
data: this.insertChannelParams, data: this.updateCompanyParams,
url: 'logisticsConfig/logisticsCompany/updateCompany', url: 'logisticsConfig/logisticsCompany/updateCompany',
method: 'post' method: 'post'
}).then(res => { }).then(res => {
if (res.success) { if (res.success) {
this.$message("更新成功") this.updateCompanyVisible = false;
this.getChannelPage(); this.$message("更新成功");
this.getCompanyPage();
} }
}) })
}, },
...@@ -424,6 +462,7 @@ export default { ...@@ -424,6 +462,7 @@ export default {
message: '删除成功!' message: '删除成功!'
}); });
this.getCompanyPage(); this.getCompanyPage();
this.getCompanyList();
} }
}) })
...@@ -461,6 +500,11 @@ export default { ...@@ -461,6 +500,11 @@ export default {
openInsertChannel() { openInsertChannel() {
this.insertChannelVisible = true; this.insertChannelVisible = true;
}, },
openUpdateCompany(id){
this.findCompany(id);
console.log("id",id);
this.updateCompanyVisible = true;
},
handleAllAgentChange(val) { handleAllAgentChange(val) {
this.insertChannelParams.position = val ? this.bizTagList.map(x => x.id) : []; this.insertChannelParams.position = val ? this.bizTagList.map(x => x.id) : [];
}, },
...@@ -499,8 +543,6 @@ export default { ...@@ -499,8 +543,6 @@ export default {
this.searchCompanyPage(); this.searchCompanyPage();
this.searchChannelPage(); this.searchChannelPage();
this.getCompanyList(); this.getCompanyList();
console.log("host",window.location.host)
console.log("protocol",window.location.protocol)
}, },
activated() { activated() {
this.tableMaxHeight = window.innerHeight - 263; this.tableMaxHeight = window.innerHeight - 263;
......
src/vuex/global/index.js
View file @ 7a01f0e3
...@@ -48,6 +48,7 @@ const state = { ...@@ -48,6 +48,7 @@ const state = {
leaf: false, leaf: false,
children: [ children: [
{path: '/deliveryChannelConfiguration/onlineDelivery', name: '线上发货配置'}, {path: '/deliveryChannelConfiguration/onlineDelivery', name: '线上发货配置'},
{path: '/deliveryChannelConfiguration/onlineDelivery', name: '平台渠道发货配置'},
] ]
}, },
] ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment