diff --git a/supervise-report-ui/src/api/project/project.js b/supervise-report-ui/src/api/project/project.js index 5668922e..f5d3fc00 100644 --- a/supervise-report-ui/src/api/project/project.js +++ b/supervise-report-ui/src/api/project/project.js @@ -158,7 +158,7 @@ export default { }); }, - // 获取项目进度 + // 获取项目阶段 getNodeByProjectSid: function(data) { return request({ url: '/v1/projectphase/getNodeByProjectSid', @@ -167,7 +167,7 @@ export default { }); }, - // 修改项目进度 + // 修改项目阶段 updatePhase: function(data) { return request({ url: '/v1/projectinformation/updatePhase', @@ -176,6 +176,26 @@ export default { }); }, + // 获取用还信记录 + getCreditRecord: function(data) { + return request({ + url: '/v1/projectcreditbalance/listPage', + method: 'post', + data: data + }); + }, + // 批量删除用还信记录 + delCreditRecord: function(params) { + return request({ + url: '/v1/projectcreditbalance/delBySids', + method: 'delete', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 保存用还信记录 saveCreditRecord: function(data) { return request({ @@ -195,8 +215,6 @@ export default { }, - - // 查询商享通所有仓库 getSxtWarehouses: function(data) { return request({ @@ -224,5 +242,62 @@ export default { }, + // 获取项目进度 + getProgress: function(data) { + return request({ + url: '/v1/ProjectEnginProg/listPage', + method: 'post', + data: data + }); + }, + // 批量删除项目进度 + delProgress: function(params) { + return request({ + url: '/v1/ProjectEnginProg/delete', + method: 'delete', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + + // 新增/保存项目进度 + saveProgress: function(data) { + return request({ + url: '/v1/ProjectEnginProg/save', + method: 'post', + data: data + }); + }, + + // 获取监管日志 + getLog: function(data) { + return request({ + url: '/v1/ProjectSupervisionLog/listPage', + method: 'post', + data: data + }); + }, + + // 新增/保存监管日志 + saveLog: function(data) { + return request({ + url: '/v1/ProjectSupervisionLog/save', + method: 'post', + data: data + }); + }, + // 批量删除项目进度 + delLog: function(params) { + return request({ + url: '/v1/ProjectSupervisionLog/delete', + method: 'delete', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, } diff --git a/supervise-report-ui/src/components/uploadFile/upload_yanchejianchaTuBiao.vue b/supervise-report-ui/src/components/uploadFile/upload_yanchejianchaTuBiao.vue index 6e56b397..044a32f2 100644 --- a/supervise-report-ui/src/components/uploadFile/upload_yanchejianchaTuBiao.vue +++ b/supervise-report-ui/src/components/uploadFile/upload_yanchejianchaTuBiao.vue @@ -150,6 +150,7 @@ this.files.forEach((o) => { imgFiles.push(o.url) }) + this.$emit('change', this.files) this.$emit('fileChange', this.files) }, handleRemove(file, fileList) { diff --git a/supervise-report-ui/src/views/project/projectDaily.vue b/supervise-report-ui/src/views/project/projectDaily.vue index 92f5cbf0..3279de11 100644 --- a/supervise-report-ui/src/views/project/projectDaily.vue +++ b/supervise-report-ui/src/views/project/projectDaily.vue @@ -628,6 +628,7 @@ var orderDate = row.orderDate // 正式 // window.open('https://supervise.yxtsoft.com/map365/#/mortgage'); + // 测试 // window.open('https://supervise.yxtsoft.com/map365/#/mortgage'); // 本地 @@ -657,6 +658,9 @@ window.open('/map365/#/shanhaiGf?projectSid=' + projectSid + '&projectName=' + projectName + '&orderDate=' + orderDate); + // window.open('http://192.168.0.112:9532/map365/#/shanhaiGf?projectSid=' + projectSid + '&projectName=' + + // projectName + + // '&orderDate=' + orderDate); } else { this.$message({ showClose: true, diff --git a/supervise-report-ui/src/views/projectList/index.vue b/supervise-report-ui/src/views/projectList/index.vue index 6d9767ff..0f7d2791 100644 --- a/supervise-report-ui/src/views/projectList/index.vue +++ b/supervise-report-ui/src/views/projectList/index.vue @@ -46,10 +46,12 @@ - + @@ -78,10 +80,10 @@ - - @@ -93,34 +95,179 @@ - + +
+ + + 查询 + 添加 + 删除 + +
+ + + + + + + + + + + +
+ +
+ + + + + 关 闭 + + + + + + + + + 阶段名称 + + + + + + + + 发生日期 + + + + + + + + 下一阶段 + + + + + + + + 备注 + + + + + + + + + + + 相关附件 + + + + + + + + + + + 取 消 + 保 存 + + + + + +
+ + + 查询 + 添加用信 + 添加还信 + 删除 + +
+ + + + + + + + + + + + + + + +
+ +
+ + + + + 关 闭 + + + + - + 项目名称 - {{formobj.projectname}} + {{creditLimitInfo.projectname}} 填报日期 - + + 类型 - + 用信 还信 @@ -131,13 +278,49 @@ - - + + + 预计到货日期 + + + + + + 预计完工日期 + + + + + + + + + + 性质 + + + + + + + + 备注 + + + + + 附件 @@ -150,20 +333,110 @@ + + + 取 消 + 保 存 + + + + + +
+ + + 查询 + 添加 + 删除 + +
+ + + + + + + + + + + + + +
+ +
+ + + + + 关 闭 + + + + + + + + + 工作名称 + + + + + + + + 日期 + + + + + + + 下一工作安排 + + + + + + 备注 - - + + + + + + + 相关附件 + + + + + + + - 取 消 - 保 存 + 取 消 + 保 存 @@ -325,6 +598,11 @@ dialogShow2: false, dialogShow3: false, dialogShow4: false, + dialogShow5: false, + dialogShow6: false, + dialogShow7: false, + dialogShow8: false, + dialogShow9: false, options: [], projectState: { sid: "", @@ -332,17 +610,10 @@ nodeValue: "" }, radio: 1, - formobj: { - usersid: window.sessionStorage.getItem('userSid'), - projectname: "", - projectsid: "", - tbdate: "", - type: 1, - money: "", - pzfiles: [], - remarks: "" - }, imgList: [], + imgList2: [], + imgList3: [], + imgList4: [], updateAction: process.env.VUE_APP_BASE_API + '/projectdaily/uploadfile', uploadFileList: [], reportFileList: [], @@ -359,6 +630,72 @@ typeValue: '', reportList: [], }, + progressParams: { + current: 1, + size: 10, + params: { + name: '', + projectSid: "" + }, + total: 0 + }, + progressData: [], + progressSids: [], + progressInfo: { + projectSid: '', + progressDescription: '', + nextStage: '', + orderDate: '', + remarks: '', + urls: [] + }, + + creditLimitParams: { + current: 1, + size: 10, + params: { + name: '', + projectsid: "" + }, + total: 0 + }, + creditLimitData: [], + creditRecordSids: [], + creditRecordList: [], + creditLimitInfo: { + usersid: window.sessionStorage.getItem('userSid'), + projectname: "", + projectsid: '', + tbdate: "", + expectedCompletionDate: "", + expectedDeliveryDate: "", + creditNature: "", + type: 1, + money: "", + pzfiles: [], + remarks: "", + psid: "" + }, + + logParams: { + current: 1, + size: 10, + params: { + name: '', + projectSid: "" + }, + total: 0 + }, + logData: [], + logSids: [], + logInfo: { + projectSid: '', + regulatoryWork: '', + workArrangement: '', + orderDate: '', + remarks: '', + urls: [] + } } }, mounted() { @@ -375,7 +712,7 @@ this.projectState.nodeValue = choose[0].nodeValue this.projectState.nodeKey = choose[0].nodeKey }, - toProjectProgress(row) { + toPhase(row) { this.projectState = { sid: row.sid, @@ -411,49 +748,176 @@ }, toCreditLimit(row) { - this.formobj.projectsid = row.sid - this.formobj.projectname = row.entryName + this.creditLimitParams.params.projectsid = row.sid + this.creditLimitParams.params.projectname = row.entryName + this.creditLimitInfo.projectsid = row.sid + this.creditLimitInfo.projectname = row.entryName + + this.dialogShow7 = true + this.getCreditLimit() + }, + getCreditLimit() { + req.getCreditRecord(this.creditLimitParams).then((response) => { + console.log(">>>>>>>>>getCreditLimit", response.data) + if (response.success) { + this.creditLimitData = response.data.records + this.creditLimitParams.total = response.data.total + } else { + this.creditLimitData = [] + this.creditLimitParams.total = 0 + } + }) + }, + + dialogClose7() { + this.dialogShow7 = false + }, + + addCreditLimit1() { this.dialogShow2 = true + this.creditLimitInfo.type = 1 + }, + addCreditLimit2() { + + if (this.creditRecordSids.length != 1) { + this.$message({ + showClose: true, + type: 'warning', + message: '请选择一条记录进行操作' + }) + return + } + + if (this.creditRecordList[0].type != '1') { + this.$message({ + showClose: true, + type: 'warning', + message: '请选择用信记录进行还信操作' + }) + return + } + + this.creditLimitInfo.psid = this.creditRecordSids[0] + this.creditLimitInfo.type = 2 + this.creditLimitInfo.projectsid = this.creditRecordList[0].projectsid + this.creditLimitInfo.projectname = this.creditRecordList[0].projectname + this.dialogShow2 = true + + }, + handleSelectionCreditRecordChange(val) { + console.log("val", val); + const aa = [] + val.forEach(element => { + aa.push(element.sid) + }) + this.creditRecordList = val + this.creditRecordSids = aa + }, + doCreditRecordEdit(row) { + this.creditLimitInfo = row + this.imgList = [] + for (var i = 0; i < this.creditLimitInfo.pzfiles.length; i++) { + this.imgList.push({ + url: this.creditLimitInfo.pzfiles[i] + }) + } + + this.dialogShow2 = true + + }, + doCreditRecordDel() { + if (this.creditRecordSids.length > 0) { + const tip = '请确认是否删除所选记录?' + this.$confirm(tip, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + req.delCreditRecord(this.creditRecordSids).then((response) => { + if (response.success) { + this.$message({ + showClose: true, + type: 'success', + message: '删除成功' + }) + this.getCreditLimit() + } else { + this.$message({ + showClose: true, + type: 'error', + message: '删除失败' + }) + } + }) + }) + } else { + this.$message({ + showClose: true, + type: 'warning', + message: '请至少选择一条记录进行删除操作' + }) + } }, dialogClose2() { - console.log("formobj", this.formobj) + console.log("creditLimitInfo", this.creditLimitInfo) this.dialogShow2 = false + this.imgList = [] + this.creditLimitInfo = { + usersid: window.sessionStorage.getItem('userSid'), + projectname: this.creditLimitParams.params.projectname, + projectsid: this.creditLimitParams.params.projectsid, + tbdate: "", + expectedCompletionDate: "", + expectedDeliveryDate: "", + creditNature: "", + type: 1, + money: "", + pzfiles: [], + remarks: "", + psid: "" + } }, radioChange(val) { console.log("radioChange", val) - this.formobj.type = val + this.creditLimitInfo.creditNature = val }, backData(value) { console.log(value, 999) console.log("imgList", this.imgList) const aa = [] + this.creditLimitInfo.pzfiles = [] if (value.length > 0 && value != null && value != undefined) { for (var i = 0; i < value.length; i++) { aa.push(value[i].url) } } - this.formobj.pzfiles = aa + this.creditLimitInfo.pzfiles = aa }, saveFormobj() { - console.log("formobj", this.formobj) + console.log("creditLimitInfo", this.creditLimitInfo) - req.saveCreditRecord(this.formobj).then((res) => { + req.saveCreditRecord(this.creditLimitInfo).then((res) => { console.log(">>>>>>>>>saveCreditRecord", res.data) this.dialogShow2 = false this.imgList = [] - this.formobj = { + this.getCreditLimit() + this.creditLimitInfo = { usersid: window.sessionStorage.getItem('userSid'), - projectname: "", - projectsid: "", + projectname: this.creditLimitParams.params.projectname, + projectsid: this.creditLimitParams.params.projectsid, tbdate: "", + expectedCompletionDate: "", + expectedDeliveryDate: "", + creditNature: "", type: 1, money: "", pzfiles: [], - remarks: "" + remarks: "", + psid: "" } }) @@ -763,7 +1227,252 @@ doClose() { this.$store.dispatch('tagsView/delView', this.$route) this.$router.go(-1) - } + }, + toProgress(row) { + + this.progressParams.params.projectSid = row.sid + this.progressInfo.projectSid = row.sid + this.dialogShow5 = true + this.getProgressData() + }, + + getProgressData() { + + req.getProgress(this.progressParams).then((response) => { + console.log(">>>>>>>>>toProgress", response.data) + if (response.success) { + this.progressData = response.data.records + this.progressParams.total = response.data.total + } else { + this.progressData = [] + this.progressParams.total = 0 + } + + }) + }, + + dialogClose5() { + this.dialogShow5 = false + }, + addProgress() { + this.dialogShow6 = true + + }, + handleSelectionProgressChange(val) { + console.log("val", val); + const aa = [] + val.forEach(element => { + aa.push(element.sid) + }) + this.progressSids = aa + }, + doProgressEdit(row) { + this.progressInfo = row + for (var i = 0; i < this.progressInfo.urls.length; i++) { + this.imgList2.push({ + url: this.progressInfo.urls[i] + }) + } + console.log("this.imgList2", this.imgList2) + this.dialogShow6 = true + }, + doProgressDel(index) { + + if (this.progressSids.length > 0) { + const tip = '请确认是否删除所选记录?' + this.$confirm(tip, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + req.delProgress(this.progressSids).then((response) => { + if (response.success) { + this.$message({ + showClose: true, + type: 'success', + message: '删除成功' + }) + this.getProgressData() + } else { + this.$message({ + showClose: true, + type: 'error', + message: '删除失败' + }) + } + }) + }) + } else { + this.$message({ + showClose: true, + type: 'warning', + message: '请至少选择一条记录进行删除操作' + }) + } + }, + backData2(value) { + console.log(value, 999) + console.log("imgList", this.imgList2) + const aa = [] + this.progressInfo.urls = [] + if (value.length > 0 && value != null && value != undefined) { + for (var i = 0; i < value.length; i++) { + aa.push(value[i].url) + } + } + this.progressInfo.urls = aa + + }, + saveProgress() { + req.saveProgress(this.progressInfo).then((res) => { + this.dialogShow6 = false + this.getProgressData() + this.progressInfo = { + projectSid: this.progressParams.params.projectSid, + progressDescription: '', + nextStage: '', + orderDate: '', + remarks: '', + urls: [] + } + this.imgList2 = [] + }) + }, + dialogClose6() { + this.dialogShow6 = false + this.progressInfo = { + projectSid: this.progressParams.params.projectSid, + progressDescription: '', + nextStage: '', + orderDate: '', + remarks: '', + urls: [] + } + this.imgList2 = [] + }, + + toLog(row) { + this.logParams.params.projectSid = row.sid + this.logInfo.projectSid = row.sid + this.dialogShow8 = true + this.getLogData() + }, + getLogData() { + req.getLog(this.logParams).then((response) => { + console.log(">>>>>>>>>toLog", response.data) + if (response.success) { + this.logData = response.data.records + this.logParams.total = response.data.total + } else { + this.logData = [] + this.logParams.total = 0 + } + + }) + + }, + + dialogClose8() { + this.dialogShow8 = false + }, + addLog(row) { + this.dialogShow9 = true + }, + handleSelectionLogChange(val) { + + console.log("val", val); + const aa = [] + val.forEach(element => { + aa.push(element.sid) + }) + this.logSids = aa + }, + doLogEdit(row) { + this.logInfo = row + for (var i = 0; i < this.logInfo.urls.length; i++) { + this.imgList3.push({ + url: this.logInfo.urls[i] + }) + } + console.log("this.imgList3", this.imgList3) + this.dialogShow9 = true + }, + doLogDel() { + + if (this.logSids.length > 0) { + const tip = '请确认是否删除所选记录?' + this.$confirm(tip, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + req.delLog(this.logSids).then((response) => { + if (response.success) { + this.$message({ + showClose: true, + type: 'success', + message: '删除成功' + }) + this.getLogData() + } else { + this.$message({ + showClose: true, + type: 'error', + message: '删除失败' + }) + } + }) + }) + } else { + this.$message({ + showClose: true, + type: 'warning', + message: '请至少选择一条记录进行删除操作' + }) + } + }, + + backData3(value) { + console.log(value, 999) + console.log("imgList", this.imgList3) + const aa = [] + this.logInfo.urls = [] + if (value.length > 0 && value != null && value != undefined) { + for (var i = 0; i < value.length; i++) { + aa.push(value[i].url) + } + } + this.logInfo.urls = aa + + }, + saveLog() { + req.saveLog(this.logInfo).then((res) => { + this.dialogShow9 = false + this.getLogData() + this.logInfo = { + projectSid: this.logParams.params.projectSid, + regulatoryWork: '', + workArrangement: '', + orderDate: '', + remarks: '', + urls: [] + } + this.imgList3 = [] + }) + }, + + dialogClose9() { + this.dialogShow9 = false + this.logInfo = { + projectSid: this.logParams.params.projectSid, + regulatoryWork: '', + workArrangement: '', + orderDate: '', + remarks: '', + urls: [] + } + this.imgList3 = [] + }, } }