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 @@ @@ -39,8 +39,8 @@
39 </template> 39 </template>
40 <template #tools="{scope}" > 40 <template #tools="{scope}" >
41 <div class="apply-btn"> 41 <div class="apply-btn">
42 - <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>  
43 - <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> 42 + <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>
  43 + <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>
44 </div> 44 </div>
45 45
46 </template> 46 </template>
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 <!--新增编辑弹框--> 52 <!--新增编辑弹框-->
53 <cm-dialog :title="dialog.title" :showDialogVisible="dialog.show" @hidedialog="hideDialog" :showFooter="false"> 53 <cm-dialog :title="dialog.title" :showDialogVisible="dialog.show" @hidedialog="hideDialog" :showFooter="false">
54 <template v-slot> 54 <template v-slot>
55 - <alarmsClearEditor v-if="dialog.show" :isExamine="true" @saveback='saveback' :status="dialog.amStatus" :amId="dialog.amId" :alarmId="dialog.alarmId"/> 55 + <alarmsClearEditor v-if="dialog.show" :isExamine="true" @saveback='saveback' :isView="isView" :status="dialog.amStatus" :amId="dialog.amId" :alarmId="dialog.alarmId"/>
56 </template> 56 </template>
57 </cm-dialog> 57 </cm-dialog>
58 58
@@ -12,6 +12,7 @@ export default { @@ -12,6 +12,7 @@ export default {
12 props:[], 12 props:[],
13 setup(props, {attrs, slots, emit}){ 13 setup(props, {attrs, slots, emit}){
14 const {proxy} = Vue.getCurrentInstance(); 14 const {proxy} = Vue.getCurrentInstance();
  15 + let isView=Vue.ref(false);
15 let height = Vue.ref(window.innerHeight); 16 let height = Vue.ref(window.innerHeight);
16 let search = Vue.ref({ 17 let search = Vue.ref({
17 status:1, 18 status:1,
@@ -115,7 +116,8 @@ export default { @@ -115,7 +116,8 @@ export default {
115 } 116 }
116 117
117 // 处理弹框 118 // 处理弹框
118 - let handle = (row) =>{ 119 + let handle = (row,flag) =>{
  120 + isView.value=flag;
119 hideDialog(true); 121 hideDialog(true);
120 dialog.value.amId = row.id; 122 dialog.value.amId = row.id;
121 dialog.value.amStatus = row.status; 123 dialog.value.amStatus = row.status;
@@ -143,7 +145,8 @@ export default { @@ -143,7 +145,8 @@ export default {
143 getDataList, 145 getDataList,
144 handle, 146 handle,
145 saveback, 147 saveback,
146 - statusVal 148 + statusVal,
  149 + isView
147 } 150 }
148 } 151 }
149 152
@@ -124,8 +124,8 @@ @@ -124,8 +124,8 @@
124 <span class="title-handle-per" v-if="!isExamine || status==0">时间：{{dateTime}}</span> 124 <span class="title-handle-per" v-if="!isExamine || status==0">时间：{{dateTime}}</span>
125 <span class="title-handle-per" v-if="status==3">时间：{{handleInfoObj.managetime}}</span> 125 <span class="title-handle-per" v-if="status==3">时间：{{handleInfoObj.managetime}}</span>
126 </div> 126 </div>
127 - <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>  
128 - <div class="editor_detail" v-if="isExamine && ((status==3 && approverName==loginName) || status==2 || status==1)" > 127 + <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>
  128 + <div class="editor_detail" v-if="(isView || status==1) && isExamine && ((status==3 && approverName==loginName) || status==2 || status==1)" >
129 <div v-html="handleInfoObj.pcontent"></div> 129 <div v-html="handleInfoObj.pcontent"></div>
130 </div> 130 </div>
131 </div> 131 </div>
@@ -187,10 +187,10 @@ @@ -187,10 +187,10 @@
187 </div> 187 </div>
188 <div class="alarmsClearEditor-btn"> 188 <div class="alarmsClearEditor-btn">
189 <el-button type="primary" @click="saveDetail(0)" v-if="!isExamine" size="small">存为草稿</el-button> 189 <el-button type="primary" @click="saveDetail(0)" v-if="!isExamine" size="small">存为草稿</el-button>
190 - <el-button type="primary" @click="saveDetail(1)" v-if="!isExamine || status==0 || (status==3 && handleInfoObj.managename==loginName)" size="small">确认</el-button> 190 + <el-button type="primary" @click="saveDetail(1)" v-if="!isExamine || status==0 || (status==3 && !isView && handleInfoObj.managename==loginName)" size="small">确认</el-button>
191 {{amStatus}} 191 {{amStatus}}
192 - <el-button type="primary" @click="saveDetail(2)" v-if="isExamine && status==1 && approverName==loginName" size="small">通过</el-button>  
193 - <el-button type="primary" @click="saveDetail(3)" v-if="isExamine && status==1 && approverName==loginName" size="small">不通过</el-button> 192 + <el-button type="primary" @click="saveDetail(2)" v-if="isExamine && status==1 && approverName==loginName && !isView" size="small">通过</el-button>
  193 + <el-button type="primary" @click="saveDetail(3)" v-if="isExamine && status==1 && approverName==loginName && !isView" size="small">不通过</el-button>
194 <el-button @click="cancleBtn(0)" size="small">取消</el-button> 194 <el-button @click="cancleBtn(0)" size="small">取消</el-button>
195 </div> 195 </div>
196 <cm-userright title="审批人(不支持多人，多选默认取第一个人)" :titles="titles" :buttonTexts="buttonTexts" :showRole="false" :showGroup="false" :showDialogVisible="showUserDialogVisible" :selectedArr="userFileRight" :userArr="userList" :isUser="false" :showOrg="false" @callback="selectUser" 196 <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 { @@ -20,6 +20,11 @@ export default {
20 alarmId:{ 20 alarmId:{
21 type:String, 21 type:String,
22 default:'' 22 default:''
  23 + },
  24 + //查看/处理
  25 + isView:{
  26 + type: Boolean,
  27 + default: false
23 } 28 }
24 }, 29 },
25 data () { 30 data () {
@@ -452,8 +457,12 @@ export default { @@ -452,8 +457,12 @@ export default {
452 reason.value=handleInfoObj.value.reason; 457 reason.value=handleInfoObj.value.reason;
453 noticeFlag.value=handleInfoObj.value.noticeFlag==1?true:false; 458 noticeFlag.value=handleInfoObj.value.noticeFlag==1?true:false;
454 repositoryInto.value=handleInfoObj.value.repositoryinto==1?true:false; 459 repositoryInto.value=handleInfoObj.value.repositoryinto==1?true:false;
455 - detail.value=handleInfoObj.value.pcontent;  
456 - repositoryInfo.value=handleInfoObj.value.pcontent; 460 + setTimeout(function (){
  461 + detail.value=handleInfoObj.value.pcontent;
  462 +
  463 + repositoryInfo.value=handleInfoObj.value.pcontent;
  464 +
  465 + },300)
457 opinion.value=props.status==1?'':handleInfoObj.value.opinion; 466 opinion.value=props.status==1?'':handleInfoObj.value.opinion;
458 approverLabel.value=handleInfoObj.value.approverName; 467 approverLabel.value=handleInfoObj.value.approverName;
459 approverName.value=handleInfoObj.value.approver; 468 approverName.value=handleInfoObj.value.approver;