【修改】修改审批历史没有
This commit is contained in:
@@ -63,7 +63,6 @@
|
|||||||
placeholder="请选择一级审批人员"></el-input>
|
placeholder="请选择一级审批人员"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="9">
|
<el-col :span="9">
|
||||||
@@ -340,7 +339,7 @@ export default {
|
|||||||
//如果不是第一次
|
//如果不是第一次
|
||||||
if (this.initShow) {
|
if (this.initShow) {
|
||||||
let dataJson = JSON.stringify(this.tableData)
|
let dataJson = JSON.stringify(this.tableData)
|
||||||
let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid})
|
let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid,approvalOpinion:this.assignForm.remark})
|
||||||
this.completeProcess({
|
this.completeProcess({
|
||||||
dataJson,
|
dataJson,
|
||||||
submitJson,
|
submitJson,
|
||||||
@@ -379,7 +378,7 @@ export default {
|
|||||||
form.userId = this.$store.getters.userInfo.usid
|
form.userId = this.$store.getters.userInfo.usid
|
||||||
//...this.applicationForm,...this.processForm,
|
//...this.applicationForm,...this.processForm,
|
||||||
let dataJson = JSON.stringify(this.tableData)
|
let dataJson = JSON.stringify(this.tableData)
|
||||||
let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid})
|
let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid,approvalOpinion:this.assignForm.remark})
|
||||||
this.$api.process.startProcess(form).then(({data}) => {
|
this.$api.process.startProcess(form).then(({data}) => {
|
||||||
this.completeProcess({dataJson, submitJson, taskId: data.result, userId: form.userId, prcType: this.prcType})
|
this.completeProcess({dataJson, submitJson, taskId: data.result, userId: form.userId, prcType: this.prcType})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -3,13 +3,18 @@
|
|||||||
<el-dialog title="调整处理人" :visible.sync="dialogVisible" width="500px">
|
<el-dialog title="调整处理人" :visible.sync="dialogVisible" width="500px">
|
||||||
<div class="label-input-form addModel">
|
<div class="label-input-form addModel">
|
||||||
<el-form ref="form" :model="form" label-width="120px" :rules="rules" class="formData">
|
<el-form ref="form" :model="form" label-width="120px" :rules="rules" class="formData">
|
||||||
<el-form-item label="选择人员" prop="assignee" class="el-form-item">
|
<!-- <el-form-item label="选择人员" prop="assignee" class="el-form-item">-->
|
||||||
<el-select v-model="form.assignee" class="icon-auth" collapse-tags
|
<!-- <el-select v-model="form.assignee" class="icon-auth" collapse-tags-->
|
||||||
placeholder="请选择">
|
<!-- placeholder="请选择">-->
|
||||||
<template v-for="item in userList">
|
<!-- <template v-for="item in userList">-->
|
||||||
<el-option :label="item.USNAME" :value="item.USID" :key="item.USID"></el-option>
|
<!-- <el-option :label="item.USNAME" :value="item.USID" :key="item.USID"></el-option>-->
|
||||||
</template>
|
<!-- </template>-->
|
||||||
</el-select>
|
<!-- </el-select>-->
|
||||||
|
<!-- </el-form-item>-->
|
||||||
|
<el-form-item label="选择人员:" prop="assignee">
|
||||||
|
<el-input readonly :disabled="diasbleds" v-model="form.assigneeName"
|
||||||
|
@click.native="handleCheck('clr')"
|
||||||
|
placeholder="请选择人员"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
@@ -18,18 +23,31 @@
|
|||||||
<el-button type="primary" @click="submit" class="btn">确 定</el-button>
|
<el-button type="primary" @click="submit" class="btn">确 定</el-button>
|
||||||
</span>
|
</span>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
<orgTable :visible.sync="visibleOrgTable" title="人员列表":config="{
|
||||||
|
value: orgTableVal,
|
||||||
|
valueName: orgTableValName
|
||||||
|
}" dialog-model :workNumFlag="true" :maxSelected="1" @confirm="isTreeOk"></orgTable>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
import orgTable from '@/components/OrgTable'
|
||||||
export default {
|
export default {
|
||||||
name: 'modal',
|
name: 'modal',
|
||||||
|
components:{
|
||||||
|
orgTable
|
||||||
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
orgTableVal:'',
|
||||||
|
orgTableValName:'',
|
||||||
|
diasbleds:false,
|
||||||
|
visibleOrgTable: false,
|
||||||
userList: [],
|
userList: [],
|
||||||
dialogVisible: false,
|
dialogVisible: false,
|
||||||
form: {
|
form: {
|
||||||
assignee: ''
|
assignee: '',
|
||||||
|
assigneeName: ''
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
assignee: [
|
assignee: [
|
||||||
@@ -49,6 +67,22 @@ export default {
|
|||||||
this.sysUserList()
|
this.sysUserList()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
isTreeOk(checkedList){
|
||||||
|
const parts = []
|
||||||
|
const partsName = []
|
||||||
|
console.log(checkedList, '0009999')
|
||||||
|
checkedList.map((item, index) => {
|
||||||
|
parts.push(item.userId || item.USID)
|
||||||
|
partsName.push(item.uname)
|
||||||
|
})
|
||||||
|
this.form.assignee= parts.toString()
|
||||||
|
this.form.assigneeName = partsName.toString()
|
||||||
|
},
|
||||||
|
handleCheck(name) {
|
||||||
|
this.orgTableValName = this.form.assigneeName
|
||||||
|
this.orgTableVal = this.form.assignee
|
||||||
|
this.visibleOrgTable = true
|
||||||
|
},
|
||||||
changeSelect(val) {
|
changeSelect(val) {
|
||||||
this.checked = (val.length || this.reportF.reportUserIdList.length) === this.userList.length;
|
this.checked = (val.length || this.reportF.reportUserIdList.length) === this.userList.length;
|
||||||
// this.$emit('update:updateMultipleSelect',this.reportF.reportUserIdList);
|
// this.$emit('update:updateMultipleSelect',this.reportF.reportUserIdList);
|
||||||
@@ -74,7 +108,7 @@ export default {
|
|||||||
let userId = this.form.assignee
|
let userId = this.form.assignee
|
||||||
let assignee = this.assigneeId
|
let assignee = this.assigneeId
|
||||||
if (userId == assignee) {
|
if (userId == assignee) {
|
||||||
this.$message.warning("当前任务受理人就是您选择的")
|
this.$message.warning("当前任务受理人就是您选择的人员")
|
||||||
} else {
|
} else {
|
||||||
this.$api.process.changeAssignee({
|
this.$api.process.changeAssignee({
|
||||||
taskId: this.taskId.join(','),
|
taskId: this.taskId.join(','),
|
||||||
|
|||||||
Reference in New Issue
Block a user