修改样式
This commit is contained in:
@@ -516,14 +516,6 @@
|
|||||||
ref="formTongGuo"
|
ref="formTongGuo"
|
||||||
:model="formTongGuo"
|
:model="formTongGuo"
|
||||||
:rules="rules">
|
:rules="rules">
|
||||||
<el-form-item
|
|
||||||
prop="approvalOpinion"
|
|
||||||
>
|
|
||||||
<el-select @change="getRule" v-model="formTongGuo.approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">
|
|
||||||
<el-option label="驳回" value="1"></el-option>
|
|
||||||
<el-option label="通过" value="0"></el-option>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item
|
<el-form-item
|
||||||
prop="commentText"
|
prop="commentText"
|
||||||
>
|
>
|
||||||
@@ -557,7 +549,8 @@
|
|||||||
<h4>责任人</h4>
|
<h4>责任人</h4>
|
||||||
<div style="margin-top: 10px;width: 300px;">
|
<div style="margin-top: 10px;width: 300px;">
|
||||||
<el-input v-model="user2" placeholder="选择责任人">
|
<el-input v-model="user2" placeholder="选择责任人">
|
||||||
</el-input></div>
|
</el-input>
|
||||||
|
</div>
|
||||||
</el-card>
|
</el-card>
|
||||||
</el-timeline-item>
|
</el-timeline-item>
|
||||||
<el-timeline-item timestamp="填写意见" placement="top" :color="user3 ? '#66b1ff' : ''">
|
<el-timeline-item timestamp="填写意见" placement="top" :color="user3 ? '#66b1ff' : ''">
|
||||||
@@ -661,10 +654,12 @@
|
|||||||
:show-save="false"
|
:show-save="false"
|
||||||
show-submit
|
show-submit
|
||||||
show-transfer
|
show-transfer
|
||||||
|
show-back
|
||||||
:submitLoading="isSubmit"
|
:submitLoading="isSubmit"
|
||||||
:saveLoading="saveLoading"
|
:saveLoading="saveLoading"
|
||||||
@transfer="handleTransfer"
|
@transfer="handleTransfer"
|
||||||
@save="handleSave"
|
@save="handleSave"
|
||||||
|
@back="handleSubmitNo"
|
||||||
@submit="handleSubmit"
|
@submit="handleSubmit"
|
||||||
>
|
>
|
||||||
</ProcessFooter>
|
</ProcessFooter>
|
||||||
@@ -686,6 +681,7 @@
|
|||||||
import ProcessTitle from '../../components/ProcessTitle'
|
import ProcessTitle from '../../components/ProcessTitle'
|
||||||
import {inboundLiaisonDetail, processCreateStand, changeAssigneeNew} from 'api/process'
|
import {inboundLiaisonDetail, processCreateStand, changeAssigneeNew} from 'api/process'
|
||||||
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
|
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
|
||||||
|
import {completeTask} from "@/api/process";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "bzrkStep2",
|
name: "bzrkStep2",
|
||||||
@@ -977,7 +973,8 @@
|
|||||||
_this: this
|
_this: this
|
||||||
}, res => {
|
}, res => {
|
||||||
this.detailData = res
|
this.detailData = res
|
||||||
}, e => {})
|
}, e => {
|
||||||
|
})
|
||||||
},
|
},
|
||||||
getData() {
|
getData() {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
@@ -1048,7 +1045,41 @@
|
|||||||
this.drawerModal = true
|
this.drawerModal = true
|
||||||
this.drawerTitle = '转办处理人'
|
this.drawerTitle = '转办处理人'
|
||||||
},
|
},
|
||||||
handleSave() {},
|
handleSave() {
|
||||||
|
},
|
||||||
|
// 退回按钮
|
||||||
|
handleSubmitNo() {
|
||||||
|
const val = this.form.country;
|
||||||
|
if (val !== '' && val !== null && typeof (val) !== 'undefined') {
|
||||||
|
if (val instanceof Array) {
|
||||||
|
this.form.country = val.join(",");
|
||||||
|
} else {
|
||||||
|
this.form.country = val
|
||||||
|
}
|
||||||
|
} else if (val === '') {
|
||||||
|
this.form.country = []
|
||||||
|
}
|
||||||
|
this.$refs['formTongGuo'].validate((valid) => {
|
||||||
|
if (valid) {
|
||||||
|
this.form.commentText = this.formTongGuo.commentText
|
||||||
|
this.form.approvalOpinion = '1'
|
||||||
|
const json = JSON.stringify(this.form);
|
||||||
|
this.$http.post('lawss/activiti/completeTask', {
|
||||||
|
taskIds: this.taskIds,
|
||||||
|
userId: this.userId,
|
||||||
|
json: json
|
||||||
|
}, {
|
||||||
|
_this: this
|
||||||
|
}, res => {
|
||||||
|
if (res.success) {
|
||||||
|
this.$message.warning("驳回成功")
|
||||||
|
// 流程提交之后,应该流转至待办任务页面
|
||||||
|
this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
handleSubmit() {
|
handleSubmit() {
|
||||||
const val = this.form.country;
|
const val = this.form.country;
|
||||||
if (val !== '' && val !== null && typeof (val) !== 'undefined') {
|
if (val !== '' && val !== null && typeof (val) !== 'undefined') {
|
||||||
@@ -1064,7 +1095,7 @@
|
|||||||
if (valid) {
|
if (valid) {
|
||||||
this.isSubmit = true
|
this.isSubmit = true
|
||||||
this.form.commentText = this.formTongGuo.commentText
|
this.form.commentText = this.formTongGuo.commentText
|
||||||
this.form.approvalOpinion = this.formTongGuo.approvalOpinion
|
this.form.approvalOpinion = '0'
|
||||||
const json = JSON.stringify(this.form);
|
const json = JSON.stringify(this.form);
|
||||||
this.$http.post('lawss/activiti/completeTask', {
|
this.$http.post('lawss/activiti/completeTask', {
|
||||||
taskIds: this.taskIds,
|
taskIds: this.taskIds,
|
||||||
@@ -1073,19 +1104,12 @@
|
|||||||
}, {
|
}, {
|
||||||
_this: this
|
_this: this
|
||||||
}, res => {
|
}, res => {
|
||||||
console.log(res);
|
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
if(this.formTongGuo.approvalOpinion === '1'){
|
|
||||||
this.$message.warning("驳回成功")
|
|
||||||
this.isSubmit = false
|
|
||||||
// 流程提交之后,应该流转至待办任务页面
|
|
||||||
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
|
|
||||||
}else{
|
|
||||||
this.processCreateStand(json)
|
this.processCreateStand(json)
|
||||||
}
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}})
|
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1147,6 +1171,7 @@
|
|||||||
|
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
@import '~@/assets/styles/style';
|
@import '~@/assets/styles/style';
|
||||||
|
|
||||||
.bzrkStep2 {
|
.bzrkStep2 {
|
||||||
/deep/ .el-drawer__container {
|
/deep/ .el-drawer__container {
|
||||||
.prc-content-border {
|
.prc-content-border {
|
||||||
@@ -1154,8 +1179,10 @@
|
|||||||
padding: 0 20px 0;
|
padding: 0 20px 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
position: relative;
|
position: relative;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
|
||||||
.headerTabs {
|
.headerTabs {
|
||||||
height: 52px;
|
height: 52px;
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -1163,6 +1190,7 @@
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
right: 10px;
|
right: 10px;
|
||||||
|
|
||||||
.headerTabsItem {
|
.headerTabsItem {
|
||||||
border: 1px solid #c1c1c1;
|
border: 1px solid #c1c1c1;
|
||||||
padding: 0 5px;
|
padding: 0 5px;
|
||||||
@@ -1170,18 +1198,21 @@
|
|||||||
line-height: 30px;
|
line-height: 30px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.active {
|
.active {
|
||||||
border: 1px solid #E6A23C;
|
border: 1px solid #E6A23C;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
background: #E6A23C;
|
background: #E6A23C;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.content {
|
.content {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
height: calc(~'100% - 103px');
|
height: calc(~'100% - 103px');
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
|
|
||||||
.tableTitle {
|
.tableTitle {
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
height: 30px;
|
height: 30px;
|
||||||
@@ -1189,6 +1220,7 @@
|
|||||||
position: relative;
|
position: relative;
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
|
|
||||||
.tableButton {
|
.tableButton {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 0;
|
right: 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user