diff --git a/apis/mineApi.js b/apis/mineApi.js index f76e9bc..a38c478 100644 --- a/apis/mineApi.js +++ b/apis/mineApi.js @@ -8,7 +8,7 @@ import http from '../utils/http/index.js' */ export const getOrderStatistics = (data) => { return http.get({ - url: '/base-paper-trading/get/supplier/order-volume-statistics', + url: '/base-paper-trading/get/supplier/income-statistics', data }) } diff --git a/pages/client-detail/base-paper-deals.vue b/pages/client-detail/base-paper-deals.vue index 9490c04..19f1a27 100644 --- a/pages/client-detail/base-paper-deals.vue +++ b/pages/client-detail/base-paper-deals.vue @@ -55,6 +55,13 @@ import { getBasePaperDeals, getOrderVolumeStatistics } from '@/apis/clientDetail export default { components: { uGap }, + props: { + // 当前企业id + id: { + type: [String, Number], + default: '' + } + }, data() { return { option: { @@ -88,13 +95,14 @@ export default { topInfo: {} } }, + created() { this.getOrderVolumeStatistics() }, methods: { // 顶部统计数据 getOrderVolumeStatistics() { - getOrderVolumeStatistics(this.orderParams).then((res) => { + getOrderVolumeStatistics({ ...this.orderParams, customerEnterpriseId: this.id }).then((res) => { // console.log('原纸交易顶部统计数据', res) this.topInfo = res }) diff --git a/pages/client-detail/index.vue b/pages/client-detail/index.vue index f2eb3d8..3217b11 100644 --- a/pages/client-detail/index.vue +++ b/pages/client-detail/index.vue @@ -19,7 +19,7 @@ - + @@ -70,9 +70,9 @@ export default { this.$refs.basicInformationRef.getBaseInfo() }) }, - onShow() { - this.$refs.popup.close() - }, + // onShow() { + // this.$refs.popup.close() + // }, methods: { go2, onClickItem(e) { diff --git a/pages/contract-manage/index.vue b/pages/contract-manage/index.vue index 292d5b9..cbd2cef 100644 --- a/pages/contract-manage/index.vue +++ b/pages/contract-manage/index.vue @@ -48,7 +48,7 @@ 操作人: {{ item.userName }} - 查看 + 查看 diff --git a/pages/mine/index.vue b/pages/mine/index.vue index ac4482d..55d0b4e 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -278,8 +278,6 @@ export default { this.companyNum = res.enterpriseList?.length || 1 } }) - }, - created() { this.getStatistics() } } diff --git a/pages/order-detail/index.vue b/pages/order-detail/index.vue index 80a970b..d326ec7 100644 --- a/pages/order-detail/index.vue +++ b/pages/order-detail/index.vue @@ -289,7 +289,7 @@ export default { } else if (item.status == '30302') { step2.push({ title: '出库', - desc: item.userName + item.quantity + '\n\r' + item.createTime + desc: item.userName + ' ' + item.quantity + '\n\r' + item.createTime }) outboundQuantity += item.quantity } else if (item.status == '30303') { diff --git a/pages/trade/index.vue b/pages/trade/index.vue index 4ff25e0..b87c05d 100644 --- a/pages/trade/index.vue +++ b/pages/trade/index.vue @@ -1,18 +1,21 @@ diff --git a/pages/trade/orderList.vue b/pages/trade/orderList.vue index f941b59..1c9d39e 100644 --- a/pages/trade/orderList.vue +++ b/pages/trade/orderList.vue @@ -59,6 +59,17 @@ export default { components: { uGap }, + props: { + refresh: { + type: Boolean, + default: false + } + }, + watch: { + refresh() { + this.orderDown() + } + }, data() { return { controlCurrent: 0, @@ -69,7 +80,7 @@ export default { emptyText: '暂无订单信息~', background: '#F7F8FA', fontSize: '40rpx', - emptyImage: '/static/imgs/client-detail/no-data-icon.png' + emptyImage: '/static/imgs/client-detail/no-data-icon.png' }, params: { asc: '', diff --git a/pages/trade/quotationList.vue b/pages/trade/quotationList.vue index 2cafc09..e064be9 100644 --- a/pages/trade/quotationList.vue +++ b/pages/trade/quotationList.vue @@ -1,52 +1,63 @@ +