diff --git a/src/api/costPush/costPush.js b/src/api/costPush/costPush.js
index 1259ec20..92815b7f 100644
--- a/src/api/costPush/costPush.js
+++ b/src/api/costPush/costPush.js
@@ -1,11 +1,11 @@
import request from '@/utils/request'
// 查询推送协议匹配列表
-export function getProtocolList(query) {
+export function getProtocolList(params) {
return request({
- url: '/material/slt_agreement_info/getSltAgreementInfo4Project',
- method: 'get',
- params: query
+ url: '/material/iws_cost_push/findAgreementPushMatchList',
+ method: 'post',
+ data: params
})
}
diff --git a/src/views/material/costPush/protocolMatch/index.vue b/src/views/material/costPush/protocolMatch/index.vue
index f6c3591c..3482af5a 100644
--- a/src/views/material/costPush/protocolMatch/index.vue
+++ b/src/views/material/costPush/protocolMatch/index.vue
@@ -27,14 +27,14 @@
-
-
+
+
-
-
-
-
+
+
+
+
@@ -81,17 +81,17 @@
- 已匹配
- 未匹配
+ 已匹配
+ 未匹配
-
+
- 已结算
- 未结算
+ 已结算
+ 未结算
-
+
{
- // this.protocolList = response.rows;
- // this.total = response.total;
- // this.loading = false;
- // });
- this.protocolList = [
- {
- agreementCode: '123',
- unitName: '123',
- projectName: '123',
- projectId: '123',
- projectCode: '123',
- isMatch: '0',
- isPay: '0',
- payTime: '2022-09-09',
- },
- {
- agreementCode: '123',
- unitName: '123',
- projectName: '123',
- projectId: '123',
- projectCode: '123',
- isMatch: '1',
- isPay: '1',
- payTime: '2022-09-09',
- },
- ]
+ getProtocolList(this.queryParams).then((response) => {
+ this.protocolList = response.rows;
+ this.total = response.total;
this.loading = false;
+ });
},
/** 重置按钮操作 */
@@ -263,7 +240,7 @@ export default {
pageNum: 1,
pageSize: 10,
isMatch: null,
- isPay: null,
+ isSettlement: null,
unitId: null,
projectId: null,
agreementId: '',
@@ -281,13 +258,13 @@ export default {
/** 导出 */
handleExport() {
- // this.download(
- // 'material/complex_query/exportOutRecord',
- // {
- // ...this.queryParams,
- // },
- // `推送协议匹配记录_${new Date().getTime()}.xlsx`,
- // )
+ this.download(
+ 'material/iws_cost_push/export',
+ {
+ ...this.queryParams,
+ },
+ `推送协议匹配记录_${new Date().getTime()}.xlsx`,
+ )
},
},
};
diff --git a/src/views/material/ma/type/index.vue b/src/views/material/ma/type/index.vue
index ffc9ed0f..50677ff5 100644
--- a/src/views/material/ma/type/index.vue
+++ b/src/views/material/ma/type/index.vue
@@ -811,7 +811,7 @@ export default {
// 表单校验
rules: {
- leasePrice: [
+ typeName: [
{
required: true,
message: "规格型号不能为空",