diff --git a/pages/add-record/index.vue b/pages/add-record/index.vue
index e561d14..c0cfcde 100644
--- a/pages/add-record/index.vue
+++ b/pages/add-record/index.vue
@@ -30,7 +30,7 @@
广州市天河区
-
+
diff --git a/pages/client-detail/equipment-information.vue b/pages/client-detail/equipment-information.vue
index e5ebe41..e1264c7 100644
--- a/pages/client-detail/equipment-information.vue
+++ b/pages/client-detail/equipment-information.vue
@@ -7,7 +7,8 @@
{{dropdownName}}
-
+
+
diff --git a/pages/trade/quotationList.vue b/pages/trade/quotationList.vue
index 6aafdc2..db6ae71 100644
--- a/pages/trade/quotationList.vue
+++ b/pages/trade/quotationList.vue
@@ -1,40 +1,45 @@
-
+
- 广州民族印刷有限公司
- 待报价
+ {{ item.belongEnterpriseName }}
+ {{ item.replyStatus | replyStatusName }}
-
-
+
+
+
+
+
- 金蝶蓝白卡
- 白卡纸/金蝶蓝/350g/787*1092/2200张
+ {{subItem.brandName}}
+
+ {{subItem.categoryName}}/{{subItem.paperName}}/{{subItem.gramWeight}}g/{{subItem.length}}*{{subItem.width}}/{{subItem.quantity}}张
+
-
+
交货时间:
- 3天
+ {{item.deliveryDay}}天
交货区域:
- 3天
+ {{item.deliveryArea}}
报价截止:
- 3天
+ {{item.enquiryValidTime}}
@@ -76,50 +81,58 @@ export default {
fontSize: '40rpx'
},
params: {
- cooperationState: 0,
- latitude: 23.12616,
- longitude: 113.38466,
- km: 5
+ asc: '',
+ desc: '',
+ // mallSupplierIds: [this.$store.state.supplierInfo.supplierId], // 网关获取供应商ID集合
+ mallSupplierIds: ['553703427180466176'] // 网关获取供应商ID集合
},
pagination: {
pageNum: 0, // 初始会执行一次下拉加载
pageSize: 10
},
- quotationData: []
- }
- },
- watch: {
- params: {
- handler(val) {
- this.getQuotationQurty()
- },
- deep: true
+ list: []
}
},
- onLoad(option) {
- if (option) {
- option.latitude && (this.params.latitude = option.latitude)
- option.longitude && (this.params.longitude = option.longitude)
- option.km && (this.params.km = option.km)
+ onLoad(option) {},
+ filters: {
+ replyStatusName(status) {
+ let name = ''
+ // 供应商端显示报价状态 30128 待报价 30130 已报价 30139 转化订单 30102 已失效
+ switch (status) {
+ case 30128:
+ name = '待报价'
+ break
+ case 30130:
+ name = '已报价'
+ break
+ case 30139:
+ name = '转化订单'
+ break
+ case 30102:
+ name = '已失效'
+ break
+ default:
+ break
+ }
+ return name
}
- this.getQuotationQurty()
},
methods: {
// 获取报价列表
getQuotationQurty() {
return new Promise((resolve, reject) => {
- getEnterpriseList({ ...this.pagination })
+ getEnterpriseList({ ...this.params, ...this.pagination })
.then(res => {
+ console.log('获取报价列表', res)
if (res) {
if (this.pagination.pageNum == 1) {
- // this.quotationData = res.records
- this.quotationData = []
- this.quotationData = [{ name: '111', id: '222' }, { name: '111', id: '222' }]
+ this.list = res.records
+ // this.list = []
+ // this.list = [{ name: '111', id: '222' }, { name: '111', id: '222' }]
} else {
- this.quotationData = this.quotationData.concat(res.records)
+ this.list = this.list.concat(res.records)
}
- console.log('this.quotationData', res)
- resolve({ list: this.quotationData, total: res.total })
+ resolve({ list: this.list, total: res.total })
}
})
.catch(err => {
@@ -133,7 +146,7 @@ export default {
this.pagination.pageNum++
this.getQuotationQurty()
.then(({ list, total }) => {
- this.$refs.quotationRef.loadSuccess({ list, total })
+ this.$refs.quotationRef.refreshSuccess({ list, total })
})
.catch(() => {
this.$refs.quotationRef.loadFail()
@@ -249,6 +262,7 @@ export default {
}
.offer-class {
display: flex;
+ justify-content: space-between;
}
.offer-btn {
width: 150rpx;
@@ -257,6 +271,7 @@ export default {
border: 2rpx solid #007aff;
border-radius: 8rpx;
line-height: 60rpx;
+ margin-right: 32rpx;
}
.offer-width {
width: 70%;