Skip to content

P
pica.cloud.web-education-admin
提交 9dedf482 编写于 作者: vino's avatar vino
浏览文件
操作

运费配置

上级 0267eac5
隐藏空白字符变更
内嵌 并排
正在显示 包含 177 行增加 和 25 行删除
src/utils/freight/index.js
浏览文件 @ 9dedf482
......@@ -24,3 +24,25 @@ export const createOrModifyExpressFee = (params) => {
description: '添加或修改运费配置信息',
});
};
/*后台-查询运费配置信息*/
export const getFreightConfig = (value) => {
return fetch({
headers,
url: getBaseUrl(`/store/admin/express/fee/store/${value.id}/config`),
method: 'get',
description: '后台-查询运费配置信息',
});
};
/*后台-店铺运费配置信息-save*/
export const saveFreightConfig = (params) => {
return fetch({
headers,
url: `/store/admin/express/fee/store/config/save`,
method: 'post',
data: params,
description: '后台-店铺运费配置信息-save',
});
};
src/utils/shop/index.js
浏览文件 @ 9dedf482
......@@ -93,9 +93,8 @@ export const closeShop = (storeId, status = 0) => {
export const brokerListAll = (params) => {
return fetch({
headers,
url: getBaseUrl('broker/admin/brokerListAll'),
method: 'post',
data: params,
url: getBaseUrl(`broker/admin/brokerListAll？ownerId=${params.ownerId}`),
method: 'get',
description: '云鹊店铺-订单管理-药代列表',
})
};
......@@ -104,8 +103,7 @@ export const brokerOwnerListAll = (params) => {
return fetch({
headers,
url: getBaseUrl('broker/admin/brokerOwnerListAll'),
method: 'post',
data: params,
method: 'get',
description: '云鹊店铺-订单管理-招募人列表',
})
};
src/views/freight/freight-config.vue
浏览文件 @ 9dedf482
......@@ -162,23 +162,22 @@
<!-- <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">-->
<el-form ref="setPriceForm"
:rules="addRules"
:model="model"
:model="goodCondition"
label-width="250px"
label-suffix=":"
label-position="right"
size="mini"
style="width: 100%;">
<el-form-item label="适用商品ID" class="required-label" prop="userName">
<el-form-item label="适用商品ID" class="required-label" prop="goodIdList">
<el-col :span="12">
<el-select v-model="model.userName"
<el-select v-model="goodCondition.goodIdList"
filterable
remote
placeholder="请输入专家姓名或医院名称,多个关键字用空格隔开，至少输入两个字符"
placeholder="多个商品ID，以“、”隔开"
clearable
style="width: 130%;"
:remote-method="remoteMethod"
:disabled="isEdit"
@change="nameChange"
@visible-change="noSelectHand">
<el-option
......@@ -192,10 +191,10 @@
</el-col>
</el-form-item>
<el-form-item label="包邮条件" class="required-label">
<el-form-item label="包邮条件" class="required-label" prop="conditionType">
<el-col :span="4">
<el-select
v-model="model.type"
v-model="goodCondition.conditionType"
size="small">
<el-option
v-for="(item,index) in typeList"
......@@ -207,15 +206,15 @@
</el-col>
<el-col :span="9" style="margin-left: 5px;">
<span style="margin-left: 5px;">满</span>
<el-input-number v-if="model.type == 1" v-model="model.title" style="margin-left: 5px;" size="small" :precision="0" :min="1" :max="100000"></el-input-number>
<el-input-number v-if="model.type == 2" v-model="model.title" style="margin-left: 5px;" size="small" :precision="2" :min="0.00" :max="99999.99"></el-input-number>
<el-input-number v-if="model.conditionType == 1" v-model="goodCondition.number" style="margin-left: 5px;" size="small" :precision="0" :min="1" :max="100000"></el-input-number>
<el-input-number v-if="model.conditionType == 2" v-model="goodCondition.number" style="margin-left: 5px;" size="small" :precision="2" :min="0.00" :max="99999.99"></el-input-number>
<span style="margin-left: 5px;" v-if="model.type == 1">件包邮</span>
<span style="margin-left: 5px;" v-if="model.type == 2">元包邮</span>
</el-col>
</el-form-item>
<el-form-item label="运费说明" class="required-label">
<el-col :span="15">
<el-input v-model="model.title" style="width: 100%;" size="small" placeholder="请输入"></el-input>
<el-input v-model="goodCondition.intro" style="width: 100%;" size="small" placeholder="请输入"></el-input>
</el-col>
</el-form-item>
......@@ -231,9 +230,11 @@
</template>
<script>
let vm = null;
import BreadCrumb from "@/components/breadcrumb.vue";
import { getExpressFee, createOrModifyExpressFee } from "@/utils/freight";
import { getExpressFee, createOrModifyExpressFee, getFreightConfig, saveFreightConfig } from "@/utils/freight";
import {closeLoading, openLoading} from "../../utils/utils";
import { getGoodsList} from '@/utils/goods';
export default {
components: {
BreadCrumb
......@@ -286,6 +287,23 @@ export default {
}],
title:"添加条件",
setAddVisible: false,
storeId:'',
goodCondition:{
goodIds:[],
conditionType:'',
number:'',
intro:'',
goodIdList:''
},
nameList:[],
addRules:{
goodIdList: [
{required: true, message: "请输入商品ID", trigger: 'blur'}
],
conditionType: [
{required: true, message: "请选择包邮条件", trigger: 'blur'}
],
},
bgRules: [{ validator: checkRange, trigger: "blur" }],
};
},
......@@ -303,7 +321,10 @@ export default {
},
},
created() {
this.getExpressFeeInfo();
vm = this;
this.storeId = this.$route.query.storeId;
// this.getExpressFeeInfo();
this.getFreightConfig();
this.tableData = [{goodsIdList: [{goodsId:119895},{goodsId:119894}], condition:"满3件包邮",desc:"单品满3件包邮"}];
},
methods: {
......@@ -466,7 +487,118 @@ export default {
});
})
.catch(() => {});
}
},
// 获取配置信息
getFreightConfig() {
getFreightConfig({id:this.storeId}).then( res => {
let curData = res.data;
if(res.data && res.data.expressFeeIntervalConfigList && res.data.expressFeeIntervalConfigList.length) {
curData.list = this.dataHandler(res.data.expressFeeIntervalConfigList);
} else {
curData.list = this.formData.list;
}
this.tableData = res.data.goodConditionDtoList;
this.formData = curData;
})
},
getLists(){
openLoading(this);
// searchForm: {
// goodsIdList:[],
// goodsName :'',
// goodsType :'',
// pageNo:1,
// pageSize: 10,
// storeId:0,
// commissionType: 0
// },
getGoodsList(this.searchForm).then((res)=>{
if(res.code != '000000'){
return this.$message({
message: res.message,
type: 'error'
});
}
closeLoading(this);
if(res.data == null){
return this.$message({
message: '分页数据加载失败',
type: 'error'
});
}
this.tableData = res.data.goodsList;
this.totalRows = res.data.totalCount;
this.isSSO = res.data.isSSO;
})
},
remoteMethod(val) {
this.searchForm = {
goodsIdList:[],
goodsName :val,
goodsType :'',
pageNo:1,
pageSize: 10,
storeId:this.storeId,
commissionType: 0
};
if (val.length >= 2) {
// console.log('搜索',val)
getGoodsList(this.searchForm)
// this.GET(`/diagnose/commission/downDoctor/doctorInfoByNameLike?name=${val}`)
.then(function (res) {
if (res.code == '000000') {
// let data = JSON.parse(JSON.stringify(res.data.data));//通过这个实现深拷贝
let list = res.data.goodsList;
vm.expertData = list;
let newList = [];
list.map((item, index) => {
newList[index] = {
value: `${item.goodsId} ${item.goodsName}`,
id: item.goodsId,
name: item.goodsName,
}
})
// console.log('新数组',newList)
vm.nameList = newList;
}
}).catch(function (error) {
errorResponseCheck(error, vm);
});
}else {
vm.expertData = [];
vm.nameList = [];
}
},
nameChange(val) {
// console.log('选中的值',val)
if (val) {
for(let i=0; i < vm.expertData.length; i++){
if (val == vm.expertData[i].goodsId) {
let item = vm.expertData[i];
vm.goodCondition.goodIdList = val;
// vm.model.userName = item.name;
// vm.model.mobile = item.mobilePhone;
// vm.model.hospitalName = item.hospital;
// vm.model.department = item.department;
// vm.model.title = item.title;
// vm.model.userId = item.doctorId;
}
}
}else {
vm.goodCondition.goodIdList = "";
}
vm.nameList = [];
},
noSelectHand(val) {
if (!val && !vm.goodCondition.goodIdList) {
vm.nameList = [];
}
},
},
};
</script>
......
src/views/goods/order-manage.vue
浏览文件 @ 9dedf482
......@@ -31,7 +31,7 @@
<el-col :span="18">
<el-form-item label="招募人">
<el-select
v-model="searchForm.broker"
v-model="searchForm.ownerId"
id="statusSelector"
placeholder="请输入招募人"
@change="changeOwner"
......@@ -48,7 +48,7 @@
</el-form-item>
<el-form-item label="药代姓名">
<el-select
v-model="searchForm.brokerOwner"
v-model="searchForm.brokerId"
id="statusSelector"
placeholder="请输入药代姓名"
clearable
......@@ -310,8 +310,8 @@
orderNo: '',
receiver: '',
orderDate: '',
broker:'',
brokerOwner:'',
brokerId:'',
ownerId:'',
pageNo: 1,
pageSize: 10,
},
......@@ -576,9 +576,9 @@
});
},
exportOrder() {
const { goodsName, orderNo, receiver, orderDate, storeId } = this.searchForm;
const { goodsName, orderNo, receiver, orderDate, storeId,brokerId,ownerId } = this.searchForm;
getOrdersExportUrl({ goodsName, orderNo, receiver, orderDate, storeId }).then(res => {
getOrdersExportUrl({ goodsName, orderNo, receiver, orderDate, storeId,brokerId,ownerId }).then(res => {
if (res.code != '000000') {
this.$message({ message: res.message, type: 'error' });
return;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或