Skip to content

J
jiedao-app-operator-master
Commit a42c4dd8 authored by dcy's avatar dcy
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 635a1fd3 440f4248
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 623 additions and 422 deletions
src/api/ecw/channel.js
View file @ a42c4dd8
...@@ -21,7 +21,7 @@ export function updateChannel(data) { ...@@ -21,7 +21,7 @@ export function updateChannel(data) {
// 删除渠道管理 // 删除渠道管理
export function deleteChannel(id) { export function deleteChannel(id) {
return request({ return request({
url: '/ecw/channel/delete?id=' + id, url: '/ecw/channel/delete?channelId=' + id,
method: 'delete' method: 'delete'
}) })
} }
......
src/api/ecw/coupon.js
View file @ a42c4dd8
...@@ -3,7 +3,7 @@ import request from '@/utils/request' ...@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 创建优惠券信息 // 创建优惠券信息
export function createCoupon(data) { export function createCoupon(data) {
return request({ return request({
url: '/ecw/coupon/createOrUpdate', url: '/product/coupon/createOrUpdate',
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -12,7 +12,7 @@ export function createCoupon(data) { ...@@ -12,7 +12,7 @@ export function createCoupon(data) {
// 更新优惠券信息 // 更新优惠券信息
export function updateCoupon(data) { export function updateCoupon(data) {
return request({ return request({
url: '/ecw/coupon/update', url: '/product/coupon/update',
method: 'put', method: 'put',
data: data data: data
}) })
...@@ -21,7 +21,7 @@ export function updateCoupon(data) { ...@@ -21,7 +21,7 @@ export function updateCoupon(data) {
// 删除优惠券信息 // 删除优惠券信息
export function deleteCoupon(id) { export function deleteCoupon(id) {
return request({ return request({
url: '/ecw/coupon/delete?id=' + id, url: '/product/coupon/delete?id=' + id,
method: 'delete' method: 'delete'
}) })
} }
...@@ -29,7 +29,7 @@ export function deleteCoupon(id) { ...@@ -29,7 +29,7 @@ export function deleteCoupon(id) {
// 获得优惠券信息 // 获得优惠券信息
export function getCoupon(id) { export function getCoupon(id) {
return request({ return request({
url: '/ecw/coupon/get?couponId=' + id, url: '/product/coupon/get?couponId=' + id,
method: 'get' method: 'get'
}) })
} }
...@@ -37,7 +37,7 @@ export function getCoupon(id) { ...@@ -37,7 +37,7 @@ export function getCoupon(id) {
// 获得优惠券信息分页 // 获得优惠券信息分页
export function getCouponPage(query) { export function getCouponPage(query) {
return request({ return request({
url: '/ecw/coupon/page', url: '/product/coupon/page',
method: 'get', method: 'get',
params: query params: query
}) })
...@@ -46,7 +46,7 @@ export function getCouponPage(query) { ...@@ -46,7 +46,7 @@ export function getCouponPage(query) {
// 获得优惠券下拉 // 获得优惠券下拉
export function getCouponSelect(query) { export function getCouponSelect(query) {
return request({ return request({
url: '/ecw/coupon/select', url: '/product/coupon/select',
method: 'get', method: 'get',
params: query params: query
}) })
...@@ -55,7 +55,7 @@ export function getCouponSelect(query) { ...@@ -55,7 +55,7 @@ export function getCouponSelect(query) {
// 导出优惠券信息 Excel // 导出优惠券信息 Excel
export function exportCouponExcel(query) { export function exportCouponExcel(query) {
return request({ return request({
url: '/ecw/coupon/export-excel', url: '/product/coupon/export-excel',
method: 'get', method: 'get',
params: query, params: query,
responseType: 'blob' responseType: 'blob'
......
src/api/ecw/zhongPao.js
View file @ a42c4dd8
...@@ -18,6 +18,14 @@ export function updateZhongPao(data) { ...@@ -18,6 +18,14 @@ export function updateZhongPao(data) {
}) })
} }
// 删除重泡货配置
export function deleteZhongPao(id) {
return request({
url: '/ecw/zhong-pao/delete?id=' + id,
method: 'delete'
})
}
// 获得重泡货配置 // 获得重泡货配置
export function getZhongPao(id) { export function getZhongPao(id) {
return request({ return request({
......
src/components/ProductsSelector/index.vue
View file @ a42c4dd8
<template> <template>
<el-row class="" :gutter="10"> <el-row class="" :gutter="10">
<el-col :span="10"> <el-col :span="10">
<el-card> <el-card>
<div slot="header" class="header"> <div slot="header" class="header">
<el-select v-model="queryParams.typeId" placeholder="选择类型" style="width:120px" clearable> <el-select v-model="queryParams.typeId" placeholder="选择类型" style="width:120px" clearable>
<el-option v-for="item in typeList" :key="item.id" :label="item.titleZh" :value="item.id" /> <el-option v-for="item in typeList" :key="item.id" :label="item.titleZh" :value="item.id" />
</el-select> </el-select>
<el-select v-model="queryParams.attrId" placeholder="选择属性" style="width:120px" clearable> <el-select v-model="queryParams.attrId" placeholder="选择属性" style="width:120px" clearable>
<el-option v-for="item in attrList" :key="item.id" :label="item.attrName" :value="item.id" /> <el-option v-for="item in attrList" :key="item.id" :label="item.attrName" :value="item.id" />
</el-select> </el-select>
<el-input v-model="queryParams.titleZh" placeholder="产品关键字" style="width:120px" clearable /> <el-input v-model="queryParams.titleZh" placeholder="产品关键字" style="width:120px" clearable />
<el-button type="primary" @click="reLoad">搜搜</el-button> <el-button type="primary" @click="reLoad">搜搜</el-button>
</div> </div>
<div class="list"> <div class="list">
<div class="item" v-for="item in list" :key="item.id"> <div class="item" v-for="item in list" :key="item.id">
<el-checkbox @change="toggleCheck(item, $event)" :value="ids.indexOf(item.id) > -1" /> {{item.titleZh}} <el-checkbox @change="toggleCheck(item, $event)" :value="ids.indexOf(item.id) > -1" /> {{item.titleZh}}
<div>{{item.titleEn}}</div> <div>{{item.titleEn}}</div>
</div> </div>
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-card> <el-card>
<div slot="header" class="header"> <div slot="header" class="header">
已选产品 已选产品
</div> </div>
<div class="list"> <div class="list">
<div class="item" v-for="(choosed) in choosedList" :key="choosed.id" :data-data="JSON.stringify(choosed)"> <div class="item" v-for="(choosed) in choosedList" :key="choosed.id" :data-data="JSON.stringify(choosed)">
<el-link class="el-icon-delete" @click="remove(choosed)" /> {{choosed.titleZh}} <el-link class="el-icon-delete" @click="remove(choosed)" /> {{choosed.titleZh}}
<div>{{choosed.titleEn}}</div> <div>{{choosed.titleEn}}</div>
</div> </div>
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
</template> </template>
<script> <script>
import {getProductPage} from '@/api/ecw/product' import { getProductPage } from '@/api/ecw/product'
import {getProductTypeList} from '@/api/ecw/productType' import { getProductTypeList } from '@/api/ecw/productType'
import {getProductAttrList} from '@/api/ecw/productAttr' import { getProductAttrList } from '@/api/ecw/productAttr'
export default { export default {
data(){ props: {
return { defaultIds: {
list:[], type: Array,
page: 1, default: []
pages: 1, }
queryParams:{ },
page: 1, data() {
attrId: null, return {
titleZh: null, list: [],
typeId: null page: 1,
}, pages: 1,
choosedList:[], queryParams: {
typeList:[], page: 1,
attrList:[] attrId: null,
} titleZh: null,
typeId: null
},
choosedList: [],
typeList: [],
attrList: []
}
},
computed: {
ids: {
get() {
let arr = []
this.choosedList.forEach(item => {
arr.push(item.id)
})
return arr
},
set(v) {
}
}
},
watch: {
ids(val) {
this.$emit('input', val)
}
},
created() {
getProductTypeList().then(res => this.typeList = res.data)
getProductAttrList().then(res => this.attrList = res.data)
this.reLoad()
this.ids = this.defaultIds //数据回显
},
methods: {
reLoad() {
this.queryParams.page = 1
this.list = []
this.getList()
}, },
computed:{ loadNextPage() {
ids(){ if (this.page >= this.pages) {
let arr = [] return this.$message.error('已加载全部')
this.choosedList.forEach(item => { }
arr.push(item.id) this.queryParams.page++
this.getList()
},
getList() {
getProductPage(this.queryParams).then(res => {
this.list = res.data.list //.concat(res.data.list || [])
this.page = res.data.page
this.pages = res.data.pages
this.choosedList = [] //搜搜重置，数据回显
if (this.defaultIds.length > 0) {
this.defaultIds.map(item => {
this.list.map(items => {
if (items.id == item) {
this.choosedList.push(items)
}
}) })
return arr })
} }
})
}, },
watch:{ toggleCheck(item, checked) {
ids(val){ if (checked) {
this.$emit('input', val) this.choose(item)
} } else {
this.remove(item)
}
}, },
created(){ choose(item) {
getProductTypeList().then(res => this.typeList = res.data) this.choosedList.push(item)
getProductAttrList().then(res => this.attrList = res.data)
this.reLoad()
}, },
methods:{ remove(item) {
reLoad(){ this.choosedList.forEach((choosed, index) => {
this.queryParams.page = 1 if (choosed.id == item.id) this.choosedList.splice(index, 1)
this.list = [] })
this.getList()
},
loadNextPage(){
if(this.page >= this.pages){
return this.$message.error('已加载全部')
}
this.queryParams.page ++
this.getList()
},
getList(){
getProductPage(this.queryParams).then(res => {
this.list = res.data.list //.concat(res.data.list || [])
this.page = res.data.page
this.pages = res.data.pages
})
},
toggleCheck(item, checked){
if(checked){
this.choose(item)
}else{
this.remove(item)
}
},
choose(item){
this.choosedList.push(item)
},
remove(item){
this.choosedList.forEach((choosed,index) => {
if(choosed.id==item.id) this.choosedList.splice(index,1)
})
}
} }
}
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.header{ .header {
>div{ > div {
margin-right: 5px; margin-right: 5px;
} }
} }
.list{ .list {
height: 200px; height: 200px;
border: 1px solid #ccc; border: 1px solid #ccc;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
padding: 0 10px; padding: 0 10px;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
.item{ .item {
width: 50%; width: 50%;
line-height: 20px; line-height: 20px;
height: 50px; height: 50px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
} }
</style> </style>
\ No newline at end of file
src/utils/dict.js
View file @ a42c4dd8
...@@ -97,6 +97,8 @@ export const DICT_TYPE = { ...@@ -97,6 +97,8 @@ export const DICT_TYPE = {
ECW_MESSAGE_LEAVE_TYPE: 'ecw_message_leave_type', ECW_MESSAGE_LEAVE_TYPE: 'ecw_message_leave_type',
ECW_MESSAGE_LEAVE_STATUS: 'ecw_message_leave_status', ECW_MESSAGE_LEAVE_STATUS: 'ecw_message_leave_status',
PWD_TYPE: 'pwd_type', PWD_TYPE: 'pwd_type',
ZHONG_PAO_TYPE: 'zhong_pao_type',
TRANSPORT_TYPE: 'transport_type',
BRAND_REG_TYPE: 'brand_registry_type', BRAND_REG_TYPE: 'brand_registry_type',
BRAND_AUTH_STATUS: 'brand_authorization_status', BRAND_AUTH_STATUS: 'brand_authorization_status',
BRAND_CUSTOMER_CHARGING_MODEL: 'customer_charging_model', BRAND_CUSTOMER_CHARGING_MODEL: 'customer_charging_model',
......
src/views/ecw/channel/index.vue
View file @ a42c4dd8
...@@ -73,11 +73,23 @@ ...@@ -73,11 +73,23 @@
<el-table-column label="名称" align="center" prop="nameZh" /> <el-table-column label="名称" align="center" prop="nameZh" />
<!-- <el-table-column label="名称-英文" align="center" prop="nameEn" /> --> <!-- <el-table-column label="名称-英文" align="center" prop="nameEn" /> -->
<el-table-column label="内部名称" align="center" prop="internalNameZh" /> <el-table-column label="内部名称" align="center" prop="internalNameZh" />
<!-- <el-table-column label="内部名称-英文" align="center" prop="internalNameEn" /> --> <!-- <el-table-column label="内部名称-英文" align="center" prop="internalNameEn" />
<el-table-column label="类型编码" align="center" prop="typeNumber" /> <el-table-column label="类型编码" align="center" prop="typeNumber" />
<el-table-column label="仓库ID字符串" align="center" prop="warehouseIds" /> <!-- <el-table-column label="仓库id字符串" align="center" prop="warehouseIds" /> -->
<el-table-column label="仓库名" align="center" prop="warehouseNameList" width="180">
<template slot-scope="scope">
<el-scrollbar style="margin-right: 6px;">
<div class="left">
<el-tag v-for="warehouseName in scope.row.warehouseNameList"
:key="warehouseName.index">
<span>{{warehouseName}}</span>
</el-tag>
</div>
</el-scrollbar>
</template>
</el-table-column>
<el-table-column label="排序" align="center" prop="sort" /> <el-table-column label="排序" align="center" prop="sort" />
<el-table-column label="快递ID" align="center" prop="expressId" /> <el-table-column label="快递公司" align="center" prop="companyName" />
<el-table-column label="预计时间(天)" align="center" prop="etaTime" /> <el-table-column label="预计时间(天)" align="center" prop="etaTime" />
<el-table-column label="渠道代理" align="center" prop="channelAgent" /> <el-table-column label="渠道代理" align="center" prop="channelAgent" />
<el-table-column label="备注" align="center" prop="remarksZh" /> <el-table-column label="备注" align="center" prop="remarksZh" />
...@@ -103,7 +115,7 @@ ...@@ -103,7 +115,7 @@
<!-- 对话框(添加 / 修改) --> <!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
...@@ -231,7 +243,7 @@ export default { ...@@ -231,7 +243,7 @@ export default {
this.title = "修改渠道管理"; this.title = "修改渠道管理";
}); });
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const channelId = row.channelId; const channelId = row.channelId;
...@@ -262,3 +274,26 @@ export default { ...@@ -262,3 +274,26 @@ export default {
} }
}; };
</script> </script>
<style lang="scss">
.left {
.el-tag {
background-color: #e6f6fd;
border: 1px solid #ccecfb;
display: inline-block;
height:auto;
padding: 0 10px;
line-height: 30px;
font-size: 12px;
color: #02a1e9;
border-radius: 4px;
box-sizing: border-box;
white-space: nowrap;
}
}
</style>
src/views/ecw/currency/index.vue
View file @ a42c4dd8
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
100外币兑人民币（CNY）汇率表
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column label="" align="center" prop="id" /> <el-table-column label="" align="center" prop="id" />
......
src/views/ecw/product/index.vue
View file @ a42c4dd8
This diff is collapsed.
src/views/ecw/productAttr/edit.vue
View file @ a42c4dd8
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<div class="app-container"> <div class="app-container">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="适用商品" prop="idList" v-if="form.type != 1"> <el-form-item label="适用商品" prop="idList">
<products-selector v-model="form.idList" /> <products-selector :defaultIds="form.idList" v-model="form.idList" />
</el-form-item> </el-form-item>
<el-form-item label="货柜位置" prop="containerLocation"> <el-form-item label="货柜位置" prop="containerLocation">
...@@ -36,10 +36,10 @@ ...@@ -36,10 +36,10 @@
<el-checkbox style="width: 100px" v-model="checked[6]">需要修改</el-checkbox> <el-checkbox style="width: 100px" v-model="checked[6]">需要修改</el-checkbox>
<dict-selector v-if="checked[6]" form-type="checkbox" :type="DICT_TYPE.ECW_ORDER_ATTR" v-model="form.attrId" multiple /> <dict-selector v-if="checked[6]" form-type="checkbox" :type="DICT_TYPE.ECW_ORDER_ATTR" v-model="form.attrId" multiple />
</el-form-item> </el-form-item>
<!-- <el-form-item label="商品材质" prop=""> <el-form-item label="商品材质" prop="materialType">
<el-checkbox style="width: 100px" v-model="checked[7]">需要修改</el-checkbox> <el-checkbox style="width: 100px" v-model="checked[7]">需要修改</el-checkbox>
<dict-selector v-if="checked[7]" form-type="checkbox" :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" v-model="form.status" multiple /> <dict-selector v-if="checked[7]" form-type="checkbox" :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" v-model="form.materialType" multiple />
</el-form-item> --> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
...@@ -75,11 +75,12 @@ export default { ...@@ -75,11 +75,12 @@ export default {
"needBook": undefined, "needBook": undefined,
"packaging": undefined, "packaging": undefined,
"requirements": undefined, "requirements": undefined,
"square": undefined "square": undefined,
"materialType": undefined
}, },
// 表单校验 // 表单校验
rules: {}, rules: {},
checked: [false, false, false, false, false, false, false] checked: [false, false, false, false, false, false, false, false]
}; };
}, },
computed: { computed: {
...@@ -88,7 +89,7 @@ export default { ...@@ -88,7 +89,7 @@ export default {
watch: { watch: {
'form.idList'(val) { 'form.idList'(val) {
if (val.length > 0) { if (val.length > 0) {
this.form.isAllProduct = undefined this.form.isAllProduct = 0
} else { } else {
this.form.isAllProduct = 1 this.form.isAllProduct = 1
} }
...@@ -96,6 +97,7 @@ export default { ...@@ -96,6 +97,7 @@ export default {
}, },
created() { created() {
this.reset() this.reset()
this.form.idList = this.$route.query && this.$route.query.ids ? [...this.$route.query.ids].map(item => { return Number(item) }) : []
}, },
methods: { methods: {
/** 表单重置 */ /** 表单重置 */
...@@ -109,7 +111,8 @@ export default { ...@@ -109,7 +111,8 @@ export default {
"needBook": undefined, "needBook": undefined,
"packaging": undefined, "packaging": undefined,
"requirements": undefined, "requirements": undefined,
"square": undefined "square": undefined,
"materialType": undefined
}; };
this.resetForm("form"); this.resetForm("form");
}, },
...@@ -129,18 +132,4 @@ export default { ...@@ -129,18 +132,4 @@ export default {
}, },
}, },
}; };
</script> </script>
<style scoped lang="scss"> \ No newline at end of file
.fee-item {
padding: 5px 0;
> div {
margin-right: 5px;
}
}
.coupon-list {
max-height: 200px;
border: 1px solid #ccc;
padding: 10px;
overflow-y: auto;
}
</style>
\ No newline at end of file
src/views/ecw/zhongPao/index.vue
View file @ a42c4dd8
This diff is collapsed.
src/views/system/helpDoc/index.vue
View file @ a42c4dd8
...@@ -79,10 +79,10 @@ ...@@ -79,10 +79,10 @@
<el-input v-model="form.titleEn" placeholder="请输入标题英文" /> <el-input v-model="form.titleEn" placeholder="请输入标题英文" />
</el-form-item> </el-form-item>
<el-form-item label="内容中文" prop="contentZh"> <el-form-item label="内容中文" prop="contentZh">
<editor v-model="form.contentZh" :min-height="192"/> <editor v-model="form.contentZh" :min-height="192"/>
</el-form-item> </el-form-item>
<el-form-item label="内容英语" prop="contentEn"> <el-form-item label="内容英语" prop="contentEn">
<editor v-model="form.contentZh" :min-height="192"/> <editor v-model="form.contentEn" :min-height="192"/>
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
......
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