diff --git a/packages/mobile/src/views/Home.vue b/packages/mobile/src/views/Home.vue index fccca5e..0fa0a70 100644 --- a/packages/mobile/src/views/Home.vue +++ b/packages/mobile/src/views/Home.vue @@ -87,7 +87,7 @@ const getYHZinfo = async () => { method: "GET", }); if (res.code === "00000") { - yhzinfo.value = res.data; + yhzinfo.value = res.data[0]; } else { throw new Error(res.message); } diff --git a/packages/mobile/src/views/Material/MaterialManagement.vue b/packages/mobile/src/views/Material/MaterialManagement.vue index 1a71dc5..27457f4 100644 --- a/packages/mobile/src/views/Material/MaterialManagement.vue +++ b/packages/mobile/src/views/Material/MaterialManagement.vue @@ -440,7 +440,6 @@ const handleGetLocation = () => { (position) => { form.material.jd = position.coords.longitude.toFixed(6); form.material.wd = position.coords.latitude.toFixed(6); - showToast("定位成功"); }, (error) => { const errorMessage = diff --git a/packages/screen/src/views/MaterialManagement/addDialog.vue b/packages/screen/src/views/MaterialManagement/addDialog.vue index 7699c79..96c258a 100644 --- a/packages/screen/src/views/MaterialManagement/addDialog.vue +++ b/packages/screen/src/views/MaterialManagement/addDialog.vue @@ -2,6 +2,8 @@
{{ yhzData.rawName }} - + - + - + + + - - - - - - - - + + + + + + + + + + @@ -54,7 +60,7 @@ \ No newline at end of file diff --git a/packages/screen/src/views/ServiceStationManagePage/component/MaterialAddDialog.vue b/packages/screen/src/views/ServiceStationManagePage/component/MaterialAddDialog.vue index 4150bf3..4c036bc 100644 --- a/packages/screen/src/views/ServiceStationManagePage/component/MaterialAddDialog.vue +++ b/packages/screen/src/views/ServiceStationManagePage/component/MaterialAddDialog.vue @@ -2,6 +2,8 @@
{{ basicData.mc }} - + - + - + + + - - - - - - - - + + + + + + + + + + @@ -54,7 +60,7 @@ diff --git a/packages/screen/src/views/ServiceStationManagePage/component/PersonAddDialog.vue b/packages/screen/src/views/ServiceStationManagePage/component/PersonAddDialog.vue index 1366eeb..6a7cf70 100644 --- a/packages/screen/src/views/ServiceStationManagePage/component/PersonAddDialog.vue +++ b/packages/screen/src/views/ServiceStationManagePage/component/PersonAddDialog.vue @@ -2,16 +2,19 @@
- + - + - - + + + + +
diff --git a/packages/screen/src/views/ServiceStationManagePage/detailDrawer.vue b/packages/screen/src/views/ServiceStationManagePage/detailDrawer.vue index e0df01a..c2f2443 100644 --- a/packages/screen/src/views/ServiceStationManagePage/detailDrawer.vue +++ b/packages/screen/src/views/ServiceStationManagePage/detailDrawer.vue @@ -144,6 +144,51 @@ const columns = () => { ); }, }, + { + label: "操作", + fixed: "right", + width: 150, + render: (row) => () => + h("div", { class: "action-btns" }, [ + h( + ElButton, + { + type: "danger", + link: true, + style: "margin-left: 10px;", + onClick: async () => { + try { + await ElMessageBox.confirm( + "确定要删除该人员吗？", + "删除确认", + { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + } + ); + const res = await request({ + url: `/snow-ops-platform/yhzry/delete`, + method: "POST", + data: { + id: row.id, + }, + }); + if (res.code === "00000") { + ElMessage.success("删除成功"); + getPeopleList(); + } + } catch (error) { + if (error instanceof Error) { + ElMessage.error(error.message || "删除失败"); + } + } + }, + }, + () => "删除" + ), + ]), + }, ]; case "material": return [ @@ -241,7 +286,7 @@ const getPeopleList = async () => { const data = { pageNum: pagination.current, pageSize: pagination.pageSize, - yhzid: Number(props.basicData.id), + yhzid: props.basicData.id, }; const res = await request({ url: "/snow-ops-platform/yhzry/list", @@ -333,8 +378,8 @@ const INIT_FORM_people = { yhzid: props.basicData.id, sjhm: "", xm: "", - sfjwd: "", - jwd: "", + jd: "", + wd: "", }; const materialForm = reactive({}); const INIT_FORM_material = { @@ -381,6 +426,7 @@ const INIT_FORM_equipment = { fsfw: "", yhzid: props.basicData.id, }; +const dialogRef = ref(null); const modelVisible = ref(false); const model = reactive({ title: "", @@ -442,44 +488,58 @@ const handleAdd = () => { // 新增负责人 const handleAddPeopleConfirm = async () => { - try { - const res = await request({ - url: "/snow-ops-platform/yhzry/add", - method: "post", - data: toRaw(peopleForm.value), + await dialogRef?.value?.dynamicComponentRef?.formRef + .validate() + .then(async () => { + try { + const res = await request({ + url: "/snow-ops-platform/yhzry/add", + method: "post", + data: toRaw(peopleForm), + }); + if (res.code === "00000") { + ElMessage.success("新增成功"); + modelVisible.value = false; + getPeopleList(); + } else { + throw new Error(res.message); + } + } catch (error) { + console.log(error); + ElMessage.error(error.message); + } + }) + .catch((err) => { + ElMessage.error("请处理表单中的错误项"); }); - if (res.code === "00000") { - ElMessage.success("新增成功"); - modelVisible.value = false; - getPeopleList(); - } else { - throw new Error(res.message); - } - } catch (error) { - console.log(error); - ElMessage.error(error.message); - } }; // 新增物资 const handleAddMaterialConfirm = async () => { - try { - const res = await request({ - url: "/snow-ops-platform/yjwz/add", - method: "post", - data: toRaw(materialForm), + await dialogRef?.value?.dynamicComponentRef?.formRef + .validate() + .then(async () => { + try { + const res = await request({ + url: "/snow-ops-platform/yjwz/add", + method: "post", + data: toRaw(materialForm), + }); + if (res.code === "00000") { + ElMessage.success("新增成功"); + modelVisible.value = false; + getMaterialList(); + } else { + throw new Error(res.message); + } + } catch (error) { + console.log(error); + ElMessage.error(error.message); + } + }) + .catch((err) => { + ElMessage.error("请处理表单中的错误项"); }); - if (res.code === "00000") { - ElMessage.success("新增成功"); - modelVisible.value = false; - getMaterialList(); - } else { - throw new Error(res.message); - } - } catch (error) { - console.log(error); - ElMessage.error(error.message); - } }; // 新增设备 diff --git a/packages/screen/src/views/ServiceStationManagePage/index.js b/packages/screen/src/views/ServiceStationManagePage/index.js index 7e910ca..624e468 100644 --- a/packages/screen/src/views/ServiceStationManagePage/index.js +++ b/packages/screen/src/views/ServiceStationManagePage/index.js @@ -2,6 +2,7 @@ import { h, ref, onMounted, reactive, watch, toRaw, nextTick } from "vue"; import { request } from "@/utils/request"; import { useRoute, useRouter } from 'vue-router' import DetailDrawer from "./detailDrawer.vue"; +import AddDialog from "./addDialog.vue"; const tableData = ref([]); // 表格数据 const filterData = reactive({ @@ -16,8 +17,19 @@ const model = reactive({ props: {}, onCancel: null, onConfirm: null, + width: '', }); // 弹窗内容 -const form = reactive({}); +const form = reactive({ +}); +const INIT_FORM = { + qxmc: "", + mc: "", + fzrXm: "", + fzrSjhm: "", + fzrUserId: "", + jd: "", + wd: "", +}; const drawer = reactive({ title: '', content: null, @@ -113,9 +125,49 @@ const getYhzDetail = async (row) => { // 打开新增养护站弹窗 const openAddDialog = () => { - - console.log('新增',) + model.title = '新增养护站'; + Object.assign(form, INIT_FORM); + model.props = { + form: form, + }; + model.content = AddDialog; + model.onCancel = () => { + dialogType.value = ''; + modelVisible.value = false; + }; + model.onConfirm = async () => { + dialogType.value = ''; + await dialogRef?.value?.dynamicComponentRef?.formRef.validate().then(() => { + addYHZ(); + }) + .catch((err) => { + ElMessage.error('请处理表单中的错误项'); + }); + }; + model.width = "50%" + modelVisible.value = true; }; + +// 新增养护站 +const addYHZ = async () => { + try { + const res = await request({ + url: "/snow-ops-platform/yhz/add", + method: "POST", + data: form, + }); + if (res.code === "00000") { + ElMessage.success("新增成功"); + modelVisible.value = false; + getTableData(); + } else { + throw new Error(res.message); + } + } catch (error) { + ElMessage.error(error.message || "新增失败"); + } +}; + export default () => { const router = useRouter();