本地备份
променени са 7 файла, в които са добавени 35 реда и са изтрити 20 реда
+ 2
- 1
src/utils/http.js
@@ -4,6 +4,7 @@ import axios from 'axios' |
||
| 4 | 4 |
import qs from 'qs' |
| 5 | 5 |
import brand from '../brand/config.js' |
| 6 | 6 |
|
| 7 |
+axios.defaults.timeout = 6000 |
|
| 7 | 8 |
axios.interceptors.request.use( |
| 8 | 9 |
config => {
|
| 9 | 10 |
// 这里的config包含每次请求的内容 |
@@ -69,7 +70,7 @@ export default {
|
||
| 69 | 70 |
baseURL: brand.baseURL, |
| 70 | 71 |
url, |
| 71 | 72 |
data: qs.stringify(data), |
| 72 |
- timeout: 5000, |
|
| 73 |
+ timeout: 10000, |
|
| 73 | 74 |
headers: {
|
| 74 | 75 |
'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8', |
| 75 | 76 |
Accept: 'application/json' |
+ 1
- 1
src/views/statistics/consumer/sales/daily.vue
@@ -198,7 +198,7 @@ export default {
|
||
| 198 | 198 |
|
| 199 | 199 |
// 导出表格 |
| 200 | 200 |
onExportExcel() {
|
| 201 |
- this.utils.exportExcel(this.districtData) |
|
| 201 |
+ this.$utils.exportExcel(this.data) |
|
| 202 | 202 |
} |
| 203 | 203 |
} |
| 204 | 204 |
} |
+ 1
- 1
src/views/statistics/consumer/sales/model.vue
@@ -205,7 +205,7 @@ export default {
|
||
| 205 | 205 |
|
| 206 | 206 |
// 导出表格 |
| 207 | 207 |
onExportExcel() {
|
| 208 |
- this.utils.exportExcel(this.districtData) |
|
| 208 |
+ this.$utils.exportExcel(this.data) |
|
| 209 | 209 |
} |
| 210 | 210 |
} |
| 211 | 211 |
} |
+ 1
- 1
src/views/statistics/distributor/sales/daily.vue
@@ -96,7 +96,7 @@ export default {
|
||
| 96 | 96 |
|
| 97 | 97 |
// 导出表格 |
| 98 | 98 |
onExportExcel() {
|
| 99 |
- this.utils.exportExcel(this.districtData) |
|
| 99 |
+ this.$utils.exportExcel(this.data) |
|
| 100 | 100 |
} |
| 101 | 101 |
} |
| 102 | 102 |
} |
+ 8
- 4
src/views/statistics/distributor/sales/distributor.vue
@@ -89,10 +89,14 @@ export default {
|
||
| 89 | 89 |
data.push({
|
| 90 | 90 |
name: v.distributor_name, |
| 91 | 91 |
num: v.num, |
| 92 |
- has_scan_num: v.has_scan_num, |
|
| 92 |
+ has_scan_num: v.has_code1_scan_num + v.has_code2_scan_num, |
|
| 93 | 93 |
has_scan_percentage_txt: |
| 94 |
- ((v.has_scan_num / v.num) * 100).toFixed(1) + '%', |
|
| 95 |
- has_scan_percentage: v.has_scan_num / v.num |
|
| 94 |
+ ( |
|
| 95 |
+ ((v.has_code1_scan_num + v.has_code2_scan_num) / v.num) * |
|
| 96 |
+ 100 |
|
| 97 |
+ ).toFixed(1) + '%', |
|
| 98 |
+ has_scan_percentage: |
|
| 99 |
+ (v.has_code1_scan_num + v.has_code2_scan_num) / v.num |
|
| 96 | 100 |
}) |
| 97 | 101 |
} |
| 98 | 102 |
|
@@ -154,7 +158,7 @@ export default {
|
||
| 154 | 158 |
|
| 155 | 159 |
// 导出表格 |
| 156 | 160 |
onExportExcel() {
|
| 157 |
- this.utils.exportExcel(this.districtData) |
|
| 161 |
+ this.$utils.exportExcel(this.data) |
|
| 158 | 162 |
} |
| 159 | 163 |
} |
| 160 | 164 |
} |
+ 8
- 4
src/views/statistics/distributor/sales/model.vue
@@ -95,10 +95,14 @@ export default {
|
||
| 95 | 95 |
data.push({
|
| 96 | 96 |
name: v.model_uni_name, |
| 97 | 97 |
num: v.num, |
| 98 |
- has_scan_num: v.has_scan_num, |
|
| 98 |
+ has_scan_num: v.has_code1_scan_num + v.has_code2_scan_num, |
|
| 99 | 99 |
has_scan_percentage_txt: |
| 100 |
- ((v.has_scan_num / v.num) * 100).toFixed(1) + '%', |
|
| 101 |
- has_scan_percentage: v.has_scan_num / v.num |
|
| 100 |
+ ( |
|
| 101 |
+ ((v.has_code1_scan_num + v.has_code2_scan_num) / v.num) * |
|
| 102 |
+ 100 |
|
| 103 |
+ ).toFixed(1) + '%', |
|
| 104 |
+ has_scan_percentage: |
|
| 105 |
+ (v.has_code1_scan_num + v.has_code2_scan_num) / v.num |
|
| 102 | 106 |
}) |
| 103 | 107 |
} |
| 104 | 108 |
|
@@ -154,7 +158,7 @@ export default {
|
||
| 154 | 158 |
|
| 155 | 159 |
// 导出表格 |
| 156 | 160 |
onExportExcel() {
|
| 157 |
- this.utils.exportExcel(this.districtData) |
|
| 161 |
+ this.$utils.exportExcel(this.data) |
|
| 158 | 162 |
} |
| 159 | 163 |
} |
| 160 | 164 |
} |
+ 14
- 8
src/views/userInfo/userInfo.vue
@@ -84,14 +84,20 @@ |
||
| 84 | 84 |
</template> |
| 85 | 85 |
</el-table-column> |
| 86 | 86 |
<el-table-column prop="integral" label="积分"> |
| 87 |
- <template slot-scope="scope"> |
|
| 88 |
- <span v-if="!isEditors[scope.$index]">{{ scope.row.integral }}</span>
|
|
| 89 |
- <el-input |
|
| 90 |
- placeholder="请输入手机号" |
|
| 91 |
- v-model="userInfos[scope.$index].integral" |
|
| 92 |
- v-else |
|
| 93 |
- > |
|
| 94 |
- </el-input> |
|
| 87 |
+ <template slot-scope="{ row }">
|
|
| 88 |
+ <template v-if="row.edit"> |
|
| 89 |
+ <el-input v-model="row.title" class="edit-input" size="small" /> |
|
| 90 |
+ <el-button |
|
| 91 |
+ class="cancel-btn" |
|
| 92 |
+ size="small" |
|
| 93 |
+ icon="el-icon-refresh" |
|
| 94 |
+ type="warning" |
|
| 95 |
+ @click="cancelEdit(row)" |
|
| 96 |
+ > |
|
| 97 |
+ 取消 |
|
| 98 |
+ </el-button> |
|
| 99 |
+ </template> |
|
| 100 |
+ <span v-else>{{ row.integral }}</span>
|
|
| 95 | 101 |
</template> |
| 96 | 102 |
</el-table-column> |
| 97 | 103 |
<el-table-column prop="province" label="省份"> </el-table-column> |