diff --git a/pages/client-detail/base-paper-deals.vue b/pages/client-detail/base-paper-deals.vue index eedec9b..71467c6 100644 --- a/pages/client-detail/base-paper-deals.vue +++ b/pages/client-detail/base-paper-deals.vue @@ -17,7 +17,7 @@ {{ item.customerEnterpriseName }} ¥ {{ item.totalOfferPrice }} - + @@ -67,10 +67,10 @@ export default { params: { asc: '', desc: '', - // customerEnterpriseId: this.$store.state.supplierInfo.id || null, // 客户企业ID默认为空,传值时网关获取当前用户关联企业id失效 - // mallSupplierId: this.$store.state.supplierInfo.supplierId || null, // 供应商id - customerEnterpriseId: '651107734133018624', - mallSupplierId: '670334117090562048', // 供应商id + customerEnterpriseId: this.$store.state.supplierInfo.id || null, // 客户企业ID默认为空,传值时网关获取当前用户关联企业id失效 + mallSupplierId: this.$store.state.supplierInfo.supplierId || null, // 供应商id + // customerEnterpriseId: '651107734133018624', // 客户企业ID + // mallSupplierId: '670334117090562048', // 供应商id status: '0', // 状态 0 全部 待发货/30106,待收货/30107,待借款/30207,已完成/30104 enterpriseIds: [] //企业ID集合网关获取 }, @@ -80,8 +80,8 @@ export default { }, orderParams: { beginDate: '', - currentSupplier: '670334117090562048', - // currentSupplier: this.$store.state.supplierInfo.supplierId || null, + // currentSupplier: '670334117090562048', + currentSupplier: this.$store.state.supplierInfo.supplierId || null, endDate: '' }, list: [], diff --git a/pages/client-detail/equipment-information.vue b/pages/client-detail/equipment-information.vue index 7585ed1..56b55e6 100644 --- a/pages/client-detail/equipment-information.vue +++ b/pages/client-detail/equipment-information.vue @@ -176,12 +176,12 @@ export default { return new Promise((resolve, reject) => { getDeviceInfo({ ...this.params, ...this.pagination }) .then((res) => { - res.records.forEach((el) => { - el.collapse = false - el.isShowSelect = false - }) // console.log('设备信息', res.records) if (res) { + res.records.forEach((el) => { + el.collapse = false + el.isShowSelect = false + }) if (this.pagination.pageNum == 1) { this.list = res.records } else {