diff --git a/src/views/login/platForm.vue b/src/views/login/platForm.vue index 72da4f9..f847191 100644 --- a/src/views/login/platForm.vue +++ b/src/views/login/platForm.vue @@ -2,7 +2,7 @@
-
+
@@ -32,7 +32,7 @@ 南通市通州区互联网+智慧养老居家上门服务项目
-
+
@@ -55,10 +55,10 @@
- {{ '< 返回' }} + {{ '< 返回' }}

请选择您的管理组织

- +
@@ -85,6 +85,7 @@ const { locale, t } = useI18n() defineOptions({ name: 'PlatForm', }) +const ishow = ref(true) const appStore = useAppStore() const routerStore = useRouterStore() const userStore = useUserStore() @@ -97,18 +98,18 @@ onBeforeMount(() => { document.body.className = 'body-bg' }) async function handleSelect(type) { - if (type === 'yunying') { - currentPlatForm.value = 'yunying' - - } else { - storage.local.setItem('platform', type) - await appStore.init() - goIndex() - } - + // if (type === 'hujiao') { + // storage.local.setItem('platform', type) + // await appStore.init() + // goIndex() + // } else { + // currentPlatForm.value = type + // ishow.value = false + // } + currentPlatForm.value = type + ishow.value = false } async function goIndex() { - console.log('goIndex') const indexRoute = getFirstValidRoute() console.log(indexRoute) if (!indexRoute) return @@ -133,7 +134,7 @@ function getFirstValidRoute() { return indexRoute } async function handleChange(e) { - storage.local.setItem('platform', 'yunying') + storage.local.setItem('platform',currentPlatForm.value) storage.local.setItem('stationId', e) await appStore.init() goIndex() diff --git a/src/views/serverObj/serverList/components/BasicInfo.vue b/src/views/serverObj/serverList/components/BasicInfo.vue index 8ef5f7a..3316399 100644 --- a/src/views/serverObj/serverList/components/BasicInfo.vue +++ b/src/views/serverObj/serverList/components/BasicInfo.vue @@ -145,16 +145,6 @@ {{ formatArea(formData.archive.houseAreaLabels) }} {{ formData.archive.householdDetailAddress || '' }}
- - -
- 身份证照片: -
- -
-
-
diff --git a/src/views/serverObj/serverList/components/EditDialog.vue b/src/views/serverObj/serverList/components/EditDialog.vue index c3f4c4f..e828f0d 100644 --- a/src/views/serverObj/serverList/components/EditDialog.vue +++ b/src/views/serverObj/serverList/components/EditDialog.vue @@ -451,8 +451,7 @@ - + @@ -478,9 +477,10 @@ import dayjs from 'dayjs' import storage from '@/utils/storage' import { message } from 'ant-design-vue' import { FastBackwardFilled } from '@ant-design/icons-vue' - +import UploadInput from '@/components/Upload/UploadInput.vue' const emit = defineEmits(['ok']) const activeKey = ref('1') +const uploadedDocuments=ref([]) const { modal, showModal, hideModal, showLoading, hideLoading } = useModal() const { formRecord, formData, formRef, formRules, resetForm } = useForm() const areaCascaderRef = ref() @@ -540,11 +540,12 @@ async function handleEdit(record = {}) { formData.value = { ...data } formData.value.birthDate = dayjs(data.birthDate) formData.value.archive.idCardPhotos = data.archive.idCardPhotos ? data.archive.idCardPhotos.map(item => config('http.apiUpload') + item) : [] - formData.value.archive.uploadedDocuments = data.archive.uploadedDocuments ? data.archive.uploadedDocuments.map(item => config('http.apiUpload') + item) : [] + uploadedDocuments.value = data.archive.uploadedDocuments ? data.archive.uploadedDocuments.map(item => config('http.apiUpload') + item) : [] + formData.value.governmentPurchasedServiceStartDate = [dayjs(formData.value.starGovernmentService), dayjs(formData.value.endGovernmentService)] nextTick(() => { - areaCascaderRef.value.initData(data.archive.homeAreaCodes) - houseAreaRef.value.initData(data.archive.houseAreaCodes) + areaCascaderRef.value.initData(data.archive.homeAreaCodes||['']) + houseAreaRef.value.initData(data.archive.houseAreaCodes||['']) }) spining.value = false } catch (error) { @@ -619,7 +620,7 @@ function handleOk() { } params.archive.idCardPhotos = formData.value.archive.idCardPhotos && formData.value.archive.idCardPhotos.length > 0 ? formData.value.archive.idCardPhotos.map(item => spliceUrl(item)) : [] - params.archive.uploadedDocuments = formData.value.archive.uploadedDocuments && formData.value.archive.uploadedDocuments.length > 0 ? formData.value.archive.uploadedDocuments.map(item => spliceUrl(item)) : [] + params.archive.uploadedDocuments = uploadedDocuments.value && uploadedDocuments.value.length > 0 ? uploadedDocuments.value.map(item => spliceUrl(item)) : [] if (formData.value.governmentPurchasedServiceStartDate && formData.value.governmentPurchasedServiceStartDate.length > 0) { params.archive.starGovernmentService = formData.value.governmentPurchasedServiceStartDate[0] params.archive.endGovernmentService = formData.value.governmentPurchasedServiceStartDate[1] @@ -694,7 +695,6 @@ function handleCancel() { */ function onAfterClose() { activeKey.value='1' - resetForm() formData.value.archive = {} hideLoading() } diff --git a/src/views/serverObj/serverList/components/TransferOut.vue b/src/views/serverObj/serverList/components/TransferOut.vue index 1645657..f970295 100644 --- a/src/views/serverObj/serverList/components/TransferOut.vue +++ b/src/views/serverObj/serverList/components/TransferOut.vue @@ -13,30 +13,30 @@ - + - - + + {{ item.introduction }} - + - + - + - + - + @@ -63,8 +63,8 @@ const spining = ref(false) formRules.value = { reason: [{ required: true, message: '请选择原因', trigger: 'change' }], directionType: [{ required: true, message: '请选择类型', trigger: 'change' }], - nStationId:[{ required: true, message: '请选择节点', trigger: 'change' }], - passWayAt:[{ required: true, message: '请选择去世时间', trigger: 'change' }] + nStationId: [{ required: true, message: '请选择节点', trigger: 'change' }], + passWayAt: [{ required: true, message: '请选择去世时间', trigger: 'change' }] } const dicsStore = useDicsStore() @@ -74,15 +74,15 @@ formData.value = {} */ function handleCreate(id) { formData.value.directionType = 'Transfer' - formData.value.direction='Out' - formData.value.customerId=storage.local.getItem('stationId'), - formData.value.stationId=id + formData.value.direction = 'Out' + formData.value.customerId = id + showModal({ type: 'create', title: '转出', }) } -function handleChange(e){ +function handleChange(e) { console.log(e) } @@ -99,8 +99,10 @@ function handleOk() { let params = { ...formData.value, } - if(params.directionType==='Death'){ - params.passWayAt=dayjs(formData.value.passWayAt) + if (params.directionType === 'Death') { + params.passWayAt = dayjs(formData.value.passWayAt) + } else { + formData.value.stationId = storage.local.getItem('stationId') } let result = null switch (modal.value.type) { diff --git a/src/views/serverObj/serverList/components/detail.vue b/src/views/serverObj/serverList/components/detail.vue index be89579..748f966 100644 --- a/src/views/serverObj/serverList/components/detail.vue +++ b/src/views/serverObj/serverList/components/detail.vue @@ -5,7 +5,7 @@
- +

{{ formData.name }} @@ -54,12 +54,13 @@ import { nextTick } from 'vue' import { useForm, useModal } from '@/hooks' +import { config } from '@/config' import apis from '@/apis' const childData = ref({}) const emit = defineEmits(['ok']) // 当前 tab key const activeKey = ref(1) - +const idCardPhotos = ref([]) const { modal, showModal, hideModal, showLoading, hideLoading } = useModal() const { formData, resetForm } = useForm() @@ -106,6 +107,9 @@ const getBasicInfo = async () => { if (!success) { return } + + idCardPhotos.value = data.archive.idCardPhotos ? data.archive.idCardPhotos.map(item => config('http.apiUpload') + item) : [] + console.log('idCardPhotos.value', idCardPhotos.value) return data; } const getDisabledPersonInfo = async () => { @@ -152,6 +156,7 @@ function handleEdit(record = {}) { }) recordId.value = record.id formData.value = cloneDeep(record) + idCardPhotos.value = record.archive.idCardPhotos ? record.archive.idCardPhotos.map(item => config('http.apiUpload') + item) : [] } function handleOk() { diff --git a/src/views/serverObj/serverList/index.vue b/src/views/serverObj/serverList/index.vue index 93aca76..1a2d2ef 100644 --- a/src/views/serverObj/serverList/index.vue +++ b/src/views/serverObj/serverList/index.vue @@ -615,22 +615,21 @@ const detailRef = ref() const lineOrderRef = ref() onMounted(() => { - searchFormData.value.serviceNodeIds = dicsStore.orgTree[0].value - getCount(searchFormData.value.serviceNodeIds) + searchFormData.value.stationId = storage.local.getItem('stationId') || '' }) getPageList() -async function getCount(params) { - try { - const { success, data } = await apis.serverObj.getCount({ serviceNodeCodes: params }) - if (config('http.code.success') === success) { - totalCount.value = data.count - } - } catch (error) { +// async function getCount(params) { +// try { +// const { success, data } = await apis.serverObj.getCount({ serviceNodeCodes: params }) +// if (config('http.code.success') === success) { +// totalCount.value = data.count +// } +// } catch (error) { - } +// } -} +// } /** * 获取表格数据 * @returns {Promise} @@ -653,6 +652,7 @@ async function getPageList() { if (config('http.code.success') === success) { listData.value = data paginationState.total = total + totalCount.value = total } } catch (error) { diff --git a/src/views/serviceMenu/serviceSites/components/EditDialog.vue b/src/views/serviceMenu/serviceSites/components/EditDialog.vue index 8700470..145c0ab 100644 --- a/src/views/serviceMenu/serviceSites/components/EditDialog.vue +++ b/src/views/serviceMenu/serviceSites/components/EditDialog.vue @@ -259,32 +259,12 @@ - -

- -
上传
-
- + - -
- -
上传
-
- + @@ -310,7 +290,8 @@ import { message } from 'ant-design-vue' import MapPickerModal from '@/components/Map/index.vue' import { useDicsStore } from '@/store' import AreaCascader from '@/components/AreaCascader/index.vue' - +import UploadInput from '@/components/Upload/UploadInput.vue' +import { getBirthDate, spliceUrl } from '@/utils/util' const emit = defineEmits(['ok']) const { t } = useI18n() const { modal, showModal, hideModal } = useModal() @@ -449,8 +430,8 @@ async function loadRecord(id, forView = false) { closeTime: record.closeAt ? dayjs(`1970-01-01 ${record.closeAt}`) : null, businessStatus: record.status || '', services: record.provideServices || [], - qualificationFiles: record.qualificationAttachment?.map(url => ({ uid: url, url })) || [], - siteImages: record.stationImgs?.map(url => ({ uid: url, url })) || [], + qualificationFiles: (record.qualificationAttachment && record.qualificationAttachment.length > 0) ? record.qualificationAttachment.map(item => config('http.apiUpload') + item) : [], + siteImages: (record.stationImgs && record.stationImgs.length > 0) ? record.stationImgs.map(item => config('http.apiUpload') + item) : [], latitude: record.latitude || 0, longitude: record.longitude || 0, } @@ -497,7 +478,8 @@ function handleOk() { Status: values.businessStatus || '', ProvideServices: values.services?.length ? values.services : null, QualificationAttachment: values.qualificationFiles?.map(f => f.url || f.response?.url) || null, - StationImgs: values.siteImages?.map(f => f.url || f.response?.url) || null, + QualificationAttachment:( values.qualificationFiles && values.qualificationFiles.length) > 0 ? values.qualificationFiles.map(item => spliceUrl(item)) : [], + StationImgs:( values.siteImages && values.siteImages.length) > 0 ? values.siteImages.map(item => spliceUrl(item)) : [], } let result diff --git a/src/views/workorderMenu/serviceWorkOrder/index.vue b/src/views/workorderMenu/serviceWorkOrder/index.vue index 1e033ef..32c773d 100644 --- a/src/views/workorderMenu/serviceWorkOrder/index.vue +++ b/src/views/workorderMenu/serviceWorkOrder/index.vue @@ -13,7 +13,7 @@