修改流程
This commit is contained in:
@@ -97,6 +97,15 @@
|
|||||||
v-if="showOver3"
|
v-if="showOver3"
|
||||||
>驳回</el-button>
|
>驳回</el-button>
|
||||||
</el-popover>
|
</el-popover>
|
||||||
|
<el-button
|
||||||
|
type="primary"
|
||||||
|
size="small"
|
||||||
|
class="common-button-primary"
|
||||||
|
icon="el-icon-check"
|
||||||
|
@click="handleReceive"
|
||||||
|
:loading="submitLoading"
|
||||||
|
v-if="showReceive"
|
||||||
|
>接收任务</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
type="danger"
|
type="danger"
|
||||||
size="small"
|
size="small"
|
||||||
@@ -215,6 +224,10 @@ export default {
|
|||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: false
|
||||||
},
|
},
|
||||||
|
showReceive: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false
|
||||||
|
},
|
||||||
visible: {
|
visible: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: false
|
||||||
@@ -383,6 +396,9 @@ export default {
|
|||||||
handleSubmit() {
|
handleSubmit() {
|
||||||
this.$emit('submit')
|
this.$emit('submit')
|
||||||
},
|
},
|
||||||
|
handleReceive() {
|
||||||
|
this.$emit('receive')
|
||||||
|
},
|
||||||
handleAccept() {
|
handleAccept() {
|
||||||
this.$emit('accept')
|
this.$emit('accept')
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -695,11 +695,11 @@
|
|||||||
v-show="verifySarStandard && !disabledXX"
|
v-show="verifySarStandard && !disabledXX"
|
||||||
show-save
|
show-save
|
||||||
show-submit
|
show-submit
|
||||||
show-confirm
|
show-receive
|
||||||
:submitLoading="isSubmit"
|
:submitLoading="isSubmit"
|
||||||
:saveLoading="saveLoading"
|
:saveLoading="saveLoading"
|
||||||
@save="handleSave"
|
@save="handleSave"
|
||||||
@accept="handleAccept"
|
@receive="handleReceive"
|
||||||
@submit="handleSubmit"
|
@submit="handleSubmit"
|
||||||
>
|
>
|
||||||
</ProcessFooter>
|
</ProcessFooter>
|
||||||
@@ -1421,6 +1421,7 @@ export default {
|
|||||||
zrIndex: '',
|
zrIndex: '',
|
||||||
zrIdList: [],
|
zrIdList: [],
|
||||||
type: '',
|
type: '',
|
||||||
|
taskType:'',
|
||||||
defaultUserProps: {
|
defaultUserProps: {
|
||||||
children: 'children',
|
children: 'children',
|
||||||
label: 'name'
|
label: 'name'
|
||||||
@@ -3059,7 +3060,7 @@ export default {
|
|||||||
return arr;
|
return arr;
|
||||||
},
|
},
|
||||||
// 接受按钮
|
// 接受按钮
|
||||||
handleAccept(){
|
handleReceive(){
|
||||||
this.isSubmit = true
|
this.isSubmit = true
|
||||||
execTask({
|
execTask({
|
||||||
todoId: this.todoId // 当前节点ID
|
todoId: this.todoId // 当前节点ID
|
||||||
@@ -3097,6 +3098,7 @@ export default {
|
|||||||
json.zrUserId = this.form.zrUserId
|
json.zrUserId = this.form.zrUserId
|
||||||
json.jlUserId = this.form.jlUserId
|
json.jlUserId = this.form.jlUserId
|
||||||
json.commentText = this.commentText
|
json.commentText = this.commentText
|
||||||
|
json.type = this.taskType
|
||||||
json.applyUpdUserId = this.form.applyUpdUserId
|
json.applyUpdUserId = this.form.applyUpdUserId
|
||||||
json.prcCreateUser = this.form.prcCreateUser
|
json.prcCreateUser = this.form.prcCreateUser
|
||||||
json.prcCreateUserName = this.form.prcCreateUserName
|
json.prcCreateUserName = this.form.prcCreateUserName
|
||||||
@@ -3214,6 +3216,7 @@ export default {
|
|||||||
const processForm = JSON.parse(res.mesg)
|
const processForm = JSON.parse(res.mesg)
|
||||||
this.todoId = res.id
|
this.todoId = res.id
|
||||||
this.form.reviseStatus = processForm.reviseStatus
|
this.form.reviseStatus = processForm.reviseStatus
|
||||||
|
this.taskType = processForm.type
|
||||||
}
|
}
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1220,7 +1220,9 @@
|
|||||||
tips = '添加'
|
tips = '添加'
|
||||||
}
|
}
|
||||||
let arr = JSON.parse(JSON.stringify(this.addForm))
|
let arr = JSON.parse(JSON.stringify(this.addForm))
|
||||||
|
this.addForm.unitName = arr.unitName
|
||||||
arr.area = arr.area.join(',')
|
arr.area = arr.area.join(',')
|
||||||
|
this.addForm = {...this.addForm}
|
||||||
this.$http.post(url, this.addForm, {
|
this.$http.post(url, this.addForm, {
|
||||||
_this: this
|
_this: this
|
||||||
}, res => {
|
}, res => {
|
||||||
|
|||||||
Reference in New Issue
Block a user