Merge pull request 'feat: 去除任务审批字段全选功能' (#193) from feat/fieldModal into test

Reviewed-on: #193
pull/194/head
刘释隆 1 year ago
commit 632fc96cdb

@ -40,6 +40,7 @@ const checkAll = computed(() => {
offList.value.map((v) => { offList.value.map((v) => {
if (v.fix) if (v.fix)
baseNum += 1 baseNum += 1
return v
}) })
return onList.value.length == offList.value.length - baseNum return onList.value.length == offList.value.length - baseNum
}) })
@ -58,9 +59,11 @@ async function handleSumbit(e: MouseEvent) {
let userFieldFixed = '' let userFieldFixed = ''
fixList.value.map((v) => { fixList.value.map((v) => {
userFieldFixed += `${v.id},` userFieldFixed += `${v.id},`
return v
}) })
onList.value.map((v) => { onList.value.map((v) => {
userFieldFixed += `${v.id},` userFieldFixed += `${v.id},`
return v
}) })
userFieldFixed = userFieldFixed.slice(0, userFieldFixed.length - 1) userFieldFixed = userFieldFixed.slice(0, userFieldFixed.length - 1)
savefield(props.reviewType, userInfo.id, userFieldFixed) savefield(props.reviewType, userInfo.id, userFieldFixed)
@ -93,6 +96,7 @@ function onCheckAllChange(value) {
offList.value.map((v) => { offList.value.map((v) => {
if (!v.checked) if (!v.checked)
onList.value.push(v) onList.value.push(v)
return v
}) })
onShowList.value = cloneDeep(onList.value) onShowList.value = cloneDeep(onList.value)
} }
@ -248,6 +252,7 @@ async function getData(type = '') {
if (item.fix) if (item.fix)
fixList.value.push(item) fixList.value.push(item)
else offList.value.push(item) else offList.value.push(item)
return v
}) })
offList.value.unshift(...fixList.value) offList.value.unshift(...fixList.value)
} }
@ -265,6 +270,7 @@ async function getData(type = '') {
if (!item.fix) if (!item.fix)
onList.value.push(item) onList.value.push(item)
} }
return v
}) })
} }
offShowList.value = cloneDeep(offList.value) offShowList.value = cloneDeep(offList.value)
@ -279,6 +285,7 @@ const indeterminate = computed(() => {
offList.value.map((v) => { offList.value.map((v) => {
if (v.fix) if (v.fix)
baseNum += 1 baseNum += 1
return v
}) })
return ( return (
onShowList.value.length > 0 onShowList.value.length > 0
@ -347,14 +354,14 @@ const moreThanSix = computed(() => {
</template> </template>
</n-input> </n-input>
<div class="draggable-ul"> <div class="draggable-ul">
<div class="draggable-li" :class="{ checkAll: indeterminate }"> <!-- <div class="draggable-li" :class="{ checkAll: indeterminate }">
<n-checkbox <n-checkbox
v-model:checked="checkAll" v-model:checked="checkAll"
label="全选" label="全选"
:indeterminate="indeterminate" :indeterminate="indeterminate"
@update:checked="onCheckAllChange" @update:checked="onCheckAllChange"
/> />
</div> </div> -->
<div class="content"> <div class="content">
<div <div
v-for="item in offShowList" v-for="item in offShowList"

Loading…
Cancel
Save