fe / yoho-shop-manage · Commits

Go to a project

Authored by OF1706
Commit 5498a8fc7aea0691ce469bfc4f07c6de7a360fc0 2 parents 89f317bf cb92452b

Merge branch 'release/3.0' into feature/reportsDev

Inline Side-by-side
Showing 9 changed files with 81 additions and 68 deletions
... ... @@ -74,7 +74,7 @@ export default {
this.$refs.upload.fileList.splice(files.indexOf(file), 1);
this.uploadList = this.$refs.upload.fileList;
this.$emit('on-remove', this.id);
this.$emit('remove', this.id);
},
handleSuccess(response, file, files) {
if (_.get(response, 'data.imagesList.length', 0)) {
... ...
// 懒加载VueHtml5Editor
import _ from 'lodash';
import MultiImage from './multi-image';
import './editor.scss';
export default [
... ...
.vue-html5-editor > .content {
max-height: 500px;
}
... ...
... ... @@ -22,10 +22,11 @@
:key="option.value">{{option.label}}</Option>
</Select>
</filter-item>
<filter-item :label="filters.answerUserName.label">
<Input v-model.trim="filters.answerUserName.model"
:placeholder="filters.answerUserName.holder"></Input>
</filter-item>
<!--<filter-item :label="filters.answerUserName.label">-->
<!--<Input v-model.trim="filters.answerUserName.model"-->
<!--:placeholder="filters.answerUserName.holder"></Input>-->
<!--</filter-item>-->
<filter-item :label="filters.askTimeStr.label">
<Date-picker type="datetimerange"
placeholder="选择日期和时间"
... ... @@ -86,7 +87,8 @@
clearFilters() {
this.filters.productSKN.model = null;
this.filters.prodName.model = null;
this.filters.answerUserName.model = null;
// this.filters.answerUserName.model = null;
this.filters.isReply.model = null;
this.filters.brandId.model = null;
this.filters.askStartTime.model = '';
... ... @@ -112,7 +114,8 @@
let fts = this.filters;
let productSKN = fts.productSKN.model,
productName = fts.prodName.model,
answerUserName = fts.answerUserName.model,
// answerUserName = fts.answerUserName.model,
isReply = fts.isReply.model,
maxSortId = fts.sort.first.model,
middleSortId = fts.sort.second.model,
... ... @@ -142,7 +145,8 @@
params,
productSKN,
productName,
answerUserName,
// answerUserName,
isReply,
maxSortId,
middleSortId,
... ...
... ... @@ -70,19 +70,20 @@ export default function() {
}
}
},
{
title: '回复人',
align: 'center',
render: (h, params) => {
let answerUserName = params.row.answerUserName;
if (answerUserName) {
return params.row.answerUserName;
} else {
return '—';
}
},
},
// {
// title: '回复人',
// align: 'center',
// render: (h, params) => {
// let answerUserName = params.row.answerUserName;
//
// if (answerUserName) {
// return params.row.answerUserName;
// } else {
// return '—';
// }
// },
// },
{
title: '咨询及回复时间',
key: 'image',
... ... @@ -98,44 +99,45 @@ export default function() {
);
}
},
{
title: '操作',
key: 'action',
align: 'center',
render: (h, params) => {
const row = params.row;
let status = row.operateFlag;
if (status === 2) {
return (
<div class="cell-action-row">
<i-button type="error" size="small"
onClick={() => this.editAnswer(row)}>
修改
</i-button>
</div>
);
} else if (status === 0) {
return (
<div class="cell-action-row">
<i-button type="primary" size="small"
onClick={() => this.editAnswer(row)}>
回复
</i-button>
</div>
);
} else if (status === 1) {
return (
<div class="cell-action-row">
<i-button type="error" size="small" style="backgroundColor: #999;border-color: #999;cursor: not-allowed;">
修改
</i-button>
</div>
);
}
},
}
// {
// title: '操作',
// key: 'action',
// align: 'center',
// render: (h, params) => {
// const row = params.row;
//
// let status = row.operateFlag;
//
// if (status === 2) {
// return (
// <div class="cell-action-row">
// <i-button type="error" size="small"
// onClick={() => this.editAnswer(row)}>
// 修改
// </i-button>
// </div>
// );
// } else if (status === 0) {
// return (
// <div class="cell-action-row">
// <i-button type="primary" size="small"
// onClick={() => this.editAnswer(row)}>
// 回复
// </i-button>
// </div>
// );
// } else if (status === 1) {
// return (
// <div class="cell-action-row">
// <i-button type="error" size="small" style="backgroundColor: #999;border-color: #999;cursor: not-allowed;">
// 修改
// </i-button>
// </div>
// );
// }
// },
// }
],
tableData: [],
pageData: {
... ... @@ -158,10 +160,11 @@ export default function() {
label: '选择品牌',
model: ''
},
answerUserName: {
label: '回复人',
model: ''
},
// answerUserName: {
// label: '回复人',
// model: ''
// },
sort: {
first: {
label: '选择类目',
... ...
... ... @@ -118,7 +118,7 @@
this.$Message.info('操作成功');
this.getOrders();
} else {
this.$Message.info('操作失败');
this.$Message.error(result.message);
}
});
};
... ... @@ -133,7 +133,7 @@
this.$Message.info('操作成功');
this.getOrders();
} else {
this.$Message.info('操作失败');
this.$Message.info(result.message);
}
});
};
... ...
... ... @@ -110,8 +110,8 @@
},
dateRange(newDate) {
this.beginDate = Array.isArray(newDate) ? newDate[0] : newDate;
this.endDate = Array.isArray(newDate) ? newDate[1] : newDate;
this.beginDate = moment(newDate[0]).format('YYYY-MM-DD');
this.endDate = moment(newDate[1]).format('YYYY-MM-DD');
this.day = this.beginDate === this.endDate === this.today ? '' : this.beginDate;
this.curTarget = 'uv';
this.getDataFlag = true;
... ... @@ -119,6 +119,9 @@
this.getOverviewData();
if (this.endDate !== this.today) {
_.each(this.targetList, tar => {
tar.chatOpt = {};
});
this.getOverviewTrend();
}
},
... ...
... ... @@ -63,7 +63,7 @@ class InvoiceService extends Service {
commitOrder(storeId) {
return this.post(apiUrl.commitOrder, {
id: storeId
proRequisitionFormId: storeId
});
}
... ...
{
"name": "yoho-shop-manage",
"version": "1.0.23",
"version": "1.0.25",
"description": "",
"main": "app.js",
"scripts": {
... ...