diff --git a/src/views/material/cost/assestsReportList.vue b/src/views/material/cost/assestsReportList.vue new file mode 100644 index 00000000..fac8bf0e --- /dev/null +++ b/src/views/material/cost/assestsReportList.vue @@ -0,0 +1,243 @@ + + + + + diff --git a/src/views/material/costPush/protocolMatch/index.vue b/src/views/material/costPush/protocolMatch/index.vue index caede069..f9780eaa 100644 --- a/src/views/material/costPush/protocolMatch/index.vue +++ b/src/views/material/costPush/protocolMatch/index.vue @@ -229,8 +229,8 @@ export default { getList() { this.loading = true; getProtocolList(this.queryParams).then((response) => { - this.protocolList = response.rows; - this.total = response.total; + this.protocolList = response.data.rows; + this.total = response.data.total; this.loading = false; }); }, diff --git a/src/views/material/lease/outBound/index.vue b/src/views/material/lease/outBound/index.vue index 65c1a68a..6e7537ad 100644 --- a/src/views/material/lease/outBound/index.vue +++ b/src/views/material/lease/outBound/index.vue @@ -1095,8 +1095,8 @@ export default { const currentTime = formatTime(new Date()) const params = { keyWord: this.queryParams.keyWord, - startTime: this.queryParams.time && this.queryParams.time[0], - endTime: this.queryParams.time && this.queryParams.time[1], + startTime: this.queryParams.startTime, + endTime: this.queryParams.endTime, pageSize: this.queryParams.pageSize, pageNum: this.queryParams.pageNum, hasSign: 1 @@ -1128,8 +1128,10 @@ export default { const currentTime = formatTime(new Date()) const params = { keyWord: this.queryParams.keyWord, - startTime: this.queryParams.time && this.queryParams.time[0], - endTime: this.queryParams.time && this.queryParams.time[1], + startTime: this.queryParams.startTime, + endTime: this.queryParams.endTime, + leaseUnitId: this.queryParams.leaseUnitId, + leaseProjectId: this.queryParams.leaseProjectId, pageSize: this.queryParams.pageSize, pageNum: this.queryParams.pageNum, hasSign: 1 diff --git a/src/views/material/repair/partUsing/index.vue b/src/views/material/repair/partUsing/index.vue index 342e0f64..40c8b359 100644 --- a/src/views/material/repair/partUsing/index.vue +++ b/src/views/material/repair/partUsing/index.vue @@ -97,6 +97,13 @@ {{ scope.row.partCost.toFixed(2) }} + + +