feat:隐患流程bug修复

dev
kongyeqing 2023-09-14 17:09:51 +08:00
parent 955a74b2e3
commit 61f4d667f0
6 changed files with 19 additions and 18 deletions

View File

@ -8,7 +8,7 @@ export default class integralFlowService extends BaseService<any>{
//创建
public startWorkFlow(params,showLoading?:boolean): Promise<AxiosResponse<ActionResult<any>>>{
const url = this.prefix.bpm+'/task/createProcess';
const url = this.prefix.bpm+'/operate/createProcess';
return this.post(url,params,{},true)
}
@ -19,13 +19,13 @@ export default class integralFlowService extends BaseService<any>{
//设置审批人
public taskCandidateSet(params,showLoading?:boolean): Promise<AxiosResponse<ActionResult<any>>>{
const url = this.prefix.bpm+'/task/candidateset';
const url = this.prefix.bpm+'/operate/candidateset';
return this.post(url,params,{},true)
}
//处理任务
public taskHandle(params,showLoading?:boolean): Promise<AxiosResponse<ActionResult<any>>>{
const url = this.prefix.bpm+'/task/taskHandle';
const url = this.prefix.bpm+'/operate/taskHandle';
return this.post(url,params,{},true)
}
}

View File

@ -8,17 +8,17 @@ export default class WorkFlowService extends BaseService<any>{
//创建流程
public startWorkFlow(params,showLoading?:boolean): Promise<AxiosResponse<ActionResult<any>>>{
const url = this.prefix.bpm+'/task/createProcess';
const url = this.prefix.bpm+'/operate/createProcess';
return this.post(url,params)
}
public again(params,showLoading?:boolean): Promise<AxiosResponse<ActionResult<any>>>{
const url = this.prefix.bpm+'/task/candidate/set';
const url = this.prefix.bpm+'/operate/candidate/set';
return this.post(url,params,{},true)
}
//处理流程
public taskHandle(params,showLoading?:boolean): Promise<AxiosResponse<ActionResult<any>>>{
const url = this.prefix.bpm+'/task/taskHandle';
const url = this.prefix.bpm+'/operate/taskHandle';
return this.post(url,params,{},true)
}
}

View File

@ -90,7 +90,7 @@
.el-dialog__headerbtn .el-dialog__close {
color: rgb(0 0 0 / 60%);
font-size: 28px;
font-size: 24px;
}
.el-dialog__headerbtn {

View File

@ -5,7 +5,7 @@
:full-btn="false" @change="change" btn-position="end"></FormComponent>
</div>
<div class="publicReportTable">
<el-table v-if="reportTable.detail.length" :data="reportTable.detail" border style="width: 100%"
<el-table v-if="summary" :data="reportTable.detail" border style="width: 100%"
height="90%" show-summary :summary-method="publicSummaryMethod" :row-class-name="rowClass"
ref="publicReportTable">
<el-table-column label="序号" width="60">

View File

@ -44,6 +44,8 @@ export default class PublicityResumption extends BaseRecordComponent<any> {
public selectData = [];
public summary = false;
public isReadonly = false;
public hideOperate = true;
@ -194,7 +196,7 @@ export default class PublicityResumption extends BaseRecordComponent<any> {
if (res.data) {
this.reportTable = res.data as any;
}
this.summary = true;
})
}
//

View File

@ -750,7 +750,6 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
}, data)
}
this.showUpdateModel(data)
this.getTableCallback()
}
}
@ -849,7 +848,6 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
this.updateParams.verifyUserName = this.$store.getters.user_map[data]
return
}
//
}
public getPickerOptions(start?, end?) {
@ -940,10 +938,10 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
occurNodeName: this.$store.getters.prevention_occur_step_map[row.occurNode],
professionClassifyName: this.$store.getters.prevention_major_type_map[row.professionClassify],
reformModeName: this.reformModeMap[row.reformMode],
majorHazard: null
}, row);
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.getTableCallback()
// url
if (row.resourceId) {
this.tableService.getFileUrls({ ids: row.resourceId.split(",") }).then((photos: any) => {
@ -1001,6 +999,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
this.getTableCallback()
})
}
this.getTableCallback()
this.showUpdate = true
}
}