Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud
This commit is contained in:
commit
8648d8d8a3
10 files changed
+43
-43
No files matched your search
+4
-4
@@ -131,10 +131,10 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts" name="MeetingBookingDialog">
|
<script setup lang="ts" name="MeetingBookingDialog">
|
||||||
import { useDict } from '/@/hooks/dict';
|
import { useDict } from '/src/hooks/dict';
|
||||||
import { useMessage } from "/@/hooks/message";
|
import { useMessage } from "/src/hooks/message";
|
||||||
import { getObj, addObj, putObj, getMeetingRoomTimeSlots, getMeetingRoomList } from '/@/api/integrated/meetingBooking'
|
import { getObj, addObj, putObj, getMeetingRoomTimeSlots, getMeetingRoomList } from '/src/api/integrated/meetingBooking'
|
||||||
import { rule } from '/@/utils/validate';
|
import { rule } from '/src/utils/validate';
|
||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
import { ref, onMounted, watch } from 'vue'
|
import { ref, onMounted, watch } from 'vue'
|
||||||
import dayjs from 'dayjs'
|
import dayjs from 'dayjs'
|
||||||
+5
-5
@@ -67,10 +67,10 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts" name="systemMeetingBooking">
|
<script setup lang="ts" name="systemMeetingBooking">
|
||||||
import { BasicTableProps, useTable } from "/@/hooks/table";
|
import { BasicTableProps, useTable } from "/src/hooks/table";
|
||||||
import { fetchList, delObjs } from "/@/api/integrated/meetingBooking";
|
import { fetchList, delObjs } from "/src/api/integrated/meetingBooking";
|
||||||
import { useMessage, useMessageBox } from "/@/hooks/message";
|
import { useMessage, useMessageBox } from "/src/hooks/message";
|
||||||
import { useDict } from '/@/hooks/dict';
|
import { useDict } from '/src/hooks/dict';
|
||||||
|
|
||||||
// 引入组件
|
// 引入组件
|
||||||
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
|
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
|
||||||
@@ -111,7 +111,7 @@ const resetQuery = () => {
|
|||||||
|
|
||||||
// 导出excel
|
// 导出excel
|
||||||
const exportExcel = () => {
|
const exportExcel = () => {
|
||||||
downBlobFile('/integrated/meetingBooking/export', Object.assign(state.queryForm, { ids: selectObjs }), 'meetingBooking.xlsx')
|
downBlobFile('/integrated/meetingBooking/export', Object.assign(state.queryForm, { ids: selectObjs }), 'booking.xlsx')
|
||||||
}
|
}
|
||||||
|
|
||||||
// 多选事件
|
// 多选事件
|
||||||
+4
-4
@@ -39,10 +39,10 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts" name="CleanUserDialog">
|
<script setup lang="ts" name="CleanUserDialog">
|
||||||
import { useDict } from '/@/hooks/dict';
|
import { useDict } from '/src/hooks/dict';
|
||||||
import { useMessage } from "/@/hooks/message";
|
import { useMessage } from "/src/hooks/message";
|
||||||
import { getObj, addObj, putObj } from '/@/api/integrated/cleanUser'
|
import { getObj, addObj, putObj } from '/src/api/integrated/cleanUser'
|
||||||
import { rule } from '/@/utils/validate';
|
import { rule } from '/src/utils/validate';
|
||||||
const emit = defineEmits(['refresh']);
|
const emit = defineEmits(['refresh']);
|
||||||
|
|
||||||
// 定义变量内容
|
// 定义变量内容
|
||||||
+4
-4
@@ -60,10 +60,10 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts" name="systemCleanUser">
|
<script setup lang="ts" name="systemCleanUser">
|
||||||
import { BasicTableProps, useTable } from "/@/hooks/table";
|
import { BasicTableProps, useTable } from "/src/hooks/table";
|
||||||
import { fetchList, delObjs } from "/@/api/integrated/cleanUser";
|
import { fetchList, delObjs } from "/src/api/integrated/cleanUser";
|
||||||
import { useMessage, useMessageBox } from "/@/hooks/message";
|
import { useMessage, useMessageBox } from "/src/hooks/message";
|
||||||
import { useDict } from '/@/hooks/dict';
|
import { useDict } from '/src/hooks/dict';
|
||||||
|
|
||||||
// 引入组件
|
// 引入组件
|
||||||
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
|
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
|
||||||
+4
-4
@@ -52,10 +52,10 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts" name="MeetingEquipmentDialog">
|
<script setup lang="ts" name="MeetingEquipmentDialog">
|
||||||
import { useDict } from '/@/hooks/dict';
|
import { useDict } from '/src/hooks/dict';
|
||||||
import { useMessage } from "/@/hooks/message";
|
import { useMessage } from "/src/hooks/message";
|
||||||
import { getObj, addObj, putObj } from '/@/api/integrated/meetingEquipment'
|
import { getObj, addObj, putObj } from '/src/api/integrated/meetingEquipment'
|
||||||
import { rule } from '/@/utils/validate';
|
import { rule } from '/src/utils/validate';
|
||||||
const emit = defineEmits(['refresh']);
|
const emit = defineEmits(['refresh']);
|
||||||
|
|
||||||
// 定义变量内容
|
// 定义变量内容
|
||||||
+4
-4
@@ -67,10 +67,10 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts" name="systemMeetingEquipment">
|
<script setup lang="ts" name="systemMeetingEquipment">
|
||||||
import { BasicTableProps, useTable } from "/@/hooks/table";
|
import { BasicTableProps, useTable } from "/src/hooks/table";
|
||||||
import { fetchList, delObjs } from "/@/api/integrated/meetingEquipment";
|
import { fetchList, delObjs } from "/src/api/integrated/meetingEquipment";
|
||||||
import { useMessage, useMessageBox } from "/@/hooks/message";
|
import { useMessage, useMessageBox } from "/src/hooks/message";
|
||||||
import { useDict } from '/@/hooks/dict';
|
import { useDict } from '/src/hooks/dict';
|
||||||
|
|
||||||
// 引入组件
|
// 引入组件
|
||||||
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
|
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
|
||||||
+6
-6
@@ -154,12 +154,12 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts" name="MeetingRoomDialog">
|
<script setup lang="ts" name="MeetingRoomDialog">
|
||||||
import { useDict } from '/@/hooks/dict';
|
import { useDict } from '/src/hooks/dict';
|
||||||
import { useMessage } from "/@/hooks/message";
|
import { useMessage } from "/src/hooks/message";
|
||||||
import { getObj, addObj, putObj } from '/@/api/integrated/meetingRoom'
|
import { getObj, addObj, putObj } from '/src/api/integrated/meetingRoom'
|
||||||
import { fetchList } from '/@/api/integrated/meetingEquipment'
|
import { fetchList } from '/src/api/integrated/meetingEquipment'
|
||||||
import { dropdown } from '/@/api/integrated/cleanUser'
|
import { dropdown } from '/src/api/integrated/cleanUser'
|
||||||
import { rule } from '/@/utils/validate';
|
import { rule } from '/src/utils/validate';
|
||||||
const emit = defineEmits(['refresh']);
|
const emit = defineEmits(['refresh']);
|
||||||
|
|
||||||
// 定义变量内容
|
// 定义变量内容
|
||||||
+4
-4
@@ -53,10 +53,10 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts" name="systemMeetingRoom">
|
<script setup lang="ts" name="systemMeetingRoom">
|
||||||
import { BasicTableProps, useTable } from "/@/hooks/table";
|
import { BasicTableProps, useTable } from "/src/hooks/table";
|
||||||
import { fetchList, delObjs } from "/@/api/integrated/meetingRoom";
|
import { fetchList, delObjs } from "/src/api/integrated/meetingRoom";
|
||||||
import { useMessage, useMessageBox } from "/@/hooks/message";
|
import { useMessage, useMessageBox } from "/src/hooks/message";
|
||||||
import { useDict } from '/@/hooks/dict';
|
import { useDict } from '/src/hooks/dict';
|
||||||
|
|
||||||
// 引入组件
|
// 引入组件
|
||||||
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
|
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
|
||||||
+4
-4
@@ -33,10 +33,10 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts" name="MeetingRoomEquipmentDialog">
|
<script setup lang="ts" name="MeetingRoomEquipmentDialog">
|
||||||
import { useDict } from '/@/hooks/dict';
|
import { useDict } from '/src/hooks/dict';
|
||||||
import { useMessage } from "/@/hooks/message";
|
import { useMessage } from "/src/hooks/message";
|
||||||
import { getObj, addObj, putObj } from '/@/api/integrated/meetingRoomEquipment'
|
import { getObj, addObj, putObj } from '/src/api/integrated/meetingRoomEquipment'
|
||||||
import { rule } from '/@/utils/validate';
|
import { rule } from '/src/utils/validate';
|
||||||
const emit = defineEmits(['refresh']);
|
const emit = defineEmits(['refresh']);
|
||||||
|
|
||||||
// 定义变量内容
|
// 定义变量内容
|
||||||
+4
-4
@@ -43,10 +43,10 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts" name="systemMeetingRoomEquipment">
|
<script setup lang="ts" name="systemMeetingRoomEquipment">
|
||||||
import { BasicTableProps, useTable } from "/@/hooks/table";
|
import { BasicTableProps, useTable } from "/src/hooks/table";
|
||||||
import { fetchList, delObjs } from "/@/api/integrated/meetingRoomEquipment";
|
import { fetchList, delObjs } from "/src/api/integrated/meetingRoomEquipment";
|
||||||
import { useMessage, useMessageBox } from "/@/hooks/message";
|
import { useMessage, useMessageBox } from "/src/hooks/message";
|
||||||
import { useDict } from '/@/hooks/dict';
|
import { useDict } from '/src/hooks/dict';
|
||||||
|
|
||||||
// 引入组件
|
// 引入组件
|
||||||
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
|
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
|
||||||
Reference in new issue
Block a user