monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit bbde155d39ab3cd6103e0165baf316cbe9b92d26 1 parent 73e1727b

驳回状态下，处理人和审批人都是登录人，处理方案显示调整

Inline Side-by-side
Showing 4 changed files with 24 additions and 12 deletions
... ... @@ -39,8 +39,8 @@
</template>
<template #tools="{scope}" >
<div class="apply-btn">
<el-button v-if="(scope.row.status==1 && scope.row.approver==loginName) || ((scope.row.status==0 || scope.row.status==3) && scope.row.managename==loginName) " @click="handle(scope.row)" size="mini">处理</el-button>
<el-button v-if="(scope.row.status==1 && scope.row.managename==loginName) || scope.row.status==2 || (scope.row.status==3 && scope.row.approver==loginName)" @click="handle(scope.row)" size="mini">查看</el-button>
<el-button v-if="(scope.row.status==1 && scope.row.approver==loginName) || ((scope.row.status==0 || scope.row.status==3) && scope.row.managename==loginName) " @click="handle(scope.row,false)" size="mini">处理</el-button>
<el-button v-if="(scope.row.status==1 && scope.row.managename==loginName) || scope.row.status==2 || (scope.row.status==3 && scope.row.approver==loginName)" @click="handle(scope.row,true)" size="mini">查看</el-button>
</div>
</template>
... ... @@ -52,7 +52,7 @@
<!--新增编辑弹框-->
<cm-dialog :title="dialog.title" :showDialogVisible="dialog.show" @hidedialog="hideDialog" :showFooter="false">
<template v-slot>
<alarmsClearEditor v-if="dialog.show" :isExamine="true" @saveback='saveback' :status="dialog.amStatus" :amId="dialog.amId" :alarmId="dialog.alarmId"/>
<alarmsClearEditor v-if="dialog.show" :isExamine="true" @saveback='saveback' :isView="isView" :status="dialog.amStatus" :amId="dialog.amId" :alarmId="dialog.alarmId"/>
</template>
</cm-dialog>
... ...
... ... @@ -12,6 +12,7 @@ export default {
props:[],
setup(props, {attrs, slots, emit}){
const {proxy} = Vue.getCurrentInstance();
let isView=Vue.ref(false);
let height = Vue.ref(window.innerHeight);
let search = Vue.ref({
status:1,
... ... @@ -115,7 +116,8 @@ export default {
}
// 处理弹框
let handle = (row) =>{
let handle = (row,flag) =>{
isView.value=flag;
hideDialog(true);
dialog.value.amId = row.id;
dialog.value.amStatus = row.status;
... ... @@ -143,7 +145,8 @@ export default {
getDataList,
handle,
saveback,
statusVal
statusVal,
isView
}
}
... ...
... ... @@ -124,8 +124,8 @@
<span class="title-handle-per" v-if="!isExamine || status==0">时间：{{dateTime}}</span>
<span class="title-handle-per" v-if="status==3">时间：{{handleInfoObj.managetime}}</span>
</div>
<cm-wang-editor v-if="!isExamine || status==0 || (status==3 && handleInfoObj.managename==loginName)" v-model="detail" :repositoryInfo="repositoryInfo" :isDisabled="repositoryInto==1?true:false" :isClear="isClear" @change="change" @changetext="changetext"></cm-wang-editor>
<div class="editor_detail" v-if="isExamine && ((status==3 && approverName==loginName) || status==2 || status==1)" >
<cm-wang-editor v-if="!isView && ( !isExamine || status==0 || (status==3 && handleInfoObj.managename==loginName))" v-model="detail" :repositoryInfo="repositoryInfo" :isDisabled="repositoryInto==1?true:false" :isClear="isClear" @change="change" @changetext="changetext"></cm-wang-editor>
<div class="editor_detail" v-if="(isView || status==1) && isExamine && ((status==3 && approverName==loginName) || status==2 || status==1)" >
<div v-html="handleInfoObj.pcontent"></div>
</div>
</div>
... ... @@ -187,10 +187,10 @@
</div>
<div class="alarmsClearEditor-btn">
<el-button type="primary" @click="saveDetail(0)" v-if="!isExamine" size="small">存为草稿</el-button>
<el-button type="primary" @click="saveDetail(1)" v-if="!isExamine || status==0 || (status==3 && handleInfoObj.managename==loginName)" size="small">确认</el-button>
<el-button type="primary" @click="saveDetail(1)" v-if="!isExamine || status==0 || (status==3 && !isView && handleInfoObj.managename==loginName)" size="small">确认</el-button>
{{amStatus}}
<el-button type="primary" @click="saveDetail(2)" v-if="isExamine && status==1 && approverName==loginName" size="small">通过</el-button>
<el-button type="primary" @click="saveDetail(3)" v-if="isExamine && status==1 && approverName==loginName" size="small">不通过</el-button>
<el-button type="primary" @click="saveDetail(2)" v-if="isExamine && status==1 && approverName==loginName && !isView" size="small">通过</el-button>
<el-button type="primary" @click="saveDetail(3)" v-if="isExamine && status==1 && approverName==loginName && !isView" size="small">不通过</el-button>
<el-button @click="cancleBtn(0)" size="small">取消</el-button>
</div>
<cm-userright title="审批人(不支持多人，多选默认取第一个人)" :titles="titles" :buttonTexts="buttonTexts" :showRole="false" :showGroup="false" :showDialogVisible="showUserDialogVisible" :selectedArr="userFileRight" :userArr="userList" :isUser="false" :showOrg="false" @callback="selectUser"
... ...
... ... @@ -20,6 +20,11 @@ export default {
alarmId:{
type:String,
default:''
},
//查看/处理
isView:{
type: Boolean,
default: false
}
},
data () {
... ... @@ -452,8 +457,12 @@ export default {
reason.value=handleInfoObj.value.reason;
noticeFlag.value=handleInfoObj.value.noticeFlag==1?true:false;
repositoryInto.value=handleInfoObj.value.repositoryinto==1?true:false;
detail.value=handleInfoObj.value.pcontent;
repositoryInfo.value=handleInfoObj.value.pcontent;
setTimeout(function (){
detail.value=handleInfoObj.value.pcontent;
repositoryInfo.value=handleInfoObj.value.pcontent;
},300)
opinion.value=props.status==1?'':handleInfoObj.value.opinion;
approverLabel.value=handleInfoObj.value.approverName;
approverName.value=handleInfoObj.value.approver;
... ...