合并master
lemon橪
commit
c3178eb7d0
|
|
@ -96,3 +96,22 @@ export function communication (params) {
|
||||||
params
|
params
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 退换货服务 提交物流
|
||||||
|
export function afterSaleDelivery (params) {
|
||||||
|
return request({
|
||||||
|
url: `/buyer/afterSale/delivery/${params.afterSaleSn}`,
|
||||||
|
method: Method.POST,
|
||||||
|
needToken: true,
|
||||||
|
params
|
||||||
|
});
|
||||||
|
}
|
||||||
|
// 获取退货可选物流公司
|
||||||
|
export function getLogisticsCompany () {
|
||||||
|
return request({
|
||||||
|
url: `/buyer/logistics`,
|
||||||
|
method: Method.GET,
|
||||||
|
needToken: true,
|
||||||
|
params: { pageNumber: 1, pageSize: 200, disabled: 'OPEN' }
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,11 +4,6 @@
|
||||||
<p slot="header">
|
<p slot="header">
|
||||||
<span>发票信息</span>
|
<span>发票信息</span>
|
||||||
</p>
|
</p>
|
||||||
<!-- <div>
|
|
||||||
<div>为响应环保，自营全面启用电子普通发票，非自营发票由第三方商家实际开具。</div>
|
|
||||||
<div>电子普通发票是税务机关认可的有效收付款凭证，与纸质普通发票具有同等法律效力，可用于报销入账、售后维权等。</div>
|
|
||||||
<div>如商品由第三方卖家销售，发票类型及内容将由该卖家决定。</div>
|
|
||||||
</div> -->
|
|
||||||
<!-- 普通发票 -->
|
<!-- 普通发票 -->
|
||||||
<div class="nav-content">
|
<div class="nav-content">
|
||||||
<Form :model="invoiceForm" ref="form" label-position="left" :rules="ruleInline" :label-width="110">
|
<Form :model="invoiceForm" ref="form" label-position="left" :rules="ruleInline" :label-width="110">
|
||||||
|
|
@ -55,15 +50,14 @@ export default {
|
||||||
name: 'invoiceModal',
|
name: 'invoiceModal',
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
invoice: 1,
|
invoice: 1, // 发票类型
|
||||||
invoiceAvailable: false, // 模态框显隐
|
invoiceAvailable: false, // 模态框显隐
|
||||||
loading: false, // 提交状态
|
loading: false, // 提交状态
|
||||||
invoiceForm: {
|
invoiceForm: {
|
||||||
// 发票表单
|
|
||||||
// 普票表单
|
// 普票表单
|
||||||
receiptTitle: '', // 发票抬头
|
receiptTitle: '', // 发票抬头
|
||||||
taxpayerId: '', // 纳税人识别号
|
taxpayerId: '', // 纳税人识别号
|
||||||
receiptContent: '商品明细', // 发票内容
|
receiptContent: '商品明细' // 发票内容
|
||||||
},
|
},
|
||||||
type: 1, // 1 个人 2 单位
|
type: 1, // 1 个人 2 单位
|
||||||
ruleInline: {
|
ruleInline: {
|
||||||
|
|
@ -107,10 +101,9 @@ export default {
|
||||||
let flage = true;
|
let flage = true;
|
||||||
|
|
||||||
// 保存分为两种类型，个人以及企业
|
// 保存分为两种类型，个人以及企业
|
||||||
const { type, receiptTitle, receiptContent } = JSON.parse(
|
const { receiptTitle } = JSON.parse(
|
||||||
JSON.stringify(this.invoiceForm)
|
JSON.stringify(this.invoiceForm)
|
||||||
);
|
);
|
||||||
|
|
||||||
// 判断是否填写发票抬头
|
// 判断是否填写发票抬头
|
||||||
if (!receiptTitle) {
|
if (!receiptTitle) {
|
||||||
this.$Message.error('请填写发票抬头!');
|
this.$Message.error('请填写发票抬头!');
|
||||||
|
|
@ -118,7 +111,7 @@ export default {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (type === 2) {
|
if (this.type === 2) {
|
||||||
this.$refs.form.validate((valid) => {
|
this.$refs.form.validate((valid) => {
|
||||||
if (!valid) {
|
if (!valid) {
|
||||||
flage = false;
|
flage = false;
|
||||||
|
|
|
||||||
|
|
@ -17,15 +17,15 @@ export default {
|
||||||
* @description api请求基础路径
|
* @description api请求基础路径
|
||||||
*/
|
*/
|
||||||
api_dev: {
|
api_dev: {
|
||||||
// common: 'http://192.168.0.106:8890',
|
common: 'http://192.168.0.101:8890',
|
||||||
// buyer: 'http://192.168.0.106:8888',
|
buyer: 'http://192.168.0.101:8888',
|
||||||
// seller: 'http://192.168.0.106:8889',
|
seller: 'http://192.168.0.101:8889',
|
||||||
// manager: 'http://192.168.0.106:8887'
|
manager: 'http://192.168.0.101:8887'
|
||||||
|
|
||||||
common: 'https://common-api.pickmall.cn',
|
// common: 'https://common-api.pickmall.cn',
|
||||||
buyer: 'https://buyer-api.pickmall.cn',
|
// buyer: 'https://buyer-api.pickmall.cn',
|
||||||
seller: 'https://store-api.pickmall.cn',
|
// seller: 'https://store-api.pickmall.cn',
|
||||||
manager: 'https://admin-api.pickmall.cn'
|
// manager: 'https://admin-api.pickmall.cn'
|
||||||
},
|
},
|
||||||
api_prod: {
|
api_prod: {
|
||||||
common: 'https://common-api.pickmall.cn',
|
common: 'https://common-api.pickmall.cn',
|
||||||
|
|
|
||||||
|
|
@ -74,11 +74,11 @@ export default {
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
changePage (val) { // 修改页码
|
changePage (val) { // 修改页码
|
||||||
this.pageNumber = val
|
this.params.pageNumber = val
|
||||||
this.getHistory()
|
this.getHistory()
|
||||||
},
|
},
|
||||||
changePageSize (val) { // 修改页数
|
changePageSize (val) { // 修改页数
|
||||||
this.param.pageSize = val
|
this.params.pageSize = val
|
||||||
this.params.pageNumber = 1
|
this.params.pageNumber = 1
|
||||||
this.getHistory()
|
this.getHistory()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -55,11 +55,14 @@
|
||||||
<div>
|
<div>
|
||||||
<!-- 订单基础操作 -->
|
<!-- 订单基础操作 -->
|
||||||
<Button @click="goDetail(order.sn)" size="small">售后详情</Button>
|
<Button @click="goDetail(order.sn)" size="small">售后详情</Button>
|
||||||
|
<Button @click="openModal(order)" v-if="order.serviceStatus == 'PASS' &&
|
||||||
|
order.serviceType != 'RETURN_MONEY'" size="small">提交物流</Button>
|
||||||
|
|
||||||
<Button @click="cancel(order.sn)" v-if="order.afterSaleAllowOperationVO.cancel" size="small">取消售后</Button>
|
<Button @click="cancel(order.sn)" v-if="order.afterSaleAllowOperationVO.cancel" size="small">取消售后</Button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>+
|
||||||
<Spin size="large" fix v-if="spinShow"></Spin>
|
<Spin size="large" fix v-if="spinShow"></Spin>
|
||||||
</div>
|
</div>
|
||||||
<!-- 分页 -->
|
<!-- 分页 -->
|
||||||
|
|
@ -70,11 +73,47 @@
|
||||||
show-sizer>
|
show-sizer>
|
||||||
</Page>
|
</Page>
|
||||||
</div>
|
</div>
|
||||||
|
<Modal v-model="logisticsShow" width="530">
|
||||||
|
<p slot="header">
|
||||||
|
<span>提交物流信息</span>
|
||||||
|
</p>
|
||||||
|
<div>
|
||||||
|
<div class="goods-list modal-goods">
|
||||||
|
<img @click="goodsDetail(singleOrder.skuId, singleOrder.goodsId)" class="hover-color" :src="singleOrder.goodsImage" alt="" />
|
||||||
|
<div>
|
||||||
|
<div class="hover-color" @click="goodsDetail(singleOrder.skuId, singleOrder.goodsId)">{{ singleOrder.goodsName }}</div>
|
||||||
|
<div class="mt_10">
|
||||||
|
<span class="global_color"
|
||||||
|
>{{ singleOrder.flowPrice | unitPrice("￥") }} </span
|
||||||
|
>x {{ singleOrder.num }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<Form ref="form" :model="form" label-position="left" :label-width="100" :rules="rules">
|
||||||
|
<FormItem label="物流公司" prop="logisticsId">
|
||||||
|
<Select v-model="form.logisticsId" placeholder="请选择物流公司">
|
||||||
|
<Option v-for="item in companyList" :value="item.id" :key="item.id">{{ item.name }}</Option>
|
||||||
|
</Select>
|
||||||
|
</FormItem>
|
||||||
|
<FormItem label="快递单号" prop="logisticsNo">
|
||||||
|
<Input v-model="form.logisticsNo" placeholder="请填写快递单号"></Input>
|
||||||
|
</FormItem>
|
||||||
|
<FormItem label="发货时间" prop="mDeliverTime">
|
||||||
|
<DatePicker type="date" style="width:100%" v-model="form.mDeliverTime" @on-change="changeTime" format="yyyy-MM-dd" placeholder="选择发货时间"></DatePicker>
|
||||||
|
</FormItem>
|
||||||
|
</Form>
|
||||||
|
</div>
|
||||||
|
<div slot="footer" style="text-align: right">
|
||||||
|
<Button @click="logisticsShow = false">关闭</Button>
|
||||||
|
<Button type="primary" :loading="submitLoading" @click="submitDelivery">提交</Button>
|
||||||
|
</div>
|
||||||
|
</Modal>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { afterSaleList, cancelAfterSale } from '@/api/member.js';
|
import { afterSaleList, cancelAfterSale } from '@/api/member.js';
|
||||||
|
import { afterSaleDelivery, getLogisticsCompany } from '@/api/order.js';
|
||||||
import { afterSaleStatusList } from '../enumeration.js'
|
import { afterSaleStatusList } from '../enumeration.js'
|
||||||
export default {
|
export default {
|
||||||
name: 'AfterSale',
|
name: 'AfterSale',
|
||||||
|
|
@ -91,7 +130,22 @@ export default {
|
||||||
// 状态数组
|
// 状态数组
|
||||||
afterSaleStatusList,
|
afterSaleStatusList,
|
||||||
total: 0, // 订单总数
|
total: 0, // 订单总数
|
||||||
spinShow: false // 加载状态
|
spinShow: false, // 加载状态
|
||||||
|
companyList: [], // 物流公司列表
|
||||||
|
logisticsShow: false, // 物流信息modal
|
||||||
|
singleOrder: {}, // 单独的售后信息
|
||||||
|
form: { // 物流信息数据
|
||||||
|
afterSaleSn: '',
|
||||||
|
logisticsId: '',
|
||||||
|
logisticsNo: '',
|
||||||
|
mDeliverTime: ''
|
||||||
|
},
|
||||||
|
rules: { // 必填校验
|
||||||
|
logisticsId: [{ required: true, message: '请选择物流公司' }],
|
||||||
|
logisticsNo: [{ required: true, message: '请填写物流编号' }],
|
||||||
|
mDeliverTime: [{ required: true, message: '请选择发货时间' }]
|
||||||
|
},
|
||||||
|
submitLoading: false // 提交加载状态
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
mounted () {
|
mounted () {
|
||||||
|
|
@ -158,6 +212,42 @@ export default {
|
||||||
filterOrderStatus (status) { // 获取订单状态中文
|
filterOrderStatus (status) { // 获取订单状态中文
|
||||||
const ob = this.afterSaleStatusList.filter(e => { return e.status === status });
|
const ob = this.afterSaleStatusList.filter(e => { return e.status === status });
|
||||||
return ob[0].name
|
return ob[0].name
|
||||||
|
},
|
||||||
|
// 获取物流公司列表
|
||||||
|
getCompany () {
|
||||||
|
getLogisticsCompany().then(res => {
|
||||||
|
if (res.success) {
|
||||||
|
this.companyList = res.result
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
|
// 提交物流信息
|
||||||
|
submitDelivery () {
|
||||||
|
this.submitLoading = true
|
||||||
|
afterSaleDelivery(this.form).then(res => {
|
||||||
|
if (res.success) {
|
||||||
|
this.logisticsShow = false;
|
||||||
|
this.$Message.success('提交成功')
|
||||||
|
this.getList()
|
||||||
|
}
|
||||||
|
this.submitLoading = false
|
||||||
|
}).catch(() => {
|
||||||
|
this.submitLoading = false
|
||||||
|
})
|
||||||
|
},
|
||||||
|
openModal (row) {
|
||||||
|
console.log(row);
|
||||||
|
this.singleOrder = row;
|
||||||
|
this.form.afterSaleSn = row.sn
|
||||||
|
this.logisticsShow = true;
|
||||||
|
this.$refs.form.resetFields()
|
||||||
|
if (!this.companyList.length) {
|
||||||
|
this.getCompany()
|
||||||
|
}
|
||||||
|
},
|
||||||
|
// 格式化时间
|
||||||
|
changeTime (time) {
|
||||||
|
this.form.mDeliverTime = time;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
@ -207,20 +297,6 @@ export default {
|
||||||
color: #999;
|
color: #999;
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
|
|
||||||
.goods-list {
|
|
||||||
width: 500px;
|
|
||||||
display: flex;
|
|
||||||
margin-bottom: 10px;
|
|
||||||
img {
|
|
||||||
width: 60px;
|
|
||||||
height: 60px;
|
|
||||||
margin-right: 10px;
|
|
||||||
}
|
|
||||||
> div {
|
|
||||||
flex: 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
> div:nth-child(2) {
|
> div:nth-child(2) {
|
||||||
width: 150px;
|
width: 150px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
|
@ -248,4 +324,21 @@ export default {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.goods-list {
|
||||||
|
width: 500px;
|
||||||
|
display: flex;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
img {
|
||||||
|
width: 60px;
|
||||||
|
height: 60px;
|
||||||
|
margin-right: 10px;
|
||||||
|
}
|
||||||
|
> div {
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.modal-goods{
|
||||||
|
padding: 5px;
|
||||||
|
background-color: #eee;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
|
|
@ -397,8 +397,9 @@ export default {
|
||||||
this.priceDetailDTO = res.result.priceDetailDTO;
|
this.priceDetailDTO = res.result.priceDetailDTO;
|
||||||
this.skuList = res.result.skuList;
|
this.skuList = res.result.skuList;
|
||||||
|
|
||||||
res.result.receiptVO ? (this.invoiceData = res.result.receiptVO) : '';
|
if (res.result.receiptVO) {
|
||||||
|
this.invoiceData = res.result.receiptVO
|
||||||
|
}
|
||||||
let notSupArea = res.result.notSupportFreight;
|
let notSupArea = res.result.notSupportFreight;
|
||||||
this.selectedCoupon = {};
|
this.selectedCoupon = {};
|
||||||
if (res.result.platformCoupon) this.selectedCoupon.platformCoupon = res.result.platformCoupon;
|
if (res.result.platformCoupon) this.selectedCoupon.platformCoupon = res.result.platformCoupon;
|
||||||
|
|
@ -589,6 +590,7 @@ export default {
|
||||||
this.$Spin.hide();
|
this.$Spin.hide();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
// 优惠券可用范围
|
||||||
useScope (type) {
|
useScope (type) {
|
||||||
let goods = '全部商品';
|
let goods = '全部商品';
|
||||||
switch (type) {
|
switch (type) {
|
||||||
|
|
|
||||||
|
|
@ -17,14 +17,14 @@ export default {
|
||||||
* @description api请求基础路径
|
* @description api请求基础路径
|
||||||
*/
|
*/
|
||||||
api_dev: {
|
api_dev: {
|
||||||
common: "https://common-api.pickmall.cn",
|
// common: "https://common-api.pickmall.cn",
|
||||||
buyer: "https://buyer-api.pickmall.cn",
|
// buyer: "https://buyer-api.pickmall.cn",
|
||||||
seller: "https://store-api.pickmall.cn",
|
// seller: "https://store-api.pickmall.cn",
|
||||||
manager: "https://admin-api.pickmall.cn"
|
// manager: "https://admin-api.pickmall.cn"
|
||||||
// common: 'http://192.168.0.103:8890',
|
common: 'http://192.168.0.101:8890',
|
||||||
// buyer: 'http://192.168.0.103:8888',
|
buyer: 'http://192.168.0.101:8888',
|
||||||
// seller: 'http://192.168.0.103:8889',
|
seller: 'http://192.168.0.101:8889',
|
||||||
// manager: 'http://192.168.0.103:8887'
|
manager: 'http://192.168.0.101:8887'
|
||||||
},
|
},
|
||||||
api_prod: {
|
api_prod: {
|
||||||
common: "https://common-api.pickmall.cn",
|
common: "https://common-api.pickmall.cn",
|
||||||
|
|
|
||||||
|
|
@ -197,3 +197,4 @@ $dark_content_color: #d5d5d5;
|
||||||
color: $light_title_color;
|
color: $light_title_color;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@import "./table-common.scss";
|
||||||
|
|
@ -36,7 +36,7 @@ import { changePass } from "@/api/index";
|
||||||
export default {
|
export default {
|
||||||
name: "change-password",
|
name: "change-password",
|
||||||
components: {
|
components: {
|
||||||
SetPassword,
|
SetPassword
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
const valideRePassword = (rule, value, callback) => {
|
const valideRePassword = (rule, value, callback) => {
|
||||||
|
|
@ -94,9 +94,11 @@ export default {
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
// 密码强度
|
||||||
changeInputPass(v, grade, strength) {
|
changeInputPass(v, grade, strength) {
|
||||||
this.strength = strength;
|
this.strength = strength;
|
||||||
},
|
},
|
||||||
|
// 确认修改密码
|
||||||
saveEditPass() {
|
saveEditPass() {
|
||||||
let params = {
|
let params = {
|
||||||
password: this.md5(this.editPasswordForm.oldPassword),
|
password: this.md5(this.editPasswordForm.oldPassword),
|
||||||
|
|
@ -125,6 +127,7 @@ export default {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
// 取消修改密码
|
||||||
cancelEditPass() {
|
cancelEditPass() {
|
||||||
this.$store.commit("removeTag", "change_password");
|
this.$store.commit("removeTag", "change_password");
|
||||||
localStorage.pageOpenedList = JSON.stringify(
|
localStorage.pageOpenedList = JSON.stringify(
|
||||||
|
|
@ -141,8 +144,7 @@ export default {
|
||||||
name: lastPageName,
|
name: lastPageName,
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
},
|
}
|
||||||
mounted() {},
|
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="search">
|
<div>
|
||||||
<Card>
|
<Card>
|
||||||
<Row @keydown.enter.native="handleSearch">
|
<Row @keydown.enter.native="handleSearch">
|
||||||
<Form
|
<Form
|
||||||
|
|
@ -46,11 +46,9 @@
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:data="data"
|
:data="data"
|
||||||
ref="table"
|
ref="table"
|
||||||
sortable="custom"
|
class="mt_10"
|
||||||
@on-sort-change="changeSort"
|
|
||||||
@on-selection-change="changeSelect"
|
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -82,15 +80,12 @@ export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
distributionStatusList, // 分销状态
|
distributionStatusList, // 分销状态
|
||||||
openSearch: true, // 显示搜索
|
|
||||||
loading: true, // 表单加载状态
|
loading: true, // 表单加载状态
|
||||||
searchForm: {
|
searchForm: {
|
||||||
// 搜索框初始化对象
|
// 搜索框初始化对象
|
||||||
pageNumber: 1, // 当前页数
|
pageNumber: 1, // 当前页数
|
||||||
pageSize: 10, // 页面大小
|
pageSize: 10, // 页面大小
|
||||||
},
|
},
|
||||||
selectList: [], // 多选数据
|
|
||||||
selectCount: 0, // 多选计数
|
|
||||||
columns: [
|
columns: [
|
||||||
{
|
{
|
||||||
title: "会员名称",
|
title: "会员名称",
|
||||||
|
|
@ -227,43 +222,30 @@ export default {
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
// 初始化数据
|
||||||
init() {
|
init() {
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
},
|
},
|
||||||
see(v) {
|
// 分页 改变页码
|
||||||
this.$router.push({
|
|
||||||
name: "distributionOrder",
|
|
||||||
query: { id: v.memberId },
|
|
||||||
});
|
|
||||||
},
|
|
||||||
changePage(v) {
|
changePage(v) {
|
||||||
this.searchForm.pageNumber = v;
|
this.searchForm.pageNumber = v;
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
this.clearSelectAll();
|
|
||||||
},
|
},
|
||||||
|
// 分页 改变页数
|
||||||
changePageSize(v) {
|
changePageSize(v) {
|
||||||
this.searchForm.pageSize = v;
|
this.searchForm.pageSize = v;
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
},
|
},
|
||||||
|
// 搜索
|
||||||
handleSearch() {
|
handleSearch() {
|
||||||
this.searchForm.pageNumber = 1;
|
this.searchForm.pageNumber = 1;
|
||||||
this.searchForm.pageSize = 10;
|
this.searchForm.pageSize = 10;
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
},
|
},
|
||||||
|
// 获取列表数据
|
||||||
clearSelectAll() {
|
|
||||||
// 清空
|
|
||||||
this.$refs.table.selectAll(false);
|
|
||||||
},
|
|
||||||
changeSelect(e) {
|
|
||||||
this.selectList = e;
|
|
||||||
this.selectCount = e.length;
|
|
||||||
},
|
|
||||||
|
|
||||||
getDataList() {
|
getDataList() {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
this.searchForm.status = "PASS";
|
this.searchForm.status = "PASS";
|
||||||
// 带多条件搜索参数获取表单数据 请自行修改接口
|
|
||||||
getDistributionListData(this.searchForm).then((res) => {
|
getDistributionListData(this.searchForm).then((res) => {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
|
|
@ -316,6 +298,3 @@ export default {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="search">
|
<div>
|
||||||
<Card>
|
<Card>
|
||||||
<Row @keydown.enter.native="handleSearch">
|
<Row @keydown.enter.native="handleSearch">
|
||||||
<Form
|
<Form
|
||||||
|
|
@ -21,7 +21,6 @@
|
||||||
<Button
|
<Button
|
||||||
@click="handleSearch"
|
@click="handleSearch"
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="ios-search"
|
|
||||||
class="search-btn"
|
class="search-btn"
|
||||||
>搜索</Button
|
>搜索</Button
|
||||||
>
|
>
|
||||||
|
|
@ -34,11 +33,8 @@
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:data="data"
|
:data="data"
|
||||||
ref="table"
|
ref="table"
|
||||||
sortable="custom"
|
|
||||||
@on-sort-change="changeSort"
|
|
||||||
@on-selection-change="changeSelect"
|
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -61,7 +57,6 @@ import { getDistributionListData, auditDistribution } from "@/api/distribution";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "distributionApply",
|
name: "distributionApply",
|
||||||
components: {},
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
loading: true, // 表单加载状态
|
loading: true, // 表单加载状态
|
||||||
|
|
@ -74,14 +69,6 @@ export default {
|
||||||
startDate: "", // 起始时间
|
startDate: "", // 起始时间
|
||||||
endDate: "", // 终止时间
|
endDate: "", // 终止时间
|
||||||
},
|
},
|
||||||
form: {
|
|
||||||
// 添加或编辑表单对象初始化数据
|
|
||||||
memberName: "",
|
|
||||||
},
|
|
||||||
// 表单验证规则
|
|
||||||
submitLoading: false, // 添加或编辑提交状态
|
|
||||||
selectList: [], // 多选数据
|
|
||||||
selectCount: 0, // 多选计数
|
|
||||||
columns: [
|
columns: [
|
||||||
{
|
{
|
||||||
title: "会员名称",
|
title: "会员名称",
|
||||||
|
|
@ -149,48 +136,31 @@ export default {
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
// 初始化数据
|
||||||
init() {
|
init() {
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
},
|
},
|
||||||
|
// 分页 改变页码
|
||||||
changePage(v) {
|
changePage(v) {
|
||||||
this.searchForm.pageNumber = v;
|
this.searchForm.pageNumber = v;
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
this.clearSelectAll();
|
this.clearSelectAll();
|
||||||
},
|
},
|
||||||
|
// 分页 改变页数
|
||||||
changePageSize(v) {
|
changePageSize(v) {
|
||||||
this.searchForm.pageSize = v;
|
this.searchForm.pageSize = v;
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
},
|
},
|
||||||
|
// 搜索
|
||||||
handleSearch() {
|
handleSearch() {
|
||||||
this.searchForm.pageNumber = 1;
|
this.searchForm.pageNumber = 1;
|
||||||
this.searchForm.pageSize = 10;
|
this.searchForm.pageSize = 10;
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
},
|
},
|
||||||
changeSort(e) {
|
// 获取列表数据
|
||||||
this.searchForm.sort = e.key;
|
|
||||||
this.searchForm.order = e.order;
|
|
||||||
if (e.order === "normal") {
|
|
||||||
this.searchForm.order = "";
|
|
||||||
}
|
|
||||||
this.getDataList();
|
|
||||||
},
|
|
||||||
clearSelectAll() {
|
|
||||||
this.$refs.table.selectAll(false);
|
|
||||||
},
|
|
||||||
changeSelect(e) {
|
|
||||||
this.selectList = e;
|
|
||||||
this.selectCount = e.length;
|
|
||||||
},
|
|
||||||
selectDateRange(v) {
|
|
||||||
if (v) {
|
|
||||||
this.searchForm.startDate = v[0];
|
|
||||||
this.searchForm.endDate = v[1];
|
|
||||||
}
|
|
||||||
},
|
|
||||||
getDataList() {
|
getDataList() {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
this.searchForm.distributionStatus = "APPLY";
|
this.searchForm.distributionStatus = "APPLY";
|
||||||
// 带多条件搜索参数获取表单数据 请自行修改接口
|
|
||||||
getDistributionListData(this.searchForm).then((res) => {
|
getDistributionListData(this.searchForm).then((res) => {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
|
|
@ -198,9 +168,6 @@ export default {
|
||||||
this.total = res.result.total;
|
this.total = res.result.total;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
// 以下为模拟数据
|
|
||||||
//this.data = [
|
|
||||||
//];
|
|
||||||
this.total = this.data.length;
|
this.total = this.data.length;
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
},
|
},
|
||||||
|
|
@ -235,6 +202,3 @@ export default {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="search">
|
<div>
|
||||||
<Card>
|
<Card>
|
||||||
<Row @keydown.enter.native="handleSearch" >
|
<Row @keydown.enter.native="handleSearch" >
|
||||||
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
|
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
|
||||||
|
|
@ -15,11 +15,11 @@
|
||||||
</Select>
|
</Select>
|
||||||
</Form-item>
|
</Form-item>
|
||||||
<Form-item style="margin-left:-35px;" class="br">
|
<Form-item style="margin-left:-35px;" class="br">
|
||||||
<Button @click="handleSearch" type="primary" icon="ios-search">搜索</Button>
|
<Button @click="handleSearch" type="primary">搜索</Button>
|
||||||
</Form-item>
|
</Form-item>
|
||||||
</Form>
|
</Form>
|
||||||
</Row>
|
</Row>
|
||||||
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
|
<Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10"></Table>
|
||||||
<Row type="flex" justify="end" class="page padding-row">
|
<Row type="flex" justify="end" class="page padding-row">
|
||||||
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page>
|
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page>
|
||||||
</Row>
|
</Row>
|
||||||
|
|
@ -55,12 +55,9 @@ import {
|
||||||
getDistributionCash,
|
getDistributionCash,
|
||||||
auditDistributionCash
|
auditDistributionCash
|
||||||
} from "@/api/distribution";
|
} from "@/api/distribution";
|
||||||
// import { parse } from 'date-fns';
|
|
||||||
import {cashStatusList} from './dataJson'
|
import {cashStatusList} from './dataJson'
|
||||||
export default {
|
export default {
|
||||||
name: "distributionCash",
|
name: "distributionCash",
|
||||||
components: {
|
|
||||||
},
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
cashStatusList, // 状态列表
|
cashStatusList, // 状态列表
|
||||||
|
|
@ -81,8 +78,6 @@ export default {
|
||||||
price: "",
|
price: "",
|
||||||
},
|
},
|
||||||
submitLoading: false, // 添加或编辑提交状态
|
submitLoading: false, // 添加或编辑提交状态
|
||||||
selectList: [], // 多选数据
|
|
||||||
selectCount: 0, // 多选计数
|
|
||||||
columns: [
|
columns: [
|
||||||
{
|
{
|
||||||
title: "编号",
|
title: "编号",
|
||||||
|
|
@ -202,21 +197,12 @@ export default {
|
||||||
this.searchForm.pageSize = v;
|
this.searchForm.pageSize = v;
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
},
|
},
|
||||||
// 搜索表格
|
// 搜索
|
||||||
handleSearch() {
|
handleSearch() {
|
||||||
this.searchForm.pageNumber = 1;
|
this.searchForm.pageNumber = 1;
|
||||||
this.searchForm.pageSize = 10;
|
this.searchForm.pageSize = 10;
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
},
|
},
|
||||||
// 排序
|
|
||||||
changeSort(e) {
|
|
||||||
this.searchForm.sort = e.key;
|
|
||||||
this.searchForm.order = e.order;
|
|
||||||
if (e.order === "normal") {
|
|
||||||
this.searchForm.order = "";
|
|
||||||
}
|
|
||||||
this.getDataList();
|
|
||||||
},
|
|
||||||
// 获取列表数据
|
// 获取列表数据
|
||||||
getDataList() {
|
getDataList() {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
|
|
@ -231,6 +217,7 @@ export default {
|
||||||
this.total = this.data.length;
|
this.total = this.data.length;
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
},
|
},
|
||||||
|
// 通过还是拒绝申请
|
||||||
handleSubmit() {
|
handleSubmit() {
|
||||||
let result = "拒绝"
|
let result = "拒绝"
|
||||||
if(this.result == 'PASS'){
|
if(this.result == 'PASS'){
|
||||||
|
|
@ -258,6 +245,7 @@ export default {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
// 弹出modal 审核
|
||||||
edit(v) {
|
edit(v) {
|
||||||
this.modalTitle = "审核";
|
this.modalTitle = "审核";
|
||||||
this.handleStatus = 'edit';
|
this.handleStatus = 'edit';
|
||||||
|
|
@ -271,6 +259,7 @@ export default {
|
||||||
this.form = JSON.parse(JSON.stringify(v));
|
this.form = JSON.parse(JSON.stringify(v));
|
||||||
this.modalVisible = true;
|
this.modalVisible = true;
|
||||||
},
|
},
|
||||||
|
// 弹出modal 查看
|
||||||
view(v){
|
view(v){
|
||||||
this.modalTitle = "查看";
|
this.modalTitle = "查看";
|
||||||
this.handleStatus = 'view';
|
this.handleStatus = 'view';
|
||||||
|
|
@ -293,6 +282,3 @@ export default {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="search">
|
<div>
|
||||||
<Card>
|
<Card>
|
||||||
<Row @keydown.enter.native="handleSearch">
|
<Form @keydown.enter.native="handleSearch" ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
|
||||||
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
|
|
||||||
<Form-item label="商品名称" prop="goodsName">
|
<Form-item label="商品名称" prop="goodsName">
|
||||||
<Input
|
<Input
|
||||||
type="text"
|
type="text"
|
||||||
|
|
@ -14,9 +13,8 @@
|
||||||
</Form-item>
|
</Form-item>
|
||||||
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
|
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
|
||||||
</Form>
|
</Form>
|
||||||
</Row>
|
<Row class="operation" style="margin:10px 0;">
|
||||||
<Row class="operation" style="margin-top: 10px">
|
<Button @click="delAll" type="primary">批量下架</Button>
|
||||||
<Button @click="delAll">批量删除</Button>
|
|
||||||
</Row>
|
</Row>
|
||||||
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
|
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
|
||||||
<template slot="goodsName" slot-scope="{row}">
|
<template slot="goodsName" slot-scope="{row}">
|
||||||
|
|
@ -33,7 +31,7 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</Table>
|
</Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page>
|
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page>
|
||||||
</Row>
|
</Row>
|
||||||
</Card>
|
</Card>
|
||||||
|
|
@ -45,14 +43,10 @@ import {
|
||||||
getDistributionGoods,
|
getDistributionGoods,
|
||||||
delDistributionGoods
|
delDistributionGoods
|
||||||
} from "@/api/distribution";
|
} from "@/api/distribution";
|
||||||
import {getShopListData} from '@/api/shops'
|
|
||||||
export default {
|
export default {
|
||||||
name: "distributionGoods",
|
name: "distributionGoods",
|
||||||
components: {
|
|
||||||
},
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
shopList:[], // 店铺列表
|
|
||||||
loading: true, // 表单加载状态
|
loading: true, // 表单加载状态
|
||||||
searchForm: { // 搜索框初始化对象
|
searchForm: { // 搜索框初始化对象
|
||||||
pageNumber: 1, // 当前页数
|
pageNumber: 1, // 当前页数
|
||||||
|
|
@ -161,50 +155,39 @@ export default {
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
// 初始化数据
|
||||||
init() {
|
init() {
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
// this.getShopList()
|
|
||||||
},
|
},
|
||||||
|
// 分页 改变页码
|
||||||
changePage(v) {
|
changePage(v) {
|
||||||
this.searchForm.pageNumber = v;
|
this.searchForm.pageNumber = v;
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
this.clearSelectAll();
|
this.clearSelectAll();
|
||||||
},
|
},
|
||||||
|
// 分页 改变页数
|
||||||
changePageSize(v) {
|
changePageSize(v) {
|
||||||
this.searchForm.pageSize = v;
|
this.searchForm.pageSize = v;
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
},
|
},
|
||||||
|
// 搜索
|
||||||
handleSearch() {
|
handleSearch() {
|
||||||
this.searchForm.pageNumber = 1;
|
this.searchForm.pageNumber = 1;
|
||||||
this.searchForm.pageSize = 10;
|
this.searchForm.pageSize = 10;
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
},
|
},
|
||||||
handleReset() {
|
// 清除选中状态
|
||||||
this.$refs.searchForm.resetFields();
|
|
||||||
this.searchForm.pageNumber = 1;
|
|
||||||
this.searchForm.pageSize = 10;
|
|
||||||
// 重新加载数据
|
|
||||||
this.init();
|
|
||||||
},
|
|
||||||
changeSort(e) {
|
|
||||||
this.searchForm.sort = e.key;
|
|
||||||
this.searchForm.order = e.order;
|
|
||||||
if (e.order === "normal") {
|
|
||||||
this.searchForm.order = "";
|
|
||||||
}
|
|
||||||
this.getDataList();
|
|
||||||
},
|
|
||||||
clearSelectAll() {
|
clearSelectAll() {
|
||||||
this.$refs.table.selectAll(false);
|
this.$refs.table.selectAll(false);
|
||||||
},
|
},
|
||||||
|
// 选中后赋值
|
||||||
changeSelect(e) {
|
changeSelect(e) {
|
||||||
this.selectList = e;
|
this.selectList = e;
|
||||||
this.selectCount = e.length;
|
this.selectCount = e.length;
|
||||||
},
|
},
|
||||||
|
// 获取列表数据
|
||||||
getDataList() {
|
getDataList() {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
// 带多条件搜索参数获取表单数据 请自行修改接口
|
|
||||||
getDistributionGoods(this.searchForm).then(res => {
|
getDistributionGoods(this.searchForm).then(res => {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
|
|
@ -215,68 +198,50 @@ export default {
|
||||||
this.total = this.data.length;
|
this.total = this.data.length;
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
},
|
},
|
||||||
|
// 下架商品
|
||||||
remove(v) {
|
remove(v) {
|
||||||
this.$Modal.confirm({
|
this.$Modal.confirm({
|
||||||
title: "确认删除",
|
title: "确认下架",
|
||||||
// 记得确认修改此处
|
content: "您确认要下架么?",
|
||||||
content: "您确认要删除么?",
|
|
||||||
loading: true,
|
loading: true,
|
||||||
onOk: () => {
|
onOk: () => {
|
||||||
// 删除
|
// 下架
|
||||||
delDistributionGoods(v.id).then(res => {
|
delDistributionGoods(v.id).then(res => {
|
||||||
this.$Modal.remove();
|
this.$Modal.remove();
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
this.$Message.success("删除成功");
|
this.$Message.success("下架成功");
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
// 批量下架
|
||||||
delAll() {
|
delAll() {
|
||||||
if (this.selectCount <= 0) {
|
if (this.selectCount <= 0) {
|
||||||
this.$Message.warning("您还未选择要删除的数据");
|
this.$Message.warning("您还未选择要下架的数据");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.$Modal.confirm({
|
this.$Modal.confirm({
|
||||||
title: "确认删除",
|
title: "确认下架",
|
||||||
content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
|
content: "您确认要下架所选的 " + this.selectCount + " 条数据?",
|
||||||
loading: true,
|
loading: true,
|
||||||
onOk: () => {
|
onOk: () => {
|
||||||
let ids = []
|
let ids = []
|
||||||
this.selectList.forEach(item => {
|
this.selectList.forEach(item => {
|
||||||
ids.push(item.id)
|
ids.push(item.id)
|
||||||
});
|
});
|
||||||
// 批量删除
|
// 批量下架
|
||||||
delDistributionGoods(ids.toString()).then(res => {
|
delDistributionGoods(ids.toString()).then(res => {
|
||||||
this.$Modal.remove();
|
this.$Modal.remove();
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
this.$Message.success("删除成功");
|
this.$Message.success("下架成功");
|
||||||
this.clearSelectAll();
|
this.clearSelectAll();
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
|
||||||
getShopList(val){
|
|
||||||
const params = {
|
|
||||||
pageNumber:1,
|
|
||||||
pageSize:10,
|
|
||||||
storeName:''
|
|
||||||
}
|
|
||||||
if(val){
|
|
||||||
params.storeName = val;
|
|
||||||
}else {
|
|
||||||
params.storeName = ''
|
|
||||||
}
|
|
||||||
|
|
||||||
getShopListData(params).then(res => {
|
|
||||||
this.shopList = res.result.records
|
|
||||||
})
|
|
||||||
},
|
|
||||||
searchChange(val){
|
|
||||||
this.getShopList(val)
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
|
@ -284,7 +249,5 @@ export default {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="search">
|
<div>
|
||||||
<Card>
|
<Card>
|
||||||
<Row v-show="openSearch" @keydown.enter.native="handleSearch">
|
<Form ref="searchForm" @keydown.enter.native="handleSearch" :model="searchForm" inline :label-width="70" class="search-form">
|
||||||
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
|
|
||||||
<Form-item label="订单编号" prop="orderSn">
|
<Form-item label="订单编号" prop="orderSn">
|
||||||
<Input
|
<Input
|
||||||
type="text"
|
type="text"
|
||||||
|
|
@ -33,8 +32,7 @@
|
||||||
</Form-item>
|
</Form-item>
|
||||||
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
|
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
|
||||||
</Form>
|
</Form>
|
||||||
</Row>
|
<Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10">
|
||||||
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom">
|
|
||||||
<template slot-scope="{row}" slot="goodsMsg">
|
<template slot-scope="{row}" slot="goodsMsg">
|
||||||
<div class="goods-msg">
|
<div class="goods-msg">
|
||||||
<img :src="row.image" width="60" height="60" alt="">
|
<img :src="row.image" width="60" height="60" alt="">
|
||||||
|
|
@ -56,7 +54,7 @@
|
||||||
<Tag :color="filterStatusColor(row.distributionOrderStatus)">{{filterStatus(row.distributionOrderStatus)}}</Tag>
|
<Tag :color="filterStatusColor(row.distributionOrderStatus)">{{filterStatus(row.distributionOrderStatus)}}</Tag>
|
||||||
</template>
|
</template>
|
||||||
</Table>
|
</Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
|
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
|
||||||
@on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]"
|
@on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]"
|
||||||
size="small" show-total show-elevator show-sizer></Page>
|
size="small" show-total show-elevator show-sizer></Page>
|
||||||
|
|
@ -81,8 +79,6 @@
|
||||||
orderStatusList, // 订单状态列表
|
orderStatusList, // 订单状态列表
|
||||||
shopList: [], // 店铺列表
|
shopList: [], // 店铺列表
|
||||||
distributionId: this.$route.query.id, // 分销id
|
distributionId: this.$route.query.id, // 分销id
|
||||||
openSearch: true, // 显示搜索
|
|
||||||
openTip: true, // 显示提示
|
|
||||||
loading: true, // 表单加载状态
|
loading: true, // 表单加载状态
|
||||||
searchForm: { // 搜索框初始化对象
|
searchForm: { // 搜索框初始化对象
|
||||||
pageNumber: 1, // 当前页数
|
pageNumber: 1, // 当前页数
|
||||||
|
|
@ -154,24 +150,28 @@
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
// 初始化数据
|
||||||
init() {
|
init() {
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
this.getShopList()
|
this.getShopList()
|
||||||
},
|
},
|
||||||
|
//分页 改变页码
|
||||||
changePage(v) {
|
changePage(v) {
|
||||||
this.searchForm.pageNumber = v;
|
this.searchForm.pageNumber = v;
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
},
|
},
|
||||||
|
// 分页 改变页数
|
||||||
changePageSize(v) {
|
changePageSize(v) {
|
||||||
this.searchForm.pageSize = v;
|
this.searchForm.pageSize = v;
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
},
|
},
|
||||||
|
// 搜索
|
||||||
handleSearch() {
|
handleSearch() {
|
||||||
this.searchForm.pageNumber = 1;
|
this.searchForm.pageNumber = 1;
|
||||||
this.searchForm.pageSize = 10;
|
this.searchForm.pageSize = 10;
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
},
|
},
|
||||||
|
// 获取列表数据
|
||||||
getDataList() {
|
getDataList() {
|
||||||
this.searchForm.distributionId = this.distributionId;
|
this.searchForm.distributionId = this.distributionId;
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
|
|
@ -181,7 +181,6 @@
|
||||||
this.searchForm.startTime = this.$options.filters.unixToDate(startTime / 1000)
|
this.searchForm.startTime = this.$options.filters.unixToDate(startTime / 1000)
|
||||||
this.searchForm.endTime = this.$options.filters.unixToDate(endTime / 1000)
|
this.searchForm.endTime = this.$options.filters.unixToDate(endTime / 1000)
|
||||||
}
|
}
|
||||||
console.log(this.searchForm)
|
|
||||||
// 带多条件搜索参数获取表单数据 请自行修改接口
|
// 带多条件搜索参数获取表单数据 请自行修改接口
|
||||||
getDistributionOrder(this.searchForm).then(res => {
|
getDistributionOrder(this.searchForm).then(res => {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
|
|
@ -194,7 +193,7 @@
|
||||||
this.total = this.data.length;
|
this.total = this.data.length;
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
},
|
},
|
||||||
getShopList(val) { // 获取店铺列表
|
getShopList(val) { // 获取店铺列表 搜索用
|
||||||
const params = {
|
const params = {
|
||||||
pageNumber: 1,
|
pageNumber: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
|
|
@ -253,8 +252,7 @@
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" >
|
<style lang="scss">
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
.goods-msg {
|
.goods-msg {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<template>
|
<template>
|
||||||
<div style="background-color: #fff;">
|
<div style="background-color: #fff;">
|
||||||
|
|
||||||
<Form ref="form" :model="form" :label-width="120" :rules="formValidate" style="padding: 10px;">
|
<Form ref="form" :model="form" :label-width="120" style="padding: 10px;">
|
||||||
|
|
||||||
<Divider orientation="left">分销设置</Divider>
|
<Divider orientation="left">分销设置</Divider>
|
||||||
<FormItem label="是否开启分销" prop="distribution">
|
<FormItem label="是否开启分销" prop="distribution">
|
||||||
|
|
@ -25,49 +25,34 @@ import { setSetting, getSetting } from "@/api/index";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "distributionSetting",
|
name: "distributionSetting",
|
||||||
components: {},
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
loading: true, // 表单加载状态
|
|
||||||
form: {
|
form: {
|
||||||
// 添加或编辑表单对象初始化数据
|
// 添加或编辑表单对象初始化数据
|
||||||
isOpen: "",
|
isOpen: "",
|
||||||
distributionDay: "", //分销关系绑定天数
|
distributionDay: "", //分销关系绑定天数
|
||||||
cashDay: "", //分销结算天数
|
cashDay: "", //分销结算天数
|
||||||
},
|
}
|
||||||
// 表单验证规则
|
|
||||||
formValidate: {},
|
|
||||||
submitLoading: false, // 添加或编辑提交状态
|
|
||||||
selectList: [], // 多选数据
|
|
||||||
selectCount: 0, // 多选计数
|
|
||||||
data: [], // 表单数据
|
|
||||||
total: 0, // 表单数据总数
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
init() {
|
init() {
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
},
|
},
|
||||||
|
// 获取分销设置数据
|
||||||
getDataList() {
|
getDataList() {
|
||||||
this.loading = true;
|
|
||||||
// 带多条件搜索参数获取表单数据 请自行修改接口
|
// 带多条件搜索参数获取表单数据 请自行修改接口
|
||||||
getSetting("DISTRIBUTION_SETTING").then((res) => {
|
getSetting("DISTRIBUTION_SETTING").then((res) => {
|
||||||
this.loading = false;
|
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
this.form = res.result;
|
this.form = res.result;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
this.loading = false;
|
|
||||||
},
|
},
|
||||||
|
// 提交数据
|
||||||
handleSubmit() {
|
handleSubmit() {
|
||||||
this.$refs.form.validate((valid) => {
|
|
||||||
if (valid) {
|
|
||||||
// 防抖处理一下
|
|
||||||
this.$options.filters.debounce(this.submit(), 1500);
|
this.$options.filters.debounce(this.submit(), 1500);
|
||||||
}
|
|
||||||
});
|
|
||||||
},
|
},
|
||||||
|
// 提交api
|
||||||
submit() {
|
submit() {
|
||||||
setSetting("DISTRIBUTION_SETTING", this.form).then((res) => {
|
setSetting("DISTRIBUTION_SETTING", this.form).then((res) => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
|
|
|
||||||
|
|
@ -22,9 +22,11 @@
|
||||||
export default {
|
export default {
|
||||||
name: "Error403",
|
name: "Error403",
|
||||||
methods: {
|
methods: {
|
||||||
|
// 返回上一页
|
||||||
backPage() {
|
backPage() {
|
||||||
this.$router.go(-1);
|
this.$router.go(-1);
|
||||||
},
|
},
|
||||||
|
// 返回首页
|
||||||
goHome() {
|
goHome() {
|
||||||
this.$router.push({
|
this.$router.push({
|
||||||
name: "home_index",
|
name: "home_index",
|
||||||
|
|
|
||||||
|
|
@ -3,11 +3,23 @@
|
||||||
<div class="error404">
|
<div class="error404">
|
||||||
<div class="error404-body-con">
|
<div class="error404-body-con">
|
||||||
<Card>
|
<Card>
|
||||||
<div class="error404-body-con-title">4<span><Icon type="ios-navigate-outline"></Icon></span>4</div>
|
<div class="error404-body-con-title">
|
||||||
<p class="error404-body-con-message">YOU LOOK LOST</p>
|
4<span><Icon type="ios-navigate-outline"></Icon></span>4
|
||||||
|
</div>
|
||||||
|
<p class="error404-body-con-message">
|
||||||
|
YOU LOOK LOST
|
||||||
|
</p>
|
||||||
<div class="error404-btn-con">
|
<div class="error404-btn-con">
|
||||||
<Button @click="goHome" size="large" style="width: 200px;" type="text">返回首页</Button>
|
<Button @click="goHome" size="large" style="width: 200px" type="text"
|
||||||
<Button @click="backPage" size="large" style="width: 200px;margin-left: 40px;" type="primary">返回上一页</Button>
|
>返回首页</Button
|
||||||
|
>
|
||||||
|
<Button
|
||||||
|
@click="backPage"
|
||||||
|
size="large"
|
||||||
|
style="width: 200px; margin-left: 40px"
|
||||||
|
type="primary"
|
||||||
|
>返回上一页</Button
|
||||||
|
>
|
||||||
</div>
|
</div>
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -16,21 +28,23 @@
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
export default {
|
export default {
|
||||||
name: 'Error404',
|
name: "Error404",
|
||||||
methods: {
|
methods: {
|
||||||
backPage () {
|
// 返回上一页
|
||||||
|
backPage() {
|
||||||
this.$router.go(-1);
|
this.$router.go(-1);
|
||||||
},
|
},
|
||||||
goHome () {
|
// 返回首页
|
||||||
|
goHome() {
|
||||||
this.$router.push({
|
this.$router.push({
|
||||||
name: 'home_index'
|
name: "home_index",
|
||||||
});
|
});
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
@keyframes error404animation {
|
@keyframes error404animation {
|
||||||
0% {
|
0% {
|
||||||
transform: rotateZ(0deg);
|
transform: rotateZ(0deg);
|
||||||
}
|
}
|
||||||
|
|
@ -50,15 +64,15 @@ export default {
|
||||||
transform: rotateZ(0deg);
|
transform: rotateZ(0deg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.error404{
|
.error404 {
|
||||||
&-body-con{
|
&-body-con {
|
||||||
width: 700px;
|
width: 700px;
|
||||||
height: 500px;
|
height: 500px;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 50%;
|
left: 50%;
|
||||||
top: 50%;
|
top: 50%;
|
||||||
transform: translate(-50%,-50%);
|
transform: translate(-50%, -50%);
|
||||||
&-title{
|
&-title {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-size: 240px;
|
font-size: 240px;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
|
|
@ -66,14 +80,14 @@ export default {
|
||||||
height: 260px;
|
height: 260px;
|
||||||
line-height: 260px;
|
line-height: 260px;
|
||||||
margin-top: 40px;
|
margin-top: 40px;
|
||||||
span{
|
span {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
color: #19be6b;
|
color: #19be6b;
|
||||||
font-size: 230px;
|
font-size: 230px;
|
||||||
animation: error404animation 3s ease 0s infinite alternate;
|
animation: error404animation 3s ease 0s infinite alternate;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
&-message{
|
&-message {
|
||||||
display: block;
|
display: block;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-size: 30px;
|
font-size: 30px;
|
||||||
|
|
@ -82,7 +96,7 @@ export default {
|
||||||
color: #dddde2;
|
color: #dddde2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
&-btn-con{
|
&-btn-con {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
padding: 20px 0;
|
padding: 20px 0;
|
||||||
margin-bottom: 40px;
|
margin-bottom: 40px;
|
||||||
|
|
|
||||||
|
|
@ -5,12 +5,24 @@
|
||||||
<div class="error500-body-con">
|
<div class="error500-body-con">
|
||||||
<Card>
|
<Card>
|
||||||
<div class="error500-body-con-title">
|
<div class="error500-body-con-title">
|
||||||
5<span class="error500-0-span"><Icon type="social-freebsd-devil"></Icon></span><span class="error500-0-span"><Icon type="social-freebsd-devil"></Icon></span>
|
5<span class="error500-0-span"
|
||||||
|
><Icon type="social-freebsd-devil"></Icon></span
|
||||||
|
><span class="error500-0-span"
|
||||||
|
><Icon type="social-freebsd-devil"></Icon
|
||||||
|
></span>
|
||||||
</div>
|
</div>
|
||||||
<p class="error500-body-con-message">Oops! the server is wrong</p>
|
<p class="error500-body-con-message">Oops! the server is wrong</p>
|
||||||
<div class="error500-btn-con">
|
<div class="error500-btn-con">
|
||||||
<Button @click="goHome" size="large" style="width: 200px;" type="text">返回首页</Button>
|
<Button @click="goHome" size="large" style="width: 200px" type="text"
|
||||||
<Button @click="backPage" size="large" style="width: 200px;margin-left: 40px;" type="primary">返回上一页</Button>
|
>返回首页</Button
|
||||||
|
>
|
||||||
|
<Button
|
||||||
|
@click="backPage"
|
||||||
|
size="large"
|
||||||
|
style="width: 200px; margin-left: 40px"
|
||||||
|
type="primary"
|
||||||
|
>返回上一页</Button
|
||||||
|
>
|
||||||
</div>
|
</div>
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -19,21 +31,23 @@
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
export default {
|
export default {
|
||||||
name: 'Error500',
|
name: "Error500",
|
||||||
methods: {
|
methods: {
|
||||||
backPage () {
|
// 返回上一页
|
||||||
|
backPage() {
|
||||||
this.$router.go(-1);
|
this.$router.go(-1);
|
||||||
},
|
},
|
||||||
goHome () {
|
// 返回首页
|
||||||
|
goHome() {
|
||||||
this.$router.push({
|
this.$router.push({
|
||||||
name: 'home_index'
|
name: "home_index",
|
||||||
});
|
});
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
@keyframes error500animation {
|
@keyframes error500animation {
|
||||||
0% {
|
0% {
|
||||||
transform: rotateZ(0deg);
|
transform: rotateZ(0deg);
|
||||||
}
|
}
|
||||||
|
|
@ -53,15 +67,15 @@ export default {
|
||||||
transform: rotateZ(0deg);
|
transform: rotateZ(0deg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.error500{
|
.error500 {
|
||||||
&-body-con{
|
&-body-con {
|
||||||
width: 700px;
|
width: 700px;
|
||||||
height: 500px;
|
height: 500px;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 50%;
|
left: 50%;
|
||||||
top: 50%;
|
top: 50%;
|
||||||
transform: translate(-50%,-50%);
|
transform: translate(-50%, -50%);
|
||||||
&-title{
|
&-title {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-size: 240px;
|
font-size: 240px;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
|
|
@ -69,7 +83,7 @@ export default {
|
||||||
height: 260px;
|
height: 260px;
|
||||||
line-height: 260px;
|
line-height: 260px;
|
||||||
margin-top: 40px;
|
margin-top: 40px;
|
||||||
.error500-0-span{
|
.error500-0-span {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
position: relative;
|
position: relative;
|
||||||
width: 170px;
|
width: 170px;
|
||||||
|
|
@ -78,7 +92,7 @@ export default {
|
||||||
border: 20px solid #ed3f14;
|
border: 20px solid #ed3f14;
|
||||||
color: #ed3f14;
|
color: #ed3f14;
|
||||||
margin-right: 10px;
|
margin-right: 10px;
|
||||||
i{
|
i {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
font-size: 120px;
|
font-size: 120px;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|
@ -89,7 +103,7 @@ export default {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
&-message{
|
&-message {
|
||||||
display: block;
|
display: block;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-size: 30px;
|
font-size: 30px;
|
||||||
|
|
@ -98,7 +112,7 @@ export default {
|
||||||
color: #dddde2;
|
color: #dddde2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
&-btn-con{
|
&-btn-con {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
padding: 20px 0;
|
padding: 20px 0;
|
||||||
margin-bottom: 40px;
|
margin-bottom: 40px;
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
@on-sort-change="changeSort"
|
@on-sort-change="changeSort"
|
||||||
@on-selection-change="changeSelect"
|
@on-selection-change="changeSelect"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -323,7 +323,3 @@ export default {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -1,239 +0,0 @@
|
||||||
<template>
|
|
||||||
<Card>
|
|
||||||
<Form
|
|
||||||
label-position="left"
|
|
||||||
ref="searchForm"
|
|
||||||
:model="params"
|
|
||||||
inline
|
|
||||||
:label-width="100"
|
|
||||||
class="search-form"
|
|
||||||
>
|
|
||||||
<Form-item label="选择店铺" prop="sn">
|
|
||||||
<span class="tips" v-if="storeName"
|
|
||||||
>{{ storeName }}
|
|
||||||
<Button
|
|
||||||
@click="
|
|
||||||
() => {
|
|
||||||
storeName = '';
|
|
||||||
params.shopId = '';
|
|
||||||
}
|
|
||||||
"
|
|
||||||
type="text"
|
|
||||||
>清空</Button
|
|
||||||
>
|
|
||||||
</span>
|
|
||||||
<Button size="small" @click="handleClickShop" type="primary"
|
|
||||||
>选择店铺</Button
|
|
||||||
>
|
|
||||||
</Form-item>
|
|
||||||
<Form-item label="选择会员" prop="sn">
|
|
||||||
<span class="tips" v-if="memberName"
|
|
||||||
>{{ memberName }}
|
|
||||||
<Button
|
|
||||||
@click="
|
|
||||||
() => {
|
|
||||||
memberName = '';
|
|
||||||
params.memberId = '';
|
|
||||||
}
|
|
||||||
"
|
|
||||||
type="text"
|
|
||||||
>清空</Button
|
|
||||||
>
|
|
||||||
</span>
|
|
||||||
<Button size="small" @click="handleClickMember" type="primary"
|
|
||||||
>选择会员</Button
|
|
||||||
>
|
|
||||||
</Form-item>
|
|
||||||
<Form-item label="选择时间类型" prop="sn">
|
|
||||||
<Select v-model="params.timeType" style="width: 200px">
|
|
||||||
<Option
|
|
||||||
v-for="item in typeList"
|
|
||||||
:value="item.value"
|
|
||||||
:key="item.value"
|
|
||||||
>{{ item.label }}</Option
|
|
||||||
>
|
|
||||||
</Select>
|
|
||||||
</Form-item>
|
|
||||||
<Form-item label="按年查询" prop="sn">
|
|
||||||
<DatePicker
|
|
||||||
type="year"
|
|
||||||
placeholder="Select year"
|
|
||||||
style="width: 200px"
|
|
||||||
v-model="year"
|
|
||||||
></DatePicker>
|
|
||||||
</Form-item>
|
|
||||||
<Form-item label="按月查询" v-if="params.timeType == 'MONTH'">
|
|
||||||
<InputNumber :max="12" :min="1" v-model="params.month"></InputNumber>
|
|
||||||
</Form-item>
|
|
||||||
</Form>
|
|
||||||
|
|
||||||
<Tabs v-model="orderStatus" @on-click="handleClickType">
|
|
||||||
<TabPane label="行业订单数量" name="NUM">
|
|
||||||
<Table :columns="columns" :data="data"></Table>
|
|
||||||
</TabPane>
|
|
||||||
<TabPane label="行业订单金额" name="PRICE">
|
|
||||||
<Table :columns="columns" :data="data"></Table>
|
|
||||||
|
|
||||||
</TabPane>
|
|
||||||
</Tabs>
|
|
||||||
|
|
||||||
<Modal v-model="modalFlag" width="1200" :title="selectName">
|
|
||||||
<!-- 店铺 -->
|
|
||||||
<shopLayout v-if="shopFlag" @callback="callbackShop" ref="shops" />
|
|
||||||
<!-- 会员 -->
|
|
||||||
<memberLayout v-else @callback="callbackMember" ref="members" />
|
|
||||||
</Modal>
|
|
||||||
</Card>
|
|
||||||
</template>
|
|
||||||
<script>
|
|
||||||
import shopLayout from "@/views/seller/shop/shopList";
|
|
||||||
import memberLayout from "@/views/member/list/index";
|
|
||||||
import * as API_Goods from "@/api/goods";
|
|
||||||
export default {
|
|
||||||
components: {
|
|
||||||
shopLayout,
|
|
||||||
memberLayout,
|
|
||||||
},
|
|
||||||
data() {
|
|
||||||
return {
|
|
||||||
storeName: "", // 店铺名称
|
|
||||||
memberName: "", // 会员名称
|
|
||||||
shopFlag: false, // 是否展示
|
|
||||||
selectName: "选择", // modal名称
|
|
||||||
modalFlag: false, // modal显隐
|
|
||||||
priceData: "", // 价格
|
|
||||||
orderStatus: "NUM", // tab展示
|
|
||||||
|
|
||||||
shopList: {}, // 店铺列表
|
|
||||||
memberList: {}, // 会员列表
|
|
||||||
|
|
||||||
typeList: [ // 类型
|
|
||||||
{
|
|
||||||
value: "YEAR",
|
|
||||||
label: "年",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: "MONTH",
|
|
||||||
label: "月",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
total: 0, // 总数
|
|
||||||
year:"", // 当前年份
|
|
||||||
params: { // 请求参数
|
|
||||||
|
|
||||||
type: "PRICE",
|
|
||||||
timeType: "YEAR",
|
|
||||||
pageNumber: 1,
|
|
||||||
pageSize: 10,
|
|
||||||
year: "",
|
|
||||||
shopId: "",
|
|
||||||
memberId: "",
|
|
||||||
},
|
|
||||||
columns: [ // 店铺名称
|
|
||||||
{
|
|
||||||
title: "商品一级分类",
|
|
||||||
key: "categoryName",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: "销售数量",
|
|
||||||
key: "num",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: "销售金额",
|
|
||||||
key: "price",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
data: [], // 店铺名称
|
|
||||||
};
|
|
||||||
},
|
|
||||||
watch: {
|
|
||||||
params: {
|
|
||||||
handler(val) {
|
|
||||||
this.init();
|
|
||||||
},
|
|
||||||
deep: true,
|
|
||||||
},
|
|
||||||
year(val) {
|
|
||||||
this.params.year = new Date(val).getFullYear();
|
|
||||||
},
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
// 选择店铺
|
|
||||||
handleClickShop() {
|
|
||||||
this.modalFlag = true;
|
|
||||||
this.selectName += "店铺";
|
|
||||||
this.shopFlag = true;
|
|
||||||
this.$nextTick(() => {
|
|
||||||
this.$refs.shops.selectedShop = true;
|
|
||||||
});
|
|
||||||
},
|
|
||||||
// 选择会员
|
|
||||||
handleClickMember() {
|
|
||||||
this.modalFlag = true;
|
|
||||||
this.selectName += "会员";
|
|
||||||
this.$nextTick(() => {
|
|
||||||
this.$refs.members.selectedMember = true;
|
|
||||||
});
|
|
||||||
},
|
|
||||||
|
|
||||||
callbackMember(val) {
|
|
||||||
this.memberName = val.username;
|
|
||||||
this.params.memberId = val.id;
|
|
||||||
this.modalFlag = false;
|
|
||||||
},
|
|
||||||
|
|
||||||
callbackShop(val) {
|
|
||||||
this.storeName = val.storeName;
|
|
||||||
this.params.shopId = val.id;
|
|
||||||
this.modalFlag = false;
|
|
||||||
},
|
|
||||||
|
|
||||||
// 点击分页
|
|
||||||
changePage(index) {
|
|
||||||
this.params.pageNumber = index;
|
|
||||||
},
|
|
||||||
|
|
||||||
handleClickType(name) {
|
|
||||||
this.params.type = name;
|
|
||||||
},
|
|
||||||
init(name) {
|
|
||||||
Promise.all([
|
|
||||||
API_Goods.goodsCategoryStatistics(this.params),
|
|
||||||
]).then((res) => {
|
|
||||||
if (res[0].result) {
|
|
||||||
this.data = res[0].result;
|
|
||||||
}
|
|
||||||
|
|
||||||
});
|
|
||||||
},
|
|
||||||
},
|
|
||||||
mounted() {
|
|
||||||
let data = new Date();
|
|
||||||
|
|
||||||
this.year = data;
|
|
||||||
this.year && this.params.month
|
|
||||||
? this.timeType == "MONTH"
|
|
||||||
: this.timeType == "YEAR";
|
|
||||||
},
|
|
||||||
};
|
|
||||||
</script>
|
|
||||||
<style scoped lang="scss">
|
|
||||||
.page-col {
|
|
||||||
text-align: right;
|
|
||||||
margin: 10px 0;
|
|
||||||
}
|
|
||||||
.order-col {
|
|
||||||
display: flex;
|
|
||||||
> div {
|
|
||||||
margin-right: 8px;
|
|
||||||
padding: 16px;
|
|
||||||
font-size: 15px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.order-list {
|
|
||||||
display: flex;
|
|
||||||
}
|
|
||||||
.tips {
|
|
||||||
margin: 0 8px;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="search">
|
<div class="search">
|
||||||
<Card>
|
<Card>
|
||||||
<Row @keydown.enter.native="handleSearch">
|
|
||||||
<Form
|
<Form
|
||||||
ref="searchForm"
|
ref="searchForm"
|
||||||
:model="searchForm"
|
:model="searchForm"
|
||||||
inline
|
inline
|
||||||
:label-width="70"
|
:label-width="70"
|
||||||
class="search-form"
|
class="search-form"
|
||||||
|
@keydown.enter.native="handleSearch"
|
||||||
>
|
>
|
||||||
<Form-item label="商品名称" prop="goodsName">
|
<Form-item label="商品名称" prop="goodsName">
|
||||||
<Input
|
<Input
|
||||||
|
|
@ -46,18 +46,14 @@
|
||||||
</Form-item>
|
</Form-item>
|
||||||
<Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search" >搜索</Button>
|
<Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search" >搜索</Button>
|
||||||
</Form>
|
</Form>
|
||||||
</Row>
|
|
||||||
<Table
|
<Table
|
||||||
:loading="loading"
|
:loading="loading"
|
||||||
border
|
border
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:data="data"
|
:data="data"
|
||||||
ref="table"
|
ref="table"
|
||||||
sortable="custom"
|
class="mt_10"
|
||||||
@on-sort-change="changeSort"
|
|
||||||
@on-selection-change="changeSelect"
|
|
||||||
>
|
>
|
||||||
|
|
||||||
<!-- 商品栏目格式化 -->
|
<!-- 商品栏目格式化 -->
|
||||||
<template slot="goodsSlot" slot-scope="{row}">
|
<template slot="goodsSlot" slot-scope="{row}">
|
||||||
<div style="margin: 5px 0px;height: 80px; display: flex;">
|
<div style="margin: 5px 0px;height: 80px; display: flex;">
|
||||||
|
|
@ -80,7 +76,7 @@
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
</Table>
|
</Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -96,7 +92,7 @@
|
||||||
</Row>
|
</Row>
|
||||||
</Card>
|
</Card>
|
||||||
<Modal
|
<Modal
|
||||||
:title="modalTitle"
|
title="下架操作"
|
||||||
v-model="modalVisible"
|
v-model="modalVisible"
|
||||||
:mask-closable="false"
|
:mask-closable="false"
|
||||||
:width="500"
|
:width="500"
|
||||||
|
|
@ -124,14 +120,11 @@
|
||||||
import { getGoodsListData, upGoods, lowGoods } from "@/api/goods";
|
import { getGoodsListData, upGoods, lowGoods } from "@/api/goods";
|
||||||
export default {
|
export default {
|
||||||
name: "goods",
|
name: "goods",
|
||||||
components: {},
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
id: "", //要操作的id
|
id: "", //要操作的id
|
||||||
loading: true, // 表单加载状态
|
loading: true, // 表单加载状态
|
||||||
modalType: 0, // 添加或编辑标识
|
|
||||||
modalVisible: false, // 添加或编辑显示
|
modalVisible: false, // 添加或编辑显示
|
||||||
modalTitle: "", // 添加或编辑标题
|
|
||||||
searchForm: {
|
searchForm: {
|
||||||
// 搜索框初始化对象
|
// 搜索框初始化对象
|
||||||
pageNumber: 1, // 当前页数
|
pageNumber: 1, // 当前页数
|
||||||
|
|
@ -143,8 +136,6 @@ export default {
|
||||||
reason: "",
|
reason: "",
|
||||||
},
|
},
|
||||||
submitLoading: false, // 添加或编辑提交状态
|
submitLoading: false, // 添加或编辑提交状态
|
||||||
selectList: [], // 多选数据
|
|
||||||
selectCount: 0, // 多选计数
|
|
||||||
columns: [
|
columns: [
|
||||||
{
|
{
|
||||||
title: "商品名称",
|
title: "商品名称",
|
||||||
|
|
@ -310,41 +301,29 @@ export default {
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
// 初始化数据
|
||||||
init() {
|
init() {
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
},
|
},
|
||||||
|
// 分页 改变页码
|
||||||
changePage(v) {
|
changePage(v) {
|
||||||
this.searchForm.pageNumber = v;
|
this.searchForm.pageNumber = v;
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
this.clearSelectAll();
|
|
||||||
},
|
},
|
||||||
|
// 分页 改变页数
|
||||||
changePageSize(v) {
|
changePageSize(v) {
|
||||||
this.searchForm.pageSize = v;
|
this.searchForm.pageSize = v;
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
},
|
},
|
||||||
|
// 搜索
|
||||||
handleSearch() {
|
handleSearch() {
|
||||||
this.searchForm.pageNumber = 1;
|
this.searchForm.pageNumber = 1;
|
||||||
this.searchForm.pageSize = 10;
|
this.searchForm.pageSize = 10;
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
},
|
},
|
||||||
changeSort(e) {
|
// 获取数据
|
||||||
this.searchForm.sort = e.key;
|
|
||||||
this.searchForm.order = e.order;
|
|
||||||
if (e.order === "normal") {
|
|
||||||
this.searchForm.order = "";
|
|
||||||
}
|
|
||||||
this.getDataList();
|
|
||||||
},
|
|
||||||
clearSelectAll() {
|
|
||||||
this.$refs.table.selectAll(false);
|
|
||||||
},
|
|
||||||
changeSelect(e) {
|
|
||||||
this.selectList = e;
|
|
||||||
this.selectCount = e.length;
|
|
||||||
},
|
|
||||||
getDataList() {
|
getDataList() {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
// 带多条件搜索参数获取表单数据
|
|
||||||
getGoodsListData(this.searchForm).then((res) => {
|
getGoodsListData(this.searchForm).then((res) => {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
if (res.records) {
|
if (res.records) {
|
||||||
|
|
@ -353,16 +332,15 @@ export default {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
// 编辑
|
||||||
edit(v) {
|
edit(v) {
|
||||||
this.id = v.id;
|
this.id = v.id;
|
||||||
if (v.underMessage != "{}") {
|
if (v.underMessage != "{}") {
|
||||||
this.underForm.reason = v.underMessage;
|
this.underForm.reason = v.underMessage;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.modalType = 1;
|
|
||||||
this.modalTitle = "下架操作";
|
|
||||||
this.modalVisible = true;
|
this.modalVisible = true;
|
||||||
},
|
},
|
||||||
|
// 下架
|
||||||
lower() {
|
lower() {
|
||||||
lowGoods(this.id, this.underForm).then((res) => {
|
lowGoods(this.id, this.underForm).then((res) => {
|
||||||
this.$Modal.remove();
|
this.$Modal.remove();
|
||||||
|
|
@ -373,6 +351,7 @@ export default {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
// 商家
|
||||||
upper(v) {
|
upper(v) {
|
||||||
this.$Modal.confirm({
|
this.$Modal.confirm({
|
||||||
title: "确认上架",
|
title: "确认上架",
|
||||||
|
|
@ -397,14 +376,10 @@ export default {
|
||||||
name: "goods-detail",
|
name: "goods-detail",
|
||||||
query: { id: id },
|
query: { id: id },
|
||||||
});
|
});
|
||||||
},
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.init();
|
this.init();
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,7 @@
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
</Table>
|
</Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -328,6 +328,4 @@
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,3 @@
|
||||||
<style lang="scss">
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
<template>
|
<template>
|
||||||
<div class="search">
|
<div class="search">
|
||||||
<Card>
|
<Card>
|
||||||
|
|
@ -17,7 +14,7 @@
|
||||||
<Button @click="add" type="primary">添加</Button>
|
<Button @click="add" type="primary">添加</Button>
|
||||||
</Row>
|
</Row>
|
||||||
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
|
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
|
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
|
||||||
show-total show-elevator show-sizer></Page>
|
show-total show-elevator show-sizer></Page>
|
||||||
</Row>
|
</Row>
|
||||||
|
|
|
||||||
|
|
@ -476,7 +476,6 @@ export default {
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
.wrapper {
|
.wrapper {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@
|
||||||
@on-selection-change="changeSelect"
|
@on-selection-change="changeSelect"
|
||||||
>
|
>
|
||||||
</Table>
|
</Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -372,6 +372,3 @@ export default {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
</i-switch>
|
</i-switch>
|
||||||
</template>
|
</template>
|
||||||
</Table>
|
</Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage"
|
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage"
|
||||||
@on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
@on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
||||||
size="small" show-total show-elevator show-sizer></Page>
|
size="small" show-total show-elevator show-sizer></Page>
|
||||||
|
|
@ -351,5 +351,4 @@ export default {
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
@import "./index.scss";
|
@import "./index.scss";
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
<Table height="350" border tooltip :loading="loading" :columns="activeColumns" :data="showPromotionList"></Table>
|
<Table height="350" border tooltip :loading="loading" :columns="activeColumns" :data="showPromotionList"></Table>
|
||||||
|
|
||||||
<Page @on-change="(val) => {params.pageNumber = val; } " :current="params.pageNumber" :page-size="params.pageSize" class="page" :total="totals" size="small" show-elevator />
|
<Page @on-change="(val) => {params.pageNumber = val; } " :current="params.pageNumber" :page-size="params.pageSize" class="mt_10" :total="totals" size="small" show-elevator />
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="search">
|
<div class="search">
|
||||||
<Card>
|
<Card>
|
||||||
<Row @keydown.enter.native="handleSearch"></Row>
|
|
||||||
<Row class="operation padding-row">
|
<Row class="operation padding-row">
|
||||||
<Button @click="add" type="primary">添加</Button>
|
<Button @click="add" type="primary">添加</Button>
|
||||||
</Row>
|
</Row>
|
||||||
|
|
@ -16,14 +15,14 @@
|
||||||
@on-selection-change="changeSelect"
|
@on-selection-change="changeSelect"
|
||||||
>
|
>
|
||||||
<!-- 页面展示 -->
|
<!-- 页面展示 -->
|
||||||
<template slot="disableSlot" slot-scope="scope">
|
<template slot="disableSlot" slot-scope="{row}">
|
||||||
<i-switch size="large" v-model="scope.row.disabled == 'OPEN'?true:false" @on-change="changeSwitch(scope.row)">
|
<i-switch size="large" :value="row.switch" @on-change="changeSwitch(row)">
|
||||||
<span slot="open">展示</span>
|
<span slot="open">开启</span>
|
||||||
<span slot="close">隐藏</span>
|
<span slot="close">禁用</span>
|
||||||
</i-switch>
|
</i-switch>
|
||||||
</template>
|
</template>
|
||||||
</Table>
|
</Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -87,12 +86,9 @@
|
||||||
} from "@/api/logistics";
|
} from "@/api/logistics";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "bill",
|
name: "logistics",
|
||||||
components: {},
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
openSearch: true, // 显示搜索
|
|
||||||
openTip: true, // 显示提示
|
|
||||||
loading: true, // 表单加载状态
|
loading: true, // 表单加载状态
|
||||||
modalType: 0, // 添加或编辑标识
|
modalType: 0, // 添加或编辑标识
|
||||||
modalVisible: false, // 添加或编辑显示
|
modalVisible: false, // 添加或编辑显示
|
||||||
|
|
@ -120,15 +116,7 @@
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
submitLoading: false, // 添加或编辑提交状态
|
submitLoading: false, // 添加或编辑提交状态
|
||||||
selectList: [], // 多选数据
|
|
||||||
selectCount: 0, // 多选计数
|
|
||||||
columns: [
|
columns: [
|
||||||
// 表头
|
|
||||||
{
|
|
||||||
type: "selection",
|
|
||||||
width: 60,
|
|
||||||
align: "center",
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
title: "物流公司名称",
|
title: "物流公司名称",
|
||||||
key: "name",
|
key: "name",
|
||||||
|
|
@ -146,14 +134,6 @@
|
||||||
key: "disabled",
|
key: "disabled",
|
||||||
width: 150,
|
width: 150,
|
||||||
slot: "disableSlot",
|
slot: "disableSlot",
|
||||||
/*render(h, params) {
|
|
||||||
return h("Badge", {
|
|
||||||
props: {
|
|
||||||
status: params.row.disabled == 'OPEN' ? "success" : "error",
|
|
||||||
text: params.row.disabled == 'OPEN' ? "开启" : "禁用",
|
|
||||||
},
|
|
||||||
});
|
|
||||||
},*/
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: "创建时间",
|
title: "创建时间",
|
||||||
|
|
@ -213,59 +193,53 @@
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
// 初始化
|
||||||
init() {
|
init() {
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
},
|
},
|
||||||
|
// 分页 改变页码
|
||||||
changePage(v) {
|
changePage(v) {
|
||||||
this.searchForm.pageNumber = v;
|
this.searchForm.pageNumber = v;
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
this.clearSelectAll();
|
|
||||||
},
|
},
|
||||||
|
// 分页 改变页数
|
||||||
changePageSize(v) {
|
changePageSize(v) {
|
||||||
this.searchForm.pageSize = v;
|
this.searchForm.pageSize = v;
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
},
|
},
|
||||||
handleSearch() {
|
// 获取列表
|
||||||
this.searchForm.pageNumber = 1;
|
|
||||||
this.searchForm.pageSize = 10;
|
|
||||||
this.getDataList();
|
|
||||||
},
|
|
||||||
handleReset() {
|
|
||||||
this.$refs.searchForm.resetFields();
|
|
||||||
this.searchForm.pageNumber = 1;
|
|
||||||
this.searchForm.pageSize = 10;
|
|
||||||
// 重新加载数据
|
|
||||||
this.getDataList();
|
|
||||||
},
|
|
||||||
changeSort(e) {
|
|
||||||
this.searchForm.sort = e.key;
|
|
||||||
this.searchForm.order = e.order;
|
|
||||||
if (e.order === "normal") {
|
|
||||||
this.searchForm.order = "";
|
|
||||||
}
|
|
||||||
this.getDataList();
|
|
||||||
},
|
|
||||||
clearSelectAll() {
|
|
||||||
this.$refs.table.selectAll(false);
|
|
||||||
},
|
|
||||||
changeSelect(e) {
|
|
||||||
this.selectList = e;
|
|
||||||
this.selectCount = e.length;
|
|
||||||
},
|
|
||||||
|
|
||||||
getDataList() {
|
getDataList() {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
|
|
||||||
getLogisticsPage(this.searchForm).then((res) => {
|
getLogisticsPage(this.searchForm).then((res) => {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
this.data = res.result.records;
|
const data = res.result.records;
|
||||||
|
data.forEach(e => {
|
||||||
|
e.switch = e.disabled === 'OPEN' ? true : false
|
||||||
|
});
|
||||||
|
this.data = data;
|
||||||
this.total = res.result.total;
|
this.total = res.result.total;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
this.total = this.data.length;
|
this.total = this.data.length;
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
},
|
},
|
||||||
|
// switch 切换状态
|
||||||
|
changeSwitch (v) {
|
||||||
|
this.form.name = v.name;
|
||||||
|
this.form.code = v.code;
|
||||||
|
this.form.standBy = v.standBy;
|
||||||
|
this.form.formItems = v.formItems;
|
||||||
|
this.form.disabled = v.disabled === 'CLOSE' ? 'OPEN' : 'CLOSE';
|
||||||
|
updateLogistics(v.id, this.form).then((res) => {
|
||||||
|
if (res.success) {
|
||||||
|
this.$Message.success("操作成功");
|
||||||
|
this.getDataList();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
// 确认提交
|
||||||
handleSubmit() {
|
handleSubmit() {
|
||||||
this.$refs.form.validate((valid) => {
|
this.$refs.form.validate((valid) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
|
|
@ -300,6 +274,7 @@
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
// 添加信息
|
||||||
add() {
|
add() {
|
||||||
this.modalType = 0;
|
this.modalType = 0;
|
||||||
this.modalTitle = "添加";
|
this.modalTitle = "添加";
|
||||||
|
|
@ -308,6 +283,7 @@
|
||||||
|
|
||||||
this.modalVisible = true;
|
this.modalVisible = true;
|
||||||
},
|
},
|
||||||
|
// 编辑
|
||||||
detail(v) {
|
detail(v) {
|
||||||
this.modalType = 1;
|
this.modalType = 1;
|
||||||
this.id = v.id;
|
this.id = v.id;
|
||||||
|
|
@ -323,6 +299,7 @@
|
||||||
? (this.form.disabled = true)
|
? (this.form.disabled = true)
|
||||||
: (this.form.disabled = false);
|
: (this.form.disabled = false);
|
||||||
},
|
},
|
||||||
|
// 删除物流公司
|
||||||
remove(v) {
|
remove(v) {
|
||||||
this.$Modal.confirm({
|
this.$Modal.confirm({
|
||||||
title: "确认删除",
|
title: "确认删除",
|
||||||
|
|
@ -347,7 +324,3 @@
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@
|
||||||
@on-sort-change="changeSort"
|
@on-sort-change="changeSort"
|
||||||
@on-selection-change="changeSelect"
|
@on-selection-change="changeSelect"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -236,8 +236,3 @@
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
</Form>
|
</Form>
|
||||||
</Row>
|
</Row>
|
||||||
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
|
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
||||||
size="small" show-total show-elevator show-sizer></Page>
|
size="small" show-total show-elevator show-sizer></Page>
|
||||||
</Row>
|
</Row>
|
||||||
|
|
@ -188,7 +188,3 @@ export default {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
</Form>
|
</Form>
|
||||||
</Row>
|
</Row>
|
||||||
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
|
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
|
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
|
||||||
show-total show-elevator show-sizer></Page>
|
show-total show-elevator show-sizer></Page>
|
||||||
</Row>
|
</Row>
|
||||||
|
|
@ -337,7 +337,4 @@ export default {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
|
|
||||||
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
|
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
|
||||||
</Table>
|
</Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
|
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
|
||||||
show-total show-elevator show-sizer></Page>
|
show-total show-elevator show-sizer></Page>
|
||||||
</Row>
|
</Row>
|
||||||
|
|
@ -530,7 +530,6 @@ export default {
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
/deep/ .ivu-table-wrapper {
|
/deep/ .ivu-table-wrapper {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -89,7 +89,7 @@
|
||||||
>
|
>
|
||||||
</Table>
|
</Table>
|
||||||
|
|
||||||
<Row type="flex" justify="end" class="page" style="margin-top: 10px">
|
<Row type="flex" justify="end" class="mt_10" style="margin-top: 10px">
|
||||||
<Page
|
<Page
|
||||||
:current="pointSearchForm.pageNumber"
|
:current="pointSearchForm.pageNumber"
|
||||||
:total="pointTotal"
|
:total="pointTotal"
|
||||||
|
|
@ -177,7 +177,7 @@
|
||||||
>
|
>
|
||||||
</Table>
|
</Table>
|
||||||
|
|
||||||
<Row type="flex" justify="end" class="page" style="margin-top: 10px">
|
<Row type="flex" justify="end" class="mt_10" style="margin-top: 10px">
|
||||||
<Page
|
<Page
|
||||||
:current="orderSearchForm.pageNumber"
|
:current="orderSearchForm.pageNumber"
|
||||||
:total="orderTotal"
|
:total="orderTotal"
|
||||||
|
|
@ -208,7 +208,7 @@
|
||||||
>
|
>
|
||||||
</Table>
|
</Table>
|
||||||
|
|
||||||
<Row type="flex" justify="end" class="page" style="margin-top: 10px">
|
<Row type="flex" justify="end" class="mt_10" style="margin-top: 10px">
|
||||||
<Page
|
<Page
|
||||||
:current="addressSearchForm.pageNumber"
|
:current="addressSearchForm.pageNumber"
|
||||||
:total="addressTotal"
|
:total="addressTotal"
|
||||||
|
|
@ -254,7 +254,7 @@
|
||||||
>
|
>
|
||||||
</Table>
|
</Table>
|
||||||
|
|
||||||
<Row type="flex" justify="end" class="page" style="margin-top: 10px">
|
<Row type="flex" justify="end" class="mt_10" style="margin-top: 10px">
|
||||||
<Page
|
<Page
|
||||||
:current="walletSearchForm.pageNumber"
|
:current="walletSearchForm.pageNumber"
|
||||||
:total="walletTotal"
|
:total="walletTotal"
|
||||||
|
|
@ -300,7 +300,7 @@
|
||||||
</template>
|
</template>
|
||||||
</Table>
|
</Table>
|
||||||
|
|
||||||
<Row type="flex" justify="end" class="page" style="margin-top: 10px">
|
<Row type="flex" justify="end" class="mt_10" style="margin-top: 10px">
|
||||||
<Page
|
<Page
|
||||||
:current="receiptRecordSearchForm.pageNumber"
|
:current="receiptRecordSearchForm.pageNumber"
|
||||||
:total="receiptRecordTotal"
|
:total="receiptRecordTotal"
|
||||||
|
|
@ -1151,7 +1151,5 @@
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
@import "memberDetail.scss";
|
@import "memberDetail.scss";
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@
|
||||||
@on-selection-change="changeSelect"
|
@on-selection-change="changeSelect"
|
||||||
>
|
>
|
||||||
</Table>
|
</Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -486,8 +486,6 @@
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
|
|
||||||
.face {
|
.face {
|
||||||
width: 60px;
|
width: 60px;
|
||||||
height: 60px;
|
height: 60px;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,4 @@
|
||||||
<style lang="scss">
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<!--短信-->
|
<!--短信-->
|
||||||
|
|
@ -111,7 +109,7 @@
|
||||||
@on-selection-change="showSelect"
|
@on-selection-change="showSelect"
|
||||||
ref="memberTable"
|
ref="memberTable"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -153,7 +151,7 @@
|
||||||
@on-selection-change="showSelect"
|
@on-selection-change="showSelect"
|
||||||
ref="shopTable"
|
ref="shopTable"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -197,7 +195,7 @@
|
||||||
@on-selection-change="showSelect"
|
@on-selection-change="showSelect"
|
||||||
ref="weChatTable"
|
ref="weChatTable"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="weChatSearchForm.pageNumber"
|
:current="weChatSearchForm.pageNumber"
|
||||||
:total="weChatTotal"
|
:total="weChatTotal"
|
||||||
|
|
@ -240,7 +238,7 @@
|
||||||
@on-selection-change="showSelect"
|
@on-selection-change="showSelect"
|
||||||
ref="otherTable"
|
ref="otherTable"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,3 @@
|
||||||
<style lang="scss">
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
<template>
|
<template>
|
||||||
<div class="search">
|
<div class="search">
|
||||||
<Card>
|
<Card>
|
||||||
|
|
@ -85,7 +82,7 @@
|
||||||
@on-selection-change="showSelect"
|
@on-selection-change="showSelect"
|
||||||
ref="table"
|
ref="table"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,3 @@
|
||||||
<style lang="scss">
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
<template>
|
<template>
|
||||||
<div class="search">
|
<div class="search">
|
||||||
<Card>
|
<Card>
|
||||||
|
|
@ -51,7 +48,7 @@
|
||||||
@on-sort-change="changeSort"
|
@on-sort-change="changeSort"
|
||||||
@on-selection-change="changeSelect"
|
@on-selection-change="changeSelect"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="pageNumber"
|
:current="pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,3 @@
|
||||||
<style lang="less">
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<!--微信模板-->
|
<!--微信模板-->
|
||||||
|
|
@ -53,7 +50,7 @@
|
||||||
:data="weChatData"
|
:data="weChatData"
|
||||||
ref="weChatTable"
|
ref="weChatTable"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="weChatSearchForm.pageNumber"
|
:current="weChatSearchForm.pageNumber"
|
||||||
:total="weChatTotal"
|
:total="weChatTotal"
|
||||||
|
|
@ -83,7 +80,7 @@
|
||||||
sortable="custom"
|
sortable="custom"
|
||||||
ref="weChatMPTable"
|
ref="weChatMPTable"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="weChatMPSearchForm.pageNumber"
|
:current="weChatMPSearchForm.pageNumber"
|
||||||
:total="weChatMPTotal"
|
:total="weChatMPTotal"
|
||||||
|
|
|
||||||
|
|
@ -82,7 +82,7 @@
|
||||||
@on-sort-change="changeSort"
|
@on-sort-change="changeSort"
|
||||||
@on-selection-change="changeSelect"
|
@on-selection-change="changeSelect"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -368,25 +368,3 @@ export default {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
// @import "@/styles/table-common.scss";
|
|
||||||
.search {
|
|
||||||
.operation {
|
|
||||||
margin-bottom: 2vh;
|
|
||||||
}
|
|
||||||
.select-count {
|
|
||||||
font-weight: 600;
|
|
||||||
color: #40a9ff;
|
|
||||||
}
|
|
||||||
.select-clear {
|
|
||||||
margin-left: 10px;
|
|
||||||
}
|
|
||||||
.page {
|
|
||||||
margin-top: 2vh;
|
|
||||||
}
|
|
||||||
.drop-down {
|
|
||||||
margin-left: 5px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@
|
||||||
@on-selection-change="changeSelect"
|
@on-selection-change="changeSelect"
|
||||||
>
|
>
|
||||||
</Table>
|
</Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -195,8 +195,6 @@
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
|
|
||||||
.face {
|
.face {
|
||||||
width: 60px;
|
width: 60px;
|
||||||
height: 60px;
|
height: 60px;
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
@on-sort-change="changeSort"
|
@on-sort-change="changeSort"
|
||||||
@on-selection-change="changeSelect"
|
@on-selection-change="changeSelect"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -53,7 +53,7 @@
|
||||||
@on-sort-change="changeSort"
|
@on-sort-change="changeSort"
|
||||||
@on-selection-change="changeSelect"
|
@on-selection-change="changeSelect"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -86,7 +86,7 @@
|
||||||
@on-sort-change="changeSort"
|
@on-sort-change="changeSort"
|
||||||
@on-selection-change="changeSelect"
|
@on-selection-change="changeSelect"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -120,7 +120,7 @@
|
||||||
@on-sort-change="changeSort"
|
@on-sort-change="changeSort"
|
||||||
@on-selection-change="changeSelect"
|
@on-selection-change="changeSelect"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
|
||||||
|
|
@ -105,7 +105,7 @@
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
</Table>
|
</Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -370,7 +370,3 @@
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,7 @@
|
||||||
</Poptip>
|
</Poptip>
|
||||||
</template>
|
</template>
|
||||||
</Table>
|
</Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -345,7 +345,3 @@
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
</Form>
|
</Form>
|
||||||
</Row>
|
</Row>
|
||||||
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
|
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
||||||
size="small" show-total show-elevator show-sizer></Page>
|
size="small" show-total show-elevator show-sizer></Page>
|
||||||
</Row>
|
</Row>
|
||||||
|
|
@ -192,7 +192,4 @@ export default {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@
|
||||||
</Row>
|
</Row>
|
||||||
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
|
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
|
||||||
@on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
|
@on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
|
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
|
||||||
@on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
@on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
||||||
size="small" show-total show-elevator show-sizer></Page>
|
size="small" show-total show-elevator show-sizer></Page>
|
||||||
|
|
@ -175,7 +175,4 @@ export default {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,7 @@
|
||||||
@on-sort-change="changeSort"
|
@on-sort-change="changeSort"
|
||||||
@on-selection-change="changeSelect"
|
@on-selection-change="changeSelect"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -310,7 +310,3 @@
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -700,8 +700,6 @@ export default {
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
// @import "@/styles/table-common.scss";
|
|
||||||
.order-log-div {
|
.order-log-div {
|
||||||
line-height: 30px;
|
line-height: 30px;
|
||||||
height: 500px;
|
height: 500px;
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@
|
||||||
|
|
||||||
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
|
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
|
||||||
|
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
|
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
|
||||||
show-total show-elevator show-sizer></Page>
|
show-total show-elevator show-sizer></Page>
|
||||||
</Row>
|
</Row>
|
||||||
|
|
@ -294,8 +294,6 @@ export default {
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
.export {
|
.export {
|
||||||
margin: 10px 20px 10px 0;
|
margin: 10px 20px 10px 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@
|
||||||
@click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
|
@click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
|
||||||
</template>
|
</template>
|
||||||
</Table>
|
</Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@
|
||||||
</i-switch>
|
</i-switch>
|
||||||
</template>
|
</template>
|
||||||
</Table>
|
</Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
||||||
size="small" show-total show-elevator>
|
size="small" show-total show-elevator>
|
||||||
|
|
||||||
|
|
@ -458,6 +458,3 @@ export default {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,4 @@
|
||||||
<style lang="scss">
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
<template>
|
<template>
|
||||||
<div class="search">
|
<div class="search">
|
||||||
<Card>
|
<Card>
|
||||||
|
|
@ -14,7 +12,7 @@
|
||||||
@on-sort-change="changeSort"
|
@on-sort-change="changeSort"
|
||||||
@on-selection-change="changeSelect"
|
@on-selection-change="changeSelect"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="pageNumber"
|
:current="pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
@on-sort-change="changeSort"
|
@on-sort-change="changeSort"
|
||||||
@on-selection-change="changeSelect"
|
@on-selection-change="changeSelect"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -488,8 +488,6 @@ export default {
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
// @import "@/styles/table-common.scss";
|
|
||||||
.search {
|
.search {
|
||||||
.operation {
|
.operation {
|
||||||
margin-bottom: 2vh;
|
margin-bottom: 2vh;
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
@on-sort-change="changeSort"
|
@on-sort-change="changeSort"
|
||||||
@on-selection-change="changeSelect"
|
@on-selection-change="changeSelect"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -488,8 +488,6 @@ export default {
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
// @import "@/styles/table-common.scss";
|
|
||||||
.search {
|
.search {
|
||||||
.operation {
|
.operation {
|
||||||
margin-bottom: 2vh;
|
margin-bottom: 2vh;
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
@on-sort-change="changeSort"
|
@on-sort-change="changeSort"
|
||||||
@on-selection-change="changeSelect"
|
@on-selection-change="changeSelect"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -472,25 +472,3 @@ export default {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
// @import "@/styles/table-common.scss";
|
|
||||||
.search {
|
|
||||||
.operation {
|
|
||||||
margin-bottom: 2vh;
|
|
||||||
}
|
|
||||||
.select-count {
|
|
||||||
font-weight: 600;
|
|
||||||
color: #40a9ff;
|
|
||||||
}
|
|
||||||
.select-clear {
|
|
||||||
margin-left: 10px;
|
|
||||||
}
|
|
||||||
.page {
|
|
||||||
margin-top: 2vh;
|
|
||||||
}
|
|
||||||
.drop-down {
|
|
||||||
margin-left: 5px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
</Row>
|
</Row>
|
||||||
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
|
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
|
||||||
@on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
|
@on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
|
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
|
||||||
@on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]"
|
@on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]"
|
||||||
size="small" show-total show-elevator show-sizer></Page>
|
size="small" show-total show-elevator show-sizer></Page>
|
||||||
|
|
@ -437,25 +437,3 @@
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
// @import "@/styles/table-common.scss";
|
|
||||||
.search {
|
|
||||||
.operation {
|
|
||||||
margin-bottom: 2vh;
|
|
||||||
}
|
|
||||||
.select-count {
|
|
||||||
font-weight: 600;
|
|
||||||
color: #40a9ff;
|
|
||||||
}
|
|
||||||
.select-clear {
|
|
||||||
margin-left: 10px;
|
|
||||||
}
|
|
||||||
.page {
|
|
||||||
margin-top: 2vh;
|
|
||||||
}
|
|
||||||
.drop-down {
|
|
||||||
margin-left: 5px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@
|
||||||
</Button>
|
</Button>
|
||||||
</template>
|
</template>
|
||||||
</Table>
|
</Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
|
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
|
||||||
show-total show-elevator show-sizer></Page>
|
show-total show-elevator show-sizer></Page>
|
||||||
</Row>
|
</Row>
|
||||||
|
|
@ -394,6 +394,3 @@ export default {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,7 @@
|
||||||
<h4>适用品类范围</h4>
|
<h4>适用品类范围</h4>
|
||||||
<div>
|
<div>
|
||||||
<Table :loading="loading" border :columns="columns1" :data="data1" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
|
<Table :loading="loading" border :columns="columns1" :data="data1" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
||||||
size="small" show-total show-elevator show-sizer></Page>
|
size="small" show-total show-elevator show-sizer></Page>
|
||||||
</Row>
|
</Row>
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
</Table>
|
</Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page :current="searchForm.pageNumber + 1" :total="total" :page-size="searchForm.pageSize"
|
<Page :current="searchForm.pageNumber + 1" :total="total" :page-size="searchForm.pageSize"
|
||||||
@on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
@on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
||||||
size="small" show-total show-elevator show-sizer></Page>
|
size="small" show-total show-elevator show-sizer></Page>
|
||||||
|
|
@ -236,6 +236,3 @@ export default {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -216,7 +216,3 @@ export default {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
</Tabs>
|
</Tabs>
|
||||||
<Table :columns="liveColumns" :data="liveData"></Table>
|
<Table :columns="liveColumns" :data="liveData"></Table>
|
||||||
<Row type="flex" style="margin:20px;" justify="end" class="page">
|
<Row type="flex" style="margin:20px;" justify="end" class="mt_10">
|
||||||
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePageNumber" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePageNumber" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
||||||
size="small" show-total show-elevator show-sizer></Page>
|
size="small" show-total show-elevator show-sizer></Page>
|
||||||
</Row>
|
</Row>
|
||||||
|
|
@ -237,7 +237,6 @@ export default {
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
.btns {
|
.btns {
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,7 @@
|
||||||
</Button>
|
</Button>
|
||||||
</template>
|
</template>
|
||||||
</Table>
|
</Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber + 1"
|
:current="searchForm.pageNumber + 1"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -237,7 +237,6 @@ export default {
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
.ivu-form-item{
|
.ivu-form-item{
|
||||||
margin-bottom: 0 !important;
|
margin-bottom: 0 !important;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -59,7 +59,7 @@
|
||||||
<Button type="error" size="small" @click="close(row.id)">删除</Button>
|
<Button type="error" size="small" @click="close(row.id)">删除</Button>
|
||||||
</template>
|
</template>
|
||||||
</Table>
|
</Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
|
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
|
||||||
show-total show-elevator show-sizer></Page>
|
show-total show-elevator show-sizer></Page>
|
||||||
</Row>
|
</Row>
|
||||||
|
|
@ -265,6 +265,3 @@ export default {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@
|
||||||
</Row>
|
</Row>
|
||||||
<Tabs value="list" @on-click="clickTabPane">
|
<Tabs value="list" @on-click="clickTabPane">
|
||||||
<TabPane label="秒杀活动列表" name="list">
|
<TabPane label="秒杀活动列表" name="list">
|
||||||
<Table :loading="loading" border :columns="columns" :data="data" ref="table" class="page">
|
<Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10">
|
||||||
<template slot-scope="{ row }" slot="action">
|
<template slot-scope="{ row }" slot="action">
|
||||||
<Button type="info" size="small" class="mr_5" v-if="row.promotionStatus == 'NEW'" @click="edit(row)">编辑</Button>
|
<Button type="info" size="small" class="mr_5" v-if="row.promotionStatus == 'NEW'" @click="edit(row)">编辑</Button>
|
||||||
|
|
||||||
|
|
@ -42,7 +42,7 @@
|
||||||
</template>
|
</template>
|
||||||
</Table>
|
</Table>
|
||||||
|
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page style="margin: 20px 0;" :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize"
|
<Page style="margin: 20px 0;" :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize"
|
||||||
:page-size-opts="[10, 20, 50]" size="small" show-total show-elevator show-sizer></Page>
|
:page-size-opts="[10, 20, 50]" size="small" show-total show-elevator show-sizer></Page>
|
||||||
</Row>
|
</Row>
|
||||||
|
|
@ -230,7 +230,6 @@ export default {
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
.mr_5 {
|
.mr_5 {
|
||||||
margin: 0 5px;
|
margin: 0 5px;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -106,7 +106,7 @@
|
||||||
>
|
>
|
||||||
</template>
|
</template>
|
||||||
</Table>
|
</Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber + 1"
|
:current="searchForm.pageNumber + 1"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
</Row>
|
</Row>
|
||||||
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
|
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
|
||||||
</Table>
|
</Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
||||||
size="small" show-total show-elevator show-sizer></Page>
|
size="small" show-total show-elevator show-sizer></Page>
|
||||||
</Row>
|
</Row>
|
||||||
|
|
@ -214,8 +214,6 @@ export default {
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
/deep/ .ivu-col {
|
/deep/ .ivu-col {
|
||||||
min-height: 100vh;
|
min-height: 100vh;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@
|
||||||
:data="order"
|
:data="order"
|
||||||
ref="table"
|
ref="table"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="orderParam.pageNumber"
|
:current="orderParam.pageNumber"
|
||||||
:total="orderTotal"
|
:total="orderTotal"
|
||||||
|
|
@ -78,7 +78,7 @@
|
||||||
:data="refund"
|
:data="refund"
|
||||||
ref="table"
|
ref="table"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="refundParam.pageNumber"
|
:current="refundParam.pageNumber"
|
||||||
:total="refundTotal"
|
:total="refundTotal"
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@
|
||||||
</Row>
|
</Row>
|
||||||
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-selection-change="changeSelect">
|
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-selection-change="changeSelect">
|
||||||
</Table>
|
</Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
||||||
size="small" show-total show-elevator show-sizer></Page>
|
size="small" show-total show-elevator show-sizer></Page>
|
||||||
</Row>
|
</Row>
|
||||||
|
|
@ -256,7 +256,3 @@ export default {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
</Form>
|
</Form>
|
||||||
</Row>
|
</Row>
|
||||||
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
|
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
||||||
size="small" show-total show-elevator show-sizer></Page>
|
size="small" show-total show-elevator show-sizer></Page>
|
||||||
</Row>
|
</Row>
|
||||||
|
|
@ -395,7 +395,3 @@
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -263,7 +263,7 @@
|
||||||
</template>
|
</template>
|
||||||
</Table>
|
</Table>
|
||||||
|
|
||||||
<Row type="flex" justify="end" class="page" style="margin-top: 10px">
|
<Row type="flex" justify="end" class="mt_10" style="margin-top: 10px">
|
||||||
<Page
|
<Page
|
||||||
:current="orderSearchForm.pageNumber"
|
:current="orderSearchForm.pageNumber"
|
||||||
:total="orderTotal"
|
:total="orderTotal"
|
||||||
|
|
@ -386,7 +386,7 @@
|
||||||
</template>
|
</template>
|
||||||
</Table>
|
</Table>
|
||||||
|
|
||||||
<Row type="flex" justify="end" class="page" style="margin-top: 10px">
|
<Row type="flex" justify="end" class="mt_10" style="margin-top: 10px">
|
||||||
<Page
|
<Page
|
||||||
:current="refundGoodsOrderSearchForm.pageNumber"
|
:current="refundGoodsOrderSearchForm.pageNumber"
|
||||||
:total="refundGoodsOrderTotal"
|
:total="refundGoodsOrderTotal"
|
||||||
|
|
@ -509,7 +509,7 @@
|
||||||
</template>
|
</template>
|
||||||
</Table>
|
</Table>
|
||||||
|
|
||||||
<Row type="flex" justify="end" class="page" style="margin-top: 10px">
|
<Row type="flex" justify="end" class="mt_10" style="margin-top: 10px">
|
||||||
<Page
|
<Page
|
||||||
:current="refundOrderSearchForm.pageNumber"
|
:current="refundOrderSearchForm.pageNumber"
|
||||||
:total="refundOrderTotal"
|
:total="refundOrderTotal"
|
||||||
|
|
@ -1006,7 +1006,5 @@
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
@import "shopDetail.scss";
|
@import "shopDetail.scss";
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@
|
||||||
<Button @click="add" type="primary">添加</Button>
|
<Button @click="add" type="primary">添加</Button>
|
||||||
</Row>
|
</Row>
|
||||||
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
|
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
||||||
size="small" show-total show-elevator show-sizer></Page>
|
size="small" show-total show-elevator show-sizer></Page>
|
||||||
</Row>
|
</Row>
|
||||||
|
|
@ -448,7 +448,3 @@ export default {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
@on-sort-change="changeSort"
|
@on-sort-change="changeSort"
|
||||||
@on-selection-change="changeSelect"
|
@on-selection-change="changeSelect"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -321,8 +321,3 @@ export default {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -155,7 +155,7 @@
|
||||||
<Table stripe :columns="columns" :data="data"></Table>
|
<Table stripe :columns="columns" :data="data"></Table>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<Page @on-change="(index)=>{refundParams.pageNumber = index}" @on-page-size-change="(size)=>{refundParams.pageSize= size}" class="page" show-total show-elevator :total="total" />
|
<Page @on-change="(index)=>{refundParams.pageNumber = index}" @on-page-size-change="(size)=>{refundParams.pageSize= size}" class="mt_10" show-total show-elevator :total="total" />
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
<Row class="padding-row">
|
<Row class="padding-row">
|
||||||
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
|
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
|
||||||
</Row>
|
</Row>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
|
||||||
size="small" show-total show-elevator show-sizer></Page>
|
size="small" show-total show-elevator show-sizer></Page>
|
||||||
</Row>
|
</Row>
|
||||||
|
|
@ -411,6 +411,4 @@ export default {
|
||||||
.search-form {
|
.search-form {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,4 @@
|
||||||
<style lang="scss">
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
<template>
|
<template>
|
||||||
<div class="search">
|
<div class="search">
|
||||||
<Card>
|
<Card>
|
||||||
|
|
@ -77,7 +75,7 @@
|
||||||
>
|
>
|
||||||
</Table>
|
</Table>
|
||||||
|
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@
|
||||||
@on-selection-change="messageChangeSelect"
|
@on-selection-change="messageChangeSelect"
|
||||||
></Table>
|
></Table>
|
||||||
</Row>
|
</Row>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchMessageForm.pageNumber"
|
:current="searchMessageForm.pageNumber"
|
||||||
:total="messageDataTotal"
|
:total="messageDataTotal"
|
||||||
|
|
@ -76,7 +76,7 @@
|
||||||
@on-selection-change="changeSelect"
|
@on-selection-change="changeSelect"
|
||||||
></Table>
|
></Table>
|
||||||
</Row>
|
</Row>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="noticeDataTotal"
|
:total="noticeDataTotal"
|
||||||
|
|
@ -246,7 +246,7 @@
|
||||||
@on-sort-change="shopMessageChangeSort"
|
@on-sort-change="shopMessageChangeSort"
|
||||||
></Table>
|
></Table>
|
||||||
</Row>
|
</Row>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchShopMessageForm.pageNumber"
|
:current="searchShopMessageForm.pageNumber"
|
||||||
:total="shopMessageDataTotal"
|
:total="shopMessageDataTotal"
|
||||||
|
|
@ -273,7 +273,7 @@
|
||||||
@on-sort-change="memberMessageChangeSort"
|
@on-sort-change="memberMessageChangeSort"
|
||||||
></Table>
|
></Table>
|
||||||
</Row>
|
</Row>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchMemberMessageForm.pageNumber"
|
:current="searchMemberMessageForm.pageNumber"
|
||||||
:total="memberMessageDataTotal"
|
:total="memberMessageDataTotal"
|
||||||
|
|
@ -1064,6 +1064,5 @@
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
@import "sms.scss";
|
@import "sms.scss";
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
<Table :loading="loading" border :columns="smsColumns" :data="smsData" ref="table" sortable="custom" @on-sort-change="templateChangeSort">
|
<Table :loading="loading" border :columns="smsColumns" :data="smsData" ref="table" sortable="custom" @on-sort-change="templateChangeSort">
|
||||||
</Table>
|
</Table>
|
||||||
|
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page :current="smsSearchForm.pageNumber" :total="smsTotal" :page-size="smsSearchForm.pageSize" @on-change="smsChangePage" @on-page-size-change="smsChangePageSize"
|
<Page :current="smsSearchForm.pageNumber" :total="smsTotal" :page-size="smsSearchForm.pageSize" @on-change="smsChangePage" @on-page-size-change="smsChangePageSize"
|
||||||
:page-size-opts="[10, 20, 50]" size="small" show-total show-elevator show-sizer></Page>
|
:page-size-opts="[10, 20, 50]" size="small" show-total show-elevator show-sizer></Page>
|
||||||
</Row>
|
</Row>
|
||||||
|
|
@ -21,7 +21,7 @@
|
||||||
</Row>
|
</Row>
|
||||||
<Table :loading="loading" border :columns="templateColumns" :data="templateData" ref="table" sortable="custom" @on-sort-change="smsChangeSort">
|
<Table :loading="loading" border :columns="templateColumns" :data="templateData" ref="table" sortable="custom" @on-sort-change="smsChangeSort">
|
||||||
</Table>
|
</Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page :current="templateSearchForm.pageNumber" :total="templateTotal" :page-size="templateSearchForm.pageSize" @on-change="templateChangePage"
|
<Page :current="templateSearchForm.pageNumber" :total="templateTotal" :page-size="templateSearchForm.pageSize" @on-change="templateChangePage"
|
||||||
@on-page-size-change="templateChangePageSize" :page-size-opts="[10, 20, 50]" size="small" show-total show-elevator show-sizer></Page>
|
@on-page-size-change="templateChangePageSize" :page-size-opts="[10, 20, 50]" size="small" show-total show-elevator show-sizer></Page>
|
||||||
</Row>
|
</Row>
|
||||||
|
|
@ -48,7 +48,7 @@
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
</Table>
|
</Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page :current="signSearchForm.pageNumber" :total="signTotal" :page-size="signSearchForm.pageSize" @on-change="signChangePage" @on-page-size-change="signChangePageSize"
|
<Page :current="signSearchForm.pageNumber" :total="signTotal" :page-size="signSearchForm.pageSize" @on-change="signChangePage" @on-page-size-change="signChangePageSize"
|
||||||
:page-size-opts="[10, 20, 50]" size="small" show-total show-elevator show-sizer></Page>
|
:page-size-opts="[10, 20, 50]" size="small" show-total show-elevator show-sizer></Page>
|
||||||
</Row>
|
</Row>
|
||||||
|
|
@ -900,8 +900,6 @@ export default {
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
@import "sms.scss";
|
@import "sms.scss";
|
||||||
|
|
||||||
.split {
|
.split {
|
||||||
|
|
|
||||||
|
|
@ -164,8 +164,6 @@
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
|
|
||||||
.sign-name {
|
.sign-name {
|
||||||
margin-top: 5px;
|
margin-top: 5px;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
@import "./ossManage.scss";
|
@import "./ossManage.scss";
|
||||||
</style>
|
</style>
|
||||||
<template>
|
<template>
|
||||||
|
|
@ -166,7 +165,7 @@
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
@import "./roleManage.scss";
|
@import "./roleManage.scss";
|
||||||
</style>
|
</style>
|
||||||
<template>
|
<template>
|
||||||
|
|
@ -19,7 +18,7 @@
|
||||||
@on-sort-change="changeSort"
|
@on-sort-change="changeSort"
|
||||||
@on-selection-change="changeSelect"
|
@on-selection-change="changeSelect"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="pageNumber"
|
:current="pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</Table>
|
</Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -62,7 +62,7 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</Table>
|
</Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,3 @@
|
||||||
<style lang="scss">
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
<template>
|
<template>
|
||||||
<div class="search">
|
<div class="search">
|
||||||
<Card>
|
<Card>
|
||||||
|
|
@ -53,7 +50,7 @@
|
||||||
@on-selection-change="showSelect"
|
@on-selection-change="showSelect"
|
||||||
ref="table"
|
ref="table"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="mt_10">
|
||||||
<Page
|
<Page
|
||||||
:current="searchForm.pageNumber"
|
:current="searchForm.pageNumber"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
|
@ -629,8 +626,3 @@ export default {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss">
|
|
||||||
// 建议引入通用样式 可删除下面样式代码
|
|
||||||
@import "@/styles/table-common.scss";
|
|
||||||
</style>
|
|
||||||
|
|
|
||||||
|
|
@ -18,10 +18,14 @@ export default {
|
||||||
* @description api请求基础路径
|
* @description api请求基础路径
|
||||||
*/
|
*/
|
||||||
api_dev: {
|
api_dev: {
|
||||||
common: "https://common-api.pickmall.cn",
|
// common: "https://common-api.pickmall.cn",
|
||||||
buyer: "https://buyer-api.pickmall.cn",
|
// buyer: "https://buyer-api.pickmall.cn",
|
||||||
seller: "https://store-api.pickmall.cn",
|
// seller: "https://store-api.pickmall.cn",
|
||||||
manager: "https://admin-api.pickmall.cn"
|
// manager: "https://admin-api.pickmall.cn"
|
||||||
|
common: 'http://192.168.0.101:8890',
|
||||||
|
buyer: 'http://192.168.0.101:8888',
|
||||||
|
seller: 'http://192.168.0.101:8889',
|
||||||
|
manager: 'http://192.168.0.101:8887'
|
||||||
},
|
},
|
||||||
api_prod: {
|
api_prod: {
|
||||||
common: "https://common-api.pickmall.cn",
|
common: "https://common-api.pickmall.cn",
|
||||||
|
|
|
||||||
|
|
@ -2,16 +2,35 @@
|
||||||
<div class="search">
|
<div class="search">
|
||||||
<Card style="height: 60px">
|
<Card style="height: 60px">
|
||||||
<div style="">
|
<div style="">
|
||||||
<Button v-if="allowOperation.editPrice" @click="modifyPrice" type="primary">调整价格</Button>
|
<Button
|
||||||
<Button v-if="allowOperation.editConsignee" @click="editAddress" type="primary">修改收货地址</Button>
|
v-if="allowOperation.editPrice"
|
||||||
<Button v-if="allowOperation.showLogistics" @click="logistics" type="primary">查看物流</Button>
|
@click="modifyPrice"
|
||||||
|
type="primary"
|
||||||
|
>调整价格</Button
|
||||||
|
>
|
||||||
|
<Button
|
||||||
|
v-if="allowOperation.editConsignee"
|
||||||
|
@click="editAddress"
|
||||||
|
type="primary"
|
||||||
|
>修改收货地址</Button
|
||||||
|
>
|
||||||
|
<Button
|
||||||
|
v-if="allowOperation.showLogistics"
|
||||||
|
@click="logistics"
|
||||||
|
type="primary"
|
||||||
|
>查看物流</Button
|
||||||
|
>
|
||||||
<Button @click="orderLogModal = true" type="primary">订单日志</Button>
|
<Button @click="orderLogModal = true" type="primary">订单日志</Button>
|
||||||
<Button v-if="allowOperation.take" @click="orderTake" type="primary">订单核销</Button>
|
<Button v-if="allowOperation.take" @click="orderTake" type="primary"
|
||||||
<Button v-if="allowOperation.ship" @click="orderDeliver" type="primary">发货</Button>
|
>订单核销</Button
|
||||||
|
>
|
||||||
|
<Button v-if="allowOperation.ship" @click="orderDeliver" type="primary"
|
||||||
|
>发货</Button
|
||||||
|
>
|
||||||
</div>
|
</div>
|
||||||
</Card>
|
</Card>
|
||||||
|
|
||||||
<Card style="height: 400px">
|
<Card style="height: 400px" class="mt_10">
|
||||||
<div style="width: 30%; float: left; margin-left: 20px">
|
<div style="width: 30%; float: left; margin-left: 20px">
|
||||||
<div class="div-item">
|
<div class="div-item">
|
||||||
<div class="div-item-left">订单号：</div>
|
<div class="div-item-left">订单号：</div>
|
||||||
|
|
@ -39,38 +58,66 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div style="width: 30%; float: left; margin-left: 20px">
|
<div style="width: 30%; float: left; margin-left: 20px">
|
||||||
<div class="div-item" v-if="orderInfo.order.needReceipt == false">
|
<div class="div-item" v-if="orderInfo.order.needReceipt == false">
|
||||||
<div class="div-item-left">发票信息：</div>
|
<div class="div-item-left">发票信息：</div>
|
||||||
<div class="div-item-right">暂无发票信息</div>
|
<div class="div-item-right">暂无发票信息</div>
|
||||||
</div>
|
</div>
|
||||||
|
<template v-if="orderInfo.order.needReceipt == true && orderInfo.receipt">
|
||||||
<div class="div-item" v-if="orderInfo.order.needReceipt == true">
|
<div class="div-item">
|
||||||
<div class="div-item-left">发票抬头：</div>
|
<div class="div-item-left">发票抬头：</div>
|
||||||
<div class="div-item-right">{{ orderInfo.receipt.receiptTitle ? orderInfo.receipt.receiptTitle : '暂无' }}</div>
|
<div class="div-item-right">
|
||||||
|
{{
|
||||||
|
orderInfo.receipt.receiptTitle
|
||||||
|
? orderInfo.receipt.receiptTitle
|
||||||
|
: "暂无"
|
||||||
|
}}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="div-item" v-if="orderInfo.order.needReceipt == true && orderInfo.receipt.taxpayerId">
|
<div class="div-item" v-if="orderInfo.receipt.taxpayerId">
|
||||||
<div class="div-item-left">发票税号：</div>
|
<div class="div-item-left">发票税号：</div>
|
||||||
<div class="div-item-right">{{ orderInfo.receipt.taxpayerId ? orderInfo.receipt.taxpayerId : '暂无' }}</div>
|
<div class="div-item-right">
|
||||||
|
{{
|
||||||
|
orderInfo.receipt.taxpayerId
|
||||||
|
? orderInfo.receipt.taxpayerId
|
||||||
|
: "暂无"
|
||||||
|
}}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="div-item" v-if="orderInfo.order.needReceipt == true">
|
<div class="div-item">
|
||||||
<div class="div-item-left">发票内容：</div>
|
<div class="div-item-left">发票内容：</div>
|
||||||
<div class="div-item-right">{{ orderInfo.receipt.receiptContent ? orderInfo.receipt.receiptContent : '暂无' }}</div>
|
<div class="div-item-right">
|
||||||
|
{{
|
||||||
|
orderInfo.receipt.receiptContent
|
||||||
|
? orderInfo.receipt.receiptContent
|
||||||
|
: "暂无"
|
||||||
|
}}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="div-item" v-if="orderInfo.order.needReceipt == true">
|
<div class="div-item">
|
||||||
<div class="div-item-left">发票金额：</div>
|
<div class="div-item-left">发票金额：</div>
|
||||||
<div class="div-item-right"><span v-if="orderInfo.receipt.receiptPrice">￥</span>{{ orderInfo.receipt.receiptPrice ? orderInfo.receipt.receiptPrice : '暂无' | unitPrice}}</div>
|
<div class="div-item-right">
|
||||||
|
<span v-if="orderInfo.receipt.receiptPrice">￥</span
|
||||||
|
>{{
|
||||||
|
orderInfo.receipt.receiptPrice
|
||||||
|
? orderInfo.receipt.receiptPrice
|
||||||
|
: "暂无" | unitPrice
|
||||||
|
}}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="div-item" v-if="orderInfo.order.needReceipt == true">
|
<div class="div-item">
|
||||||
<div class="div-item-left">是否开票：</div>
|
<div class="div-item-left">是否开票：</div>
|
||||||
<div class="div-item-right">{{ orderInfo.receipt.receiptStatus == 0 ? '未开' : '已开' }}</div>
|
<div class="div-item-right">
|
||||||
|
{{ orderInfo.receipt.receiptStatus == 0 ? "未开" : "已开" }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
</div>
|
||||||
<div style="width: 36%; float: left">
|
<div style="width: 36%; float: left">
|
||||||
<div class="div-item">
|
<div class="div-item">
|
||||||
<div class="div-item-left">收货信息：</div>
|
<div class="div-item-left">收货信息：</div>
|
||||||
|
|
@ -106,29 +153,61 @@
|
||||||
</div>
|
</div>
|
||||||
</Card>
|
</Card>
|
||||||
|
|
||||||
<Card>
|
<Card class="mt_10">
|
||||||
<Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom">
|
<Table
|
||||||
|
:loading="loading"
|
||||||
|
border
|
||||||
|
:columns="columns"
|
||||||
|
:data="data"
|
||||||
|
ref="table"
|
||||||
|
sortable="custom"
|
||||||
|
>
|
||||||
<!-- 商品栏目格式化 -->
|
<!-- 商品栏目格式化 -->
|
||||||
<template slot="goodsSlot" slot-scope="{row}">
|
<template slot="goodsSlot" slot-scope="{ row }">
|
||||||
<div style="margin-top: 5px; height: 80px; display: flex">
|
<div style="margin-top: 5px; height: 80px; display: flex">
|
||||||
<div style="">
|
<div style="">
|
||||||
<img :src="row.image" style="height: 60px; margin-top: 1px; width: 60px" />
|
<img
|
||||||
|
:src="row.image"
|
||||||
|
style="height: 60px; margin-top: 1px; width: 60px"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div style="margin-left: 13px">
|
<div style="margin-left: 13px">
|
||||||
<div class="div-zoom">
|
<div class="div-zoom">
|
||||||
<a @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
|
<a @click="linkTo(row.goodsId, row.skuId)">{{
|
||||||
|
row.goodsName
|
||||||
|
}}</a>
|
||||||
</div>
|
</div>
|
||||||
<span v-for="(item, key) in JSON.parse(row.specs)" :key="key">
|
<span v-for="(item, key) in JSON.parse(row.specs)" :key="key">
|
||||||
<span v-show="key!='images'" style="font-size: 12px;color: #999999;">
|
<span
|
||||||
{{key}} : {{item}}
|
v-show="key != 'images'"
|
||||||
|
style="font-size: 12px; color: #999999"
|
||||||
|
>
|
||||||
|
{{ key }} : {{ item }}
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
<Poptip trigger="hover" style="display: block;" title="扫码在手机中查看" transfer>
|
<Poptip
|
||||||
|
trigger="hover"
|
||||||
|
style="display: block"
|
||||||
|
title="扫码在手机中查看"
|
||||||
|
transfer
|
||||||
|
>
|
||||||
<div slot="content">
|
<div slot="content">
|
||||||
<vue-qr :text="wapLinkTo(row.goodsId,row.skuId)" :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
|
<vue-qr
|
||||||
|
:text="wapLinkTo(row.goodsId, row.skuId)"
|
||||||
|
:margin="0"
|
||||||
|
colorDark="#000"
|
||||||
|
colorLight="#fff"
|
||||||
|
:size="150"
|
||||||
|
></vue-qr>
|
||||||
</div>
|
</div>
|
||||||
<img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
|
<img
|
||||||
|
src="../../../assets/qrcode.svg"
|
||||||
|
class="hover-pointer"
|
||||||
|
width="20"
|
||||||
|
height="20"
|
||||||
|
alt=""
|
||||||
|
/>
|
||||||
</Poptip>
|
</Poptip>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -138,20 +217,25 @@
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
<span class="label">商品总额：</span>
|
<span class="label">商品总额：</span>
|
||||||
<span class="txt">{{ orderInfo.order.priceDetailDTO.goodsPrice | unitPrice('￥')}}</span>
|
<span class="txt">{{
|
||||||
|
orderInfo.order.priceDetailDTO.goodsPrice | unitPrice("￥")
|
||||||
|
}}</span>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<span class="label">优惠金额：</span>
|
<span class="label">优惠金额：</span>
|
||||||
<span class="txt">
|
<span class="txt">
|
||||||
{{
|
{{
|
||||||
orderInfo.order.priceDetailDTO.couponPrice +
|
(orderInfo.order.priceDetailDTO.couponPrice +
|
||||||
orderInfo.order.priceDetailDTO.discountPrice
|
orderInfo.order.priceDetailDTO.discountPrice)
|
||||||
| unitPrice('￥')}}
|
| unitPrice("￥")
|
||||||
|
}}
|
||||||
</span>
|
</span>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<span class="label">运费：</span>
|
<span class="label">运费：</span>
|
||||||
<span class="txt">{{ orderInfo.order.freightPrice | unitPrice('￥')}}</span>
|
<span class="txt">{{
|
||||||
|
orderInfo.order.freightPrice | unitPrice("￥")
|
||||||
|
}}</span>
|
||||||
</li>
|
</li>
|
||||||
<li v-if="orderInfo.order.priceDetailDTO.payPoint != 0">
|
<li v-if="orderInfo.order.priceDetailDTO.payPoint != 0">
|
||||||
<span class="label">使用积分：</span>
|
<span class="label">使用积分：</span>
|
||||||
|
|
@ -162,7 +246,9 @@
|
||||||
|
|
||||||
<li>
|
<li>
|
||||||
<span class="label">应付金额：</span>
|
<span class="label">应付金额：</span>
|
||||||
<span class="txt flowPrice">¥{{ orderInfo.order.flowPrice | unitPrice }}</span>
|
<span class="txt flowPrice"
|
||||||
|
>¥{{ orderInfo.order.flowPrice | unitPrice }}</span
|
||||||
|
>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -173,9 +259,22 @@
|
||||||
<span>修改金额</span>
|
<span>修改金额</span>
|
||||||
</p>
|
</p>
|
||||||
<div>
|
<div>
|
||||||
<Form ref="modifyPriceForm" :model="modifyPriceForm" label-position="left" :label-width="100" :rules="modifyPriceValidate">
|
<Form
|
||||||
|
ref="modifyPriceForm"
|
||||||
|
:model="modifyPriceForm"
|
||||||
|
label-position="left"
|
||||||
|
:label-width="100"
|
||||||
|
:rules="modifyPriceValidate"
|
||||||
|
>
|
||||||
<FormItem label="订单金额" prop="orderPrice">
|
<FormItem label="订单金额" prop="orderPrice">
|
||||||
<InputNumber style="width:100%;" v-model="modifyPriceForm.orderPrice" size="large" :min="0.01" :max="99999"><span slot="append">元</span></InputNumber>
|
<InputNumber
|
||||||
|
style="width: 100%"
|
||||||
|
v-model="modifyPriceForm.orderPrice"
|
||||||
|
size="large"
|
||||||
|
:min="0.01"
|
||||||
|
:max="99999"
|
||||||
|
><span slot="append">元</span></InputNumber
|
||||||
|
>
|
||||||
</FormItem>
|
</FormItem>
|
||||||
</Form>
|
</Form>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -191,21 +290,55 @@
|
||||||
<span>修改收件信息</span>
|
<span>修改收件信息</span>
|
||||||
</p>
|
</p>
|
||||||
<div>
|
<div>
|
||||||
<Form ref="addressForm" :model="addressForm" label-position="left" :label-width="100" :rules="addressRule">
|
<Form
|
||||||
|
ref="addressForm"
|
||||||
|
:model="addressForm"
|
||||||
|
label-position="left"
|
||||||
|
:label-width="100"
|
||||||
|
:rules="addressRule"
|
||||||
|
>
|
||||||
<FormItem label="收件人" prop="consigneeName">
|
<FormItem label="收件人" prop="consigneeName">
|
||||||
<Input v-model="addressForm.consigneeName" size="large" maxlength="20"></Input>
|
<Input
|
||||||
|
v-model="addressForm.consigneeName"
|
||||||
|
size="large"
|
||||||
|
maxlength="20"
|
||||||
|
></Input>
|
||||||
</FormItem>
|
</FormItem>
|
||||||
<FormItem label="联系方式" prop="consigneeMobile">
|
<FormItem label="联系方式" prop="consigneeMobile">
|
||||||
<Input v-model="addressForm.consigneeMobile" size="large" maxlength="11"></Input>
|
<Input
|
||||||
|
v-model="addressForm.consigneeMobile"
|
||||||
|
size="large"
|
||||||
|
maxlength="11"
|
||||||
|
></Input>
|
||||||
</FormItem>
|
</FormItem>
|
||||||
<FormItem label="地址信息" prop="consigneeAddressPath">
|
<FormItem label="地址信息" prop="consigneeAddressPath">
|
||||||
<Input v-model="addressForm.consigneeAddressPath" disabled style="width: 325px" v-if="showRegion == false" />
|
<Input
|
||||||
<Button v-if="showRegion == false" size="small" @click="regionClick" :loading="submitLoading" type="primary" style="margin-left: 8px">修改
|
v-model="addressForm.consigneeAddressPath"
|
||||||
|
disabled
|
||||||
|
style="width: 325px"
|
||||||
|
v-if="showRegion == false"
|
||||||
|
/>
|
||||||
|
<Button
|
||||||
|
v-if="showRegion == false"
|
||||||
|
size="small"
|
||||||
|
@click="regionClick"
|
||||||
|
:loading="submitLoading"
|
||||||
|
type="primary"
|
||||||
|
style="margin-left: 8px"
|
||||||
|
>修改
|
||||||
</Button>
|
</Button>
|
||||||
<region style="width: 400px" @selected="selectedRegion" v-if="showRegion == true" />
|
<region
|
||||||
|
style="width: 400px"
|
||||||
|
@selected="selectedRegion"
|
||||||
|
v-if="showRegion == true"
|
||||||
|
/>
|
||||||
</FormItem>
|
</FormItem>
|
||||||
<FormItem label="详细地址" prop="consigneeDetail">
|
<FormItem label="详细地址" prop="consigneeDetail">
|
||||||
<Input v-model="addressForm.consigneeDetail" size="large" maxlength="11"></Input>
|
<Input
|
||||||
|
v-model="addressForm.consigneeDetail"
|
||||||
|
size="large"
|
||||||
|
maxlength="11"
|
||||||
|
></Input>
|
||||||
</FormItem>
|
</FormItem>
|
||||||
</Form>
|
</Form>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -221,9 +354,19 @@
|
||||||
<span>订单核销</span>
|
<span>订单核销</span>
|
||||||
</p>
|
</p>
|
||||||
<div>
|
<div>
|
||||||
<Form ref="orderTakeForm" :model="orderTakeForm" label-position="left" :label-width="100" :rules="orderTakeValidate">
|
<Form
|
||||||
|
ref="orderTakeForm"
|
||||||
|
:model="orderTakeForm"
|
||||||
|
label-position="left"
|
||||||
|
:label-width="100"
|
||||||
|
:rules="orderTakeValidate"
|
||||||
|
>
|
||||||
<FormItem label="核销码" prop="qrCode">
|
<FormItem label="核销码" prop="qrCode">
|
||||||
<Input v-model="orderTakeForm.qrCode" size="large" maxlength="10"></Input>
|
<Input
|
||||||
|
v-model="orderTakeForm.qrCode"
|
||||||
|
size="large"
|
||||||
|
maxlength="10"
|
||||||
|
></Input>
|
||||||
</FormItem>
|
</FormItem>
|
||||||
</Form>
|
</Form>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -238,7 +381,14 @@
|
||||||
<span>订单日志</span>
|
<span>订单日志</span>
|
||||||
</p>
|
</p>
|
||||||
<div class="order-log-div">
|
<div class="order-log-div">
|
||||||
<Table :loading="loading" border :columns="orderLogColumns" :data="orderLogData" ref="table" sortable="custom"></Table>
|
<Table
|
||||||
|
:loading="loading"
|
||||||
|
border
|
||||||
|
:columns="orderLogColumns"
|
||||||
|
:data="orderLogData"
|
||||||
|
ref="table"
|
||||||
|
sortable="custom"
|
||||||
|
></Table>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div slot="footer" style="text-align: right">
|
<div slot="footer" style="text-align: right">
|
||||||
|
|
@ -291,15 +441,32 @@
|
||||||
<span>订单发货</span>
|
<span>订单发货</span>
|
||||||
</p>
|
</p>
|
||||||
<div>
|
<div>
|
||||||
<Form ref="orderDeliveryForm" :model="orderDeliveryForm" :label-width="90" :rules="orderDeliverFormValidate" style="position: relative">
|
<Form
|
||||||
|
ref="orderDeliveryForm"
|
||||||
|
:model="orderDeliveryForm"
|
||||||
|
:label-width="90"
|
||||||
|
:rules="orderDeliverFormValidate"
|
||||||
|
style="position: relative"
|
||||||
|
>
|
||||||
<FormItem label="物流公司" prop="logisticsId">
|
<FormItem label="物流公司" prop="logisticsId">
|
||||||
<Select v-model="orderDeliveryForm.logisticsId" placeholder="请选择" style="width: 250px">
|
<Select
|
||||||
<Option v-for="(item, i) in checkedLogistics" :key="i" :value="item.id">{{ item.name }}
|
v-model="orderDeliveryForm.logisticsId"
|
||||||
|
placeholder="请选择"
|
||||||
|
style="width: 250px"
|
||||||
|
>
|
||||||
|
<Option
|
||||||
|
v-for="(item, i) in checkedLogistics"
|
||||||
|
:key="i"
|
||||||
|
:value="item.id"
|
||||||
|
>{{ item.name }}
|
||||||
</Option>
|
</Option>
|
||||||
</Select>
|
</Select>
|
||||||
</FormItem>
|
</FormItem>
|
||||||
<FormItem label="物流单号" prop="logisticsNo">
|
<FormItem label="物流单号" prop="logisticsNo">
|
||||||
<Input v-model="orderDeliveryForm.logisticsNo" style="width: 250px" />
|
<Input
|
||||||
|
v-model="orderDeliveryForm.logisticsNo"
|
||||||
|
style="width: 250px"
|
||||||
|
/>
|
||||||
</FormItem>
|
</FormItem>
|
||||||
</Form>
|
</Form>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -340,7 +507,8 @@ export default {
|
||||||
shipper: "",
|
shipper: "",
|
||||||
}, //物流信息
|
}, //物流信息
|
||||||
sn: "", //订单编号
|
sn: "", //订单编号
|
||||||
orderInfo: { // 订单信息
|
orderInfo: {
|
||||||
|
// 订单信息
|
||||||
order: {
|
order: {
|
||||||
priceDetailDTO: {},
|
priceDetailDTO: {},
|
||||||
},
|
},
|
||||||
|
|
@ -518,20 +686,22 @@ export default {
|
||||||
},
|
},
|
||||||
//弹出订单核销框
|
//弹出订单核销框
|
||||||
orderTake() {
|
orderTake() {
|
||||||
this.orderTakeForm.qrCode = this.orderInfo.order.verificationCode
|
this.orderTakeForm.qrCode = this.orderInfo.order.verificationCode;
|
||||||
this.orderTakeModal = true;
|
this.orderTakeModal = true;
|
||||||
},
|
},
|
||||||
//订单核销提交
|
//订单核销提交
|
||||||
orderTakeSubmit() {
|
orderTakeSubmit() {
|
||||||
this.$refs.orderTakeForm.validate((valid) => {
|
this.$refs.orderTakeForm.validate((valid) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
API_Order.orderTake(this.sn, this.orderTakeForm.qrCode).then((res) => {
|
API_Order.orderTake(this.sn, this.orderTakeForm.qrCode).then(
|
||||||
|
(res) => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
this.$Message.success("订单核销成功");
|
this.$Message.success("订单核销成功");
|
||||||
this.orderTakeModal = false;
|
this.orderTakeModal = false;
|
||||||
this.getDataDetail();
|
this.getDataDetail();
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
@ -597,13 +767,15 @@ export default {
|
||||||
orderDeliverySubmit() {
|
orderDeliverySubmit() {
|
||||||
this.$refs.orderDeliveryForm.validate((valid) => {
|
this.$refs.orderDeliveryForm.validate((valid) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
API_Order.orderDelivery(this.sn, this.orderDeliveryForm).then((res) => {
|
API_Order.orderDelivery(this.sn, this.orderDeliveryForm).then(
|
||||||
|
(res) => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
this.$Message.success("订单发货成功");
|
this.$Message.success("订单发货成功");
|
||||||
this.orderDeliverModal = false;
|
this.orderDeliverModal = false;
|
||||||
this.getDataDetail();
|
this.getDataDetail();
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
@ -616,8 +788,10 @@ export default {
|
||||||
this.addressForm.consigneeName = this.orderInfo.order.consigneeName;
|
this.addressForm.consigneeName = this.orderInfo.order.consigneeName;
|
||||||
this.addressForm.consigneeMobile = this.orderInfo.order.consigneeMobile;
|
this.addressForm.consigneeMobile = this.orderInfo.order.consigneeMobile;
|
||||||
this.addressForm.consigneeDetail = this.orderInfo.order.consigneeDetail;
|
this.addressForm.consigneeDetail = this.orderInfo.order.consigneeDetail;
|
||||||
this.addressForm.consigneeAddressPath = this.orderInfo.order.consigneeAddressPath;
|
this.addressForm.consigneeAddressPath =
|
||||||
this.addressForm.consigneeAddressIdPath = this.orderInfo.order.consigneeAddressIdPath;
|
this.orderInfo.order.consigneeAddressPath;
|
||||||
|
this.addressForm.consigneeAddressIdPath =
|
||||||
|
this.orderInfo.order.consigneeAddressIdPath;
|
||||||
},
|
},
|
||||||
//修改收货地址
|
//修改收货地址
|
||||||
editAddressSubmit() {
|
editAddressSubmit() {
|
||||||
|
|
|
||||||
|
|
@ -277,6 +277,8 @@ export default {
|
||||||
res.result[i].consigneeAddressPath.replace(/,/g, "") + res.result[i].consigneeDetail
|
res.result[i].consigneeAddressPath.replace(/,/g, "") + res.result[i].consigneeDetail
|
||||||
}
|
}
|
||||||
return res.result
|
return res.result
|
||||||
|
} else {
|
||||||
|
this.$Message.warning('暂无待发货订单')
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue