|
@@ -123,7 +123,7 @@
|
|
|
<template #footer>
|
|
|
<div class="dialog-footer">
|
|
|
<el-button size="large" @click="sequenceModal = false">取消</el-button>
|
|
|
- <el-button type="primary" hc-btn @click="sequenceModal = false">确认</el-button>
|
|
|
+ <el-button type="primary" size="large" @click="saveSort">确认</el-button>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-dialog>
|
|
@@ -235,7 +235,7 @@ watch(() => [
|
|
|
checkboxUserList.value,
|
|
|
], ([list]) => {
|
|
|
|
|
|
- console.log(list, 'list')
|
|
|
+
|
|
|
let newUser = [], newUserId = [], users = ''
|
|
|
const dataList = deepClone(checkboxUserList.value)
|
|
|
UserDataList.value = dataList
|
|
@@ -253,7 +253,7 @@ watch(() => [
|
|
|
newUserId.push(itemArr[1])
|
|
|
}
|
|
|
})
|
|
|
- console.log(users, 'users')
|
|
|
+
|
|
|
if ( curItem.value) {
|
|
|
curItem.value.userIds = newUserId.join(',')
|
|
|
curItem.value.users = users
|
|
@@ -262,26 +262,7 @@ watch(() => [
|
|
|
|
|
|
}
|
|
|
})
|
|
|
-// watch(() => [
|
|
|
-// fixedBranchList.value,
|
|
|
-// ], ([list]) => {
|
|
|
-// fixedBranchList.value = list
|
|
|
-// const userIdList = arrToKey(fixedBranchList.value, 'userIds', ',')
|
|
|
-// const { isWarn, element } = hasDuplicates(userIdList.split(','))
|
|
|
-// if (isWarn) {
|
|
|
-// checkboxUserList.value.forEach((ele, index)=>{
|
|
|
-// if (ele.split('-')[1] === element) {
|
|
|
-// window.$message.warning('不能选择重复的任务人员' + ele.split('-')[0])
|
|
|
-// checkboxUserList.value.splice(index, 1)
|
|
|
-// }
|
|
|
-// })
|
|
|
-// }
|
|
|
-
|
|
|
-
|
|
|
-// }, {
|
|
|
-// deep:true,
|
|
|
-// },
|
|
|
-// )
|
|
|
+
|
|
|
|
|
|
//渲染完成
|
|
|
onMounted(() => {
|
|
@@ -292,7 +273,7 @@ onMounted(() => {
|
|
|
|
|
|
//处理用户数据
|
|
|
const setUserDataList = (users) => {
|
|
|
- console.log(users, 'users')
|
|
|
+
|
|
|
if (users) {
|
|
|
const usersArr = users.split(',')
|
|
|
UserDataList.value = usersArr
|
|
@@ -387,30 +368,21 @@ const downSortClick = (index, elemnt) => {
|
|
|
if (indexs !== data.length) {
|
|
|
const tmp = data.splice(indexs, 1)
|
|
|
checkboxUserList.value.splice(index, 0, tmp[0])
|
|
|
+ curItem.value.users = data.join(',')
|
|
|
+ let userIdsarr = []
|
|
|
+ data.forEach((ele)=>{
|
|
|
+ userIdsarr.push(ele.split('-')[1])
|
|
|
+ })
|
|
|
+ curItem.value.userIds = userIdsarr.join(',')
|
|
|
+
|
|
|
} else {
|
|
|
window?.$message?.warning('已经处于置底,无法下移')
|
|
|
}
|
|
|
|
|
|
-
|
|
|
|
|
|
- let curUser = curItem.value.users.split(',')
|
|
|
- let curUserIds = curItem.value.userIds.split(',')
|
|
|
- let userIndex = arrIndex(curUser, elemnt) // 1
|
|
|
- let userIdsIndex = arrIndex(curUserIds, elemnt.split('-')[1]) // 1
|
|
|
- const userIndexs = userIndex + 1
|
|
|
- if (userIndexs !== curUser.length) {
|
|
|
- const tmp = curUser.splice(userIndexs, 1)
|
|
|
- curUser.splice(userIndex, 0, tmp[0])
|
|
|
- curItem.value.users = curUser.join(',')
|
|
|
- }
|
|
|
- const userIdsIndexs = userIdsIndex + 1
|
|
|
- if (userIdsIndexs !== curUserIds.length) {
|
|
|
- const tmp = curUserIds.splice(userIdsIndexs, 1)
|
|
|
- curUserIds.splice(userIdsIndex, 0, tmp[0])
|
|
|
- curItem.value.userIds = curUserIds.join(',')
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
//向上
|
|
|
const upSortClick = (index, elemnt) => {
|
|
@@ -418,29 +390,29 @@ const upSortClick = (index, elemnt) => {
|
|
|
if (index !== 0) {
|
|
|
const tmp = data.splice(index - 1, 1)
|
|
|
checkboxUserList.value.splice(index, 0, tmp[0])
|
|
|
+ curItem.value.users = data.join(',')
|
|
|
+ let userIdsarr = []
|
|
|
+ data.forEach((ele)=>{
|
|
|
+ userIdsarr.push(ele.split('-')[1])
|
|
|
+ })
|
|
|
+ curItem.value.userIds = userIdsarr.join(',')
|
|
|
+
|
|
|
} else {
|
|
|
window?.$message?.warning('已经处于置顶,无法上移')
|
|
|
}
|
|
|
|
|
|
- let curUser = curItem.value.users.split(',')
|
|
|
- let curUserIds = curItem.value.userIds.split(',')
|
|
|
- let userIndex = arrIndex(curUser, elemnt) // 1
|
|
|
- let userIdsIndex = arrIndex(curUserIds, elemnt.split('-')[1]) // 1
|
|
|
- const userIndexs = userIndex - 1
|
|
|
- if (userIndexs !== curUser.length) {
|
|
|
- const tmp = curUser.splice(userIndexs, 1)
|
|
|
- curUser.splice(userIndex, 0, tmp[0])
|
|
|
- curItem.value.users = curUser.join(',')
|
|
|
- }
|
|
|
- const userIdsIndexs = userIdsIndex - 1
|
|
|
- if (userIdsIndexs !== curUserIds.length) {
|
|
|
- const tmp = curUserIds.splice(userIdsIndexs, 1)
|
|
|
- curUserIds.splice(userIdsIndex, 0, tmp[0])
|
|
|
- curItem.value.userIds = curUserIds.join(',')
|
|
|
-
|
|
|
- }
|
|
|
|
|
|
|
|
|
+}
|
|
|
+//
|
|
|
+const saveSort = ()=>{
|
|
|
+ sequenceModal.value = false
|
|
|
+ curItem.value.users = checkboxUserList.value
|
|
|
+ let userIdsarr = []
|
|
|
+ checkboxUserList.value.forEach((ele)=>{
|
|
|
+ userIdsarr.push(ele.split('-')[1])
|
|
|
+ })
|
|
|
+ curItem.value.userIds = userIdsarr.join(',')
|
|
|
}
|
|
|
|
|
|
//确认选择
|