diff --git a/src/views/serviceMenu/serviceSites/index.vue b/src/views/serviceMenu/serviceSites/index.vue index 9fc399f..378a204 100644 --- a/src/views/serviceMenu/serviceSites/index.vue +++ b/src/views/serviceMenu/serviceSites/index.vue @@ -11,7 +11,7 @@ - + {{ item.introduction }} @@ -22,16 +22,13 @@ - + - - - 已结单 - 已作废 - + + @@ -180,7 +177,7 @@ import ExportRecordsModal from '@/components/ExportRecord/index.vue' import { useI18n } from 'vue-i18n' import storage from '@/utils/storage' import AreaCascader from '@/components/AreaCascader/index.vue' - +import NodeTree from '@/components/NodeTree/index.vue' defineOptions({ name: 'menu', @@ -237,6 +234,7 @@ const { resetForm } = useForm() const editDialogRef = ref() import { useDicsStore } from '@/store' const dicsStore = useDicsStore() +const areaCodes = ref([]) getList() @@ -248,10 +246,13 @@ async function getList() { try { showLoading() const { pageSize, current } = paginationState + console.log("=====searchFormData",searchFormData.value.areaCodes) + const { success, data, total } = await apis.serviceMenu .getServiceSiteList({ pageSize, current: current, + // areaCodes:areaCodes, ...searchFormData.value, }) .catch(() => { @@ -267,6 +268,7 @@ async function getList() { hideLoading() } } + /** * 搜索 */ @@ -631,6 +633,14 @@ const handleRetryExport = (record) => { message.error('重新导出失败'); }); }; + +// 选择区域后 +// 如果你用 diff --git a/src/views/workorderMenu/invalidWzorkOrder/index.vue b/src/views/workorderMenu/invalidWzorkOrder/index.vue index ed8f772..216daf2 100644 --- a/src/views/workorderMenu/invalidWzorkOrder/index.vue +++ b/src/views/workorderMenu/invalidWzorkOrder/index.vue @@ -34,7 +34,7 @@ - + @@ -134,6 +134,7 @@ import { formatUtcDateTime } from '@/utils/util' import EditDialog from './components/EditDialog.vue' import { useI18n } from 'vue-i18n' import storage from '@/utils/storage' +import AreaCascader from '@/components/AreaCascader/index.vue' defineOptions({ // eslint-disable-next-line vue/no-reserved-component-names name: 'menu', diff --git a/src/views/workorderMenu/serviceWorkOrder/components/EditDialog.vue b/src/views/workorderMenu/serviceWorkOrder/components/EditDialog.vue new file mode 100644 index 0000000..00dfd42 --- /dev/null +++ b/src/views/workorderMenu/serviceWorkOrder/components/EditDialog.vue @@ -0,0 +1,266 @@ + + + + + diff --git a/src/views/workorderMenu/serviceWorkOrder/index.vue b/src/views/workorderMenu/serviceWorkOrder/index.vue index e69de29..216daf2 100644 --- a/src/views/workorderMenu/serviceWorkOrder/index.vue +++ b/src/views/workorderMenu/serviceWorkOrder/index.vue @@ -0,0 +1,248 @@ + + + + +