guangyin
/
hbt-prevention-ui
forked from xxhjsb/hbt-prevention-ui
1
0
Fork 0
Code Pull Requests Activity

feat:流程按钮调整

feature1.3
kongyeqing 2024-12-26 17:39:22 +08:00
parent 7033f86921
commit 5a8a50e029
3 changed files with 66 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/views/hiddenDanger/common.component.html
View File

@ -73,21 +73,21 @@
<el-dialog :close-on-click-modal="false" :title="isReadonly?'详情':!updateParams.id?'新增':'编辑'"
:visible.sync="showUpdate" width="980px" :before-close="handleClose" destroy-on-close>
<div class="sub-title" v-if="isManager || isFile">隐患信息</div>
<FormComponent ref="form" :options="updateOptions"
<FormComponent ref="applyForm" :options="updateOptions"
:isReadonly="isReadonly || ((isManager || isFile) && updateParams.status>1)" labelWidth="98px"
labelAlign="right" :data.sync="updateParams" @actionCallback="callback" :actions="updateActions"
:full-btn="true" @change="change" btn-position="center"></FormComponent>
labelAlign="right" :data.sync="updateParams" @actionCallback="callback" :actions="[]" :full-btn="true"
@change="change" btn-position="center"></FormComponent>
<div class="sub-title"
v-if="((isManager || isFile) && updateParams.status>1 && !(updateParams.status===2 && isReadonly))
|| ((isManager || isFile) && updateParams.reformConfirmFlag!==null && updateParams.reformConfirmFlag!==undefined)">隐患确认</div>
<FormComponent
<FormComponent ref="confirmForm"
v-if="(isManager || isFile) && updateParams.status>1 && !(updateParams.status===2 && isReadonly)
|| ((isManager || isFile) && updateParams.reformConfirmFlag!==null && updateParams.reformConfirmFlag!==undefined)"
:options="updateOptions2"
:isReadonly="isReadonly || (isManager && updateParams.status>2)
|| ((isManager || isFile) && updateParams.status!==2 && updateParams.reformConfirmFlag!==null && updateParams.reformConfirmFlag!==undefined)"" labelWidth="
110px" labelAlign="right" :data.sync="updateParams" @actionCallback="callback" :actions="updateActions"
110px" labelAlign="right" :data.sync="updateParams" @actionCallback="callback" :actions="[]"
:full-btn="true" @change="change" btn-position="center"></FormComponent>
@ -95,27 +95,34 @@
v-if="((isManager || isFile) && updateParams.status>2 && !(updateParams.status===3 && isReadonly))
|| ((isManager || isFile) && updateParams.executeConfirmFlag!==null && updateParams.executeConfirmFlag!==undefined)">隐患整改
</div>
<FormComponent
<FormComponent ref="administerForm"
v-if="((isManager || isFile) && updateParams.status>2 && !(updateParams.status===3 && isReadonly))
|| ((isManager || isFile) && updateParams.executeConfirmFlag!==null && updateParams.executeConfirmFlag!==undefined)"
:options="updateOptions3"
:isReadonly="isReadonly || (isManager && updateParams.status>3)
|| ((isManager || isFile) && updateParams.status!==3 && updateParams.executeConfirmFlag!==null && updateParams.executeConfirmFlag!==undefined)"
labelWidth="110px" labelAlign="right" :data.sync="updateParams" @actionCallback="callback"
:actions="updateActions" :full-btn="true" @change="change" btn-position="center"></FormComponent>
labelWidth="110px" labelAlign="right" :data.sync="updateParams" @actionCallback="callback" :actions="[]"
:full-btn="true" @change="change" btn-position="center"></FormComponent>
<div class="sub-title"
v-if="((isManager || isFile) && updateParams.status>3 && !(updateParams.status===4 && isReadonly))
|| ((isManager || isFile) && updateParams.verifyConfirmFlag!==null && updateParams.verifyConfirmFlag!==undefined)">隐患验证</div>
<FormComponent
<FormComponent ref="checkForm"
v-if="(isManager && updateParams.status>3 && !(updateParams.status===4 && isReadonly))
|| ((isManager || isFile) && updateParams.verifyConfirmFlag!==null && updateParams.verifyConfirmFlag!==undefined)"
:options="updateOptions4"
:isReadonly="isReadonly || (isManager && updateParams.status>4)
|| ((isManager || isFile) && updateParams.status!==4 && updateParams.verifyConfirmFlag!==null && updateParams.verifyConfirmFlag!==undefined)"
labelWidth="110px" labelAlign="right" :data.sync="updateParams" @actionCallback="callback"
:actions="updateActions" :full-btn="true" @change="change" btn-position="center"></FormComponent>
labelWidth="110px" labelAlign="right" :data.sync="updateParams" @actionCallback="callback" :actions="[]"
:full-btn="true" @change="change" btn-position="center"></FormComponent>
<div style="text-align: center;">
<button-list-component v-if="!isReadonly" @callback="buttonCallback($event)" :actions="updateActions"
:full-btn="false" ></button-list-component>
</div>
</el-dialog>

