diff --git a/sgzb-ui/src/api/claimAndRefund/receive.js b/sgzb-ui/src/api/claimAndRefund/receive.js index 549aa092..c08dc73f 100644 --- a/sgzb-ui/src/api/claimAndRefund/receive.js +++ b/sgzb-ui/src/api/claimAndRefund/receive.js @@ -185,7 +185,13 @@ export function getLeaseApplyListAll(query) { }) } - +export function getLeaseApplyAuditListAll(query) { + return request({ + url: '/base/tm_task/getLeaseApplyAuditListAll', + method: 'get', + params: query + }) +} diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue index 949c30a9..9a6314a0 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue @@ -165,7 +165,7 @@ import { submitLeaseApply, getTaskDetail, editLeaseApply, - getLeaseApplyListAll + getLeaseApplyAuditListAll } from '@/api/claimAndRefund/receive' import { getInfo } from '@/api/login' export default { @@ -413,7 +413,7 @@ export default { // 获取 任务详情数据 async GetTaskDetail(taskId){ - const res = await getLeaseApplyListAll({taskId}) + const res = await getLeaseApplyAuditListAll({taskId}) const data = res.rows[0] diff --git a/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue b/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue index a9f6d2b7..1f54a425 100644 --- a/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue +++ b/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue @@ -75,12 +75,24 @@ + + + + + + + + + - - - @@ -169,8 +181,52 @@ - + + + + + + + + + + + + + + + 查询 + 重置 + + + + + + + + + + + + + + @@ -246,6 +302,19 @@ export default { { required: true, message: "班组名称不能为空", trigger: "blur" } ] }, + //记录弹窗 + openRecord:false, + dialogQuery: { + pageNum: 1, + pageSize: 10, + startTime: undefined, + unitId: undefined, + modelId: undefined, + typeId: undefined + }, + dialogList:[], + queryType:1, + dialogTotal: 0, }; }, created() { @@ -326,17 +395,38 @@ export default { this.queryParams.pageNum = 1; this.getList(); }, + handleDialogQuery() { + this.dialogQuery.pageNum = 1; + this.getDialogList(); + }, /** 重置按钮操作 */ resetQuery() { - this.dateRange = []; this.resetForm("queryForm"); this.handleQuery(); }, + resetDialogQuery() { + this.resetForm("dialogQuery"); + this.handleDialogQuery(); + }, // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.dictId) this.single = selection.length!=1 this.multiple = !selection.length + }, + /** 按钮操作 */ + handleOut(row) {//1 + this.reset(); + this.form = row; + console.log(this.form) + this.openOut = true; + this.title = "出库"; + }, + handleIn(row) {//2 + this.reset(); + this.nform = row; + this.openIn = true; + this.title = "退库"; }, /** 提交按钮 */ submitForm: function(type) { @@ -369,19 +459,26 @@ export default { }); } }, - /** 按钮操作 */ - handleOut(row) {//1 - this.reset(); - this.form = row; - console.log(this.form) - this.openOut = true; - this.title = "出库"; + + //查看记录 + openRecords(row,type){ + this.openRecord = true; + this.queryType = type + this.dialogQuery.typeName = row.typeName; + this.dialogQuery.modelName = row.modelName; + this.dialogQuery.unitId = row.unitId; + this.dialogQuery.typeId = row.typeId; + + this.getDialogList(); }, - handleIn(row) {//2 - this.reset(); - this.nform = row; - this.openIn = true; - this.title = "退库"; + /** 查询列表 */ + getDialogList() { + this.dialogQuery.queryType = this.queryType; + getRecords(this.dialogQuery).then(response => { + this.dialogList = response.rows; + this.dialogTotal = response.total; + } + ); }, /** 导出按钮操作 */ handleExport() { diff --git a/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue b/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue index f4dba199..a8723d78 100644 --- a/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue +++ b/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue @@ -60,7 +60,12 @@ - + + +
维修费用小计：{{repairCost}}
@@ -83,7 +88,7 @@ 人为 - +
报废费用小计：{{scrapCost}}
@@ -296,8 +301,14 @@ countCost(list){ let arrCost = 0; list.forEach(item=>{ - arrCost = arrCost + Number(item.costs) - console.log(arrCost) + if(item.partType==0){ + arrCost = arrCost + }else if(item.scrapType==0){ + arrCost = arrCost + }else{ + arrCost = arrCost + Number(item.costs) + } + // console.log(arrCost) }) console.log(arrCost) return arrCost.toFixed(2) @@ -334,7 +345,6 @@ } }); return sums; - }, countNum(row){ @@ -361,13 +371,7 @@ path:'/cost/cost/costApplyList', }) } - - - }) - - - }, //返回 handleBack(){ diff --git a/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue b/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue index ca74b777..99b9cf41 100644 --- a/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue +++ b/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue @@ -55,9 +55,9 @@