Skip to content

P
pica.cloud.web-education-admin
提交 55ee6ab7 编写于 作者: bo.dang's avatar bo.dang
浏览文件
操作

Merge branch 'dev-20210607' into 'release' 

Dev 20210607,code review:bo.dang

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!264
上级 bbef9b77 36198be3
显示空白字符变更
内嵌 并排
正在显示 包含 1617 行增加 和 105 行删除
src/router/router.js
浏览文件 @ 55ee6ab7
......@@ -74,6 +74,7 @@ const rangeApply = r => require.ensure([], () => r(require('../views/yqrange/ran
const shopList = r => require.ensure([], () => r(require('../views/shop/shop-list.vue')), 'shop-list')
const createShop = r => require.ensure([], () => r(require('../views/shop/create-shop.vue')), 'create-shop')
const goodsManage = r => require.ensure([], () => r(require('../views/goods/goods-manage.vue')), 'goods-manage')
const freightConfig = r => require.ensure([], () => r(require('../views/freight/freight-config.vue')), 'freight-config')
const createGood = r => require.ensure([], () => r(require('../views/goods/create-good.vue')), 'create-good')
const orderManage = r => require.ensure([], () => r(require('../views/goods/order-manage.vue')), 'order-manage')
const orderDetail = r => require.ensure([], () => r(require('../views/goods/order-detail.vue')), 'order-detail')
......@@ -322,6 +323,10 @@ export default [{
path: '/goods-manage',
component: goodsManage,
},
{
path: '/freight-config',
component: freightConfig,
},
{
path: '/create-good',
component: createGood,
......
src/utils/freight/index.js 0 → 100644
浏览文件 @ 55ee6ab7
import fetch from '../fetch';
import { getBaseUrl } from '@/utils/index'
let headers = {
'Content-Type': 'application/json;charset=UTF-8',
token: localStorage.getItem('storageToken'),
};
/*查询运费配置信息*/
export const getExpressFee = () => {
return fetch({
headers,
url: getBaseUrl(`/trade/coupon/express/fee/admin`),
method: 'get',
description: '查询运费配置信息',
});
};
/*添加或修改运费配置信息*/
export const createOrModifyExpressFee = (params) => {
return fetch({
headers,
url: `/trade/coupon/express/fee/admin/create`,
method: 'post',
data: 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: getBaseUrl(`/store/admin/express/fee/store/config/save`),
method: 'post',
data: params,
description: '后台-店铺运费配置信息-save',
});
};
src/utils/goods/index.js
浏览文件 @ 55ee6ab7
......@@ -113,3 +113,13 @@ export const getCheckPackageIdList = (storeId) => {
description: '',
})
};
export const getGoodsIdList = (params) => {
return fetch({
headers,
url: getBaseUrl(`store/goods/query/v2`),
method: 'post',
data: params,
description: '商品ID列表查询',
})
};
src/utils/shop/index.js
浏览文件 @ 55ee6ab7
......@@ -90,4 +90,20 @@ export const closeShop = (storeId, status = 0) => {
})
};
export const brokerListAll = (params) => {
return fetch({
headers,
url: getBaseUrl(`broker/admin/brokerListAll?ownerId=${params.ownerId}`),
method: 'get',
description: '云鹊店铺-订单管理-药代列表',
})
};
export const brokerOwnerListAll = (params) => {
return fetch({
headers,
url: getBaseUrl('broker/admin/brokerOwnerListAll'),
method: 'get',
description: '云鹊店铺-订单管理-招募人列表',
})
};
src/views/freight/freight-config.vue 0 → 100644
浏览文件 @ 55ee6ab7
<template>
<div class="order-detail-wrapper">
<bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond"></bread-crumb>
<div class="order-detail-content screenSet" id="screenSet">
<div class="header-title">店铺运费</div>
<div class="freight-config-content">
<el-form ref="form" :model="formData" label-width="100px" inline>
<!-- ≤,≥,＜,＞ -->
<el-row class="title">
运费配置
</el-row>
<el-row
class="c-row"
:style="{ padding: index != 0 ? '20px' : '' }"
v-for="(item, index) in formData.list.slice(0, 1)"
:key="'first' + index"
>
<span v-if="index == 0" style="margin: 0 20px 0 40px;">0</span>
<el-input
v-else
disabled
v-model="item.rangeMin"
size="small"
style="width: 80px"
placeholder="请输入"
></el-input>
<span> ≤ </span>
<span class="big">订单金额</span>
<span> ＜ </span>
<el-form-item :prop="`list.${index}.rangeMax`" :rules="bgRules">
<el-input
v-model="item.rangeMax"
size="small"
style="width: 80px;"
placeholder="请输入"
></el-input>
</el-form-item>
<span class="small">元</span>
<span class="middle">运费：</span>
<el-form-item :prop="`list.${index}.fee`" :rules="bgRules">
<el-input
v-model="item.fee"
size="small"
style="width: 80px"
placeholder="请输入"
></el-input>
</el-form-item>
<span class="small">元</span>
</el-row>
<el-row>
<el-button
style="margin: 10px 20px 20px;"
size="small"
type="primary"
@click="addCondition"
>添加条件
</el-button>
</el-row>
<el-row
class="c-row"
style="padding: 10px 20px;"
v-for="(item, index) in formData.list.slice(1)"
:key="index"
>
<el-input
v-model="item.rangeMin"
disabled
size="small"
style="width: 80px"
placeholder="请输入"
></el-input>
<span> ≤ </span>
<span class="big">订单金额</span>
<span> ＜ </span>
<el-form-item :prop="`list.${index}.rangeMax`" :rules="bgRules">
<el-input
v-model="item.rangeMax"
size="small"
style="width: 80px;"
placeholder="请输入"
></el-input>
</el-form-item>
<span class="small">元</span>
<span class="middle">运费：</span>
<el-form-item :prop="`list.${index}.fee`" :rules="bgRules">
<el-input
v-model="item.fee"
size="small"
style="width: 80px;"
placeholder="请输入"
></el-input>
</el-form-item>
<span class="small">元</span>
<el-button
type="danger"
size="small"
@click="deleteCondition(index + 1)"
>删除</el-button>
</el-row>
<el-row class="title" style="margin-top: 80px;">
提示文案
</el-row>
<el-row>
<el-form-item class="lh" label="运费说明：">
<el-input
v-model="formData.intro"
size="small"
maxlength="10"
style="width: 410px"
placeholder="请输入"></el-input>
</el-form-item>
</el-row>
</el-form>
</div>
<div class="header-title">商品运费</div>
<el-button
style="margin: 10px 20px 20px;"
size="small"
type="primary"
@click="addGoodsCondition"
>添加条件
</el-button>
<el-table :data="resultForm.goodConditionReqList" @row-click='handleRowClickRole' border class="item-table" style="width: 100%;margin-top: 30px;">
<el-table-column prop="goodIds" label="商品ID" min-width="100" align="center">
<template slot-scope="scope">
<div v-for="(item, index) in scope.row.goodIds" :key="index" style="text-align: center;margin: 0 auto;padding: 0;">
<div v-if="index != scope.row.goodIds.length - 1" style="cursor: pointer;color: #449284;float: left;display: inline-block;" @click="viewGoods(item)">{{item}}、</div>
<div v-else-if="index == scope.row.goodIds.length - 1" style="cursor: pointer;color: #449284;float: left;display: inline-block;" @click="viewGoods(item)">{{item}}</div>
</div>
</template>
</el-table-column>
<el-table-column prop="conditionType" label="包邮条件" min-width="100" align="center">
<template slot-scope="scope">
<div v-if="scope.row.conditionType == 1">
满{{scope.row.number}}件包邮
</div>
<div v-if="scope.row.conditionType == 2">
满{{scope.row.numberText}}元包邮
</div>
</template>
</el-table-column>
<el-table-column prop="intro" label="说明" min-width="100" align="center">
</el-table-column>
<el-table-column prop="status" label="操作" min-width="100" align="center">
<template slot-scope="scope">
<el-button type="text" size="small" @click="editGoodsFreight(scope.row)">编辑</el-button>
<el-button type="text" size="small" @click="delGoodsFreight(scope.row,scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
<el-row style="margin: 50px 0 0 220px;">
<el-button
:disabled="btnDisabled"
type="primary"
size="small"
@click="beforSave()"
>保存</el-button>
<el-button
:disabled="btnDisabled"
size="small"
@click="cancleSave()"
>取消</el-button>
</el-row>
<el-dialog
:title="title"
:visible.sync="setAddVisible"
width="60%">
<!-- <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">-->
<el-form ref="GoodsPriceForm"
:rules="addRules"
:model="goodCondition"
label-width="250px"
label-suffix=":"
label-position="right"
size="mini"
style="width: 100%;">
<el-form-item label="适用商品ID" class="required-label" prop="goodIds">
<el-col :span="12">
<!-- <el-select v-model="goodCondition.goodIdList"-->
<!-- filterable-->
<!-- remote-->
<!-- reserve-keyword-->
<!-- placeholder="多个商品ID，以“、”隔开"-->
<!-- clearable-->
<!-- value-key="id"-->
<!-- style="width: 130%;"-->
<!-- :remote-method="remoteMethod"-->
<!-- @change="nameChange"-->
<!-- @visible-change="noSelectHand">-->
<el-select v-model="goodCondition.goodIds"
filterable
clearable
multiple
placeholder="可以选择多个商品ID"
style="width: 130%;">
<el-option
v-for="item in nameList"
:key="item.id"
:label="item.id"
:value="item.id">
<span>{{item.value}}</span>
</el-option>
</el-select>
</el-col>
</el-form-item>
<el-form-item label="包邮条件" class="required-label" prop="conditionType">
<el-col :span="4">
<el-select
v-model="goodCondition.conditionType"
size="small">
<el-option
v-for="(item,index) in typeList"
:key="index"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-col>
<el-col :span="9" style="margin-left: 5px;">
<span style="margin-left: 5px;">满</span>
<el-input-number v-if="goodCondition.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="goodCondition.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="goodCondition.conditionType == 1">件包邮</span>
<span style="margin-left: 5px;" v-if="goodCondition.conditionType == 2">元包邮</span>
</el-col>
</el-form-item>
<el-form-item label="运费说明" class="required-label">
<el-col :span="15">
<el-input v-model="goodCondition.intro" maxlength="10" style="width: 100%;" size="small" placeholder="请输入"></el-input>
</el-col>
</el-form-item>
</el-form>
<!-- </el-row>-->
<span slot="footer" class="dialog-footer" style="text-align: center;">
<el-button @click="setAddVisible = false">取 消</el-button>
<el-button type="primary" @click="save()">保存</el-button>
</span>
</el-dialog>
</div>
</div>
</template>
<script>
let vm = null;
import BreadCrumb from "@/components/breadcrumb.vue";
import { getExpressFee, createOrModifyExpressFee, getFreightConfig, saveFreightConfig } from "@/utils/freight";
import {closeLoading, openLoading} from "../../utils/utils";
import { getGoodsIdList } from '@/utils/goods';
export default {
components: {
BreadCrumb
},
data() {
var checkRange = (rule, value, callback) => {
console.log("in checkRange", rule);
let min = 0,
max = 999999999.99;
let arr = (value + "").split(".");
if (arr.length > 1) {
let temp = arr[1];
if (temp.length > 2) {
return callback(new Error("最多为2位小数"));
}
}
let val = parseFloat(value);
if (val >= min && val <= max) {
callback();
} else {
callback(new Error(`输入范围0 ~ 999999999.99`));
}
};
return {
curmbFirst: '云鹊店铺',
curmbSecond: '运费配置',
btnDisabled: false,
formData: {
expressFeeConfigId: 0,
intro: "",
introId:"",
list: [
{
fee: 0,
rangeMin: 0,
rangeMax: 0,
},
],
},
model:{
type:1,
userName: "",
},
typeList: [
{
label: '件数',
value: 1,
}, {
label: '金额',
value: 2,
}],
title:"添加条件",
setAddVisible: false,
storeId:'',
goodCondition:{
goodIds:[],
conditionType:'',
number:'',
intro:'',
goodIdList:''
},
goodIdsArray:[],
nameList:[],
resultForm:{
goodConditionReqList:[],
intro:'',
introId:'',
storeExpressIntervalReqList:[],
storeId:''
},
rowIndex:'',
addRules:{
goodIds: [
{required: true, message: "请输入商品ID", trigger: 'blur'}
],
conditionType: [
{required: true, message: "请选择包邮条件", trigger: 'blur'}
],
},
bgRules: [{ validator: checkRange, trigger: "blur" }],
};
},
watch: {
"formData.list": {
handler(val) {
const length = val.length;
if (length > 1) {
for (let i = 1; i < length; i++) {
val[i].rangeMin = val[i - 1].rangeMax;
}
}
},
deep: true,
},
},
created() {
vm = this;
this.storeId = this.$route.query.storeId;
// this.getExpressFeeInfo();
this.getFreightConfig();
},
methods: {
changeValue(v){
console.log(v);
},
// 对数据进行处理
dataHandler(listData, isRatioLower = true) {
let list = JSON.parse(JSON.stringify(listData));
let ratio = 0.01;
if(isRatioLower) {
list.map( item => {
item.fee = Number(item.fee * ratio).toFixed(2);
item.rangeMin = Number(item.rangeMin * ratio).toFixed(2);
item.rangeMax = Number(item.rangeMax * ratio).toFixed(2);
});
} else {
ratio = 100;
list.map( item => {
item.fee = parseInt(item.fee * ratio);
item.rangeMin = parseInt(item.rangeMin * ratio);
item.rangeMax = parseInt(item.rangeMax * ratio);
});
}
return list;
},
// 获取配置信息
getExpressFeeInfo() {
getExpressFee().then( res => {
let curData = res.data;
if(res.data && res.data.list && res.data.list.length) {
curData.list = this.dataHandler(res.data.list);
} else {
curData.list = this.formData.list;
}
this.formData = curData;
})
},
// 增加单个条件
addCondition() {
this.formData.list.push({
fee: 0,
rangeMin: 0,
rangeMax: 0,
});
},
handleRowClickRole(row){
this.rowIndex = row.index
console.log(this.rowIndex)
},
// 删除条件
deleteCondition(index) {
this.formData.list.splice(index, 1);
},
// 保存前校验
beforSave() {
this.$refs["form"].validate((valid) => {
if (!valid) return false;
this.$confirm("是否确认保存?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.saveAll();
})
.catch(() => {});
});
},
// 保存
saveAll() {
this.btnDisabled = true;
let formData = JSON.parse(JSON.stringify(this.formData));
formData.list = this.dataHandler(formData.list, false);
vm.resultForm.storeExpressIntervalReqList = formData.list;
vm.resultForm.intro = formData.intro;
vm.resultForm.introId = formData.introId;
vm.resultForm.storeId = vm.storeId;
saveFreightConfig(vm.resultForm)
// createOrModifyExpressFee(formData)
.then((res) => {
if (res.code == "000000") {
// this.getExpressFeeInfo();
this.$message({ type: "success", message: "保存成功!" });
this.$router.push({
path: `/shop-list`
})
} else {
this.$message({ type: "error", message: res.message });
}
})
.finally((res) => {
this.btnDisabled = false;
});
},
cancleSave(){
this.$router.push({
path: `/shop-list`
})
// this.$confirm(`是否取消？`, "", {
// confirmButtonText: "确定",
// cancelButtonText: "取消",
// type: "warning"
// // customClass: 'range-make-box',
// })
// .then(() => {
// // confirm
// vm.DELETE("rtc/liveAdmin/" + row.id, {}).then(res => {
// if (res.code == "000000") {
// vm.$message({
// type: "success",
// message: "删除成功"
// });
// this.getLiveList("", "");
// } else {
// vm.$message({
// type: "warning",
// message: res.message
// });
// }
// });
// })
// .catch(() => {});
},
// 查看商品详情
viewGoods(row){
// url = `/create-good?id=${row.goodsId}&storeId=${this.searchForm.storeId}&goodsType=${goodsType}&commissionFlag=${this.commissionFlag}`
let url = `/create-good?id=${row}&storeId=${this.storeId}&goodsType=5&commissionFlag=2`
// this.$store.dispatch('goodsManage/changeGoodsInfo', {...row});
this.$router.push({
path: url
})
},
addGoodsCondition(){
vm.remoteMethod();
vm.goodCondition = {
goodIds:[],
conditionType:'',
number:'',
intro:'',
goodIdList:''
};
this.title = "添加条件";
this.setAddVisible = true;
},
setIdArray(goodIdList){
let idArray = [];
if(goodIdList.indexOf("、") > -1){
idArray = goodIdList.split("、");
}
else {
idArray.push(goodIdList);
}
return idArray;
},
getIdArray(goodIds){
let idArray = '';
for(let i=0; i < goodIds.length; i++){
if(i != goodIds.length - 1){
idArray = idArray + goodIds[i] + "、";
}
else if(i == goodIds.length - 1){
idArray = idArray + goodIds[i];
}
}
return idArray;
},
editGoodsFreight(row){
vm.remoteMethod();
let idArray = this.getIdArray(row.goodIds);
if(row.conditionType == 2){
vm.goodCondition = {
id:row.id,
goodIds:row.goodIds,
conditionType:row.conditionType,
number:row.number/100,
intro:row.intro,
introId:row.introId,
goodIdList:idArray
};
}
else {
vm.goodCondition = {
id:row.id,
goodIds:row.goodIds,
conditionType:row.conditionType,
number:row.number,
intro:row.intro,
introId:row.introId,
goodIdList:idArray
};
}
this.title = "修改条件";
this.setAddVisible = true;
},
delGoodsFreight(row,index){
// vm.rowIndex;
vm.resultForm.goodConditionReqList.splice(index,1);
},
// 获取配置信息
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;
}
if(res.data.goodConditionDtoList){
for (let i=0;i < res.data.goodConditionDtoList.length; i++){
if(res.data.goodConditionDtoList[i].goodExpressConditionConfig.conditionType == 2){
this.resultForm.goodConditionReqList.push(
{id:res.data.goodConditionDtoList[i].goodExpressConditionConfig.id,
goodIds:res.data.goodConditionDtoList[i].goodIds,
conditionType:res.data.goodConditionDtoList[i].goodExpressConditionConfig.conditionType,
number:res.data.goodConditionDtoList[i].goodExpressConditionConfig.number,
numberText:res.data.goodConditionDtoList[i].goodExpressConditionConfig.number/100,
intro:res.data.goodConditionDtoList[i].goodExpressConditionConfig.intro,
introId:res.data.goodConditionDtoList[i].goodExpressConditionConfig.id
});
}
else {
this.resultForm.goodConditionReqList.push(
{id:res.data.goodConditionDtoList[i].goodExpressConditionConfig.id,
goodIds:res.data.goodConditionDtoList[i].goodIds,
conditionType:res.data.goodConditionDtoList[i].goodExpressConditionConfig.conditionType,
number:res.data.goodConditionDtoList[i].goodExpressConditionConfig.number,
numberText:res.data.goodConditionDtoList[i].goodExpressConditionConfig.number,
intro:res.data.goodConditionDtoList[i].goodExpressConditionConfig.intro,
introId:res.data.goodConditionDtoList[i].goodExpressConditionConfig.id
});
}
}
}
// this.tableData = res.data.goodConditionDtoList;
this.formData.list = curData.list;
this.formData.intro = res.data.storeExpressFeeIntro.intro;
this.formData.introId = res.data.storeExpressFeeIntro.id;
})
},
remoteMethod(val) {
this.searchForm = {
goodsIdList:[],
goodIdStr :val,
goodsType :'',
pageNo:1,
pageSize: 10,
storeId:this.storeId,
commissionType: 0
};
// if (val.length >= 2) {
// console.log('搜索',val)
getGoodsIdList(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)
let addFlag = true;
if (val) {
for(let i=0; i < vm.expertData.length; i++){
if (val == vm.expertData[i].goodsId) {
let item = vm.expertData[i];
vm.goodIdsArray = vm.goodCondition.goodIds;
for(let j=0; j < vm.goodIdsArray.length; j++){
if(vm.goodIdsArray[j] == val){
addFlag = false;
break;
}
}
if(addFlag){
vm.goodIdsArray.push(val);
}
vm.goodCondition.goodIdList = this.getIdArray(vm.goodIdsArray);
break;
// 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 = [];
}
},
// 保存商品运费添加条件
save(){
let addFlag = false;
this.$refs["GoodsPriceForm"].validate((valid) => {
if (!valid) return false;
// vm.goodCondition.goodIds = [];
// vm.goodCondition.goodIds = vm.setIdArray(vm.goodCondition.goodIdList);
if(vm.resultForm.goodConditionReqList.length > 0){
// this.formData.tabs[0].contents = vm.resultForm.goodConditionReqList.filter(function (item) {
// return item.goodIds == vm.goodCondition.goodIds;
// });
for(let i=0; i < vm.resultForm.goodConditionReqList.length; i++){
if((vm.goodCondition.id != ""
&& vm.resultForm.goodConditionReqList[i].id == vm.goodCondition.id)
|| (vm.goodCondition.id == "" && vm.getIdArray(vm.resultForm.goodConditionReqList[i].goodIds) == vm.getIdArray(vm.goodCondition.goodIds))){
vm.resultForm.goodConditionReqList[i].conditionType = vm.goodCondition.conditionType;
vm.resultForm.goodConditionReqList[i].goodIds = vm.goodCondition.goodIds;
if(vm.goodCondition.conditionType == 2){
vm.resultForm.goodConditionReqList[i].number = vm.goodCondition.number * 100;
vm.resultForm.goodConditionReqList[i].numberText = vm.goodCondition.number;
}
else{
vm.resultForm.goodConditionReqList[i].number = vm.goodCondition.number;
}
vm.resultForm.goodConditionReqList[i].intro = vm.goodCondition.intro;
vm.resultForm.goodConditionReqList[i].introId = vm.goodCondition.introId;
addFlag = false;
break;
}
if(i == vm.resultForm.goodConditionReqList.length - 1){
addFlag = true;
}
}
if(addFlag){
vm.addGoodConditionReqList();
}
}
else {
vm.addGoodConditionReqList();
}
vm.setAddVisible = false;
});
},
addGoodConditionReqList(){
if(vm.goodCondition.conditionType == 2){
vm.resultForm.goodConditionReqList.push({
goodIds:vm.goodCondition.goodIds,
conditionType:vm.goodCondition.conditionType,
number:vm.goodCondition.number * 100,
numberText:vm.goodCondition.number,
intro:vm.goodCondition.intro,
introId:vm.goodCondition.introId
});
}
else {
vm.resultForm.goodConditionReqList.push({
goodIds:vm.goodCondition.goodIds,
conditionType:vm.goodCondition.conditionType,
number:vm.goodCondition.number,
numberText:vm.goodCondition.number,
intro:vm.goodCondition.intro,
introId:vm.goodCondition.introId
});
}
}
},
};
</script>
<style lang="less">
.freight-config-content {
.el-form-item {
position: relative;
top: -7px;
left: 0;
margin-bottom: 0;
}
.el-button {
position: relative;
top: -4px;
left: 0;
}
}
</style>
<style lang="less" scoped>
.order-detail-wrapper {
.order-detail-content {
background: #fff;
padding: 10px;
.header-title {
padding: 10px 12px;
font-size: 13px;
color: #449284;
border-bottom: 1px solid #efefef;
}
.freight-config-content {
margin-top: 60px;
min-height: 400px;
.title {
border-bottom: 0.5px solid #e7e8e9;
padding-bottom: 6px;
margin-bottom: 20px;
color: #373839;
font-weight: 700;
}
.c-row {
& > span {
display: inline-block;
width: 40px;
margin: 0;
text-align: center;
color: #626262;
&.big {
width: 70px;
}
&.small {
width: 20px;
margin: 0 50px 0 0;
}
&.middle {
width: 50px;
}
}
}
}
}
}
</style>
src/views/goods/goods-manage.vue
浏览文件 @ 55ee6ab7
......@@ -3,15 +3,19 @@
<bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond"></bread-crumb>
<div class="yqshop-content screenSet" id="screenSet">
<div class="header-title">商品管理</div>
<el-form ref="searchForm" :model="searchForm" label-width="80px" label-suffix=":" :inline="true">
<el-form ref="searchForm" :model="searchForm" label-width="100px" label-suffix=":" :inline="true">
<el-row :gutter="30" type="flex" style="margin-top: 10px">
<el-col :span="18">
<el-col :span="6">
<el-form-item label="商品名称">
<el-input v-model="searchForm.goodsName" size="small" placeholder="请输入商品名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="商品ID">
<el-input v-model="id" size="small" placeholder="请输入商品ID"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="商品类型">
<el-select
v-model="searchForm.goodsType"
......@@ -26,6 +30,10 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30" type="flex" style="margin-top: 10px">
<el-col :span="6">
<el-form-item label="分佣方式" v-if="commissionFlag == 2">
<el-select
v-model="searchForm.commissionType"
......@@ -41,11 +49,28 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="药代分佣方式" v-if="commissionFlag == 2">
<el-select
v-model="searchForm.proxyCommissionType"
placeholder="请选择分佣方式"
size="small"
clearable>
<el-option
v-for="item in commissionTypeList"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" style="text-align: right">
<el-button type="primary" size="small" @click="searchList">查询</el-button>
<el-button type="default" size="small" @click="resetForm" style="margin-left:0;">重置</el-button>
</el-col>
</el-row>
<el-row :gutter="30" type="flex" style="margin-top: 10px">
<el-col :span="12">
<el-button type="primary" size="small" @click="batchOpt('on')">批量上架</el-button>
......@@ -102,6 +127,17 @@
<span v-if="scope.row.commissionType == 2">{{scope.row.commissionPrice | priceNum}}元</span>
</template>
</el-table-column>
<el-table-column prop="commissionType" label="药代分佣方式" width="120" align="center">
<template slot-scope="scope">
<span>{{ scope.row.proxyCommissionType | commissionTypeFormat}}</span>
</template>
</el-table-column>
<el-table-column prop="commissionPrice" label="药代分佣" width="120" align="center">
<template slot-scope="scope">
<span v-if="scope.row.proxyCommissionType == 1">{{scope.row.proxyCommissionPrice | priceNum}}%</span>
<span v-if="scope.row.proxyCommissionType == 2">{{scope.row.proxyCommissionPrice | priceNum}}元</span>
</template>
</el-table-column>
<el-table-column prop="saleTime" label="发布时间" width="170" align="center">
</el-table-column>
......@@ -211,20 +247,78 @@
label-position="right"
size="mini"
style="width: 100%;">
<el-form-item label="分佣方式" prop="commissionType">
<!-- <div v-for="(item, index) in setPriceForm.adminCommissionGoodsRespList" :key="index" >-->
<!-- <el-form-item v-if="item.commissionKind == 1" label="分佣方式">-->
<!-- <el-col :span="18">-->
<!-- <el-radio-group v-model="item.commissionType" size="small" style="line-height: 45px;">-->
<!-- <div>-->
<!-- <el-radio :label="1" style="float: left;margin-top: 5px;line-height: 20px;">按比例分佣（%）</el-radio>-->
<!-- <span style="float: right;width: 100px;"><el-input-number v-model="item.commissionPrice1" size="small" :precision="2" :min="0"></el-input-number></span>-->
<!-- </div>-->
<!-- <div>-->
<!-- <el-radio :label="2" style="float: left;margin-top: 30px;line-height: 20px;">固定分佣金额（元）</el-radio>-->
<!-- <span style="float: right;width: 100px;margin-left: 14px;"><el-input-number v-model="item.commissionPrice2" size="small" :precision="2" :min="0" :max="9999.99"></el-input-number></span>-->
<!-- </div>-->
<!-- </el-radio-group>-->
<!-- </el-col>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-if="item.commissionKind == 2" label="药代分佣方式">-->
<!-- <el-col :span="18">-->
<!-- <el-radio-group v-model="item.commissionType" size="small" style="line-height: 45px;">-->
<!-- <div>-->
<!-- <el-radio :label="1" style="float: left;margin-top: 5px;line-height: 20px;">按比例分佣（%）</el-radio>-->
<!-- <span style="float: right;width: 100px;"><el-input-number v-model="item.commissionPrice1" size="small" :precision="2" :min="0"></el-input-number></span>-->
<!-- </div>-->
<!-- <div>-->
<!-- <el-radio :label="2" style="float: left;margin-top: 30px;line-height: 20px;">固定分佣金额（元）</el-radio>-->
<!-- <span style="float: right;width: 100px;margin-left: 14px;"><el-input-number v-model="item.commissionPrice2" size="small" :precision="2" :min="0" :max="9999.99"></el-input-number></span>-->
<!-- </div>-->
<!-- </el-radio-group>-->
<!-- </el-col>-->
<!-- </el-form-item>-->
<!-- </div>-->
<el-form-item label="分佣方式">
<el-col :span="18">
<el-radio-group v-model="setPriceForm.commission.commissionType" size="small" style="line-height: 45px;">
<div>
<el-radio :label="1" style="float: left;margin-top: 5px;line-height: 20px;">按比例分佣（%）</el-radio>
<span style="float: right;width: 100px;"><el-input-number v-model="setPriceForm.commission.commissionPrice1" size="small" :precision="2" :min="0"></el-input-number></span>
</div>
<div>
<el-radio :label="2" style="float: left;margin-top: 30px;line-height: 20px;">固定分佣金额（元）</el-radio>
<span style="float: right;width: 100px;margin-left: 14px;"><el-input-number v-model="setPriceForm.commission.commissionPrice2" size="small" :precision="2" :min="0" :max="9999.99"></el-input-number></span>
</div>
</el-radio-group>
</el-col>
</el-form-item>
<el-form-item label="药代分佣方式">
<el-col :span="18">
<el-radio-group v-model="setPriceForm.commissionType" size="small" style="line-height: 45px;">
<el-radio-group v-model="setPriceForm.proxyCommission.commissionType" size="small" style="line-height: 45px;">
<div>
<el-radio :label="1" style="float: left;margin-top: 5px;line-height: 20px;">按比例分佣（%）</el-radio>
<span style="float: right;width: 100px;"><el-input-number v-model="setPriceForm.commissionPrice1" size="small" :precision="2" :min="0"></el-input-number></span>
<span style="float: right;width: 100px;"><el-input-number v-model="setPriceForm.proxyCommission.commissionPrice1" size="small" :precision="2" :min="0"></el-input-number></span>
</div>
<div>
<el-radio :label="2" style="float: left;margin-top: 30px;line-height: 20px;">固定分佣金额（元）</el-radio>
<span style="float: right;width: 100px;margin-left: 14px;"><el-input-number v-model="setPriceForm.commissionPrice2" size="small" :precision="2" :min="0" :max="9999.99"></el-input-number></span>
<span style="float: right;width: 100px;margin-left: 14px;"><el-input-number v-model="setPriceForm.proxyCommission.commissionPrice2" size="small" :precision="2" :min="0" :max="9999.99"></el-input-number></span>
</div>
</el-radio-group>
</el-col>
</el-form-item>
<!-- <el-form-item label="分佣方式" prop="commissionType">-->
<!-- <el-col :span="18">-->
<!-- <el-radio-group v-model="setPriceForm.commissionType" size="small" style="line-height: 45px;">-->
<!-- <div>-->
<!-- <el-radio :label="1" style="float: left;margin-top: 5px;line-height: 20px;">按比例分佣（%）</el-radio>-->
<!-- <span style="float: right;width: 100px;"><el-input-number v-model="setPriceForm.commissionPrice1" size="small" :precision="2" :min="0"></el-input-number></span>-->
<!-- </div>-->
<!-- <div>-->
<!-- <el-radio :label="2" style="float: left;margin-top: 30px;line-height: 20px;">固定分佣金额（元）</el-radio>-->
<!-- <span style="float: right;width: 100px;margin-left: 14px;"><el-input-number v-model="setPriceForm.commissionPrice2" size="small" :precision="2" :min="0" :max="9999.99"></el-input-number></span>-->
<!-- </div>-->
<!-- </el-radio-group>-->
<!-- </el-col>-->
<!-- </el-form-item>-->
</el-form>
<!-- </el-row>-->
......@@ -282,7 +376,8 @@
pageNo:1,
pageSize: 10,
storeId:0,
commissionType: 0
commissionType: 0,
proxyCommissionType:0
},
innerVisible:false,
selectList:[],
......@@ -320,13 +415,34 @@
commissionFlag: 2,
setPriceVisible: false,
setPriceForm:{
commissionType: 1,
commissionPrice: '',
// commissionType: 1,
// commissionPrice: '',
// commissionPrice1: '',
// commissionPrice2: '',
// storeId: '',
// goodsId: '',
// maxPrice: ''
adminCommissionGoodsRespList:[],
commission:{
commissionKind: "",
commissionPrice: "",
commissionPrice1: '',
commissionPrice2: '',
storeId: '',
goodsId: '',
maxPrice: ''
commissionType: "",
goodsId: "",
maxPrice: 0,
storeId:"",
},
proxyCommission:{
commissionKind: "",
commissionPrice: "",
commissionPrice1: '',
commissionPrice2: '',
commissionType: "",
goodsId: "",
maxPrice: 0,
storeId:"",
},
},
setPriceRules: {
commissionType: [
......@@ -690,25 +806,116 @@
this.setPrice(this.selectList[0], true);
},
setPrice(row, batchUpdatePriceFlag){
if(this.$refs.setPriceForm) {
this.$refs.setPriceForm.resetFields()
}
this.batchUpdatePriceFlag = batchUpdatePriceFlag;
this.setPriceForm.storeId = row.storeId;
this.setPriceForm.goodsId = row.goodsId;
this.setPriceForm.commissionType = "";
this.setPriceForm.commissionPrice1 = undefined;
this.setPriceForm.commissionPrice2 = undefined;
this.setPriceForm.commissionType = row.commissionType;
if(this.setPriceForm.commissionType == 1){
this.setPriceForm.commissionPrice1 = row.commissionPrice/100;
}
else if(this.setPriceForm.commissionType == 2){
this.setPriceForm.commissionPrice2 = row.commissionPrice/100;
// if(this.$refs.setPriceForm) {
// this.$refs.setPriceForm.resetFields()
// }
if(row.adminCommissionGoodsRespList){
this.setPriceForm.adminCommissionGoodsRespList = row.adminCommissionGoodsRespList;
for(let i = 0; i < this.setPriceForm.adminCommissionGoodsRespList.length; i++){
if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 1){
this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice1 = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice/100;
}
else if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 2){
this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice2 = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice/100;
}
if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1){
// this.setPriceForm.commission = this.setPriceForm.adminCommissionGoodsRespList[i];
this.setPriceForm.commission.commissionKind = this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind;
this.setPriceForm.commission.commissionPrice = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice;
this.setPriceForm.commission.commissionPrice1 = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice1;
this.setPriceForm.commission.commissionPrice2 = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice2;
this.setPriceForm.commission.commissionType = this.setPriceForm.adminCommissionGoodsRespList[i].commissionType;
this.setPriceForm.commission.goodsId = this.setPriceForm.adminCommissionGoodsRespList[i].goodsId;
this.setPriceForm.commission.maxPrice = this.setPriceForm.adminCommissionGoodsRespList[i].maxPrice;
this.setPriceForm.commission.storeId = this.setPriceForm.adminCommissionGoodsRespList[i].storeId;
}
else if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 2){
// this.setPriceForm.proxyCommission = this.setPriceForm.adminCommissionGoodsRespList[i];
this.setPriceForm.proxyCommission.commissionKind = this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind;
this.setPriceForm.proxyCommission.commissionPrice = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice;
this.setPriceForm.proxyCommission.commissionPrice1 = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice1;
this.setPriceForm.proxyCommission.commissionPrice2 = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice2;
this.setPriceForm.proxyCommission.commissionType = this.setPriceForm.adminCommissionGoodsRespList[i].commissionType;
this.setPriceForm.proxyCommission.goodsId = this.setPriceForm.adminCommissionGoodsRespList[i].goodsId;
this.setPriceForm.proxyCommission.maxPrice = this.setPriceForm.adminCommissionGoodsRespList[i].maxPrice;
this.setPriceForm.proxyCommission.storeId = this.setPriceForm.adminCommissionGoodsRespList[i].storeId;
}
}
let newArray = this.setPriceForm.adminCommissionGoodsRespList.filter(function (item) {
return item.commissionKind == 1;
});
if(newArray == null || newArray.length == 0){
this.setPriceForm.commission = {
commissionKind: 1,
commissionPrice: "",
commissionPrice1: undefined,
commissionPrice2: undefined,
commissionType: 0,
goodsId: row.goodsId,
maxPrice: 0,
storeId: row.storeId,
};
}
let array = this.setPriceForm.adminCommissionGoodsRespList.filter(function (item) {
return item.commissionKind == 2;
});
if(array == null || array.length == 0){
this.setPriceForm.proxyCommission = {
commissionKind: 2,
commissionPrice: "",
commissionPrice1: undefined,
commissionPrice2: undefined,
commissionType: 0,
goodsId: row.goodsId,
maxPrice: 0,
storeId: row.storeId,
};
}
}
else {
this.setPriceForm.commission = {
commissionKind: 1,
commissionPrice: "",
commissionPrice1: undefined,
commissionPrice2: undefined,
commissionType: 0,
goodsId: row.goodsId,
maxPrice: 0,
storeId: row.storeId,
};
this.setPriceForm.proxyCommission = {
commissionKind: 2,
commissionPrice: "",
commissionPrice1: undefined,
commissionPrice2: undefined,
commissionType: 0,
goodsId: row.goodsId,
maxPrice: 0,
storeId: row.storeId,
};
}
// this.setPriceForm.storeId = row.storeId;
// this.setPriceForm.goodsId = row.goodsId;
// this.setPriceForm.commissionType = "";
// this.setPriceForm.commissionPrice1 = undefined;
// this.setPriceForm.commissionPrice2 = undefined;
// this.setPriceForm.commissionType = row.commissionType;
// if(this.setPriceForm.commissionType == 1){
// this.setPriceForm.commissionPrice1 = row.commissionPrice/100;
// }
// else if(this.setPriceForm.commissionType == 2){
// this.setPriceForm.commissionPrice2 = row.commissionPrice/100;
// }
this.setPriceVisible = true;
// this.setPriceForm.price = row.price;
this.setPriceVisible = true;
// if(this.$refs.setPriceForm) {
// this.$refs.setPriceForm.resetFields()
// }
......@@ -716,29 +923,36 @@
},
confirmSetPrice() {
if(this.setPriceForm.commissionType == null || this.setPriceForm.commissionType == ""){
if(this.setPriceForm.commission.commissionType == 1
&& (this.setPriceForm.commission.commissionPrice1 == undefined
|| this.setPriceForm.commission.commissionPrice1 > 100)){
this.$message({
message: '请选择分佣方式',
message: '请输入按比例分佣0-100',
type: "warning"
});
return;
}
if(this.setPriceForm.commissionType == 1 && this.setPriceForm.commissionPrice1 == undefined ){
if(this.setPriceForm.commission.commissionType == 2
&& this.setPriceForm.commission.commissionPrice2 == undefined){
this.$message({
message: '请输入按比例分佣',
message: '请输入固定分佣金额',
type: "warning"
});
return;
}
else if(this.setPriceForm.commissionType == 1 && this.setPriceForm.commissionPrice1 > 100){
if(this.setPriceForm.proxyCommission.commissionType == 1
&& (this.setPriceForm.proxyCommission.commissionPrice1 == undefined
|| this.setPriceForm.proxyCommission.commissionPrice1 > 100)){
this.$message({
message: '请输入按比例分佣0-100',
type: "warning"
});
return;
}
if(this.setPriceForm.commissionType == 2 && this.setPriceForm.commissionPrice2 == undefined ){
if(this.setPriceForm.proxyCommission.commissionType == 2
&& this.setPriceForm.proxyCommission.commissionPrice2 == undefined){
this.$message({
message: '请输入固定分佣金额',
type: "warning"
......@@ -746,6 +960,50 @@
return;
}
// for(let i = 0; i < this.setPriceForm.adminCommissionGoodsRespList.length; i++){
// // if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1
// // && (this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == null || this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == "")){
// //
// // this.$message({
// // message: '请选择分佣方式',
// // type: "warning"
// // });
// // return;
// // }
// //
// // if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1
// // && this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 1 && this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice1 == undefined ){
// // this.$message({
// // message: '请输入按比例分佣',
// // type: "warning"
// // });
// // return;
// // }
// if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 1 && this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice1 > 100){
// this.$message({
// message: '请输入按比例分佣0-100',
// type: "warning"
// });
// return;
// }
// // if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1
// // && this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 2 && this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice2 == undefined ){
// // this.$message({
// // message: '请输入固定分佣金额',
// // type: "warning"
// // });
// // return;
// // }
//
// if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 1){
// this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice1 * 100;
// }
// else if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 2){
// this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice2 * 100;
// }
//
// }
let timeoutId = null
timeoutId && clearTimeout(timeoutId)
timeoutId = setTimeout(() => {
......@@ -754,23 +1012,38 @@
},
// 防止按钮多次点击
clickHandle() {
this.$refs.setPriceForm.validate((valid) => {
if(valid) {
// this.$refs.setPriceForm.validate((valid) => {
// if(valid) {
vm.loading = true
if(this.setPriceForm.commission.commissionType == 1){
this.setPriceForm.commission.commissionPrice = (this.setPriceForm.commission.commissionPrice1 * 100).toFixed(0);
}
else if(this.setPriceForm.commission.commissionType == 2){
this.setPriceForm.commission.commissionPrice = (this.setPriceForm.commission.commissionPrice2 * 100).toFixed(0);
}
if(this.setPriceForm.proxyCommission.commissionType == 1){
this.setPriceForm.proxyCommission.commissionPrice = (this.setPriceForm.proxyCommission.commissionPrice1 * 100).toFixed(0);
}
else if(this.setPriceForm.proxyCommission.commissionType == 2){
this.setPriceForm.proxyCommission.commissionPrice = (this.setPriceForm.proxyCommission.commissionPrice2 * 100).toFixed(0);
}
vm.setPriceForm.adminCommissionGoodsRespList[0] = this.setPriceForm.commission;
vm.setPriceForm.adminCommissionGoodsRespList[1] = this.setPriceForm.proxyCommission;
// 批量设置价格
if(vm.batchUpdatePriceFlag){
let setPriceList = [];
if(vm.setPriceForm.commissionType == 1){
vm.setPriceForm.commissionPriceStr = vm.setPriceForm.commissionPrice1;
}
else if(vm.setPriceForm.commissionType == 2){
vm.setPriceForm.commissionPriceStr = vm.setPriceForm.commissionPrice2;
}
// if(vm.setPriceForm.commissionType == 1){
// vm.setPriceForm.commissionPriceStr = vm.setPriceForm.commissionPrice1;
// }
// else if(vm.setPriceForm.commissionType == 2){
// vm.setPriceForm.commissionPriceStr = vm.setPriceForm.commissionPrice2;
// }
let parm = {
commissionPrice: vm.setPriceForm.commissionPriceStr * 100,
commissionType: vm.setPriceForm.commissionType,
goodsIdList:[],
storeId: vm.setPriceForm.storeId
adminCommissionGoodsReqList:vm.setPriceForm.adminCommissionGoodsRespList,
// commissionPrice: vm.setPriceForm.commissionPriceStr * 100,
// commissionType: vm.setPriceForm.commissionType,
goodsIdList:[]
}
for(let i = 0; i < vm.selectList.length; i++){
parm.goodsIdList.push(vm.selectList[i].goodsId);
......@@ -794,14 +1067,14 @@
});
}
else {
if(vm.setPriceForm.commissionType == 1){
vm.setPriceForm.commissionPriceStr = vm.setPriceForm.commissionPrice1;
}
else if(vm.setPriceForm.commissionType == 2){
vm.setPriceForm.commissionPriceStr = vm.setPriceForm.commissionPrice2;
}
vm.setPriceForm.commissionPrice = vm.setPriceForm.commissionPriceStr * 100;
vm.POST('/store/commission/admin/goods/save', vm.setPriceForm).then(res => {
// if(vm.setPriceForm.commissionType == 1){
// vm.setPriceForm.commissionPriceStr = vm.setPriceForm.commissionPrice1;
// }
// else if(vm.setPriceForm.commissionType == 2){
// vm.setPriceForm.commissionPriceStr = vm.setPriceForm.commissionPrice2;
// }
// vm.setPriceForm.commissionPrice = vm.setPriceForm.commissionPriceStr * 100;
vm.POST('/store/commission/admin/goods/save', vm.setPriceForm.adminCommissionGoodsRespList).then(res => {
vm.loading = false
// closeLoading(this);
if (res.code == "000000") {
......@@ -820,8 +1093,8 @@
});
}
}
})
// }
// })
},
},
......
src/views/goods/order-detail.vue
浏览文件 @ 55ee6ab7
......@@ -65,6 +65,8 @@
<p>下单时间：{{orderDetailData.createdTime}}</p>
<p v-if="(showStatus == 1 || showStatus == 2 || showStatus == 3) && orderDetailData.payChannel">支付方式：{{orderDetailData.payChannel | payChanelFormat}}</p>
<p v-if="showStatus == 1 || showStatus == 2 || showStatus == 3">支付时间：{{orderDetailData.paymentTime}}</p>
<p v-if="showStatus == 1 || showStatus == 2 || showStatus == 3">&nbsp;&nbsp;&nbsp;招募人：{{orderDetailData.ownerName}}</p>
<p v-if="showStatus == 1 || showStatus == 2 || showStatus == 3">所属药代：{{orderDetailData.brokerName}}</p>
<!--<p>发货时间：{{orderDetailData.sendTime}}</p>-->
<!--<p>成交时间：{{orderDetailData.finishTime}}</p>-->
</div>
......@@ -96,7 +98,10 @@
<div class="total-set">
<p><span>商品总额：</span><span>￥{{orderDetailData.totalPrice | toFixed2}}</span></p>
<p><span>优惠：</span><span>-￥{{orderDetailData.totalCouponFee | toFixed2}}</span></p>
<p><span>运费：</span><span>￥{{orderDetailData.expressFee | toFixed2}}</span></p>
<p><span>&nbsp;运费：</span>
<span v-if="orderDetailData.expressFee == 0">免运费</span>
<span v-else-if="orderDetailData.expressFee != 0">￥{{orderDetailData.expressFee | toFixed2}}</span>
</p>
<p class="total-price" v-if="showStatus == 1 || showStatus == 2 || showStatus == 3"><span>实付：</span><span>￥{{orderDetailData.amount | toFixed2}}</span></p>
<p class="total-price" v-if="showStatus == 4"><span>应付：</span><span>￥{{(orderDetailData.totalPrice)| toFixed2}}</span></p>
<p class="total-price" v-if="showStatus == 5"><span>实付：</span><span>￥0.00</span></p>
......@@ -148,6 +153,8 @@
remark: '',//备注
sendTime: '',//发货时间
payChannel: '',//支付方式
ownerName:'',// 招募人姓名
brokerName:'',//药代名称
// showStatus: null,//订单展示状态,1已完成,2已发货,3待发货,4待支付,5交易关闭
},
tableData: [],
......
src/views/goods/order-manage.vue
浏览文件 @ 55ee6ab7
......@@ -26,6 +26,43 @@
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30" type="flex" style="margin-top: 10px">
<el-col :span="18">
<el-form-item label="招募人">
<el-select
v-model="searchForm.ownerId"
id="statusSelector"
placeholder="请输入招募人"
@change="changeOwner"
clearable
style="width:110%;height: 32px;line-height: 32px;"
>
<el-option
v-for="item in brokerOwnerList"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="药代姓名">
<el-select
v-model="searchForm.brokerId"
id="statusSelector"
placeholder="请输入药代姓名"
clearable
style="width:110%;height: 32px;line-height: 32px;"
>
<el-option
v-for="item in brokerList"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" style="text-align: right">
<el-button type="primary" size="small" @click="searchList">查询</el-button>
<el-button type="default" size="small" @click="resetForm" style="margin-left:0;">重置</el-button>
......@@ -81,6 +118,8 @@
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column prop="ownerName" label="招募人" min-width="100" align="center"></el-table-column>
<el-table-column prop="brokerName" label="药代姓名" min-width="100" align="center"></el-table-column>
<el-table-column prop="comments" label="备注" min-width="100" align="center"></el-table-column>
<el-table-column label="操作" min-width="250" align="center" fixed="right">
<template slot-scope="scope">
......@@ -251,7 +290,7 @@
import BreadCrumb from "@/components/breadcrumb.vue";
import SendSetDialog from "@/components/shop/send-set-dialog";
import { getOrdersExportUrl } from "@/utils/yqrange/yqrangeApi";
import { queryOrderList, updateExpress, refundApply } from "@/utils/shop";
import { queryOrderList, updateExpress, refundApply, brokerListAll, brokerOwnerListAll} from "@/utils/shop";
import { toDecimal2 } from '@/utils';
export default {
......@@ -271,6 +310,8 @@
orderNo: '',
receiver: '',
orderDate: '',
brokerId:'',
ownerId:'',
pageNo: 1,
pageSize: 10,
},
......@@ -334,13 +375,19 @@
label: '支付用户',
value: 2,
},
]
],
ownerId:'',
brokerList:[],
brokerOwnerList:[],
}
},
created() {
console.log("order created() : enter");
this.searchForm.storeId = this.$route.query.storeId || 0,
this.searchList();
this.brokerListAll();
this.brokerOwnerListAll();
},
methods: {
searchList(){
......@@ -365,10 +412,15 @@
orderNo: '',
receiver: '',
orderDate: '',
brokerId:'',
ownerId:'',
pageNo: 1,
pageSize: 10,
};
this.ownerId = "";
this.searchList();
this.brokerOwnerListAll();
this.brokerListAll();
},
handleSizeChange(val) {
this.searchForm.pageSize = val;
......@@ -529,16 +581,43 @@
});
},
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;
}
window.open(res.data);
});
},
// 云鹊店铺-订单管理-药代列表
brokerListAll(){
brokerListAll({ownerId:this.ownerId}).then(res => {
closeLoading(this);
if (res.code == '000000') {
this.brokerList = res.data;
}
})
},
//云鹊店铺-订单管理-招募人列表
brokerOwnerListAll(){
brokerOwnerListAll().then(res => {
closeLoading(this);
if (res.code == '000000') {
this.brokerOwnerList = res.data;
}
})
},
changeOwner(data) {
this.ownerId = data;
this.brokerListAll();
}
},
filters: {
toFixed2: function (value) {
......
src/views/shop/shop-list.vue
浏览文件 @ 55ee6ab7
......@@ -3,15 +3,19 @@
<bread-crumb :curmbFirst="curmbFirst"></bread-crumb>
<div class="yqshop-content screenSet" id="screenSet">
<div class="header-title">云鹊店铺</div>
<el-form ref="searchForm" :model="searchForm" label-width="80px" label-suffix=":" :inline="true">
<el-form ref="searchForm" :model="searchForm" label-width="100px" label-suffix=":" :inline="true">
<el-row :gutter="30" type="flex" style="margin-top: 10px">
<el-col :span="18">
<el-col :span="6">
<el-form-item label="店铺名称">
<el-input v-model="searchForm.storeName" size="small" placeholder="请输入店铺名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="店铺ID">
<el-input v-model="searchForm.id" size="small" placeholder="请输入店铺ID"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="店铺类型">
<el-select
v-model="searchForm.type"
......@@ -26,6 +30,10 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30" type="flex" style="margin-top: 10px">
<el-col :span="6">
<el-form-item label="分佣方式">
<el-select
v-model="searchForm.commissionType"
......@@ -41,6 +49,22 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="药代分佣方式">
<el-select
v-model="searchForm.proxyCommissionType"
placeholder="请选择分佣方式"
size="small"
clearable>
<el-option
v-for="item in commissionTypeList"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" style="text-align: right">
<el-button type="primary" size="small" @click="searchList">查询</el-button>
<el-button type="default" size="small" @click="resetForm" style="margin-left:0;">重置</el-button>
......@@ -96,6 +120,17 @@
<span v-if="scope.row.tradeStore.commissionType == 2">{{scope.row.tradeStore.commissionPrice | priceNum}}元</span>
</template>
</el-table-column>
<el-table-column prop="commissionType" label="药代分佣方式" width="120" align="center">
<template slot-scope="scope">
<span>{{ scope.row.tradeStore.proxyCommissionType | commissionTypeFormat}}</span>
</template>
</el-table-column>
<el-table-column prop="commissionPrice" label="药代分佣" width="120" align="center">
<template slot-scope="scope">
<span v-if="scope.row.tradeStore.proxyCommissionType == 1">{{scope.row.tradeStore.proxyCommissionPrice | priceNum}}%</span>
<span v-if="scope.row.tradeStore.proxyCommissionType == 2">{{scope.row.tradeStore.proxyCommissionPrice | priceNum}}元</span>
</template>
</el-table-column>
<el-table-column label="操作" min-width="230" align="center" fixed="right">
<template slot-scope="scope">
<div>
......@@ -103,6 +138,7 @@
<el-button @click="editShop(scope.row)" type="text" size="small">{{scope.row.tradeStore.storeType == 3 ? '查看' : '编辑'}}</el-button>
<el-button @click="shopManage(scope.row)" type="text" size="small">商品管理</el-button>
<el-button @click="orderManage(scope.row)" type="text" size="small">订单管理</el-button>
<el-button v-if="scope.row.tradeStore.commissionFlag == 2" @click="setFreight(scope.row)" type="text" size="small">运费配置</el-button>
<el-button v-if="storageIdType == 1 && (scope.row.tradeStore.storeType == 3 && scope.row.tradeStore.storeStatus == 1)" @click="closeShopAction(scope.row)" type="text" size="small">关闭店铺</el-button>
</div>
</template>
......@@ -134,20 +170,37 @@
label-position="right"
size="mini"
style="width: 100%;">
<el-form-item label="分佣方式" prop="commissionType">
<!-- <div v-for="(item, index) in setPriceForm.adminCommissionGoodsRespList" :key="index" >-->
<el-form-item label="分佣方式">
<el-col :span="18">
<el-radio-group v-model="setPriceForm.commissionType" size="small" style="line-height: 45px;">
<el-radio-group v-model="setPriceForm.commission.commissionType" size="small" style="line-height: 45px;">
<div>
<el-radio :label="1" style="float: left;margin-top: 5px;line-height: 20px;">按比例分佣（%）</el-radio>
<span style="float: right;width: 100px;"><el-input-number v-model="setPriceForm.commissionPrice1" size="small" :precision="2" :min="0"></el-input-number></span>
<span style="float: right;width: 100px;"><el-input-number v-model="setPriceForm.commission.commissionPrice1" size="small" :precision="2" :min="0"></el-input-number></span>
</div>
<div>
<el-radio :label="2" style="float: left;margin-top: 30px;line-height: 20px;">固定分佣金额（元）</el-radio>
<span style="float: right;width: 100px;margin-left: 14px;"><el-input-number v-model="setPriceForm.commissionPrice2" size="small" :precision="2" :min="0" :max="9999.99"></el-input-number></span>
<span style="float: right;width: 100px;margin-left: 14px;"><el-input-number v-model="setPriceForm.commission.commissionPrice2" size="small" :precision="2" :min="0" :max="9999.99"></el-input-number></span>
</div>
</el-radio-group>
</el-col>
</el-form-item>
<el-form-item label="药代分佣方式">
<el-col :span="18">
<el-radio-group v-model="setPriceForm.proxyCommission.commissionType" size="small" style="line-height: 45px;">
<div>
<el-radio :label="1" style="float: left;margin-top: 5px;line-height: 20px;">按比例分佣（%）</el-radio>
<span style="float: right;width: 100px;"><el-input-number v-model="setPriceForm.proxyCommission.commissionPrice1" size="small" :precision="2" :min="0"></el-input-number></span>
</div>
<div>
<el-radio :label="2" style="float: left;margin-top: 30px;line-height: 20px;">固定分佣金额（元）</el-radio>
<span style="float: right;width: 100px;margin-left: 14px;"><el-input-number v-model="setPriceForm.proxyCommission.commissionPrice2" size="small" :precision="2" :min="0" :max="9999.99"></el-input-number></span>
</div>
</el-radio-group>
</el-col>
</el-form-item>
<!-- </div>-->
</el-form>
<!-- </el-row>-->
......@@ -183,7 +236,8 @@
pageSize: 10,
id: null,
type: null,
commissionType: 0
commissionType: 0,
proxyCommissionType:0
},
canAdd: false,
totalRows: 0,
......@@ -227,18 +281,39 @@
}],
setPriceVisible: false,
setPriceForm:{
commissionType: 1,
commissionPrice: '',
// commissionType: 1,
// commissionPrice: '',
// commissionPrice1: '',
// commissionPrice2: '',
// storeId: '',
// goodsId: '',
// maxPrice: ''
adminCommissionGoodsRespList:[],
commission:{
commissionKind: "",
commissionPrice: "",
commissionPrice1: '',
commissionPrice2: '',
storeId: '',
goodsId: '',
maxPrice: ''
commissionType: "",
goodsId: "",
maxPrice: 0,
storeId:"",
},
proxyCommission:{
commissionKind: "",
commissionPrice: "",
commissionPrice1: '',
commissionPrice2: '',
commissionType: "",
goodsId: "",
maxPrice: 0,
storeId:"",
},
},
setPriceRules: {
commissionType: [
{required: true, message: "请选择分佣方式", trigger: 'blur'}
]
// commissionType: [
// {required: true, message: "请选择分佣方式", trigger: 'blur'}
// ]
},
}
},
......@@ -294,7 +369,8 @@
pageSize: 10,
id: null,
type: null,
commissionType: 0
commissionType: 0,
proxyCommissionType:0
};
this.searchList();
},
......@@ -365,29 +441,37 @@
})
},
confirmSetPrice() {
if(this.setPriceForm.commissionType == null || this.setPriceForm.commissionType == ""){
if(this.setPriceForm.commission.commissionType == 1
&& (this.setPriceForm.commission.commissionPrice1 == undefined
|| this.setPriceForm.commission.commissionPrice1 > 100)){
this.$message({
message: '请选择接诊服务费结算方式（上级医生）',
message: '请输入按比例分佣0-100',
type: "warning"
});
return;
}
if(this.setPriceForm.commissionType == 1 && this.setPriceForm.commissionPrice1 == undefined ){
if(this.setPriceForm.commission.commissionType == 2
&& this.setPriceForm.commission.commissionPrice2 == undefined){
this.$message({
message: '请输入按比例分佣',
message: '请输入固定分佣金额',
type: "warning"
});
return;
}
else if(this.setPriceForm.commissionType == 1 && this.setPriceForm.commissionPrice1 > 100){
if(this.setPriceForm.proxyCommission.commissionType == 1
&& (this.setPriceForm.proxyCommission.commissionPrice1 == undefined
|| this.setPriceForm.proxyCommission.commissionPrice1 > 100)){
this.$message({
message: '请输入按比例分佣0-100',
type: "warning"
});
return;
}
if(this.setPriceForm.commissionType == 2 && this.setPriceForm.commissionPrice2 == undefined ){
if(this.setPriceForm.proxyCommission.commissionType == 2
&& this.setPriceForm.proxyCommission.commissionPrice2 == undefined){
this.$message({
message: '请输入固定分佣金额',
type: "warning"
......@@ -395,6 +479,51 @@
return;
}
// for(let i = 0; i < this.setPriceForm.adminCommissionGoodsRespList.length; i++){
// if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1
// && (this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == null || this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == "")){
//
// this.$message({
// message: '请选择分佣方式',
// type: "warning"
// });
// return;
// }
//
// if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1
// && this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 1 && this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice1 == undefined ){
// this.$message({
// message: '请输入按比例分佣',
// type: "warning"
// });
// return;
// }
// else if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1
// && this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 1 && this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice1 > 100){
// this.$message({
// message: '请输入按比例分佣0-100',
// type: "warning"
// });
// return;
// }
// if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1
// && this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 2 && this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice2 == undefined ){
// this.$message({
// message: '请输入固定分佣金额',
// type: "warning"
// });
// return;
// }
//
// if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 1){
// this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice1 * 100;
// }
// else if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 2){
// this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice2 * 100;
// }
//
// }
let timeoutId = null
timeoutId && clearTimeout(timeoutId)
timeoutId = setTimeout(() => {
......@@ -407,14 +536,28 @@
if(valid) {
vm.loading = true;
if(vm.setPriceForm.commissionType == 1){
vm.setPriceForm.commissionPriceStr = vm.setPriceForm.commissionPrice1;
if(vm.setPriceForm.commission.commissionType == 1){
vm.setPriceForm.commission.commissionPrice = (vm.setPriceForm.commission.commissionPrice1 * 100).toFixed(0);
}
else if(vm.setPriceForm.commission.commissionType == 2){
vm.setPriceForm.commission.commissionPrice = (vm.setPriceForm.commission.commissionPrice2 * 100).toFixed(0);
}
if(vm.setPriceForm.proxyCommission.commissionType == 1){
vm.setPriceForm.proxyCommission.commissionPrice = (vm.setPriceForm.proxyCommission.commissionPrice1 * 100).toFixed(0);
}
else if(vm.setPriceForm.commissionType == 2){
vm.setPriceForm.commissionPriceStr = vm.setPriceForm.commissionPrice2;
else if(vm.setPriceForm.proxyCommission.commissionType == 2){
vm.setPriceForm.proxyCommission.commissionPrice = (vm.setPriceForm.proxyCommission.commissionPrice2 * 100).toFixed(0);
}
vm.setPriceForm.commissionPrice = vm.setPriceForm.commissionPriceStr * 100;
vm.POST('/store/commission/admin/store/save', vm.setPriceForm).then(res => {
vm.setPriceForm.adminCommissionGoodsRespList[0] = vm.setPriceForm.commission;
vm.setPriceForm.adminCommissionGoodsRespList[1] = vm.setPriceForm.proxyCommission;
// if(vm.setPriceForm.commissionType == 1){
// vm.setPriceForm.commissionPriceStr = vm.setPriceForm.commissionPrice1;
// }
// else if(vm.setPriceForm.commissionType == 2){
// vm.setPriceForm.commissionPriceStr = vm.setPriceForm.commissionPrice2;
// }
// vm.setPriceForm.commissionPrice = vm.setPriceForm.commissionPriceStr * 100;
vm.POST('/store/commission/admin/store/save', vm.setPriceForm.adminCommissionGoodsRespList).then(res => {
vm.loading = false
// closeLoading(this);
if (res.code == "000000") {
......@@ -439,25 +582,128 @@
if(this.$refs.setPriceForm) {
this.$refs.setPriceForm.resetFields()
}
// this.batchUpdatePriceFlag = batchUpdatePriceFlag;
this.setPriceForm.storeId = row.tradeStore.id;
this.setPriceForm.goodsId = row.tradeStore.goodsId;
this.setPriceForm.commissionType = "";
this.setPriceForm.commissionPrice1 = undefined;
this.setPriceForm.commissionPrice2 = undefined;
this.setPriceForm.commissionType = row.tradeStore.commissionType;
if(this.setPriceForm.commissionType == 1){
this.setPriceForm.commissionPrice1 = row.tradeStore.commissionPrice/100;
}
else if(this.setPriceForm.commissionType == 2){
this.setPriceForm.commissionPrice2 = row.tradeStore.commissionPrice/100;
if(row.adminCommissionGoodsRespList){
this.setPriceForm.adminCommissionGoodsRespList = row.adminCommissionGoodsRespList;
for(let i = 0; i < this.setPriceForm.adminCommissionGoodsRespList.length; i++){
if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 1){
this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice1 = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice/100;
}
else if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 2){
this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice2 = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice/100;
}
if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1){
// this.setPriceForm.commission = this.setPriceForm.adminCommissionGoodsRespList[i];
this.setPriceForm.commission.commissionKind = this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind;
this.setPriceForm.commission.commissionPrice = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice;
this.setPriceForm.commission.commissionPrice1 = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice1;
this.setPriceForm.commission.commissionPrice2 = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice2;
this.setPriceForm.commission.commissionType = this.setPriceForm.adminCommissionGoodsRespList[i].commissionType;
this.setPriceForm.commission.goodsId = this.setPriceForm.adminCommissionGoodsRespList[i].goodsId;
this.setPriceForm.commission.maxPrice = this.setPriceForm.adminCommissionGoodsRespList[i].maxPrice;
this.setPriceForm.commission.storeId = this.setPriceForm.adminCommissionGoodsRespList[i].storeId;
}
else if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 2){
// this.setPriceForm.proxyCommission = this.setPriceForm.adminCommissionGoodsRespList[i];
this.setPriceForm.proxyCommission.commissionKind = this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind;
this.setPriceForm.proxyCommission.commissionPrice = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice;
this.setPriceForm.proxyCommission.commissionPrice1 = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice1;
this.setPriceForm.proxyCommission.commissionPrice2 = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice2;
this.setPriceForm.proxyCommission.commissionType = this.setPriceForm.adminCommissionGoodsRespList[i].commissionType;
this.setPriceForm.proxyCommission.goodsId = this.setPriceForm.adminCommissionGoodsRespList[i].goodsId;
this.setPriceForm.proxyCommission.maxPrice = this.setPriceForm.adminCommissionGoodsRespList[i].maxPrice;
this.setPriceForm.proxyCommission.storeId = this.setPriceForm.adminCommissionGoodsRespList[i].storeId;
}
}
let newArray = this.setPriceForm.adminCommissionGoodsRespList.filter(function (item) {
return item.commissionKind == 1;
});
if(newArray == null || newArray.length == 0){
this.setPriceForm.commission = {
commissionKind: 1,
commissionPrice: "",
commissionPrice1: undefined,
commissionPrice2: undefined,
commissionType: 0,
goodsId: row.tradeStore.goodsId,
maxPrice: 0,
storeId: row.tradeStore.id,
};
}
let array = this.setPriceForm.adminCommissionGoodsRespList.filter(function (item) {
return item.commissionKind == 2;
});
if(array == null || array.length == 0){
this.setPriceForm.proxyCommission = {
commissionKind: 2,
commissionPrice: "",
commissionPrice1: undefined,
commissionPrice2: undefined,
commissionType: 0,
goodsId: row.tradeStore.goodsId,
maxPrice: 0,
storeId: row.tradeStore.id,
};
}
}
else {
this.setPriceForm.commission = {
commissionKind: 1,
commissionPrice: "",
commissionPrice1: undefined,
commissionPrice2: undefined,
commissionType: 0,
goodsId: row.tradeStore.goodsId,
maxPrice: 0,
storeId: row.tradeStore.id,
};
this.setPriceForm.proxyCommission = {
commissionKind: 2,
commissionPrice: "",
commissionPrice1: undefined,
commissionPrice2: undefined,
commissionType: 0,
goodsId: row.tradeStore.goodsId,
maxPrice: 0,
storeId: row.tradeStore.id,
};
}
// this.batchUpdatePriceFlag = batchUpdatePriceFlag;
// this.setPriceForm.storeId = row.tradeStore.id;
// this.setPriceForm.goodsId = row.tradeStore.goodsId;
// this.setPriceForm.commissionType = "";
// this.setPriceForm.commissionPrice1 = undefined;
// this.setPriceForm.commissionPrice2 = undefined;
// this.setPriceForm.commissionType = row.tradeStore.commissionType;
// if(this.setPriceForm.commissionType == 1){
// this.setPriceForm.commissionPrice1 = row.tradeStore.commissionPrice/100;
// }
// else if(this.setPriceForm.commissionType == 2){
// this.setPriceForm.commissionPrice2 = row.tradeStore.commissionPrice/100;
// }
this.setPriceVisible = true;
// if(this.$refs.setPriceForm) {
// this.$refs.setPriceForm.resetFields()
// }
// this.getProfit(row);
},
// 运费配置
setFreight(row) {
let routeData = this.$router.resolve({
path: '/freight-config',
query: {
storeId: row.tradeStore.id,
commissionFlag:row.tradeStore.commissionFlag
}
});
window.open(routeData.href, '_blank');
},
},
filters: {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或