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 { @@ -74,7 +74,7 @@ export default {
74 74
75 this.$refs.upload.fileList.splice(files.indexOf(file), 1); 75 this.$refs.upload.fileList.splice(files.indexOf(file), 1);
76 this.uploadList = this.$refs.upload.fileList; 76 this.uploadList = this.$refs.upload.fileList;
77 - this.$emit('on-remove', this.id); 77 + this.$emit('remove', this.id);
78 }, 78 },
79 handleSuccess(response, file, files) { 79 handleSuccess(response, file, files) {
80 if (_.get(response, 'data.imagesList.length', 0)) { 80 if (_.get(response, 'data.imagesList.length', 0)) {
1 // 懒加载VueHtml5Editor 1 // 懒加载VueHtml5Editor
2 import _ from 'lodash'; 2 import _ from 'lodash';
3 import MultiImage from './multi-image'; 3 import MultiImage from './multi-image';
4 - 4 +import './editor.scss';
5 5
6 6
7 export default [ 7 export default [
  1 +.vue-html5-editor > .content {
  2 + max-height: 500px;
  3 +}
@@ -22,10 +22,11 @@ @@ -22,10 +22,11 @@
22 :key="option.value">{{option.label}}</Option> 22 :key="option.value">{{option.label}}</Option>
23 </Select> 23 </Select>
24 </filter-item> 24 </filter-item>
25 - <filter-item :label="filters.answerUserName.label">  
26 - <Input v-model.trim="filters.answerUserName.model"  
27 - :placeholder="filters.answerUserName.holder"></Input>  
28 - </filter-item> 25 +
  26 + <!--<filter-item :label="filters.answerUserName.label">-->
  27 + <!--<Input v-model.trim="filters.answerUserName.model"-->
  28 + <!--:placeholder="filters.answerUserName.holder"></Input>-->
  29 + <!--</filter-item>-->
29 <filter-item :label="filters.askTimeStr.label"> 30 <filter-item :label="filters.askTimeStr.label">
30 <Date-picker type="datetimerange" 31 <Date-picker type="datetimerange"
31 placeholder="选择日期和时间" 32 placeholder="选择日期和时间"
@@ -86,7 +87,8 @@ @@ -86,7 +87,8 @@
86 clearFilters() { 87 clearFilters() {
87 this.filters.productSKN.model = null; 88 this.filters.productSKN.model = null;
88 this.filters.prodName.model = null; 89 this.filters.prodName.model = null;
89 - this.filters.answerUserName.model = null; 90 +
  91 + // this.filters.answerUserName.model = null;
90 this.filters.isReply.model = null; 92 this.filters.isReply.model = null;
91 this.filters.brandId.model = null; 93 this.filters.brandId.model = null;
92 this.filters.askStartTime.model = ''; 94 this.filters.askStartTime.model = '';
@@ -112,7 +114,8 @@ @@ -112,7 +114,8 @@
112 let fts = this.filters; 114 let fts = this.filters;
113 let productSKN = fts.productSKN.model, 115 let productSKN = fts.productSKN.model,
114 productName = fts.prodName.model, 116 productName = fts.prodName.model,
115 - answerUserName = fts.answerUserName.model, 117 +
  118 + // answerUserName = fts.answerUserName.model,
116 isReply = fts.isReply.model, 119 isReply = fts.isReply.model,
117 maxSortId = fts.sort.first.model, 120 maxSortId = fts.sort.first.model,
118 middleSortId = fts.sort.second.model, 121 middleSortId = fts.sort.second.model,
@@ -142,7 +145,8 @@ @@ -142,7 +145,8 @@
142 params, 145 params,
143 productSKN, 146 productSKN,
144 productName, 147 productName,
145 - answerUserName, 148 +
  149 + // answerUserName,
146 isReply, 150 isReply,
147 maxSortId, 151 maxSortId,
148 middleSortId, 152 middleSortId,
@@ -70,19 +70,20 @@ export default function() { @@ -70,19 +70,20 @@ export default function() {
70 } 70 }
71 } 71 }
72 }, 72 },
73 - {  
74 - title: '回复人',  
75 - align: 'center',  
76 - render: (h, params) => {  
77 - let answerUserName = params.row.answerUserName;  
78 73
79 - if (answerUserName) {  
80 - return params.row.answerUserName;  
81 - } else {  
82 - return '—';  
83 - }  
84 - },  
85 - }, 74 + // {
  75 + // title: '回复人',
  76 + // align: 'center',
  77 + // render: (h, params) => {
  78 + // let answerUserName = params.row.answerUserName;
  79 + //
  80 + // if (answerUserName) {
  81 + // return params.row.answerUserName;
  82 + // } else {
  83 + // return '—';
  84 + // }
  85 + // },
  86 + // },
86 { 87 {
87 title: '咨询及回复时间', 88 title: '咨询及回复时间',
88 key: 'image', 89 key: 'image',
@@ -98,44 +99,45 @@ export default function() { @@ -98,44 +99,45 @@ export default function() {
98 ); 99 );
99 } 100 }
100 }, 101 },
101 - {  
102 - title: '操作',  
103 - key: 'action',  
104 - align: 'center',  
105 - render: (h, params) => {  
106 - const row = params.row;  
107 102
108 - let status = row.operateFlag;  
109 -  
110 - if (status === 2) {  
111 - return (  
112 - <div class="cell-action-row">  
113 - <i-button type="error" size="small"  
114 - onClick={() => this.editAnswer(row)}>  
115 - 修改  
116 - </i-button>  
117 - </div>  
118 - );  
119 - } else if (status === 0) {  
120 - return (  
121 - <div class="cell-action-row">  
122 - <i-button type="primary" size="small"  
123 - onClick={() => this.editAnswer(row)}>  
124 - 回复  
125 - </i-button>  
126 - </div>  
127 - );  
128 - } else if (status === 1) {  
129 - return (  
130 - <div class="cell-action-row">  
131 - <i-button type="error" size="small" style="backgroundColor: #999;border-color: #999;cursor: not-allowed;">  
132 - 修改  
133 - </i-button>  
134 - </div>  
135 - );  
136 - }  
137 - },  
138 - } 103 + // {
  104 + // title: '操作',
  105 + // key: 'action',
  106 + // align: 'center',
  107 + // render: (h, params) => {
  108 + // const row = params.row;
  109 + //
  110 + // let status = row.operateFlag;
  111 + //
  112 + // if (status === 2) {
  113 + // return (
  114 + // <div class="cell-action-row">
  115 + // <i-button type="error" size="small"
  116 + // onClick={() => this.editAnswer(row)}>
  117 + // 修改
  118 + // </i-button>
  119 + // </div>
  120 + // );
  121 + // } else if (status === 0) {
  122 + // return (
  123 + // <div class="cell-action-row">
  124 + // <i-button type="primary" size="small"
  125 + // onClick={() => this.editAnswer(row)}>
  126 + // 回复
  127 + // </i-button>
  128 + // </div>
  129 + // );
  130 + // } else if (status === 1) {
  131 + // return (
  132 + // <div class="cell-action-row">
  133 + // <i-button type="error" size="small" style="backgroundColor: #999;border-color: #999;cursor: not-allowed;">
  134 + // 修改
  135 + // </i-button>
  136 + // </div>
  137 + // );
  138 + // }
  139 + // },
  140 + // }
139 ], 141 ],
140 tableData: [], 142 tableData: [],
141 pageData: { 143 pageData: {
@@ -158,10 +160,11 @@ export default function() { @@ -158,10 +160,11 @@ export default function() {
158 label: '选择品牌', 160 label: '选择品牌',
159 model: '' 161 model: ''
160 }, 162 },
161 - answerUserName: {  
162 - label: '回复人',  
163 - model: ''  
164 - }, 163 +
  164 + // answerUserName: {
  165 + // label: '回复人',
  166 + // model: ''
  167 + // },
165 sort: { 168 sort: {
166 first: { 169 first: {
167 label: '选择类目', 170 label: '选择类目',
@@ -118,7 +118,7 @@ @@ -118,7 +118,7 @@
118 this.$Message.info('操作成功'); 118 this.$Message.info('操作成功');
119 this.getOrders(); 119 this.getOrders();
120 } else { 120 } else {
121 - this.$Message.info('操作失败'); 121 + this.$Message.error(result.message);
122 } 122 }
123 }); 123 });
124 }; 124 };
@@ -133,7 +133,7 @@ @@ -133,7 +133,7 @@
133 this.$Message.info('操作成功'); 133 this.$Message.info('操作成功');
134 this.getOrders(); 134 this.getOrders();
135 } else { 135 } else {
136 - this.$Message.info('操作失败'); 136 + this.$Message.info(result.message);
137 } 137 }
138 }); 138 });
139 }; 139 };
@@ -110,8 +110,8 @@ @@ -110,8 +110,8 @@
110 110
111 }, 111 },
112 dateRange(newDate) { 112 dateRange(newDate) {
113 - this.beginDate = Array.isArray(newDate) ? newDate[0] : newDate;  
114 - this.endDate = Array.isArray(newDate) ? newDate[1] : newDate; 113 + this.beginDate = moment(newDate[0]).format('YYYY-MM-DD');
  114 + this.endDate = moment(newDate[1]).format('YYYY-MM-DD');
115 this.day = this.beginDate === this.endDate === this.today ? '' : this.beginDate; 115 this.day = this.beginDate === this.endDate === this.today ? '' : this.beginDate;
116 this.curTarget = 'uv'; 116 this.curTarget = 'uv';
117 this.getDataFlag = true; 117 this.getDataFlag = true;
@@ -119,6 +119,9 @@ @@ -119,6 +119,9 @@
119 this.getOverviewData(); 119 this.getOverviewData();
120 120
121 if (this.endDate !== this.today) { 121 if (this.endDate !== this.today) {
  122 + _.each(this.targetList, tar => {
  123 + tar.chatOpt = {};
  124 + });
122 this.getOverviewTrend(); 125 this.getOverviewTrend();
123 } 126 }
124 }, 127 },
@@ -63,7 +63,7 @@ class InvoiceService extends Service { @@ -63,7 +63,7 @@ class InvoiceService extends Service {
63 63
64 commitOrder(storeId) { 64 commitOrder(storeId) {
65 return this.post(apiUrl.commitOrder, { 65 return this.post(apiUrl.commitOrder, {
66 - id: storeId 66 + proRequisitionFormId: storeId
67 }); 67 });
68 } 68 }
69 69
1 { 1 {
2 "name": "yoho-shop-manage", 2 "name": "yoho-shop-manage",
3 - "version": "1.0.23", 3 + "version": "1.0.25",
4 "description": "", 4 "description": "",
5 "main": "app.js", 5 "main": "app.js",
6 "scripts": { 6 "scripts": {