diff --git a/src/views/hiddenDanger/files.component.vue b/src/views/hiddenDanger/files.component.vue index 330ce44..9e93b28 100644 --- a/src/views/hiddenDanger/files.component.vue +++ b/src/views/hiddenDanger/files.component.vue @@ -693,8 +693,8 @@ export default class HiddenDangerFilesComponent extends BaseRecordComponent professionClassifyName: this.$store.getters.prevention_major_type_map[row.professionClassify], reformModeName: this.reformModeMap[row.reformMode], }, row); - this.updateParams.majorHazardName = !this.updateParams.majorHazard? '不涉及' : this.$store.getters.prevention_risk_source_map[this.updateParams.majorHazard] this.updateParams.majorHazard = +this.updateParams.majorHazard + this.updateParams.majorHazardName = !this.updateParams.majorHazard? '不涉及' : this.$store.getters.prevention_risk_source_map[this.updateParams.majorHazard] this.getTableCallback() // 获取url if (row.resourceId) { diff --git a/src/views/hiddenDanger/manager.component.vue b/src/views/hiddenDanger/manager.component.vue index 8435f24..abf1a1a 100644 --- a/src/views/hiddenDanger/manager.component.vue +++ b/src/views/hiddenDanger/manager.component.vue @@ -856,7 +856,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent moment(end).subtract(1, 'day').toDate().getTime(); + return time.getTime() < moment(start).subtract(1, 'day').toDate().getTime() || time.getTime() > moment(end).toDate().getTime(); } } } @@ -934,8 +934,8 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent { this.updateParams.resourceName = this.photoList.map(item => item.name).join(",") this.updateParams.resourceOtherId = this.fileList.map(item => item.id).join(",") this.updateParams.resourceOtherName = this.fileList.map(item => item.name).join(",") - if (this.updateParams.majorHazard && this.updateParams.majorHazard !== 0) { - this.updateParams.majorHazard = this.updateParams.majorHazard.toString() - } + this.updateParams.majorHazard = this.updateParams.majorHazard.toString() this.tableService.addOrUpdate(this.updateParams, !this.updateParams.id).then((res: any) => { this.$message.success(!this.updateParams.id ? "新增成功!" : "编辑成功"); this.handleClose(); @@ -681,8 +679,8 @@ export default class RulesManagerComponent extends BaseRecordComponent { professionClassifyName: this.$store.getters.prevention_major_type_map[row.professionClassify], reformModeName: this.reformModeMap[row.reformMode], }, row) - this.updateParams.majorHazard = parseInt(this.updateParams.majorHazard) - this.updateParams.majorHazardName = !this.updateParams.majorHazard || this.updateParams.majorHazard === 0 ? '不涉及' : this.$store.getters.prevention_risk_source_map[this.updateParams.majorHazard] + this.updateParams.majorHazard = +this.updateParams.majorHazard; + this.updateParams.majorHazardName = !this.updateParams.majorHazard ? '不涉及' : this.$store.getters.prevention_risk_source_map[this.updateParams.majorHazard] // 获取url if (row.resourceId) { diff --git a/src/views/workprogress/leader.component.vue b/src/views/workprogress/leader.component.vue index 4d486d6..29c55f7 100644 --- a/src/views/workprogress/leader.component.vue +++ b/src/views/workprogress/leader.component.vue @@ -46,6 +46,7 @@ export default class LeadershipStructure extends BaseRecordComponent { public subIsReadonly = false; + public subUpdateActions = [] as any; public fileList = [] as any; diff --git a/src/views/workprogress/managementSystem.component.vue b/src/views/workprogress/managementSystem.component.vue index e86a9de..7dd3321 100644 --- a/src/views/workprogress/managementSystem.component.vue +++ b/src/views/workprogress/managementSystem.component.vue @@ -60,6 +60,8 @@ export default class ManagementSystem extends BaseRecordComponent { public subShowUpdate = false; + public subUpdateActions = [] as any; + public formActions = [{ name: "查询", value: "search", diff --git a/src/views/workprogress/programme.component.vue b/src/views/workprogress/programme.component.vue index ede6747..00e2a46 100644 --- a/src/views/workprogress/programme.component.vue +++ b/src/views/workprogress/programme.component.vue @@ -65,6 +65,7 @@ export default class Programme extends BaseRecordComponent { public subShowUpdate = false; + public subUpdateActions = [] as any; public formActions = [{ name: "查询", value: "search",