|
|
@@ -75,7 +75,7 @@
|
|
|
{{ record.specialNeedWeek }}
|
|
|
</div>
|
|
|
<div class="divider" v-if="record.specialNeedSailingSorts?.length" />
|
|
|
- <div class="inline-flex"> 第二班、第三班 </div>
|
|
|
+ <div class="inline-flex"> {{ record.specialNeedSailingSorts }} </div>
|
|
|
</div>
|
|
|
</template>
|
|
|
<template v-if="column.key === 'action'">
|
|
|
@@ -133,6 +133,8 @@
|
|
|
import { useModal } from '/@/components/Modal';
|
|
|
import FormModal from './FormModal.vue';
|
|
|
import FormModalDetail from './FormModalDetail.vue';
|
|
|
+ import { getSailings } from '/@/api/biz/management/working';
|
|
|
+
|
|
|
// import { useMessage } from '@/hooks/web/useMessage';
|
|
|
const bizDictOptions = reactive<any>({});
|
|
|
const bizDictData = ref([
|
|
|
@@ -142,6 +144,7 @@
|
|
|
]);
|
|
|
const activeKey = ref(BasicTabActive);
|
|
|
const tabData = ref(BasicTab);
|
|
|
+ const allSailings = ref([]);
|
|
|
const [registerModal, { openModal }] = useModal();
|
|
|
const [registerModalDetail, { openModal: openModalDetail }] = useModal();
|
|
|
// const { createMessage } = useMessage();
|
|
|
@@ -165,6 +168,8 @@
|
|
|
}
|
|
|
return ele;
|
|
|
});
|
|
|
+
|
|
|
+ // console.log('🚀 ~ file: index.vue:173 ~ onMounted ~ allSailings.value:', allSailings.value);
|
|
|
});
|
|
|
const [registerTable, { reload }] = useTable({
|
|
|
api: bedScheduledPersonQueryPage,
|
|
|
@@ -218,8 +223,11 @@
|
|
|
};
|
|
|
}
|
|
|
|
|
|
- function handleAfterFetch(data) {
|
|
|
+ async function handleAfterFetch(data) {
|
|
|
console.log('🚀 ~ file: index.vue:238 ~ handleAfterFetch ~ data:', data);
|
|
|
+ if (!allSailings.value.length) {
|
|
|
+ allSailings.value = await getSailings();
|
|
|
+ }
|
|
|
const res = data.map(ele => {
|
|
|
ele.specialNeedWeek = '';
|
|
|
for (const i in ele.specialNeed) {
|
|
|
@@ -228,9 +236,16 @@
|
|
|
}
|
|
|
}
|
|
|
ele.specialNeedWeek = ele.specialNeedWeek.substring(1);
|
|
|
+ // ele.specialNeedSailingSorts = ele.specialNeed?.sailingSorts;
|
|
|
// 班次需要请求
|
|
|
- ele.specialNeedSailingSorts = ele.specialNeed?.sailingSorts;
|
|
|
- // console.log('ele', ele);
|
|
|
+ ele.specialNeedSailingSorts = allSailings.value
|
|
|
+ .filter(eleA => {
|
|
|
+ return ele.specialNeed?.sailingSorts.includes(eleA.sort);
|
|
|
+ })
|
|
|
+ .map(sEle => {
|
|
|
+ return sEle.name;
|
|
|
+ })
|
|
|
+ .join('、');
|
|
|
return ele;
|
|
|
});
|
|
|
return res;
|