Skip to content

E
ElectricitySheep
Commit 0ba954ed authored by zhangjianguo's avatar zhangjianguo
Browse files
Options

地区的选择

parent a21a0f1b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 443 additions and 27 deletions
src/components/setup/addFreightRule.vue
View file @ 0ba954ed
<style>
<style scoped>
.addFreightRule .form-box {
background: #fff;
padding: 20px 50% 20px 0;
......@@ -12,6 +12,23 @@
display: inline-block;
font-size: 13px;
}
.addFreightRule .gez_list{
width: 650px;
margin-bottom: 12px;
padding: 20px;
border: 1px solid #EBEEF5;
background-color: #FFF;
color: #303133;
display: flex;
flex-direction: row;
justify-content: space-between;
}
.addFreightRule .imgstyle{
width: 32px;
height: 32px;
margin: 0 5px;
}
</style>
<template>
<div class="addFreightRule">
......@@ -22,17 +39,29 @@
<el-input v-model="msg.RulesName"/>
</el-form-item>
<el-form-item label="计费方式">
<el-radio-group v-model="msg.LogisticsType" >
<el-radio-group v-model="msg.ChargeMode" >
<el-radio :label="1">按重计费</el-radio>
<el-radio :label="2">按件计费</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="运费规则" class="is-required">
<span style="color: #409EFF;font-size: 14px;cursor: pointer;" @click="dialogFormVisible=true">+新增规则</span>
<div class="gez_list el-card" v-for="(item,index) in msg.Detail" :key="index">
<div style="width: 500px;">
<span>首重/件(克/个):{{item.First}} <span>/</span> 首费(元):{{item.FirstPrice}} <span>/</span>续重/件(克/个):{{item.Second}}<span>/</span>续费(元){{item.SecondPrice}}</span>
</div>
<div style="width: 110px;display: flex;flex-direction: row;justify-content: space-around">
<el-tooltip class="item" effect="dark" content="编辑" placement="top" >
<img src="../../assets/img/setup/edit.png" alt="" class="imgstyle">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<img src="../../assets/img/setup/del.png" alt="" class="imgstyle" @click="delete_b">
</el-tooltip>
</div>
</div>
<span style="color: #409EFF;font-size: 14px;cursor: pointer;" @click="addOf">+新增规则</span>
</el-form-item>
</el-form>
</div>
<el-button type="primary" style="margin: 12px 0 " @click="preserve">保存</el-button>
<el-button style="margin: 12px 0 " @click="cancel">取消</el-button>
......@@ -41,56 +70,65 @@
<!--新增规则弹窗-->
<el-dialog title="新增规则" :visible.sync="dialogFormVisible" >
<el-form :model="msg.Detail" :rules="rules">
<el-form :model="Detail" :rules="rules">
<el-row :gutter="0">
<el-col :span="11">
<el-form-item label="首重(克)：" label-width="100px" style="padding: 0px 1rem;" prop="MallName2">
<el-input v-model="msg.Detail.First" />
<el-input v-model="Detail.First" />
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="首费（元）" label-width="100px" style="padding: 0px 1rem;" >
<el-input v-model="msg.Detail.FirstPrice" />
<el-input v-model="Detail.FirstPrice" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="0">
<el-col :span="11">
<el-form-item label="续重(克)：" label-width="100px" style="padding: 0px 1rem;" >
<el-input v-model="msg.Detail.Second" />
<el-input v-model="Detail.Second" />
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="续费（元）" label-width="100px" style="padding: 0px 1rem;" >
<el-input v-model="msg.Detail.SecondPrice" />
<el-input v-model="Detail.SecondPrice" />
</el-form-item>
</el-col>
</el-row>
<el-form-item label="地区选择">
<region_Choice @event1="change($event)"></region_Choice>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
<el-button type="primary" @click="Addto">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import region_Choice from './view/regionChoice'
export default {
name: "addFreightRule",
data(){
data(){
return{
msg:{
ID:"",
ID:0,
RulesName:'',
jifei:1,
Detail:{
First:0,
FirstPrice:0,
Second:0,
SecondPrice:0,
}
// jifei:1,
ChargeMode:1,
Detail:[],
},
Detail:{
ID:0,
First:0,
FirstPrice:0,
Second:0,
SecondPrice:0,
List:[],
},
dialogFormVisible:false,
rules: {
......@@ -105,6 +143,9 @@
},
}
},
components:{
region_Choice,
},
methods:{
cancel(){
this.$router.go(-1);//返回上一层
......@@ -114,11 +155,73 @@
},
addRule(){
},
change(data){
let List=[];
for(let i=0 ;i<data.length;i++){
if(data[i].ischeckAll==true && data[i].indeterminate==false){ //全选的情况 只穿省的ID
List.push({'ID':0,'RegionId':data[i].ID})
}
if(data[i].indeterminate==true){//传市的ID
if(data[i].hasOwnProperty('cityList')==true){
let citylist = data[i].cityList;
for(let j= 0;j<citylist.length;j++){
if(citylist[j].ischeckAll==true && citylist[j].indeterminate==false){
List.push({'ID':0,'RegionId':citylist[j].ID})
}
if(citylist[j].indeterminate==true){
if(citylist[j].hasOwnProperty('areaList')==true){
let areaList = citylist[j].areaList;
for(let z= 0;z<areaList.length;z++){
if(areaList[z].ischeckAll==true){
List.push({'ID':0,'RegionId':areaList[z].ID})
}
}
}
}
}
}
}
}
this.Detail.List = List
},
delete_b(){
},
addOf(){
this.Detail.First=0;
this.Detail.FirstPrice=0;
this.Detail.Second=0;
this.Detail.SecondPrice=0;
this.Detail.List=[];
this.dialogFormVisible=true
},
Addto(){
this.dialogFormVisible=false
this.Detail.First=parseInt(this.Detail.First);
this.Detail.FirstPrice=parseInt(this.Detail.FirstPrice);
this.Detail.Second=parseInt(this.Detail.Second);
this.Detail.SecondPrice=parseInt(this.Detail.SecondPrice);
this.msg.Detail.push(this.Detail)
},
preserve(){
this.apipost("/api/MallBase/AddOrUpdateLogisticsRules",this.msg , res => {
if (res.data.resultCode == 1) {
} else {
this.Info(res.data.message);
}
})
}
}
},
}
</script>
<style scoped>
</style>
src/components/setup/view/regionChoice.vue 0 → 100644
View file @ 0ba954ed
This diff is collapsed.
src/plug/index.js
View file @ 0ba954ed
......@@ -55,7 +55,8 @@ export default {
Vue.prototype.domainManager = function () {
let domainUrl = '';
domainUrl = "http://192.168.2.214:8200";
domainUrl = "https://localhost:5001";
// domainUrl = "https://localhost:5001";
domainUrl = "http://192.168.2.65";
let locationName = window.location.hostname;
if (locationName.indexOf('testerp.oytour') !== -1) {
domainUrl = "http://testapi.oytour.com";
......@@ -63,7 +64,7 @@ export default {
domainUrl = "http://reborn.oytour.com";
}
var obj = {
//主地址npm
//主地址npm
DomainUrl: domainUrl,
//常用提交数据URL
PostUrl: domainUrl + "/api/common/post",
......@@ -116,7 +117,7 @@ export default {
//文件类型数组
Vue.prototype.FileType = function () {
var fileTypeJson = {
//主地址npm
//主地址npm
UserImg: "User", //用户相图片
//常用提交数据URL
GoodsImg: "Goods", //素材相关文件
......@@ -186,9 +187,9 @@ export default {
var apiurl = this.domainManager().DomainUrl + cmd;
var timestamp = (new Date()).valueOf();
this.apiurl = apiurl;
if (!localStorage.mall_userInfo && localStorage.mall_userInfo != ""
if (!localStorage.mall_userInfo && localStorage.mall_userInfo != ""
&& this.$route.path.toLowerCase() != "/login"
&& this.$route.path.toLowerCase() != "/register"
&& this.$route.path.toLowerCase() != "/register"
&& this.$route.path.toLowerCase() != "/forgetpassword"
) {
this.$router.push({
......
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