diff --git a/src/views/userCenter/processCenter.vue b/src/views/userCenter/processCenter.vue
index bf7d14d..2145ebb 100644
--- a/src/views/userCenter/processCenter.vue
+++ b/src/views/userCenter/processCenter.vue
@@ -34,23 +34,23 @@
批量同意
- 批量不同意
+ 批量不同意
-
+
- 审批意见:
+ 审核意见:
@@ -76,11 +76,11 @@ import tabs from '../userCenter/processCenter/tabs.vue'
},
data() {
return {
- approveForm:{},
+ approveForm:{approvalOpinion:''},
approveFormRules:{
approvalOpinion:[{
required:true,
- message:'请填写审批意见'
+ message:'请填写审核意见'
}]
},
dialogVisible:false,
@@ -89,6 +89,7 @@ import tabs from '../userCenter/processCenter/tabs.vue'
prcName:''
},
checkList:[],
+ flag:1,//是不是同意
isShowbtn:this.$store.getters.activeTab =='' || this.$store.getters.activeTab =='first'
}
},
@@ -111,7 +112,7 @@ import tabs from '../userCenter/processCenter/tabs.vue'
this.$refs.examineForm.validate(v=>{
if(v){
this.checkList= this.checkList.map(item=>{
- item.flag=2
+ item.flag= this.flag
item.approvalOpinion = this.approveForm.approvalOpinion
return item
})
@@ -122,11 +123,13 @@ import tabs from '../userCenter/processCenter/tabs.vue'
})
},
allAgree(type){
+ this.approveForm.approvalOpinion=''
if(this.checkList.length>0){
if(type=='no'){
this.dialogVisible=true
+ this.flag=2
}else{
-
+ this.flag=1
}
}else{
this.$message.warning("请至少选择一条数据")
diff --git a/src/views/userCenter/processCenter/finishProcess.vue b/src/views/userCenter/processCenter/finishProcess.vue
index 02d4fec..20604ac 100644
--- a/src/views/userCenter/processCenter/finishProcess.vue
+++ b/src/views/userCenter/processCenter/finishProcess.vue
@@ -12,14 +12,9 @@
{{row.prcNum}}
-
-
- {{getPrcName(row.prcType)}}
-
-
-
+
+
{{row.prcName}}
@@ -31,8 +26,14 @@
title="上一处理人">
-
+ title="完成日期">
+
+
+ {{getPrcName(row.prcType)}}
+
+
+
未完成
已完成
diff --git a/src/views/userCenter/processCenter/gencyProcess.vue b/src/views/userCenter/processCenter/gencyProcess.vue
index f4327fe..444475d 100644
--- a/src/views/userCenter/processCenter/gencyProcess.vue
+++ b/src/views/userCenter/processCenter/gencyProcess.vue
@@ -17,22 +17,33 @@
{{row.prcNum}}
+
+
+ {{row.prcName}}
+
+
{{getPrcName(row.prcType)}}
-
-
- {{row.prcName}}
-
+
+
+
+
+
+ 同意
+
+
+ 不同意
+
办理
@@ -43,6 +54,28 @@
:page-sizes="[5, 10, 20]" :page-size="q.size" layout="total, sizes, prev, pager, next, jumper"
:total="total" />
+
+
+
+ 审核意见:
+
+
+
+
+
+ 取消
+ 确定
+
+
@@ -53,6 +86,14 @@ export default {
mixins:[ProcessMixin],
data() {
return {
+ approveForm:{approvalOpinion:''},
+ approveFormRules:{
+ approvalOpinion:[{
+ required:true,
+ message:'请填写审核意见'
+ }]
+ },
+ dialogVisible:false,
q:{
current:1,
size:10
@@ -60,7 +101,8 @@ export default {
total: 0,
tableData: [],
checkList:[],
- checkIds:[]
+ checkIds:[],
+ flag:1
};
},
props:{
@@ -83,6 +125,33 @@ export default {
this.loadData()
},
methods: {
+ cancel(){
+ this.dialogVisible=false
+ },
+ submitForm(){
+ this.$refs.examineForm.validate(v=>{
+ if(v){
+ this.checkList= this.checkList.map(item=>{
+ item.flag=this.flag
+ item.approvalOpinion = this.approveForm.approvalOpinion
+ return item
+ })
+ this.completeProcess(this.checkList).then(res=>{
+
+ })
+ }
+ })
+ },
+ handleSubmit(row,flag){
+ this.approveForm.approvalOpinion=''
+ if(flag=='no'){
+ this.flag=2
+ this.dialogVisible=true
+ }else{
+ this.flag=1
+ }
+
+ },
selectAllEvent({checked}) {
const records = this.$refs.xTable.getCheckboxRecords()
this.checkList = records
diff --git a/src/views/userCenter/processCenter/monitorProcesses.vue b/src/views/userCenter/processCenter/monitorProcesses.vue
index 2561a44..8d4ea88 100644
--- a/src/views/userCenter/processCenter/monitorProcesses.vue
+++ b/src/views/userCenter/processCenter/monitorProcesses.vue
@@ -13,13 +13,8 @@
{{row.prcNum}}
-
-
- {{getPrcName(row.prcType)}}
-
-
-
+
+
{{row.prcName}}
@@ -31,8 +26,14 @@
title="上一处理人">
-
+ title="完成日期">
+
+
+ {{getPrcName(row.prcType)}}
+
+
+
未完成
已完成
diff --git a/src/views/userCenter/processCenter/sentProcess.vue b/src/views/userCenter/processCenter/sentProcess.vue
index f7011bc..5c9fac8 100644
--- a/src/views/userCenter/processCenter/sentProcess.vue
+++ b/src/views/userCenter/processCenter/sentProcess.vue
@@ -14,14 +14,8 @@
{{row.prcNum}}
-
-
- {{getPrcName(row.prcType)}}
-
-
-
+
{{row.prcName}}
@@ -33,8 +27,14 @@
title="上一处理人">
-
+ title="完成日期">
+
+
+ {{getPrcName(row.prcType)}}
+
+
+
未完成
已完成
diff --git a/src/views/userCenter/processCenter/taskDraft.vue b/src/views/userCenter/processCenter/taskDraft.vue
index 09dd668..b3af6c5 100644
--- a/src/views/userCenter/processCenter/taskDraft.vue
+++ b/src/views/userCenter/processCenter/taskDraft.vue
@@ -19,7 +19,7 @@
{{getPrcName(row.prcType)}}
-
+
{{row.prcName}}