From 0fd8f2cb234d44d2fe93bd6ebf4e5f31fb1b5a78 Mon Sep 17 00:00:00 2001 From: kongyeqing <2697454777@qq.com> Date: Mon, 18 Sep 2023 17:44:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/tree.component.vue | 34 +++-- src/service/integralFlow.service.ts | 2 +- src/views/hiddenDanger/clap.component.vue | 85 ++++++++++-- src/views/hiddenDanger/files.component.vue | 18 ++- .../rules/rulesManager.component.vue | 87 ++++++++++-- .../hiddenDanger/safe/plan.component.vue | 131 ++++++++++++++---- src/views/integral/common.component.html | 2 +- src/views/integral/event.component.vue | 11 +- .../exchangeFlow/exchange.component.vue | 4 +- .../assessment/device/device.component.vue | 6 +- .../businessInfo/businessInfo.component.vue | 6 + .../riskJudgment/riskJudgment.component.vue | 6 +- .../safetyNotice/safetyNotice.component.html | 22 ++- .../safetyNotice/safetyNotice.component.vue | 76 ++++++++-- src/views/threecards/riskCard.component.vue | 9 +- src/views/threecards/safeCard.component.vue | 5 +- .../managementSystem.component.vue | 3 + .../workprogress/programme.component.vue | 3 + 18 files changed, 403 insertions(+), 107 deletions(-) diff --git a/src/components/tree.component.vue b/src/components/tree.component.vue index 32bb69b..b0a679e 100644 --- a/src/components/tree.component.vue +++ b/src/components/tree.component.vue @@ -1,33 +1,45 @@ \ No newline at end of file diff --git a/src/service/integralFlow.service.ts b/src/service/integralFlow.service.ts index 34c7945..562d11a 100644 --- a/src/service/integralFlow.service.ts +++ b/src/service/integralFlow.service.ts @@ -19,7 +19,7 @@ export default class integralFlowService extends BaseService{ //设置审批人 public taskCandidateSet(params,showLoading?:boolean): Promise>>{ - const url = this.prefix.bpm+'/operate/candidateset'; + const url = this.prefix.bpm+'/operate/candidate/set'; return this.post(url,params,{},true) } diff --git a/src/views/hiddenDanger/clap.component.vue b/src/views/hiddenDanger/clap.component.vue index 253ac46..249880e 100644 --- a/src/views/hiddenDanger/clap.component.vue +++ b/src/views/hiddenDanger/clap.component.vue @@ -132,9 +132,11 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent public loadAreaData() { this.areaService.selectByPage({ pageSize: 1000 }).then((res: any) => { this.areaList = res.data.datas.map(item => { - return { - name: item.name, - value: item.id + if (item.name) { + return { + name: item.name, + value: item.id + } } }); }) @@ -143,9 +145,11 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent public loadUnitData(id?) { this.unitService.selectByPage({ pageSize: 1000, areaId: id }, false).then((res: any) => { this.unitList = res.data.datas.map(item => { - return { - name: item.name, - value: item.id + if (item.name) { + return { + name: item.name, + value: item.id + } } }); const option = this.updateOptions.find(item => item.key === "unitId") as any; @@ -469,6 +473,8 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent public change(data, item) { if (item && item.key === "areaId") { + this.unitList = []; + this.updateParams.unitId = [] this.loadUnitData(data) } if (item && item.key === "inspectUserId") { @@ -493,9 +499,9 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent } if (item && item.key === 'violateNumber') { this.updateParams.violateNumber = null - setTimeout(()=>{ + setTimeout(() => { this.updateParams.violateNumber = +data.toFixed(0) - },0) + }, 0) } // } @@ -568,6 +574,9 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent }) } else { this.tableService.selectById(row.id).then((res: any) => { + console.log(JSON.parse(JSON.stringify(res))); + + // const unitName = this.updateParams = Object.assign({ classifyName: this.$store.getters.prevention_dangrous_type_map[res.data.classify], attributeClassifyName: this.$store.getters.prevention_safe_reason_map[row.attributeClassify], @@ -577,16 +586,26 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent occurNodeName: this.$store.getters.prevention_occur_step_map[res.data.occurNode], professionClassifyName: this.$store.getters.prevention_major_type_map[res.data.professionClassify], reformModeName: this.reformModeMap[res.data.reformMode], - unitName: (this.unitList.find((item: any) => item.value === res.data.unitId) as any).name, - areaName: (this.areaList.find((item: any) => item.value === res.data.areaId) as any).name, + unitName: (this.unitList.find((item: any) => item.value === res.data.unitId) as any)?.name ?? null, + areaName: (this.areaList.find((item: any) => item.value === res.data.areaId) as any)?.name ?? null, type: "随手拍", }, res.data) this.updateParams.majorHazard = this.updateParams.majorHazard ? +this.updateParams.majorHazard : 0 this.updateParams.majorHazardName = !this.updateParams.majorHazard ? '不涉及' : this.$store.getters.prevention_risk_source_map[this.updateParams.majorHazard] // 地图定位 this.center = [res.data.locationLng, res.data.locationLat]; - this.buildUpdateForm() - + this.buildUpdateForm(); + if (row && !isRead) { + //区域是否删除 + let isDeleteArea = !res.data.areaId ? true : this.judgeDeleteAreaMethod(res.data); + if (!isDeleteArea) { + this.loadUnitData(res.data.areaId); + //单元是否删除 + if (res.data.unitId) { + this.judgeDeleteUnitMethod(res.data); + } + } + } // 获取url if (res.data.resourceId) { this.updateParams.photo = 1; @@ -621,6 +640,48 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent } } + /** + * 判断区域是否删除 + * @param res + */ + public judgeDeleteAreaMethod(res: any) { + const find = this.areaList.find((data: any) => data.value === res.areaId); + if (!find) { + this.updateParams.areaId = null; + this.updateParams.unitId = null; + this.$confirm(`风险区域信息变更，请重新选择！`, "", { + type: 'warning', + showCancelButton: false, + closeOnClickModal: false, + }).then(() => { + // + }).catch(() => { + // + }) + } + return !!find + } + /** + * 判断单元是否删除 + * @param res + */ + public judgeDeleteUnitMethod(res: any) { + const find = this.unitList.find((data: any) => data.value === res.unitId); + if (!find) { + this.updateParams.unitId = []; + this.$confirm(`风险单元信息变更，请重新选择！`, "", { + type: 'warning', + showCancelButton: false, + closeOnClickModal: false, + }).then(() => { + // + }).catch(() => { + // + }) + } + return !!find + } + public onDragEnd() { const lngLat = this.marker.getLngLat(); this.updateParams.locationLng = lngLat.lng; diff --git a/src/views/hiddenDanger/files.component.vue b/src/views/hiddenDanger/files.component.vue index 2a08fb9..8636684 100644 --- a/src/views/hiddenDanger/files.component.vue +++ b/src/views/hiddenDanger/files.component.vue @@ -456,19 +456,22 @@ export default class HiddenDangerFilesComponent extends BaseRecordComponent }, { name: "治理资金", type: "number", - width: "35%", + width: "calc(50% - 20px)", key: "executeMoney", require: true, hide: this.updateParams.reformConfirmFlag === 0, showError: false, + rules: [ + { pattern: /^[1-9]\d{0,7}(\.\d{1,3})?$/, message: '不超过八位的整数', }, + ], unit: { - name: "¥", + name: "元", type: "text" } }, { - name: "", + name: "资金来源", type: "textarea", - width: "calc(65% - 40px)", + width: "calc(50% - 20px)", key: "executeMoneySource", hide: this.updateParams.reformConfirmFlag === 0, placeholder: "请输入资金来源" @@ -479,6 +482,13 @@ export default class HiddenDangerFilesComponent extends BaseRecordComponent key: "realConfirmUserName", require: true, disable: true, + }, { + name: "确认人", + type: "text", + width: "calc(50% - 20px)", + key: "realConfirmUserName", + require: true, + disable: true, }, { name: "确认时间", type: "date", diff --git a/src/views/hiddenDanger/rules/rulesManager.component.vue b/src/views/hiddenDanger/rules/rulesManager.component.vue index ec925a3..028c6f8 100644 --- a/src/views/hiddenDanger/rules/rulesManager.component.vue +++ b/src/views/hiddenDanger/rules/rulesManager.component.vue @@ -282,9 +282,11 @@ export default class RulesManagerComponent extends BaseRecordComponent { public loadAreaData() { this.areaService.selectByPage({ pageSize: 1000 }).then((res: any) => { this.areaList = res.data.datas.map(item => { - return { - name: item.name, - value: item.id + if (item.name) { + return { + name: item.name, + value: item.id + } } }); }) @@ -299,9 +301,11 @@ export default class RulesManagerComponent extends BaseRecordComponent { } this.unitService.getListByIds({ areaIds: ids }, false).then((res: any) => { this.unitList = res.data.map(item => { - return { - name: item.name, - value: item.id + if (item.name) { + return { + name: item.name, + value: item.id + } } }); const option = this.updateOptions.find(item => item.key === "units") as any; @@ -354,9 +358,6 @@ export default class RulesManagerComponent extends BaseRecordComponent { } public change(data, item) { - console.log('item', item); - console.log('data', data); - // 区域 if (item && item.key === "areas") { if (this.updateParams.units.length) { @@ -498,9 +499,14 @@ export default class RulesManagerComponent extends BaseRecordComponent { this.updateParams = Object.assign(res.data, row) } else { this.updateParams = res.data; - this.loadUnitData(res.data.areas) + //区域是否删除 + let isDeleteArea = this.judgeDeleteAreaMethod(res); + if (!isDeleteArea) { + this.loadUnitData(res.data.areas); + //单元是否删除 + this.judgeDeleteUnitMethod(res); + } } - this.updateParams.tableItems.forEach((item, i) => { item.index = i + 1 }) @@ -508,10 +514,63 @@ export default class RulesManagerComponent extends BaseRecordComponent { this.showUpdate = true; }) } - - - } + /** + * 判断区域是否删除 + * @param res + */ + public judgeDeleteAreaMethod(res: any) { + let deleteData = [] as any; + this.updateParams.areas.forEach((item, index) => { + const find = this.areaList.find((data: any) => data.value === item); + if (!find) { + deleteData.push(item); + } + }); + if (deleteData.length > 0) { + this.updateParams.areas = null; + this.updateParams.units = null; + this.$confirm(`风险区域信息变更，请重新选择！`, "", { + type: 'warning', + showCancelButton: false, + closeOnClickModal: false, + }).then(() => { + // + }).catch(() => { + // + }) + + } + + return !!deleteData.length + } + /** + * 判断单元是否删除 + * @param res + */ + public judgeDeleteUnitMethod(res: any) { + let deleteData = [] as any; + this.updateParams.units.forEach((item, index) => { + const find = this.unitList.find((data: any) => data.value === item); + if (!find) { + deleteData.push(item); + } + }); + if (deleteData.length > 0) { + this.updateParams.units = null; + this.$confirm(`风险单元信息变更，请重新选择！`, "", { + type: 'warning', + showCancelButton: false, + closeOnClickModal: false, + }).then(() => { + // + }).catch(() => { + // + }) + } + return !!deleteData.length + } + public doSubSave(goOn?) { if (!this.subUpdateParams.index) { this.subUpdateParams.index = this.updateParams.tableItems.length + 1; diff --git a/src/views/hiddenDanger/safe/plan.component.vue b/src/views/hiddenDanger/safe/plan.component.vue index 0fe33fd..81998b0 100644 --- a/src/views/hiddenDanger/safe/plan.component.vue +++ b/src/views/hiddenDanger/safe/plan.component.vue @@ -344,16 +344,16 @@ export default class PlanComponent extends BaseRecordComponent { }] }) } - - // 加载区域列表 public loadAreaData() { this.areaService.selectByPage({ pageSize: 1000 }).then((res: any) => { this.areaList = res.data.datas.map(item => { - this.areaMap[item.id] = item.name; - return { - name: item.name, - value: item.id + if (item.name) { + this.areaMap[item.id] = item.name; + return { + name: item.name, + value: item.id + } } }); }) @@ -363,18 +363,20 @@ export default class PlanComponent extends BaseRecordComponent { return new Promise((resove, reject) => { this.unitService.getListByIds({ areaIds: ids }, false).then((res: any) => { this.unitList = res.data.map(item => { - this.unitMap[item.id] = item.name; - return { - name: item.name, - value: item.id + if (item.name) { + this.unitMap[item.id] = item.name; + return { + name: item.name, + value: item.id + } } + }); const option = this.updateOptions.find(item => item.key === "unitIds") as any; if (option) { option.datas = this.unitList; } resove() - // this.buildUpdateForm() }) }) } @@ -578,14 +580,25 @@ export default class PlanComponent extends BaseRecordComponent { this.updateActions[2].hide = false; this.isReadonly = !!isRead; if (row) { - await this.loadUnitData(row.areaIds) - this.updateParams = Object.assign({ - planTypeName: this.planTypeMap[row.planType], - areaNames: row.areaIds.map(item => this.areaMap[item]).join(","), - unitNames: row.unitIds.map(item => this.unitMap[item]).join(","), - inspectTypeName: this.$store.getters.prevention_danger_check_type_map[row.inspectType], - inspectCycleUnitName: this.$store.getters.prevention_cycle_unit_map[row.inspectCycleUnit], - }, row); + if (isRead) { + await this.loadUnitData(row.areaIds) + this.updateParams = Object.assign({ + planTypeName: this.planTypeMap[row.planType], + areaNames: row.areaIds.map(item => this.areaMap[item]).join(","), + unitNames: row.unitIds.map(item => this.unitMap[item]).join(","), + inspectTypeName: this.$store.getters.prevention_danger_check_type_map[row.inspectType], + inspectCycleUnitName: this.$store.getters.prevention_cycle_unit_map[row.inspectCycleUnit], + }, row); + } else { + this.updateParams = JSON.parse(JSON.stringify(row)); + //区域是否删除 + let isDeleteArea = this.judgeDeleteAreaMethod(this.updateParams); + if (!isDeleteArea) { + this.loadUnitData(row.areaIds); + //单元是否删除 + this.judgeDeleteUnitMethod(this.updateParams); + } + } if (row.planType === 1) { this.$set(this.updateParams, "time", isRead ? row.startTime + "~" + row.endTime : [row.startTime, row.endTime]) } else if (row.planType === 2) { @@ -597,18 +610,88 @@ export default class PlanComponent extends BaseRecordComponent { this.buildUpdateForm(); this.showUpdate = true } + /** + * 判断区域是否删除 + * @param res + */ + public judgeDeleteAreaMethod(paramsData: any) { + let deleteData = [] as any; + paramsData.areaIds.forEach((item, index) => { + const find = this.areaList.find((data: any) => data.value === item); + if (!find) { + deleteData.push(item); + } + }); + if (deleteData.length > 0) { + this.updateParams.areaIds = null; + this.updateParams.unitIds = null; + this.$confirm(`风险区域信息变更，请重新选择！`, "", { + type: 'warning', + showCancelButton: false, + closeOnClickModal: false, + }).then(() => { + // + }).catch(() => { + // + }) + + } + + + return !!deleteData.length + } + /** + * 判断单元是否删除 + * @param res + */ + public judgeDeleteUnitMethod(paramsData: any) { + + let deleteData = [] as any; + paramsData.unitIds.forEach((item, index) => { + const find = this.unitList.find((data: any) => data.value === item); + if (!find) { + deleteData.push(item); + } + }); + if (deleteData.length > 0) { + this.updateParams.unitIds = null; + this.$confirm(`风险单元信息变更，请重新选择！`, "", { + type: 'warning', + showCancelButton: false, + closeOnClickModal: false, + }).then(() => { + // + }).catch(() => { + // + }) + } + return !!deleteData.length + } + // 打开下发弹窗 - public openSendModel(row) { + public async openSendModel(row) { const now = moment().format("YYYY-MM-DD HH:mm:ss") if (row.startTime < now) { this.$message.error("检查开始时间不能早于当前时间,请先修改数据"); return } - this.updateActions[2].hide = true; - this.currentPlan = row; - this.showSend = true; - this.tableTabs = []; + //区域是否删除 + let isDeleteArea = this.judgeDeleteAreaMethod(JSON.parse(JSON.stringify(row))); + if (!isDeleteArea) { + await this.loadUnitData(row.areaIds); + //单元是否删除 + let isDeleteUnit = this.judgeDeleteUnitMethod(JSON.parse(JSON.stringify(row))); + if (!isDeleteUnit) { + this.updateActions[2].hide = true; + this.currentPlan = row; + this.showSend = true; + this.tableTabs = []; + } + } else { + return + } + } public openRecordModel(row) { diff --git a/src/views/integral/common.component.html b/src/views/integral/common.component.html index 1eb8cc9..e8cba3e 100644 --- a/src/views/integral/common.component.html +++ b/src/views/integral/common.component.html @@ -25,7 +25,7 @@ { public tableService = new IntegralEventService(); public params = { - userId: null, + userName: null, createTime: null, } as any; @@ -75,15 +75,14 @@ export default class IntegralEvent extends BaseRecordComponent { public formOptions: FormOption[] = [{ name: "姓名", - key: "userId", - type: "select", - datas: this.$store.state.userList + key: "userName", + type: "text", }, { name: "时间", key: "createTime", type: "date", subType: "datetimerange", - format: 'yyyy-MM-dd HH:mm:ss' + format: 'yyyy-MM-dd HH:mm' }]; public subActions = [{ @@ -183,11 +182,11 @@ export default class IntegralEvent extends BaseRecordComponent { public toggleAll() { - this.tableData.datas.forEach((item, index) => { (this.$refs.multipleTable as any).toggleRowSelection(item); }) } + public selectAll() { if (!this.selectData.length) { this.toggleAll() diff --git a/src/views/integral/exchange/exchangeFlow/exchange.component.vue b/src/views/integral/exchange/exchangeFlow/exchange.component.vue index 4cab273..f71a3ef 100644 --- a/src/views/integral/exchange/exchangeFlow/exchange.component.vue +++ b/src/views/integral/exchange/exchangeFlow/exchange.component.vue @@ -379,9 +379,9 @@ export default class IntegralExchange extends BaseRecordComponent { return `结束` } else { if (data.status === 1) { - return `申请` + return `申请` } else if (data.status === 2) { - return `审批中` + return `审批中` } } } diff --git a/src/views/risk/assessment/device/device.component.vue b/src/views/risk/assessment/device/device.component.vue index beda337..fee35b8 100644 --- a/src/views/risk/assessment/device/device.component.vue +++ b/src/views/risk/assessment/device/device.component.vue @@ -527,8 +527,8 @@ export default class DeviceManagerComponent extends BaseRecordComponent { if (!this.selectData.length) { this.toggleAll() } else { - console.log('this.tableData.datas',this.tableData.datas); - + console.log('this.tableData.datas', this.tableData.datas); + this.tableData.datas.forEach((item, index) => { const find = this.selectData.find((data: any) => data.id === item.id); if (!find) { @@ -606,7 +606,7 @@ export default class DeviceManagerComponent extends BaseRecordComponent { this.showProject = false; this.updateProParams = {} as any; } - + //删除 public deleteData(ids: any) { if (!ids.length) { diff --git a/src/views/riskAssessment/businessInfo/businessInfo.component.vue b/src/views/riskAssessment/businessInfo/businessInfo.component.vue index 8cdd429..b0583aa 100644 --- a/src/views/riskAssessment/businessInfo/businessInfo.component.vue +++ b/src/views/riskAssessment/businessInfo/businessInfo.component.vue @@ -570,6 +570,9 @@ export default class BusinessInfo extends BaseRecordComponent { }) this.updateParams.planViewResourceId = resourceId.join(",") this.updateParams.planViewResourceName = resourceName.join(",") + } else { + this.updateParams.planViewResourceId = ''; + this.updateParams.planViewResourceName = ''; } if (this.fileList2.length > 0) { @@ -582,6 +585,9 @@ export default class BusinessInfo extends BaseRecordComponent { }) this.updateParams.orgResourceId = resourceId.join(",") this.updateParams.orgResourceName = resourceName.join(",") + } else { + this.updateParams.orgResourceId = ''; + this.updateParams.orgResourceId = ''; } // 新增 diff --git a/src/views/riskAssessment/riskJudgment/riskJudgment.component.vue b/src/views/riskAssessment/riskJudgment/riskJudgment.component.vue index 64d115f..23e43d3 100644 --- a/src/views/riskAssessment/riskJudgment/riskJudgment.component.vue +++ b/src/views/riskAssessment/riskJudgment/riskJudgment.component.vue @@ -219,9 +219,9 @@ export default class RiskJudgment extends BaseRecordComponent { onMove: this.onRemove, onPreview: this.onPreview, autoUpload: true, - accept: "image/png, image/jpeg,.doc,.docx,.xls,.xlsx,.pdf", + accept: "image/png, image/jpeg", listType: "text", - tip: this.isReadonly ? "" : "请上传.pdf,.png,.jpg,.doc.docx,.xls,.xlsx格式文件", + tip: this.isReadonly ? "" : "请上传.png,.jpg格式文件", fileList: this.fileList, btn: [{ name: "上传附件", @@ -442,7 +442,7 @@ export default class RiskJudgment extends BaseRecordComponent { public callback(data, type) { if (type) { - if (type === 'pageSize' || type === 'pageNum') { + if (type === 'pageSize' || type === 'pageNum') { this.params[type] = data; } this.getTableData(); diff --git a/src/views/riskAssessment/safetyNotice/safetyNotice.component.html b/src/views/riskAssessment/safetyNotice/safetyNotice.component.html index d893caa..92715cf 100644 --- a/src/views/riskAssessment/safetyNotice/safetyNotice.component.html +++ b/src/views/riskAssessment/safetyNotice/safetyNotice.component.html @@ -62,8 +62,8 @@ - +