feat: 审批选择增加taskindex条件 #222

Merged
yaoshuli merged 2 commits from feat/20240417similarite into test 1 year ago

@ -14,6 +14,7 @@ defineProps({
const taskStore = useTaskStore(); const taskStore = useTaskStore();
const data = ref<any[]>([]); const data = ref<any[]>([]);
const activeId = ref(""); const activeId = ref("");
const taskIndex = ref("")
const el = ref<HTMLDivElement | null>(null); const el = ref<HTMLDivElement | null>(null);
const keyword = ref(""); const keyword = ref("");
const canloadMore = ref(true); const canloadMore = ref(true);
@ -27,6 +28,7 @@ const pagination = reactive({
function selectHandler(item, index: number) { function selectHandler(item, index: number) {
activeId.value = item.id; activeId.value = item.id;
taskIndex.value = item.taskIndex
console.log(activeId.value, item.id); console.log(activeId.value, item.id);
console.log(index); console.log(index);
taskStore.setActive(index, item.id); taskStore.setActive(index, item.id);
@ -76,6 +78,7 @@ watch(
() => taskStore.activeId, () => taskStore.activeId,
(newVal) => { (newVal) => {
activeId.value = newVal; activeId.value = newVal;
taskIndex.value = taskStore.getApprovalList.find(i => i.id === newVal)?.taskIndex
}, },
); );
@ -94,6 +97,7 @@ watch(
}); });
data.value = newlist; data.value = newlist;
activeId.value = newlist[index].id; activeId.value = newlist[index].id;
taskIndex.value = newlist[index]?.taskIndex
taskStore.setActive(index, newlist[index].id); taskStore.setActive(index, newlist[index].id);
// taskStore.setActive(index) // taskStore.setActive(index)
@ -136,6 +140,7 @@ onMounted(() => {
searchId.value = id; searchId.value = id;
data.value = await fetchList(); data.value = await fetchList();
activeId.value = data.value[0]?.id; activeId.value = data.value[0]?.id;
taskIndex.value = data.value[0]?.taskIndex
console.log(data.value); console.log(data.value);
}); });
}); });
@ -166,7 +171,7 @@ defineExpose({
v-for="(item, index) in data" v-for="(item, index) in data"
:key="item.id" :key="item.id"
:show-field-list="showFieldList" :show-field-list="showFieldList"
:selected="activeId === item.id" :selected="`${activeId}_${taskIndex}` === `${item.id}_${item.taskIndex}`"
:list-item="item" :list-item="item"
@click="selectHandler(item, index)" @click="selectHandler(item, index)"
/> />

Loading…
Cancel
Save