36
src/views/hiddenDanger/manager.component.vue
View File

@ -8,6 +8,7 @@ import WorkFlowService from "@/service/workFlow.service";
import FormOption from "hbt-common/models/formOptions";
import BtnOption from "hbt-common/models/btnOptions";
import MapComponent from "@/components/map.component.vue";
import ButtonListComponent from "hbt-common/components/common/buttonList.component.vue"
import ManagerService from "@/service/manager.service";
import mapboxgl from "mapbox-gl";
import moment from "moment";
@ -17,6 +18,7 @@ import moment from "moment";
FormComponent,
TableComponent,
MapComponent,
ButtonListComponent
},
} as any)
export default class HiddenDangerManagerComponent extends BaseRecordComponent<any> {
@ -1160,6 +1162,34 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
},
};
}
public buttonCallback(action) {
if (action.value.indexOf("submit") >= 0 || action.value.indexOf("save") >= 0) {
let formRef: any;
if (this.updateParams.status === 0 || this.updateParams.status === 1) {
formRef = this.$refs.applyForm;
if (formRef.vaildParams()) {
this.callback(action)
}
}else if(this.updateParams.status === 2){
formRef = this.$refs.confirmForm;
if (formRef.vaildParams()) {
this.callback(action)
}
}else if(this.updateParams.status === 3){
formRef = this.$refs.administerForm;
if (formRef.vaildParams()) {
this.callback(action)
}
}else if(this.updateParams.status === 4){
formRef = this.$refs.checkForm;
if (formRef.vaildParams()) {
this.callback(action)
}
}
} else {
this.callback(action)
}
}
public callback(data, type?) {
if (type) {
@ -1382,7 +1412,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
userIds = [this.updateParams.executeUserId];
} else {
this.updateParams.status -= 1;
handleParams.type = 0;
handleParams.type = 1;
}
this.updateParams.realConfirmTime = moment().format(
"YYYY-MM-DD HH:mm:ss"
@ -1394,7 +1424,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
userIds = [this.updateParams.verifyUserId];
} else {
this.updateParams.status -= 1;
handleParams.type = 0;
handleParams.type = 1;
}
this.updateParams.realExecuteTime = moment().format(
"YYYY-MM-DD HH:mm:ss"
@ -1405,7 +1435,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
this.updateParams.status += 1;
} else {
this.updateParams.status -= 1;
handleParams.type = 0;
handleParams.type = 1;
}
this.updateParams.realVerifyTime = moment().format("YYYY-MM-DD HH:mm:ss");
}

2
src/views/integral/exchange/exchangeFlow/exchange.component.vue
View File

@ -637,7 +637,7 @@ export default class IntegralExchange extends BaseRecordComponent<any> {
} else {
if (this.updateParams.approvalResult === 0) {
this.updateParams.status = 1
tmpParam.type = 0
tmpParam.type = 1
} else if (this.updateParams.approvalResult === 1) {
this.updateParams.status = 3
tmpParam.type = 1