diff --git a/src/service/integralFlow.service.ts b/src/service/integralFlow.service.ts index 751b382..34c7945 100644 --- a/src/service/integralFlow.service.ts +++ b/src/service/integralFlow.service.ts @@ -8,7 +8,7 @@ export default class integralFlowService extends BaseService{ //创建 public startWorkFlow(params,showLoading?:boolean): Promise>>{ - 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{ //设置审批人 public taskCandidateSet(params,showLoading?:boolean): Promise>>{ - 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>>{ - const url = this.prefix.bpm+'/task/taskHandle'; + const url = this.prefix.bpm+'/operate/taskHandle'; return this.post(url,params,{},true) } } \ No newline at end of file diff --git a/src/service/workFlow.service.ts b/src/service/workFlow.service.ts index eb6e588..373527e 100644 --- a/src/service/workFlow.service.ts +++ b/src/service/workFlow.service.ts @@ -8,17 +8,17 @@ export default class WorkFlowService extends BaseService{ //创建流程 public startWorkFlow(params,showLoading?:boolean): Promise>>{ - 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>>{ - 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>>{ - const url = this.prefix.bpm+'/task/taskHandle'; + const url = this.prefix.bpm+'/operate/taskHandle'; return this.post(url,params,{},true) } } \ No newline at end of file diff --git a/src/views/common.component.scss b/src/views/common.component.scss index 1b6da0a..fe707f4 100644 --- a/src/views/common.component.scss +++ b/src/views/common.component.scss @@ -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 { diff --git a/src/views/estimate/publicityResumption/publicityResumption.component.html b/src/views/estimate/publicityResumption/publicityResumption.component.html index 0e44d01..3734842 100644 --- a/src/views/estimate/publicityResumption/publicityResumption.component.html +++ b/src/views/estimate/publicityResumption/publicityResumption.component.html @@ -5,7 +5,7 @@ :full-btn="false" @change="change" btn-position="end">
- diff --git a/src/views/estimate/publicityResumption/publicityResumption.component.vue b/src/views/estimate/publicityResumption/publicityResumption.component.vue index 99583fd..c2255ba 100644 --- a/src/views/estimate/publicityResumption/publicityResumption.component.vue +++ b/src/views/estimate/publicityResumption/publicityResumption.component.vue @@ -39,11 +39,13 @@ export default class PublicityResumption extends BaseRecordComponent { public updateParams = {} as any; public reportTable = { - detail:[] + detail: [] } as any; public selectData = []; + public summary = false; + public isReadonly = false; public hideOperate = true; @@ -160,7 +162,7 @@ export default class PublicityResumption extends BaseRecordComponent { public callback(data, type) { if (type) { - if (type === 'pageSize' || type === 'pageNum') { + if (type === 'pageSize' || type === 'pageNum') { this.params[type] = data; } this.getTableData(); @@ -194,7 +196,7 @@ export default class PublicityResumption extends BaseRecordComponent { if (res.data) { this.reportTable = res.data as any; } - + this.summary = true; }) } // 重置数据 diff --git a/src/views/hiddenDanger/manager.component.vue b/src/views/hiddenDanger/manager.component.vue index 02e8d22..2fea19a 100644 --- a/src/views/hiddenDanger/manager.component.vue +++ b/src/views/hiddenDanger/manager.component.vue @@ -124,7 +124,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent { if (data.taskInfo.processStatus === 2) { return `中断` - } else if(data.taskInfo.processStatus === 3){ + } else if (data.taskInfo.processStatus === 3) { return `作废` - } else if(data.taskInfo.processStatus === 4){ + } else if (data.taskInfo.processStatus === 4) { return `结束` } else { return `${this.statusMap[data.status]}` @@ -705,7 +705,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent data.reportTime || "--" }); this.tableColumn.push({ name: '隐患标题', width: "150", render: (data) => { - if (this.params.type === 1 ) { + if (this.params.type === 1) { return `${data.title || '未命名'}` } else { return data.title @@ -750,7 +750,6 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent { @@ -1001,6 +999,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent