|
@@ -10,7 +10,7 @@
|
|
<a-form-item label="起始年月">
|
|
<a-form-item label="起始年月">
|
|
<a-range-picker
|
|
<a-range-picker
|
|
style="width: 100%"
|
|
style="width: 100%"
|
|
- placeholder="['开始年月', '结束年月']"
|
|
|
|
|
|
+ :placeholder="['开始年月', '结束年月']"
|
|
format="YYYY-MM"
|
|
format="YYYY-MM"
|
|
:mode="mode2"
|
|
:mode="mode2"
|
|
:value="value"
|
|
:value="value"
|
|
@@ -74,13 +74,13 @@
|
|
</div>
|
|
</div>
|
|
</a-card>
|
|
</a-card>
|
|
|
|
|
|
- <!-- table rowKey="id" :scroll="{ x: 1500 }"-->
|
|
|
|
|
|
+ <!-- table rowKey="id" :scroll="{ x: 1500 }" v-if="data"-->
|
|
<a-card :bordered="false" style="marginTop:10px;">
|
|
<a-card :bordered="false" style="marginTop:10px;">
|
|
<a-table
|
|
<a-table
|
|
bordered
|
|
bordered
|
|
:row-key="record => record.id"
|
|
:row-key="record => record.id"
|
|
- :columns="externalStatisticsColumns"
|
|
|
|
- :data-source="externalStatisticsData"
|
|
|
|
|
|
+ :columns="extStaColumns"
|
|
|
|
+ :data-source="extStadata"
|
|
:loading="loading"
|
|
:loading="loading"
|
|
:pagination="pagination"
|
|
:pagination="pagination"
|
|
@change="handleTableChange"
|
|
@change="handleTableChange"
|
|
@@ -94,10 +94,11 @@
|
|
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
|
|
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
|
|
import JEllipsis from '@/components/jeecg/JEllipsis'
|
|
import JEllipsis from '@/components/jeecg/JEllipsis'
|
|
import moment from 'moment'
|
|
import moment from 'moment'
|
|
|
|
+
|
|
import departmentChart from '@views/reportForms/order-statistics/chart/external/departmentChart'
|
|
import departmentChart from '@views/reportForms/order-statistics/chart/external/departmentChart'
|
|
import customerChart from '@views/reportForms/order-statistics/chart/external/customerChart.vue'
|
|
import customerChart from '@views/reportForms/order-statistics/chart/external/customerChart.vue'
|
|
|
|
|
|
-import { external } from '@api/reportForms/order-statistics.js'
|
|
|
|
|
|
+import { externalList } from '@api/reportForms/order-statistics.js'
|
|
|
|
|
|
export default {
|
|
export default {
|
|
name: 'ExternalStatistics', // 订单外部统计表
|
|
name: 'ExternalStatistics', // 订单外部统计表
|
|
@@ -108,7 +109,7 @@ export default {
|
|
// let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} /> // 省略
|
|
// let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} /> // 省略
|
|
return {
|
|
return {
|
|
description: '订单外部统计表',
|
|
description: '订单外部统计表',
|
|
- externalStatisticsColumns: [
|
|
|
|
|
|
+ extStaColumns: [
|
|
{
|
|
{
|
|
title: '部门',
|
|
title: '部门',
|
|
width: 140,
|
|
width: 140,
|
|
@@ -159,7 +160,7 @@ export default {
|
|
},
|
|
},
|
|
{ title: '本币金额', width: 150, dataIndex: 'iNatMoney', className: 'replacecolor' }
|
|
{ title: '本币金额', width: 150, dataIndex: 'iNatMoney', className: 'replacecolor' }
|
|
],
|
|
],
|
|
- externalStatisticsData: [],
|
|
|
|
|
|
+ extStadata: [],
|
|
loading: false, // 表格加载
|
|
loading: false, // 表格加载
|
|
|
|
|
|
// 查询条件
|
|
// 查询条件
|
|
@@ -187,10 +188,11 @@ export default {
|
|
methods: {
|
|
methods: {
|
|
getExternalData() {
|
|
getExternalData() {
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
- external(this.queryParam).then(res => {
|
|
|
|
|
|
+ externalList(this.queryParam).then(res => {
|
|
if (res.success) {
|
|
if (res.success) {
|
|
- this.ExternalData = res.result.records
|
|
|
|
- console.log('订单外部列表', this.ExternalData)
|
|
|
|
|
|
+ console.log('99');
|
|
|
|
+ this.extStadata = res.result.records
|
|
|
|
+ console.log('订单外部列表', this.extStadata)
|
|
this.pagination = {
|
|
this.pagination = {
|
|
total: res.result.total,
|
|
total: res.result.total,
|
|
current: res.result.current,
|
|
current: res.result.current,
|
|
@@ -204,20 +206,16 @@ export default {
|
|
handlePanelChange(value, mode) {
|
|
handlePanelChange(value, mode) {
|
|
this.value = value
|
|
this.value = value
|
|
this.mode2 = [mode[0] === 'date' ? 'month' : mode[0], mode[1] === 'date' ? 'month' : mode[1]]
|
|
this.mode2 = [mode[0] === 'date' ? 'month' : mode[0], mode[1] === 'date' ? 'month' : mode[1]]
|
|
- // console.log('this.mode2', this.mode2)
|
|
|
|
this.queryParam.startYearMonth = value[0].format('YYYY-MM')
|
|
this.queryParam.startYearMonth = value[0].format('YYYY-MM')
|
|
this.queryParam.endYearMonth = value[1].format('YYYY-MM')
|
|
this.queryParam.endYearMonth = value[1].format('YYYY-MM')
|
|
console.log('开始年月:', this.queryParam.startYearMonth)
|
|
console.log('开始年月:', this.queryParam.startYearMonth)
|
|
console.log('结束年月:', this.queryParam.endYearMonth)
|
|
console.log('结束年月:', this.queryParam.endYearMonth)
|
|
- setFieldsValue({
|
|
|
|
- timeRange: value
|
|
|
|
- })
|
|
|
|
},
|
|
},
|
|
|
|
|
|
// 时间发生变化的回调,发生在用户选择时间时
|
|
// 时间发生变化的回调,发生在用户选择时间时
|
|
monthChange(value) {
|
|
monthChange(value) {
|
|
this.value = value
|
|
this.value = value
|
|
- console.log('what------monthChange')
|
|
|
|
|
|
+ // console.log('what------monthChange')
|
|
},
|
|
},
|
|
searchQuery() {
|
|
searchQuery() {
|
|
this.queryParam.pageNo = ''
|
|
this.queryParam.pageNo = ''
|