|
|
@@ -51,13 +51,35 @@
|
|
|
</form>
|
|
|
<div class="vongi-slot">
|
|
|
|
|
|
- </div>
|
|
|
- <div v-if="actionSp" class="fyy-scon-botton">
|
|
|
+
|
|
|
+
|
|
|
+ <div v-if="actionSp&&actionType" class="fyy-scon-botton">
|
|
|
+ <div class="examine-btn examine-btn1" @click="openFrom('2')">拒绝</div>
|
|
|
+ <div class="examine-btn examine-btn2" @click="openFromStep('1')">通过并指派下一级</div>
|
|
|
+ </div>
|
|
|
+ <div v-if="actionSp&&actionType" class="fyy-scon-botton">
|
|
|
+ <div class="examine-btn examine-btn2" @click="openFrom('1')">终审通过</div>
|
|
|
+ </div>
|
|
|
+
|
|
|
+ <div v-if="actionSp&&!actionType" class="fyy-scon-botton">
|
|
|
<div class="examine-btn examine-btn1" @click="openFrom('2')">拒绝</div>
|
|
|
<div class="examine-btn examine-btn2" @click="openFrom('1')">通过</div>
|
|
|
</div>
|
|
|
+ <div v-if="actionSp&&!actionType" class="fyy-scon-botton">
|
|
|
+ <div class="examine-btn examine-btn2" style="background:#ff9800" @click="openFromStep2('1')">指派下一级</div>
|
|
|
+
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+
|
|
|
<div class="mui-content vongi-wordcard" v-if="list" style=" background-color: #ffffff;margin-top: 10px; padding-top: 0px;">
|
|
|
- <examineDetail :edit="false" :list="list" ></examineDetail>
|
|
|
+ <examineDetail :edit="false"
|
|
|
+ :update="actionSpUpdate"
|
|
|
+ ref="examineDetailObj"
|
|
|
+
|
|
|
+ :view="detail.docStatus==0&&actionSp"
|
|
|
+ @getinfo="doActionAsynCallBack"
|
|
|
+ @updateinfo="getDetail"
|
|
|
+ :list="list" ></examineDetail>
|
|
|
</div>
|
|
|
|
|
|
|
|
|
@@ -119,7 +141,9 @@ import * as API from '@/apis/Oa/doc'
|
|
|
opinion: '',
|
|
|
status: ''
|
|
|
},
|
|
|
+ actionSpUpdate:false,
|
|
|
actionSp:false,
|
|
|
+ actionType:true,
|
|
|
textList:[
|
|
|
[],
|
|
|
[//工程合同会签申请单
|
|
|
@@ -145,7 +169,7 @@ import * as API from '@/apis/Oa/doc'
|
|
|
status: ['待审核', '已通过', '未通过', '已撤销'],
|
|
|
// status: ['待审核', '已批准', '已拒绝','已撤销'],
|
|
|
statusColor: ['mui-btn-warning', 'mui-btn-success', 'mui-btn-danger',''],
|
|
|
-
|
|
|
+ spstep:false,
|
|
|
|
|
|
}
|
|
|
},
|
|
|
@@ -165,31 +189,64 @@ import * as API from '@/apis/Oa/doc'
|
|
|
}
|
|
|
return 'color:' + color + ';border-color:' + color + ';';
|
|
|
},
|
|
|
+ getDetailInfo(){
|
|
|
+ this.getDetail()
|
|
|
+ this.selectIdList = [this.id];
|
|
|
+ if (!this.selectIdList.length) {
|
|
|
+ mui.toast('请选择要处理的信息');
|
|
|
+ } else {
|
|
|
+ this.subForm.status = 1;
|
|
|
+ this.subForm.opinion = '同意';
|
|
|
+ this.openFromVisible = true;
|
|
|
+ //直接点击处理，不需要弹窗理由框,又需要弹窗理由框了
|
|
|
+ //this.doAction();
|
|
|
+ }
|
|
|
+ },
|
|
|
//获取详情
|
|
|
getDetail() {
|
|
|
this.isLoading = true;
|
|
|
this.actionSp=false;
|
|
|
+ this.actionType=true;
|
|
|
+ this.actionSpUpdate=false;
|
|
|
this.list=null;
|
|
|
API.edit( this.id).then(response => {
|
|
|
this.detail = response.masterFile;
|
|
|
this.list=response
|
|
|
var list= response.examineStepDTOList
|
|
|
+ var oldobj={};
|
|
|
for(var i in list){
|
|
|
var obj=list[i];
|
|
|
|
|
|
if(obj.examineStep.examineStatus==1&&this.detail.docStatus==0){
|
|
|
|
|
|
+ if(obj.examineStep.examineType=="and"){
|
|
|
+ this.actionType=false;
|
|
|
+ }
|
|
|
var sz=obj.stepPersonList
|
|
|
for(var j in sz){
|
|
|
var obk=sz[j];
|
|
|
if(obk.status==0&&obk.personId==this.person_data.id){
|
|
|
+
|
|
|
this.actionSp=true;
|
|
|
+ this.actionSpUpdate=true
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(oldobj.stepPersonList){
|
|
|
+ sz=oldobj.stepPersonList
|
|
|
+ for(var j in sz){
|
|
|
+ var obk=sz[j];
|
|
|
+ if(obk.personId==this.person_data.id){
|
|
|
+
|
|
|
+ this.actionSpUpdate=true
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
+ oldobj=obj;
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -201,6 +258,7 @@ import * as API from '@/apis/Oa/doc'
|
|
|
},
|
|
|
//显示内容表单
|
|
|
openFrom(status) {
|
|
|
+ this.spstep=false;
|
|
|
this.selectIdList = [this.id];
|
|
|
if (!this.selectIdList.length) {
|
|
|
mui.toast('请选择要处理的信息');
|
|
|
@@ -212,18 +270,41 @@ import * as API from '@/apis/Oa/doc'
|
|
|
//this.doAction();
|
|
|
}
|
|
|
},
|
|
|
- //检测表单
|
|
|
- checkForm() {
|
|
|
- return true;
|
|
|
+ openFromStep() {
|
|
|
+ this.spstep=true;
|
|
|
+ this.subForm.status = 1;
|
|
|
+ this.subForm.opinion = '同意';
|
|
|
+ this.openFromVisible = true;
|
|
|
+
|
|
|
+ },
|
|
|
+ openFromStep2() {
|
|
|
+ this.$refs.examineDetailObj.openFromStep()
|
|
|
+ },
|
|
|
+ //同意拒绝
|
|
|
+ doActionAsynCallBack() {
|
|
|
+ if(this.actionType){
|
|
|
+ //指派+审批通过
|
|
|
+ this.spstep=false;
|
|
|
+ this.doAction()
|
|
|
+ }else{
|
|
|
+ //指派
|
|
|
+ this.getDetail();
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
},
|
|
|
//同意拒绝
|
|
|
doAction() {
|
|
|
- this.subForm.masterFileId = this.id;
|
|
|
- if (this.checkForm()) {
|
|
|
+
|
|
|
+ if(this.spstep){
|
|
|
+ this.$refs.examineDetailObj.openFromStep()
|
|
|
+ this.openFromVisible = false;
|
|
|
+ }else{
|
|
|
+ this.subForm.masterFileId = this.id;
|
|
|
this.isLoading = true;
|
|
|
API.checkSubmit(this.subForm).then(response => {
|
|
|
this.isLoading = false;
|
|
|
-
|
|
|
+
|
|
|
this.openFromVisible = false;
|
|
|
this.getDetail();
|
|
|
}).catch(error => {
|
|
|
@@ -231,6 +312,8 @@ import * as API from '@/apis/Oa/doc'
|
|
|
mui.toast(error);
|
|
|
})
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
},
|
|
|
asynCallBack() {
|
|
|
|
zhengkaixin