diff --git a/src/api/cost/cost.js b/src/api/cost/cost.js index baa2c94..2f5d37b 100644 --- a/src/api/cost/cost.js +++ b/src/api/cost/cost.js @@ -73,7 +73,12 @@ export const submitFeeBearApi = (params) => { } /** 获取月结记录接口*/ export const getMonthRecordApi = (params) => { - return request.post('/material//sltAgreementInfo/getSltInfoMonth', params) + return request.post('/material/sltAgreementInfo/getSltInfoMonth', params) +} + +/** 确认结算接口所有结算*/ +export const submitAllFeeBearApi = (params) => { + return request.post('/material/sltAgreementInfo/submitFee', params) } diff --git a/src/views/cost/csotSettlement/component/finishAndDetails.vue b/src/views/cost/csotSettlement/component/finishAndDetails.vue index b5debee..f174022 100644 --- a/src/views/cost/csotSettlement/component/finishAndDetails.vue +++ b/src/views/cost/csotSettlement/component/finishAndDetails.vue @@ -5,9 +5,11 @@
领用单位：{{ currRowInfo.unitName }}
工程名称：{{ currRowInfo.projectName }}
-
总合计：xxxxx元
+
总合计：{{ totalAmount }}元
- 导出全部明细表 + 导出全部明细表
@@ -46,8 +48,10 @@ :isRepair="true" :totalPrice="repairTotalPrice" :tableData="repairTableData" + :currRowInfo="currRowInfo" :listType="3" @handleExport="handleExport" + @onChangeRepairPrice="onChangeRepairPrice" /> - 确认完工结算 @@ -84,7 +92,11 @@ diff --git a/src/views/cost/csotSettlement/component/monthRecord.vue b/src/views/cost/csotSettlement/component/monthRecord.vue index d12d618..20a3042 100644 --- a/src/views/cost/csotSettlement/component/monthRecord.vue +++ b/src/views/cost/csotSettlement/component/monthRecord.vue @@ -15,10 +15,14 @@ type="month" placeholder="请选择月份" value-format="yyyy-MM" + @change="onChangeTime" /> - - + + 批量导出 @@ -79,7 +83,7 @@ 明细 - 导出明细表 @@ -146,7 +150,7 @@ /> @@ -211,8 +215,8 @@ export default { monthRecordParams: { startTime: '', endTime: '', - costBear: '', agreementId: '', + costBearingParty: '', pageNum: 1, pageSize: 10, }, @@ -238,14 +242,10 @@ export default { methods: { /** 获取月结记录列表数据 */ async getMonthRecordList() { - // console.log('99999') - this.monthRecordParams.startTime = this.dateMonth[0] || '' - this.monthRecordParams.endTime = this.dateMonth[1] || '' this.monthRecordParams.agreementId = this.agreementId // 调后台 Api 获取数据 const res = await getMonthRecordApi([this.monthRecordParams]) this.monthRecordList = res.data - console.log(res, '月结记录---') }, /** 查询 */ handleQuery() { @@ -254,19 +254,41 @@ export default { /** 重置 */ resetQuery() { this.resetForm('monthRecordFormRef') - this.dateMonth = [] + this.monthRecordParams.startTime = '' + this.monthRecordParams.endTime = '' this.getMonthRecordList() }, - /** 批量明细导出 */ - handleBatchExport() { - if (this.selectList.length < 1) { + /** 导出按钮 */ + handelExport(row) { + // 如果 row 为null 表示批量导出 + const { startTime, endTime, agreementId, costBearingParty } = + this.monthRecordParams + let exportList = [ + { + codeNum: '', + startTime, + endTime, + agreementId, + costBearingParty, + }, + ] + if (!row && this.selectList.length < 1) { this.$message.error('请勾选需要导出的数据！') return + } else if (!row && this.selectList.length > 0) { + this.selectList.map((e) => { + exportList[0].codeNum += e.codeNum + '，' + }) + exportList[0].codeNum = exportList[0].codeNum.slice(0, -1) + } else { + exportList[0].codeNum = row.codeNum } - }, - /** 单个明细导出 */ - exportDetails(row) { - console.log('导出--', row) + + this.downloadJson( + 'material/sltAgreementInfo/exportSltInfoMonth', + JSON.stringify(exportList), + `月结明细${new Date().getTime()}.xlsx`, + ) }, /** 列表勾选 */ handleSelectionChange(list) { @@ -293,6 +315,21 @@ export default { this.monthDetails = row.node this.innerVisible = true }, + /** 时间变化 */ + onChangeTime(val) { + let startTime = '' + if (val.split('-')[1] == 1) { + startTime = `${val.split('-')[0] * 1 - 1}-12-21` + } else { + startTime = `${val.split('-')[0]}-0${ + val.split('-')[1] * 1 - 1 + }-21` + } + let endTime = val + '-20' + + this.monthRecordParams.startTime = startTime + this.monthRecordParams.endTime = endTime + }, }, } diff --git a/src/views/cost/csotSettlement/costApplyList.vue b/src/views/cost/csotSettlement/costApplyList.vue index 9ecb465..f90489f 100644 --- a/src/views/cost/csotSettlement/costApplyList.vue +++ b/src/views/cost/csotSettlement/costApplyList.vue @@ -127,17 +127,10 @@ - 结算中 - 已结算 @@ -153,11 +146,11 @@ > {{ - row.status == 2 ? '结算明细' : '完工结算' + row.isSlt == 1 ? '结算明细' : '完工结算' }} @@ -226,9 +219,9 @@ export default { // 工程数据 projectList: [], statusList: [ - { id: '0', name: '请选择' }, - { id: '1', name: '结算中' }, - { id: '2', name: '已结算' }, + { id: '', name: '请选择' }, + { id: '0', name: '结算中' }, + { id: '1', name: '已结算' }, ], //集合 // 表格数据 agreementList: [ @@ -370,8 +363,11 @@ export default { this.monthRecordDialogVisible = false }, /** 关闭完工结算或结算明细页面 */ - closeCurrPage() { + closeCurrPage(isRefresh) { this.isHome = true + if (isRefresh) { + this.getList() + } }, }, } diff --git a/src/views/repairTest/repair/dialogOneForm.vue b/src/views/repairTest/repair/dialogOneForm.vue index 6bf246d..ca426a0 100644 --- a/src/views/repairTest/repair/dialogOneForm.vue +++ b/src/views/repairTest/repair/dialogOneForm.vue @@ -230,7 +230,6 @@ /> - - - - + + + + 导入导入 展开/折叠 下载导入模板下载导入模板 点击上传 -
支持格式：excel表格，单个文件不能超过20MB - 注意：需要根据模版导入本年配件框架内容，重复上传会覆盖本年框架内容。 + 注意：需要根据模版导入本年配件框架内容，重复上传会覆盖本年框架内容。
-
+
确定 - 取消 + type="primary" + style="margin-right: 6px" + @click="confirmUpload" + >确定 + 取消
-
@@ -342,7 +347,7 @@ export default { // 查询参数 queryParams: { paName: undefined, - year: undefined + year: undefined, }, // 表单参数 form: {}, @@ -387,7 +392,7 @@ export default { isEdit: false, // excel文件列表 fileList: [], - excelList: undefined + excelList: undefined, } }, created() { @@ -396,49 +401,53 @@ export default { methods: { /** 确认上传excel */ confirmUpload() { - if (this.excelList != undefined) { - let ifSize = this.excelList.file.size / 1024 / 1024 < 20; - if (!ifSize) { - this.$modal.msgError('上传文件大于20M，请重新选择文件上传！') - } else { - console.log(this.excelList) - excelUpLoad(this.excelList).then(res => { - console.log(res) - if (res.code == 200) { - this.$modal.msgSuccess(res.msg) - this.openUpload = false - this.reset() - this.getList() + if (this.excelList != undefined) { + let ifSize = this.excelList.file.size / 1024 / 1024 < 20 + if (!ifSize) { + this.$modal.msgError( + '上传文件大于20M，请重新选择文件上传！', + ) } else { - this.$modal.msgError(res.msg) + console.log(this.excelList) + excelUpLoad(this.excelList) + .then((res) => { + console.log(res) + if (res.code == 200) { + this.$modal.msgSuccess(res.msg) + this.openUpload = false + this.reset() + this.getList() + } else { + this.$modal.msgError(res.msg) + } + }) + .catch((err) => { + console.log(err) + }) } - }).catch(err => { - console.log(err) - }) + } else { + this.$modal.msgError('请选择上传文件！') } - } else { - this.$modal.msgError('请选择上传文件！') - } }, /** 点击下载excel导入模板 */ downloadExcelTemplate() { - this.download( - 'material/base/maPartType/downLoad', - {}, - `配件模板.xlsx`, - ) + this.download( + 'material/base/maPartType/downLoad', + {}, + `配件模板.xlsx`, + ) }, /** 上传excel文件 */ uploadExcel(obj) { - this.excelList = obj + this.excelList = obj }, /** 移除excel文件 */ handleRemoveExcel() { - this.excelList = undefined + this.excelList = undefined }, /** 上传的excel数超出限制 */ excelExceed(files, fileList) { - this.$modal.msgError('上传的excel文件数量超出限制！') + this.$modal.msgError('上传的excel文件数量超出限制！') }, /** 上传excel文件前 */ beforeExcelUpload(file) { @@ -454,12 +463,12 @@ export default { }, /** 关闭excel弹窗 */ closeExcelDialog() { - this.excelList = undefined - this.openUpload = false + this.excelList = undefined + this.openUpload = false }, /** 查询部门列表 */ getList() { - console.log(this.queryParams) + console.log(this.queryParams) // this.loading = true; listPartType(this.queryParams) .then((response) => { diff --git a/src/views/warehouseManage/warehousing/newTools/index.vue b/src/views/warehouseManage/warehousing/newTools/index.vue index caf89be..a26b5de 100644 --- a/src/views/warehouseManage/warehousing/newTools/index.vue +++ b/src/views/warehouseManage/warehousing/newTools/index.vue @@ -246,7 +246,12 @@ - 确认入库 @@ -596,6 +601,7 @@ export default { ], }, userId: sessionStorage.getItem('userId'), + passLoading: false, // 确认入库按钮 loading } }, created() { @@ -714,6 +720,7 @@ export default { changePutinStatus(param).then((response) => { if (response.code == 200) { this.$modal.msgSuccess('审批成功') + this.open = false this.getDialogTable() this.getList() } else { @@ -728,6 +735,8 @@ export default { taskId: this.query.taskId, dictName: this.query.dictName, } + + this.passLoading = true getPutinDetailsList(params).then((res) => { let deviceList = res.rows deviceList.forEach((item) => { @@ -742,15 +751,19 @@ export default { checkResult: '1', inputRecordList: deviceList, } - changePutinStatus(param).then((response) => { - if (response.code == 200) { - this.$modal.msgSuccess('审批成功') - this.getDialogTable() - this.getList() - } else { - this.$modal.msgSuccess('审批失败') - } - }) + changePutinStatus(param) + .then((response) => { + if (response.code == 200) { + this.$modal.msgSuccess('审批成功') + this.getDialogTable() + this.getList() + } else { + this.$modal.msgSuccess('审批失败') + } + }) + .finally(() => { + this.passLoading = false + }) }) }, //拒绝 diff --git a/vue.config.js b/vue.config.js index b9faf0b..0673162 100644 --- a/vue.config.js +++ b/vue.config.js @@ -42,11 +42,11 @@ module.exports = { // target: `https://test-cc.zhgkxt.com`,//线上环境-南网 // target: `https://z.csgmall.com.cn`, - // target: `http://192.168.2.160:39080`, //超 + target: `http://192.168.2.141:39080`, //超 // target: `http://10.40.92.81:8080`, //韩/ // target: `http://10.40.92.74:8080`,//旭/ // target: `http://10.40.92.138:28080`, //帅 - target: `http://192.168.2.218:39080`, //福 + // target: `http://192.168.2.218:39080`, //福 // target: `http://192.168.2.120:39080`, //跃 //******** 注意事项 ********* */