diff --git a/src/views/material/cost/component/leaseCostRangeReportHome.vue b/src/views/material/cost/component/leaseCostRangeReportHome.vue
index d9bd1b1f..9552e357 100644
--- a/src/views/material/cost/component/leaseCostRangeReportHome.vue
+++ b/src/views/material/cost/component/leaseCostRangeReportHome.vue
@@ -31,6 +31,16 @@
+
+
+
+
+
查询
重置
@@ -94,6 +104,18 @@
{{ scope.row.remark || '-' }}
+
+
+ 已竣工
+ 未竣工
+ -
+
+
+
+
+ {{ scope.row.actualEndDate || '-' }}
+
+
详情
@@ -249,6 +271,11 @@ export default {
startDate: null,
endDate: null,
},
+ proStatus:[
+ { id: 0, name: '未竣工' },
+ { id: 1, name: '已竣工' },
+ { id: 2, name: '空白' },
+ ],
// 详情弹窗相关
detailDialogVisible: false,
detailLoading: false,
@@ -422,6 +449,7 @@ export default {
const columns = [
{ header: '序号', key: 'index', width: 8 },
{ header: '协议号', key: 'agreementCode', width: 18 },
+ { header: '分公司', key: 'impUnitName', width: 18 },
{ header: '结算单位', key: 'unitName', width: 20 },
{ header: '结算工程', key: 'projectName', width: 25 },
{ header: '结算状态', key: 'isSettled', width: 10 },
@@ -435,7 +463,9 @@ export default {
{ header: '最早租赁时间', key: 'earliestLeaseTime', width: 15 },
{ header: '最晚归还时间', key: 'latestReturnTime', width: 15 },
{ header: '结算时间', key: 'settlementTime', width: 12 },
- { header: '备注', key: 'remark', width: 20 }
+ { header: '备注', key: 'remark', width: 20 },
+ { header: '竣工状态', key: 'isFinish', width: 18 },
+ { header: '竣工日期', key: 'actualEndDate', width: 18 }
];
worksheet.columns = columns;
@@ -474,6 +504,7 @@ export default {
const dataRow = {
index: String(index + 1), // 转换为字符串,避免被格式化为小数
agreementCode: row.agreementCode || '',
+ impUnitName: row.impUnitName || '',
unitName: row.unitName || '',
projectName: row.projectName || '',
isSettled: row.isSettled === '1' ? '已结算' : '未结算',
@@ -487,7 +518,10 @@ export default {
earliestLeaseTime: row.earliestLeaseTime || '',
latestReturnTime: row.latestReturnTime || '',
settlementTime: row.settlementTime || '',
- remark: row.remark || ''
+ remark: row.remark || '',
+ isFinish: row.isFinish === '1' ? '已竣工'
+ : (row.isFinish === '0' ? '未竣工' : ''),
+ actualEndDate: row.actualEndDate || ''
};
const newRow = worksheet.addRow(dataRow);
diff --git a/src/views/material/cost/component/lostReportHome.vue b/src/views/material/cost/component/lostReportHome.vue
index 425c62ae..0d703d2d 100644
--- a/src/views/material/cost/component/lostReportHome.vue
+++ b/src/views/material/cost/component/lostReportHome.vue
@@ -202,6 +202,7 @@ export default {
proStatus:[
{ id: 0, name: '未竣工' },
{ id: 1, name: '已竣工' },
+ { id: 2, name: '空白' },
],
}
},
diff --git a/src/views/material/cost/component/repairReportHome.vue b/src/views/material/cost/component/repairReportHome.vue
index 86503bf8..63320e16 100644
--- a/src/views/material/cost/component/repairReportHome.vue
+++ b/src/views/material/cost/component/repairReportHome.vue
@@ -147,6 +147,7 @@ export default {
proStatus:[
{ id: 0, name: '未竣工' },
{ id: 1, name: '已竣工' },
+ { id: 2, name: '空白' },
],
}
},
diff --git a/src/views/material/cost/component/reportHome.vue b/src/views/material/cost/component/reportHome.vue
index c30cecd7..32098880 100644
--- a/src/views/material/cost/component/reportHome.vue
+++ b/src/views/material/cost/component/reportHome.vue
@@ -419,6 +419,7 @@ export default {
proStatus:[
{ id: 0, name: '未竣工' },
{ id: 1, name: '已竣工' },
+ { id: 2, name: '空白' },
],
}
},
diff --git a/src/views/material/cost/component/scrapReportHome.vue b/src/views/material/cost/component/scrapReportHome.vue
index 8a0dec13..467d1160 100644
--- a/src/views/material/cost/component/scrapReportHome.vue
+++ b/src/views/material/cost/component/scrapReportHome.vue
@@ -145,6 +145,7 @@ export default {
proStatus:[
{ id: 0, name: '未竣工' },
{ id: 1, name: '已竣工' },
+ { id: 2, name: '空白' },
],
}
},
diff --git a/src/views/material/cost/component/unreportHome.vue b/src/views/material/cost/component/unreportHome.vue
index 75478a30..49e4eee0 100644
--- a/src/views/material/cost/component/unreportHome.vue
+++ b/src/views/material/cost/component/unreportHome.vue
@@ -186,6 +186,7 @@
未竣工
+
-
+
-
+
@@ -273,7 +273,7 @@ export default {
// 是否显示弹出层
open: false,
rowData: {},
- maForm: {
+ maForm: {
backUnit: undefined,
backPro: undefined,
scrapCode: undefined,
@@ -287,7 +287,7 @@ export default {
this.maForm = this.paramTemp;
this.getTaskInfo();
},
- methods: {
+ methods: {
//获取任务详情-列表数据
getTaskInfo() {
this.loading = true;
@@ -366,7 +366,7 @@ export default {
confirmButtonText: "确定",
});
return;
- } else {
+ } else {
// 二次确认
this.$modal.confirm("是否确认通过所选择的数据项?").then(() => {
batchPassApi({'scrapApplyDetailsList':this.passTemp}).then((response) => {
diff --git a/src/views/material/repair/scrapManage/component/queryToolsApply.vue b/src/views/material/repair/scrapManage/component/queryToolsApply.vue
index 3a04e914..a161d134 100644
--- a/src/views/material/repair/scrapManage/component/queryToolsApply.vue
+++ b/src/views/material/repair/scrapManage/component/queryToolsApply.vue
@@ -18,10 +18,10 @@
disabled
/>
-
+
-
+
@@ -263,7 +263,7 @@ export default {
// 是否显示弹出层
open: false,
rowData: {},
- maForm: {
+ maForm: {
backUnit: undefined,
backPro: undefined,
scrapCode: undefined,
@@ -277,7 +277,7 @@ export default {
this.maForm = this.paramTemp;
this.getTaskInfo();
},
- methods: {
+ methods: {
//获取任务详情-列表数据
getTaskInfo() {
this.loading = true;
diff --git a/src/views/material/stquery/deviceUsingRecord.vue b/src/views/material/stquery/deviceUsingRecord.vue
index 71f679d8..de06190f 100644
--- a/src/views/material/stquery/deviceUsingRecord.vue
+++ b/src/views/material/stquery/deviceUsingRecord.vue
@@ -101,6 +101,26 @@
>
+
+
+
+
+
+
+
+
+
+
+
+
+ 施工机具
+ 安全工器具
+
+
+
+
+ 是
+ 否
+
+
0){
@@ -330,7 +373,9 @@ export default {
isSlt: this.queryParams.isSlt,
startTime: this.queryParams.startTime,
endTime: this.queryParams.endTime,
- isFinish : this.queryParams.isFinish
+ isFinish : this.queryParams.isFinish,
+ jijuType : this.queryParams.jijuType,
+ isTeam : this.queryParams.isTeam
}
const response = await getProjUsingRecordListNoPage(param)
let obj = {
@@ -412,7 +457,9 @@ export default {
endTime: this.queryParams.endTime,
pageSize: this.queryParams.pageSize,
pageNum: this.queryParams.pageNum,
- isFinish : this.queryParams.isFinish
+ isFinish : this.queryParams.isFinish,
+ jijuType : this.queryParams.jijuType,
+ isTeam : this.queryParams.isTeam
}
const currentTime = formatTime(new Date());