Skip to content

S
SuperMan
Commit 65b4047e authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 6dd0349d
Show whitespace changes
Inline Side-by-side
Showing with 956 additions and 953 deletions
src/components/administrative/ApprovalProcess.vue
View file @ 65b4047e
......@@ -23,7 +23,7 @@
<div class="approval_layer_info" v-if="approvalType==2">
<div class="normalMember">
<ul>
<li v-for="item in showMember">{{item.DepartmentName}}</li> <!-- @click="mySetCheckedKeys(item.DepartmentId)"-->
<li v-for="item in showMember">{{item.DepartmentName}}</li>
</ul>
</div>
<input type="button" class="normalBtn" @click="getMember(),mySetCheckedKeys(-1)" value="添加成员" />
......@@ -48,7 +48,6 @@
</el-radio-group>
</div>
</div>
</div>
<div class="approval_page_layer_bottom">
<input type="button" class="hollowFixedBtn" value="取消" @click="closeLayer" /> &nbsp;&nbsp;
......@@ -57,19 +56,22 @@
</div>
</div>
</div>
<input type="button" class="hollowFixedBtn approval_back_btn" value="返回" @click="goback"/>
<input type="button" class="hollowFixedBtn approval_back_btn" value="返回" @click="goback" />
<div class="approval_page_content" v-loading="loading">
<p style="text-align: center; border-bottom:1px solid #f1f1f1; padding: 15px 0 10px 0;font-size: 16px;">{{TemplateTypeName}}流程设置</p>
<p style="text-align: center; border-bottom:1px solid #f1f1f1; padding: 15px 0 10px 0;font-size: 16px;">
{{TemplateTypeName}}流程设置</p>
<div class="approval_page_title">默认审批流程</div>
<div class="approval_person_content">
<span class="approval_span_type">默认审批人</span>
<div class="approval_person_list fl">
<div class="approval_process_item" draggable="true" v-for="(item,index) in myAuditList" @click="getItemValue(item,index)">
<div class="approval_process_item" draggable="true" v-for="(item,index) in myAuditList"
@click="getItemValue(item,index)">
<span style="position: relative;" @mouseenter="itemIndex=index" @mouseleave="itemIndex='-1'">
<i class="iconfont icon-user11"></i>
{{item.AuditDescription}}&nbsp;
<b class="bnotice" v-if="item.AuditWay!=1">({{item.AuditWay=="2"?'会签':'或签'}})</b>
<em v-if='index==itemIndex' class="iconfont icon-guanbi approval_process_item_delete" @click.stop='deleteItem(item.Sort)'></em>
<em v-if='index==itemIndex' class="iconfont icon-guanbi approval_process_item_delete"
@click.stop='deleteItem(item.Sort)'></em>
</span>
<i class="iconfont icon-jiantouyou"></i>
</div>
......@@ -83,10 +85,11 @@
<span style="position: relative;" @mouseenter="itemIndex1=index" @mouseleave="itemIndex1='-1'">
<i class="iconfont icon-user11"></i>
{{item.EmName}}&nbsp;
<em v-if='index==itemIndex1' @click="deleteUser(item.EmployeeId)" class="iconfont icon-guanbi approval_process_item_delete" ></em>
<em v-if='index==itemIndex1' @click="deleteUser(item.EmployeeId)"
class="iconfont icon-guanbi approval_process_item_delete"></em>
</span>
</div>
<input type="button" class="hollowFixedBtn" value="添加" @click='addAuditUser'/>
<input type="button" class="hollowFixedBtn" value="添加" @click='addAuditUser' />
</div>
</div>
......@@ -99,7 +102,8 @@
<div>
<div class="processOtherDiv" v-for="(item,index) in otherList" @click="goUrl('updateProcessDesign',item.Id)">
<p style="background: #f1f1f1; padding: 10px 30px;">{{item.Description}}
<span class="fr processOtherdelSpan" style="margin-left: 10px;" @click.stop="deleteOtherProcess(item.Id)">删除</span>
<span class="fr processOtherdelSpan" style="margin-left: 10px;"
@click.stop="deleteOtherProcess(item.Id)">删除</span>
<span class="fr processOtherdelSpan">修改</span>
</p>
<div style="padding: 0 30px;">
......@@ -134,14 +138,8 @@
<p style="margin: 0 0 10px 0;">选择： <el-input class='w200' placeholder="输入关键字进行过滤" v-model="filterText">
</el-input>
</p>
<el-tree class='ApprovalProcessBg'
:data="memberList"
show-checkbox
:filter-node-method="filterNode"
ref="tree" :props="defaultProps"
:render-after-expand="false"
node-key="DepartmentId"
@check-change="handleNodeChange">
<el-tree class='ApprovalProcessBg' :data="memberList" show-checkbox :filter-node-method="filterNode" ref="tree"
:props="defaultProps" :render-after-expand="false" node-key="DepartmentId" @check-change="handleNodeChange">
</el-tree>
</div>
<div class="fl">
......@@ -163,14 +161,8 @@
<p style="margin: 0 0 10px 0;">选择岗位： <el-input class='w200' placeholder="输入关键字进行过滤" v-model="filterText1">
</el-input>
</p>
<el-tree class='ApprovalProcessBg'
:data="roleList"
ref="treeRole"
show-checkbox
:filter-node-method="filterNode1"
:props="defaultProps1"
@check-change="checkedRole"
>
<el-tree class='ApprovalProcessBg' :data="roleList" ref="treeRole" show-checkbox
:filter-node-method="filterNode1" :props="defaultProps1" @check-change="checkedRole">
</el-tree>
</div>
<div class="fl">
......@@ -192,14 +184,8 @@
<p style="margin: 0 0 10px 0;">选择抄送人：<el-input class='w200' placeholder="输入关键字进行过滤" v-model="filterText2">
</el-input>
</p>
<el-tree class='ApprovalProcessBg'
:data="userList"
show-checkbox
:filter-node-method="filterNode2"
ref="treeUser"
:props="defaultProps2"
:render-after-expand="false"
node-key="DepartmentId"
<el-tree class='ApprovalProcessBg' :data="userList" show-checkbox :filter-node-method="filterNode2"
ref="treeUser" :props="defaultProps2" :render-after-expand="false" node-key="DepartmentId"
@check-change="handleNodeChange1">
</el-tree>
</div>
......@@ -216,8 +202,6 @@
<button class="normalBtn" type="primary" @click="saveAuditUser">确定</button>
</div>
</el-dialog>
</div>
</template>
......@@ -225,9 +209,9 @@
export default {
data() {
return {
filterText:"",
filterText1:"",
filterText2:"",
filterText: "",
filterText1: "",
filterText2: "",
defaultProps: {
children: 'ChildList',
label: 'DepartmentName',
......@@ -266,56 +250,56 @@
label: '第6级主管'
},
],
TemplateType:'',
addBtn:true,
loading:true,
TemplateType: '',
addBtn: true,
loading: true,
dialogTitle: '',
outerVisible:false,
outerVisible1:false,
outerVisible2:false,
outerVisible: false,
outerVisible1: false,
outerVisible2: false,
itemIndex: -1,
itemIndex1: -1,
approvalType: 1,
showlayer: false,
isTransition: false,
updateItem:[],
updateItemIndex:-1, //修改节点
TemplateId:'',
addMsg:{
Id:'',
TemplateId:'',
AuditList:[],
AuditUserList:[],
ConditionSortList:[],
Sort:'',
updateItem: [],
updateItemIndex: -1, //修改节点
TemplateId: '',
addMsg: {
Id: '',
TemplateId: '',
AuditList: [],
AuditUserList: [],
ConditionSortList: [],
Sort: '',
},
zgObj: {
AuditDescription: '',
RoleOrInitiator: '1',
AuditType: '',
AuditUserList: [],
AuditWay:2,
AuditWay: 2,
Sort: '',
},
tempChosenId: -1,
//返回数据
TemplateTypeName:'',
TemplateTypeName: '',
myAuditList: [],
myAuditUserList: [],
myAuditUserList1:[],
myAuditUserList1: [],
memberList: [],
sysUserKeys:[],
userList:[],
sysUserKeys: [],
userList: [],
roleList: [],
checkedMember: [],
showMember: [],
showRole:[],
showRole: [],
memberSetCheckedKeys: [],
memberSetCheckedUserKeys:[],
memberSetCheckedUserKeys: [],
normalMember: [],
otherList:[],
otherListSpr:[],
otherListCsr:[],
otherList: [],
otherListSpr: [],
otherListCsr: [],
}
},
watch: {
......@@ -342,96 +326,100 @@
if (!value) return true;
return data.DepartmentName.indexOf(value) !== -1;
},
deleteOtherProcess(id){
deleteOtherProcess(id) {
this.$confirm('是否删除?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('WorkFlow_post_DelOtherCondition',{ConditionId:id},res=>{
if(res.data.resultCode==1){
this.apipost('WorkFlow_post_DelOtherCondition', {
ConditionId: id
}, res => {
if (res.data.resultCode == 1) {
this.$message.success('删除成功！');
this.getOtherList()
}
},err=>{})
}, err => {})
}).catch(() => {
this.$message.info('已取消删除！');
});
},
addAppPerson(){
this.approvalType=1;
this.addBtn=true;
addAppPerson() {
this.approvalType = 1;
this.addBtn = true;
this.showLayer();
},
deleteUser(id){
if(this.memberSetCheckedUserKeys.findIndex(item => item === id)!=-1){
deleteUser(id) {
if (this.memberSetCheckedUserKeys.findIndex(item => item === id) != -1) {
this.memberSetCheckedUserKeys.splice(this.memberSetCheckedUserKeys.findIndex(item => item === id), 1)
}
if(this.myAuditUserList.findIndex(item => item.EmployeeId === id)!=-1)
{
if (this.myAuditUserList.findIndex(item => item.EmployeeId === id) != -1) {
this.myAuditUserList.splice(this.myAuditUserList.findIndex(item => item.EmployeeId === id), 1)
}
if(this.myAuditUserList1.findIndex(item => item.EmployeeId === id)!=-1)
{
if (this.myAuditUserList1.findIndex(item => item.EmployeeId === id) != -1) {
this.myAuditUserList1.splice(this.myAuditUserList1.findIndex(item => item.EmployeeId === id), 1)
}
},
addAuditUser(){
let _arr=this.sysUserKeys.concat(this.memberSetCheckedUserKeys)
addAuditUser() {
let _arr = this.sysUserKeys.concat(this.memberSetCheckedUserKeys)
this.dialogTitle = '选择人员';
this.outerVisible2=true;
let _this=this;
this.outerVisible2 = true;
let _this = this;
this.apipost('WorkFlow_get_GetDepartMentEmployee', {}, res => {
if(res.data.resultCode==1){
if (res.data.resultCode == 1) {
this.userList = res.data.data
_this.$refs.treeUser.setCheckedKeys(_arr);
}
}, err => {})
},
saveAuditUser(){
if(this.myAuditUserList1.length<=10){
this.myAuditUserList=JSON.parse(JSON.stringify(this.myAuditUserList1))
saveAuditUser() {
if (this.myAuditUserList1.length <= 10) {
this.myAuditUserList = JSON.parse(JSON.stringify(this.myAuditUserList1))
this.outerVisible2 = false
}else{
} else {
this.$message.error('人数不能超过10人')
return false;
}
},
clearValue(value){
if(value=='1'){
this.zgObj.RoleOrInitiator='1'
clearValue(value) {
if (value == '1') {
this.zgObj.RoleOrInitiator = '1'
}
if(value=='2'){
this.showMember=[];
this.memberSetCheckedKeys=[];
if (value == '2') {
this.showMember = [];
this.memberSetCheckedKeys = [];
}
if(value=='3'){
this.showRole=[]
this.zgObj.AuditWay=2
if (value == '3') {
this.showRole = []
this.zgObj.AuditWay = 2
}
},
getList() {
this.apipost('WorkFlow_get_GetDefaultCondition', {TemplateId:this.TemplateId}, res => {
if(res.data.resultCode == 1) {
this.loading=false
this.addMsg.Id=res.data.data.Id
this.myAuditList = res.data.data.AuditList==null?[]:res.data.data.AuditList
this.myAuditUserList = res.data.data.AuditUserList==null?[]:res.data.data.AuditUserList
this.apipost('WorkFlow_get_GetDefaultCondition', {
TemplateId: this.TemplateId
}, res => {
if (res.data.resultCode == 1) {
this.loading = false
this.addMsg.Id = res.data.data.Id
this.myAuditList = res.data.data.AuditList == null ? [] : res.data.data.AuditList
this.myAuditUserList = res.data.data.AuditUserList == null ? [] : res.data.data.AuditUserList
this.myAuditUserList1 = JSON.parse(JSON.stringify(this.myAuditUserList))
this.myAuditUserList1.forEach(item=>{
this.myAuditUserList1.forEach(item => {
this.sysUserKeys.push(item.EmployeeId)
})
this.TemplateTypeName=res.data.data.TemplateTypeName
this.TemplateType=res.data.data.TemplateType;
this.TemplateTypeName = res.data.data.TemplateTypeName
this.TemplateType = res.data.data.TemplateType;
} else {}
}, error => {})
},
getOtherList(){
this.apipost('WorkFlow_get_GetOtherConditionList', {TemplateId:this.TemplateId}, res => {
if(res.data.resultCode == 1) {
this.otherList=res.data.data
this.otherListSpr=res.data.data.AuditList
getOtherList() {
this.apipost('WorkFlow_get_GetOtherConditionList', {
TemplateId: this.TemplateId
}, res => {
if (res.data.resultCode == 1) {
this.otherList = res.data.data
this.otherListSpr = res.data.data.AuditList
} else {}
}, error => {})
},
......@@ -451,15 +439,15 @@
},
handleNodeChange1(data, checked) {
data.IsCheck = checked;
if(data.Type == 2 && data.IsCheck) { //是员工且选中
if (data.Type == 2 && data.IsCheck) { //是员工且选中
let isExsit = false
this.myAuditUserList1.forEach(x => {
if(x.EmployeeId == data.DepartmentId) {
if (x.EmployeeId == data.DepartmentId) {
isExsit = true
return false
}
})
if(!isExsit) {
if (!isExsit) {
this.myAuditUserList1.push({
EmName: data.DepartmentName,
EmployeeId: data.DepartmentId,
......@@ -467,71 +455,76 @@
})
this.memberSetCheckedUserKeys.push(data.DepartmentId)
}
} else if(data.Type == 2 && !data.IsCheck) {
if(this.myAuditUserList1.findIndex(item => item.EmployeeId === data.DepartmentId) != -1) {
this.myAuditUserList1.splice(this.myAuditUserList1.findIndex(item => item.EmployeeId === data.DepartmentId), 1)
this.memberSetCheckedUserKeys.splice(this.memberSetCheckedUserKeys.findIndex(item => item === data.DepartmentId), 1)
if(this.myAuditUserList1.findIndex(item => item.EmployeeId === data.ParentId) != -1) {
this.memberSetCheckedUserKeys.splice(this.memberSetCheckedUserKeys.findIndex(item => item === data.ParentId), 1)
} else if (data.Type == 2 && !data.IsCheck) {
if (this.myAuditUserList1.findIndex(item => item.EmployeeId === data.DepartmentId) != -1) {
this.myAuditUserList1.splice(this.myAuditUserList1.findIndex(item => item.EmployeeId === data.DepartmentId),
1)
this.memberSetCheckedUserKeys.splice(this.memberSetCheckedUserKeys.findIndex(item => item === data
.DepartmentId), 1)
if (this.myAuditUserList1.findIndex(item => item.EmployeeId === data.ParentId) != -1) {
this.memberSetCheckedUserKeys.splice(this.memberSetCheckedUserKeys.findIndex(item => item === data
.ParentId), 1)
}
}
}
if(data.Type != 2 && data.IsCheck) {
if(this.memberSetCheckedUserKeys.findIndex(item => item === data.DepartmentId) == -1) {
if (data.Type != 2 && data.IsCheck) {
if (this.memberSetCheckedUserKeys.findIndex(item => item === data.DepartmentId) == -1) {
this.memberSetCheckedUserKeys.push(data.DepartmentId)
}
} else if(data.Type == 2 && !data.IsCheck) {
if(this.memberSetCheckedUserKeys.findIndex(item => item === data.DepartmentId) != -1) {
this.memberSetCheckedUserKeys.splice(this.memberSetCheckedUserKeys.findIndex(item => item === data.DepartmentId), 1)
if(this.myAuditUserList1.findIndex(item => item.EmployeeId === data.ParentId) != -1) {
this.memberSetCheckedUserKeys.splice(this.memberSetCheckedUserKeys.findIndex(item => item === data.ParentId), 1)
} else if (data.Type == 2 && !data.IsCheck) {
if (this.memberSetCheckedUserKeys.findIndex(item => item === data.DepartmentId) != -1) {
this.memberSetCheckedUserKeys.splice(this.memberSetCheckedUserKeys.findIndex(item => item === data
.DepartmentId), 1)
if (this.myAuditUserList1.findIndex(item => item.EmployeeId === data.ParentId) != -1) {
this.memberSetCheckedUserKeys.splice(this.memberSetCheckedUserKeys.findIndex(item => item === data
.ParentId), 1)
}
}
}
},
handleNodeChange(data, checked) {
data.IsCheck = checked;
if(data.Type == 2 && data.IsCheck) { //是员工且选中
if (data.Type == 2 && data.IsCheck) { //是员工且选中
let isExsit = false
this.showMember.forEach(x => {
if(x.DepartmentId == data.DepartmentId) {
if (x.DepartmentId == data.DepartmentId) {
isExsit = true
return false
}
})
if(!isExsit) {
if (!isExsit) {
this.showMember.push({
DepartmentName: data.DepartmentName,
DepartmentId: data.DepartmentId
})
this.memberSetCheckedKeys.push(data.DepartmentId)
}
} else if(data.Type == 2 && !data.IsCheck) {
if(this.showMember.findIndex(item => item.DepartmentId === data.DepartmentId) != -1) {
} else if (data.Type == 2 && !data.IsCheck) {
if (this.showMember.findIndex(item => item.DepartmentId === data.DepartmentId) != -1) {
this.showMember.splice(this.showMember.findIndex(item => item.DepartmentId === data.DepartmentId), 1)
this.memberSetCheckedKeys.splice(this.memberSetCheckedKeys.findIndex(item => item === data.DepartmentId), 1)
if(this.showMember.findIndex(item => item.DepartmentId === data.ParentId) != -1) {
if (this.showMember.findIndex(item => item.DepartmentId === data.ParentId) != -1) {
this.memberSetCheckedKeys.splice(this.memberSetCheckedKeys.findIndex(item => item === data.ParentId), 1)
}
}
}
if(data.Type != 2 && data.IsCheck) {
if(this.memberSetCheckedKeys.findIndex(item => item === data.DepartmentId) == -1) {
if (data.Type != 2 && data.IsCheck) {
if (this.memberSetCheckedKeys.findIndex(item => item === data.DepartmentId) == -1) {
this.memberSetCheckedKeys.push(data.DepartmentId)
}
} else if(data.Type == 2 && !data.IsCheck) {
if(this.memberSetCheckedKeys.findIndex(item => item === data.DepartmentId) != -1) {
} else if (data.Type == 2 && !data.IsCheck) {
if (this.memberSetCheckedKeys.findIndex(item => item === data.DepartmentId) != -1) {
this.memberSetCheckedKeys.splice(this.memberSetCheckedKeys.findIndex(item => item === data.DepartmentId), 1)
if(this.showMember.findIndex(item => item.DepartmentId === data.ParentId) != -1) {
if (this.showMember.findIndex(item => item.DepartmentId === data.ParentId) != -1) {
this.memberSetCheckedKeys.splice(this.memberSetCheckedKeys.findIndex(item => item === data.ParentId), 1)
}
}
}
},
mySetCheckedKeys(id) {
if(this.memberSetCheckedKeys.length == 0)
if (this.memberSetCheckedKeys.length == 0)
return
if(id == -1) {
if (id == -1) {
this.$refs.tree.setCheckedKeys(this.memberSetCheckedKeys)
return
}
......@@ -539,34 +532,36 @@
this.memberSetCheckedKeys.splice(this.memberSetCheckedKeys.findIndex(item => item === id), 1)
this.$refs.tree.setCheckedKeys(this.memberSetCheckedKeys);
},
mySetCheckedUsersKeys(){
mySetCheckedUsersKeys() {
},
checkedRole(data,checked){
checkedRole(data, checked) {
data.IsCheck = checked;
if(data.Disabled==false&&data.IsCheck){
this.showRole=[];
this.showRole.push({DepartmentName:data.DepartmentName,Id:data.DepartmentId})
if (data.Disabled == false && data.IsCheck) {
this.showRole = [];
this.showRole.push({
DepartmentName: data.DepartmentName,
Id: data.DepartmentId
})
}
},
deleteItem(sort) {
this.myAuditList.splice(this.myAuditList.findIndex(item => item.Sort === sort), 1)
},
getItemValue(obj,index){
this.addBtn=false;
this.updateItemIndex=index;
this.updateItem=obj;
getItemValue(obj, index) {
this.addBtn = false;
this.updateItemIndex = index;
this.updateItem = obj;
this.showLayer();
this.approvalType=obj.AuditType;
if(obj.AuditType==1){
this.zgObj.RoleOrInitiator=obj.RoleOrInitiator.toString();
}
if(obj.AuditType==2){
this.showMember=[];
this.memberSetCheckedKeys=[];
this.zgObj.AuditWay=obj.AuditWay;
obj.AuditUserList.forEach((item,index)=>{
this.approvalType = obj.AuditType;
if (obj.AuditType == 1) {
this.zgObj.RoleOrInitiator = obj.RoleOrInitiator.toString();
}
if (obj.AuditType == 2) {
this.showMember = [];
this.memberSetCheckedKeys = [];
this.zgObj.AuditWay = obj.AuditWay;
obj.AuditUserList.forEach((item, index) => {
this.showMember.push({
DepartmentName: item.EmName,
DepartmentId: item.EmployeeId
......@@ -574,24 +569,25 @@
this.memberSetCheckedKeys.push(item.EmployeeId)
})
}
if(obj.AuditType==3){
this.zgObj.AuditWay=obj.AuditWay;
this.showRole=[];
this.showRole.push({DepartmentName:obj.AuditDescription})
if (obj.AuditType == 3) {
this.zgObj.AuditWay = obj.AuditWay;
this.showRole = [];
this.showRole.push({
DepartmentName: obj.AuditDescription
})
}
},
saveUpdateNode(){
saveUpdateNode() {
let zg = {}
if(this.approvalType == 1)
{
if (this.approvalType == 1) {
zg.AuditType = 1;
zg.AuditWay = 1;
zg.AuditUserList=[],
zg.AuditUserList = [],
zg.Sort = this.myAuditList.length + 1;
zg.RoleOrInitiator = this.zgObj.RoleOrInitiator
let obj = {}
if(this.tempChosenId != -1) {
if (this.tempChosenId != -1) {
obj = this.zgList.find((item) => {
return item.value === this.tempChosenId;
})
......@@ -599,22 +595,22 @@
} else {
zg.AuditDescription = '直接主管'
}
this.myAuditList[this.updateItemIndex]=zg;
this.myAuditList[this.updateItemIndex] = zg;
}
if(this.approvalType == 2) { //指定成员
if (this.approvalType == 2) { //指定成员
let Au = this.showMember;
let Auu = [];
Au.forEach((item, index) => {
Auu.push({
EmployeeId: item.DepartmentId,
EmName:item.DepartmentName,
EmName: item.DepartmentName,
Sort: index
})
})
if(Auu.length==1){
if (Auu.length == 1) {
zg.AuditWay = 1
zg.AuditDescription = Auu[0].EmName
}else if(Auu.length>1){
} else if (Auu.length > 1) {
zg.AuditWay = this.zgObj.AuditWay;
zg.AuditDescription = '指定' + this.showMember.length + '人'
}
......@@ -622,35 +618,33 @@
zg.RoleOrInitiator = '-1';
zg.Sort = this.myAuditList.length + 1;
zg.AuditUserList = Auu;
if(Auu.length==0)
{
if (Auu.length == 0) {
this.$message.error("成员不能为空")
return
}else if(Auu.length>10){
} else if (Auu.length > 10) {
this.$message.error("人数不能超过10人！")
return
}
this.myAuditList[this.updateItemIndex]=zg;
this.myAuditList[this.updateItemIndex] = zg;
}
if(this.approvalType == 3) { //岗位
zg.AuditType=3;
if (this.approvalType == 3) { //岗位
zg.AuditType = 3;
zg.AuditWay = this.zgObj.AuditWay;
zg.Sort = this.myAuditList.length + 1;
zg.AuditUserList='';
if(this.showRole.length==0)
{
zg.AuditUserList = '';
if (this.showRole.length == 0) {
this.$message.error("请选择岗位")
return
}else{
zg.RoleOrInitiator=this.showRole[0].Id;
zg.AuditDescription=this.showRole[0].DepartmentName;
} else {
zg.RoleOrInitiator = this.showRole[0].Id;
zg.AuditDescription = this.showRole[0].DepartmentName;
}
this.myAuditList[this.updateItemIndex]=zg;
this.myAuditList[this.updateItemIndex] = zg;
}
this.closeLayer()
},
deleteRole(){
this.showRole=[];
deleteRole() {
this.showRole = [];
},
changeValue(value) {
this.tempChosenId = value
......@@ -658,15 +652,15 @@
addNode() {
//data>>AuditList>>AuditType 核人类型 1主管(指定一级) 2 指定成员 3角色
let zg = {}
if(this.approvalType == 1) //主管
if (this.approvalType == 1) //主管
{
zg.AuditType = 1;
zg.AuditWay = 1;
zg.AuditUserList=[],
zg.AuditUserList = [],
zg.Sort = this.myAuditList.length + 1;
zg.RoleOrInitiator = this.zgObj.RoleOrInitiator
let obj = {}
if(this.tempChosenId != -1) {
if (this.tempChosenId != -1) {
obj = this.zgList.find((item) => {
return item.value === this.tempChosenId;
})
......@@ -676,20 +670,20 @@
}
this.myAuditList.push(zg);
}
if(this.approvalType == 2) { //指定成员
if (this.approvalType == 2) { //指定成员
let Au = this.showMember;
let Auu = [];
Au.forEach((item, index) => {
Auu.push({
EmployeeId: item.DepartmentId,
EmName:item.DepartmentName,
EmName: item.DepartmentName,
Sort: index
})
})
if(Auu.length==1){
if (Auu.length == 1) {
zg.AuditWay = 1
zg.AuditDescription = Auu[0].EmName
}else if(Auu.length>1){
} else if (Auu.length > 1) {
zg.AuditWay = this.zgObj.AuditWay;
zg.AuditDescription = '指定' + this.showMember.length + '人'
}
......@@ -697,11 +691,10 @@
zg.RoleOrInitiator = '-1';
zg.Sort = this.myAuditList.length + 1;
zg.AuditUserList = Auu;
if(Auu.length==0)
{
if (Auu.length == 0) {
this.$message.error("成员不能为空")
return
}else if(Auu.length>10){
} else if (Auu.length > 10) {
this.$message.error("人数不能超过10人！")
return
}
......@@ -709,18 +702,17 @@
this.myAuditList.push(zg);
}
if(this.approvalType == 3) { //岗位
zg.AuditType=3;
if (this.approvalType == 3) { //岗位
zg.AuditType = 3;
zg.AuditWay = this.zgObj.AuditWay;
zg.Sort = this.myAuditList.length + 1;
zg.AuditUserList='';
if(this.showRole.length==0)
{
zg.AuditUserList = '';
if (this.showRole.length == 0) {
this.$message.error("请选择部门")
return
}else{
zg.RoleOrInitiator=this.showRole[0].Id;
zg.AuditDescription=this.showRole[0].DepartmentName;
} else {
zg.RoleOrInitiator = this.showRole[0].Id;
zg.AuditDescription = this.showRole[0].DepartmentName;
}
this.myAuditList.push(zg);
}
......@@ -732,29 +724,39 @@
},
closeLayer() {
let _this = this;
setTimeout(function() {
setTimeout(function () {
_this.showlayer = false;
}, 300)
this.isTransition = false;
},
saveApproval(){
this.addMsg.AuditList=this.myAuditList;
this.addMsg.AuditUserList=this.myAuditUserList;
this.ConditionSortList=[],
this.addMsg.Sort=0,
this.loading=true;
this.apipost('WorkFlow_post_SetDefaultCondition',this.addMsg,res=>{
if(res.data.resultCode==1){
this.loading=false;
saveApproval() {
this.addMsg.AuditList = this.myAuditList;
this.addMsg.AuditUserList = this.myAuditUserList;
this.ConditionSortList = [],
this.addMsg.Sort = 0,
this.loading = true;
this.apipost('WorkFlow_post_SetDefaultCondition', this.addMsg, res => {
if (res.data.resultCode == 1) {
this.loading = false;
this.$message.success("操作成功！")
}
},err=>{})
}, err => {})
},
goUrl (path,id) {
this.$router.push({ name: path,query:{"id":id} })
goUrl(path, id) {
this.$router.push({
name: path,
query: {
"id": id
}
})
},
goback(){
this.$router.push({name: 'Approval',query:{"Bid":this.$route.query.Bid}});
goback() {
this.$router.push({
name: 'Approval',
query: {
"Bid": this.$route.query.Bid
}
});
}
},
mounted() {
......@@ -764,22 +766,26 @@
}
}
</script>
<style>
.processOtherdelSpan{
.processOtherdelSpan {
color: #E95252;
}
.processOtherdelSpan:hover{
.processOtherdelSpan:hover {
text-decoration: underline;
}
.processOtherDiv{
.processOtherDiv {
font-size: 12px;
min-height: 80px;
border:1px solid #D2D2D2;
border: 1px solid #D2D2D2;
margin-top: 20px;
cursor: pointer;
}
.showMemberIcon {
float: right;
font-size: 20px;
......@@ -831,7 +837,7 @@
}
.approval_page_content i {
color: #999!important;
color: #999 !important;
}
.approval_page_layer_bottom {
......@@ -953,4 +959,5 @@
padding-left: 20px;
overflow: hidden;
}
</style>
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ 65b4047e
......@@ -824,8 +824,6 @@
this.PostConfig.TripColor = tempData.LineTripColor;
this.FeatureData.TripColor = tempData.LineTripColor;
}
console.log(" this.PostConfig", this.PostConfig)
console.log(" this.FeatureData", this.FeatureData)
this.FeatureData.LtName = tempData.LtName;
this.FeatureData.DayList = tempData.DayList;
......
src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue
View file @ 65b4047e
......@@ -591,7 +591,6 @@
//选中的景点
'ChooseScenicArray': {
handler: function (val, oldVal) {
console.log("this.ChooseScenicArray",this.ChooseScenicArray)
//新增
this.ChooseScenicArray.forEach(x => {
let isExist = false;
......@@ -604,7 +603,6 @@
let scenic = this.$tripUtils.scenicObj();
this.QScenicList.forEach(s => {
if (s.ID === x) {
console.log("scenic22",s);
scenic.Description = s.Feature;
scenic.CouponsId = x;
scenic.CouponsName = s.Name;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment