diff --git a/src/api/cost/cost.js b/src/api/cost/cost.js index ec0e9331..9376d348 100644 --- a/src/api/cost/cost.js +++ b/src/api/cost/cost.js @@ -363,3 +363,12 @@ export function getExportZipProgress(data) { data: data, }) } + +// 结算-维修单-详情 +export function getRepairDetailsListApi(query) { + return request({ + url: '/material/repair/getRepairDetailsList', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/ma/standardBox.js b/src/api/ma/standardBox.js index 716f0bad..cbf927d4 100644 --- a/src/api/ma/standardBox.js +++ b/src/api/ma/standardBox.js @@ -44,7 +44,13 @@ export function getBoxDetailListApi(query) { params: query, }) } - +export function getNumListApi(query) { + return request({ + url: '/material/bm_qrcode_box/getNumList', + method: 'get', + params: query, + }) +} diff --git a/src/views/material/cost/component/applyDetail.vue b/src/views/material/cost/component/applyDetail.vue index 0167e555..cd08fa9a 100644 --- a/src/views/material/cost/component/applyDetail.vue +++ b/src/views/material/cost/component/applyDetail.vue @@ -672,8 +672,16 @@ export default { }, //提交按钮 handleAdd() { + let settlementType = '' + if (this.rowData[0].settlementType == 1) { + settlementType = '工器具' + } else if (this.rowData[0].settlementType == 2) { + settlementType = '安全工器具' + } else { + settlementType = '总费用' + } this.$modal - .confirm('是否确认提交?') + .confirm(`当前结算类型为【${settlementType}】,是否确认提交?`) .then(() => { const loading = this.$loading() let params = { diff --git a/src/views/material/cost/component/applyHome.vue b/src/views/material/cost/component/applyHome.vue index 9aa90358..bda8762e 100644 --- a/src/views/material/cost/component/applyHome.vue +++ b/src/views/material/cost/component/applyHome.vue @@ -304,11 +304,19 @@ > + + + + @@ -323,6 +331,35 @@ 关 闭 + + + + + + + + + + @@ -338,7 +375,8 @@ import { getProjectListByUnitIds, getAgreementInfoById, getSltInfo, - viewRepairCodeApi + viewRepairCodeApi, + getRepairDetailsListApi } from '@/api/cost/cost' import { toChineseAmount } from '@/utils/bonus.js' import vueEasyPrint from 'vue-easy-print' @@ -434,9 +472,28 @@ export default { repairTotal: 0, tableColumns: [ { label: '维修单号', prop: 'repairCode' }, - { label: '状态', prop: 'repairStatus' } + { label: '状态', prop: 'repairStatus' }, + { label: '创建人', prop: 'createBy' }, ], - repairList: [] + repairList: [], + repairView: false, + repairViewParams: { + pageNum: 1, + pageSize: 10 + }, + repairViewColumns: [ + { label: '退料单位', prop: 'backUnit' }, + { label: '退料工程', prop: 'backPro' }, + { label: '类型名称', prop: 'typeName' }, + { label: '规格型号', prop: 'type' }, + { label: '计量单位', prop: 'unitName' }, + { label: '退料数量', prop: 'typeRepairNum' }, + { label: '已维修数量', prop: 'typeRepairedNum' }, + { label: '报废数量', prop: 'typeScrapNum' }, + { label: '待修数量', prop: 'waitRepairNum' }, + { label: '管理模式', prop: 'manageType' }, + ], + repairViewList: [], } }, // updated() { @@ -651,13 +708,26 @@ export default { this.getRepairList() }, handleView(row) { - this.repairDialogVisible = false - this.$router.push({ - path: '/repair/repairManage', - query: { - code: row.repairCode - } - }) + // this.repairDialogVisible = false + // this.$router.push({ + // path: '/repair/repairManage', + // query: { + // code: row.repairCode + // } + // }) + this.repairView = true + this.getRepairDetailsList(row) + }, + async getRepairDetailsList(row) { + try { + this.isLoading = true + const res = await getRepairDetailsListApi({ taskId: row.taskId }) + this.repairViewList = res.data + } catch (error) { + console.log('🚀 ~ error:', error) + } finally { + this.isLoading = false + } }, //维修任务单打印 print() { diff --git a/src/views/material/purchase/goodsEntry/detail.vue b/src/views/material/purchase/goodsEntry/detail.vue index a6f15869..4b56d135 100644 --- a/src/views/material/purchase/goodsEntry/detail.vue +++ b/src/views/material/purchase/goodsEntry/detail.vue @@ -121,7 +121,7 @@