diff --git a/src/views/business/apply/addApply.vue b/src/views/business/apply/addApply.vue index 588aa1b8..19d5dd1e 100644 --- a/src/views/business/apply/addApply.vue +++ b/src/views/business/apply/addApply.vue @@ -131,8 +131,13 @@ - - + + + + {{ row.remainingYears }} + {{ row.remainingYears }} + + - + - + @@ -366,7 +373,7 @@ export default { leaseType: '0', pageNum: 1, // 页码 pageSize: 10, // 每页条数 - useTimeRange: null, + useTimeRange: null }, useProjectList: [], // 使用项目下拉选 voltageList: [], // 电压等级下拉选 @@ -423,7 +430,7 @@ export default { // 新增:当前选中的类目名称(用于显示) currentCategoryName: '', currentToolCategoryName: '', - selectedRow: [], + selectedRow: [] } }, created() { diff --git a/src/views/business/audit/auditList.vue b/src/views/business/audit/auditList.vue index 7c843552..9718ea60 100644 --- a/src/views/business/audit/auditList.vue +++ b/src/views/business/audit/auditList.vue @@ -131,7 +131,7 @@ 待审批项目(共 {{ selectedRows.length }} 项) - - - + + + - + 通过 @@ -59,6 +59,11 @@ export default { approveData: { approveResult: 1, approveOpinion: '' + }, + rules: { + approveOpinion: [ + { required: true, message: '请输入审批意见', trigger: 'blur' }, + ] } } }, @@ -87,7 +92,7 @@ export default { this.loading = true try { // 对每个选中的项目执行审批 - const promises = this.selectedRows.map(async (row) => { + const promises = this.selectedRows.map(async(row) => { // 先获取审批实例ID const instanceRes = await getApprovalInstanceByBusiness(this.businessType, row.id) if (!instanceRes || !instanceRes.data || !instanceRes.data.id) { diff --git a/src/views/toolsManage/toolsLedger/index.vue b/src/views/toolsManage/toolsLedger/index.vue index 36434826..1d19c87c 100644 --- a/src/views/toolsManage/toolsLedger/index.vue +++ b/src/views/toolsManage/toolsLedger/index.vue @@ -300,6 +300,21 @@ export default { ) : h('span', {}, row.repairNum) }, + },{ + label: '退役数量', + prop: 'scrapNum', + render: (h, { row }) => { + return row.manageMode == 0 && row.scrapNum > 0 + ? h( + 'span', + { + style: { color: '#409EFF', cursor: 'pointer' }, + on: { click: () => this.handleDialog(row, '2') }, + }, + row.scrapNum, + ) + : h('span', {}, row.scrapNum) + }, }, { label: '工具总数', prop: 'totalNum' }, {