diff --git a/.env.development b/.env.development index a600124..eef8e0f 100644 --- a/.env.development +++ b/.env.development @@ -11,10 +11,10 @@ VITE_OPEN_PROXY = false VITE_PROXY_API = /dev-api -# VITE_PROXY = [ ["/dev-api", "http://192.168.110.186:8040" ],["/dev-img-api", "http://file.sczysoft.com" ]] - # http://42.193.40.239:8017/doc.html//线上 http://192.168.110.186:8017/doc.html//本地 -VITE_PROXY = [ ["/dev-api", "http://192.168.110.186:8017" ],["/dev-img-api", "http://file.sczysoft.com" ]] + +VITE_PROXY = [ ["/dev-api", "http://42.193.40.239:8017" ],["/dev-img-api", "http://file.sczysoft.com" ]] +# VITE_PROXY = [ ["/dev-api", "http://192.168.110.186:8017" ],["/dev-img-api", "http://file.sczysoft.com" ]] # VITE_GLOB_UPLOAD_URL=/dev-api VITE_UPLOAD_IMG_URL=/dev-img-api diff --git a/src/api/Othteam.ts b/src/api/Othteam.ts index 416ed41..1f977b1 100644 --- a/src/api/Othteam.ts +++ b/src/api/Othteam.ts @@ -157,6 +157,16 @@ export function getOtheWareHousePage(data) { params: data }); } +/** +*应急仓库详情 +*/ +export function getHouseDetail(houseId) { + return request({ + url: `admin/OtheWareHouse/getOtheWareHouse`, + method: "GET", + params: { houseId } + }); +} /** *应急仓库管理员列表 @@ -165,15 +175,15 @@ export function getHouseSysUser(userId) { return request({ url: `admin/OtheWareHouse/getHouseSysUser`, method: "GET", - params: {userId} + params: { userId } }); } /** *应急仓库添加-修改 */ -export function delOthpersonHouse(data) { +export function saveOtheWareHouse(data) { return request({ - url: `admin/OtheWareHouse/delOthperson`, + url: `admin/OtheWareHouse/saveOtheWareHouse`, method: "POST", data: data }); diff --git a/src/assets/icons/icon-statistic.svg b/src/assets/icons/icon-statistic.svg new file mode 100644 index 0000000..032d32d --- /dev/null +++ b/src/assets/icons/icon-statistic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-trends.svg b/src/assets/icons/icon-trends.svg new file mode 100644 index 0000000..bd03194 --- /dev/null +++ b/src/assets/icons/icon-trends.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-work.svg b/src/assets/icons/icon-work.svg new file mode 100644 index 0000000..fee970f --- /dev/null +++ b/src/assets/icons/icon-work.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/modules/emergency.js b/src/router/modules/emergency.js index ad9b9a3..c8491fd 100644 --- a/src/router/modules/emergency.js +++ b/src/router/modules/emergency.js @@ -36,15 +36,29 @@ export default { ] }, { - path: 'resourse', - name: 'resourse', - component: () => import('@/views/emergency/matter/index.vue'), + path: 'house', + name: 'house', + component: () => import('@/views/emergency/house/index.vue'), meta: { icon: 'point', - auth: "emer.resourse", + auth: "emer.house", title: '物资管理', breadcrumb: true, //是否显示面包屑 - } + }, + children: [ + { + path: 'house-detail', + name: 'house-detail', + component: () => import('@/views/emergency/house/details.vue'), + meta: { + auth: "emer.house.detail", + title: '仓库详情', + sidebar: false, //是否在菜单栏显示 + breadcrumb: true, //是否显示面包屑 + activeMenu: '/emergency/house' + } + } + ] }, { path: 'shelter', diff --git a/src/router/modules/statistic.js b/src/router/modules/statistic.js index 6badfbe..47e3de6 100644 --- a/src/router/modules/statistic.js +++ b/src/router/modules/statistic.js @@ -8,7 +8,7 @@ export default { meta: { auth: "statistic", title: '统计分析', - icon: 'point', + icon: 'icon-statistic', }, children: [ { diff --git a/src/router/modules/work-manage.js b/src/router/modules/work-manage.js index e60526d..c74633f 100644 --- a/src/router/modules/work-manage.js +++ b/src/router/modules/work-manage.js @@ -8,7 +8,7 @@ export default { meta: { auth: "daily", title: '工作管理', - icon: 'point', + icon: 'icon-work', }, children: [ { diff --git a/src/router/modules/work-trends.js b/src/router/modules/work-trends.js index bceac7c..977e390 100644 --- a/src/router/modules/work-trends.js +++ b/src/router/modules/work-trends.js @@ -8,7 +8,7 @@ export default { meta: { auth: "trends", title: '工作动态', - icon: 'point', + icon: 'icon-trends', }, children: [ { diff --git a/src/views/emergency/equip/index.vue b/src/views/emergency/equip/index.vue deleted file mode 100644 index 7ccb47a..0000000 --- a/src/views/emergency/equip/index.vue +++ /dev/null @@ -1,219 +0,0 @@ - - - \ No newline at end of file diff --git a/src/views/emergency/equip/inventory/AddWarehouse.vue b/src/views/emergency/equip/inventory/AddWarehouse.vue deleted file mode 100644 index b9e9db3..0000000 --- a/src/views/emergency/equip/inventory/AddWarehouse.vue +++ /dev/null @@ -1,322 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/emergency/equip/inventory/inventory.vue b/src/views/emergency/equip/inventory/inventory.vue deleted file mode 100644 index a2558d8..0000000 --- a/src/views/emergency/equip/inventory/inventory.vue +++ /dev/null @@ -1,184 +0,0 @@ - - diff --git a/src/views/emergency/house/details.vue b/src/views/emergency/house/details.vue new file mode 100644 index 0000000..26b370a --- /dev/null +++ b/src/views/emergency/house/details.vue @@ -0,0 +1,422 @@ + + + \ No newline at end of file diff --git a/src/views/emergency/matter/add-edit-dialog.vue b/src/views/emergency/house/dialog/add-equip-dialog.vue similarity index 84% rename from src/views/emergency/matter/add-edit-dialog.vue rename to src/views/emergency/house/dialog/add-equip-dialog.vue index 3356e01..9d5f712 100644 --- a/src/views/emergency/matter/add-edit-dialog.vue +++ b/src/views/emergency/house/dialog/add-equip-dialog.vue @@ -22,13 +22,13 @@ label-position="right" label-width="150px" :rules="ruleForm" - :model="addPostFactorForm" + :model="addForm" > @@ -36,7 +36,7 @@ @@ -46,14 +46,14 @@ :min="0" :step="1" step-strictly - v-model="addPostFactorForm.equnum" + v-model="addForm.equnum" > @@ -61,7 +61,7 @@ @@ -69,7 +69,7 @@ @@ -77,7 +77,7 @@ @@ -85,7 +85,7 @@ @@ -117,8 +117,8 @@ :disabled="props.readonly" > @@ -228,16 +228,17 @@ const props = defineProps({ id: String, }); const listperformid = ref(props.id); -const addPostFactorForm = ref({}); +const addForm = ref({}); const emits = defineEmits(["close", "onSubmit"]); //保存并退出 const handleSubmit = () => { formRef.value?.validate((valid) => { if (valid) { - addPostFactorForm.value.othequipmentid = - addPostFactorForm.value.othequipmentid || uuid.value; - addPostFactorForm.value.userId = userId.value; - saveOthequipment(addPostFactorForm.value).then((res: any) => { + addForm.value.othequipmentid = addForm.value.othequipmentid || uuid.value; + addForm.value.userId = userId.value; + addForm.value.houseId = props.id; + + saveOthequipment(addForm.value).then((res: any) => { if (res.code == 1) { ElMessage.success({ message: "保存成功", @@ -266,7 +267,7 @@ const handleUpload = (res) => { let file = res.file; const formData = new FormData(); formData.append("file", file); - let uuids = addPostFactorForm.value.othequipmentid || uuid.value; + let uuids = addForm.value.othequipmentid || uuid.value; uploadFile(userId.value, uuids, FileType.equipment, formData).then( (res: any) => { if (res) { @@ -281,16 +282,15 @@ const handleUpload = (res) => { }; //图片查询 const getFiles = () => { - getFile( - addPostFactorForm.value.othequipmentid || uuid.value, - FileType.equipment - ).then((res: any) => { - if (res.data.length > 0) { - const path = res.data[res.data.length - 1]; - addPostFactorForm.value.equipPhoto = - import.meta.env.VITE_UPLOAD_URL + path.filepath; + getFile(addForm.value.othequipmentid || uuid.value, FileType.equipment).then( + (res: any) => { + if (res.data.length > 0) { + const path = res.data[res.data.length - 1]; + addForm.value.equipPhoto = + import.meta.env.VITE_UPLOAD_URL + path.filepath; + } } - }); + ); }; //关闭弹窗 const onclone = () => { @@ -305,7 +305,7 @@ watch( uuid.value = getUUID(); if (val) { if (!props.visible) return; - addPostFactorForm.value = val; + addForm.value = val; getFiles(); } } diff --git a/src/views/emergency/equip/details.vue b/src/views/emergency/house/dialog/add-house-dialog.vue similarity index 73% rename from src/views/emergency/equip/details.vue rename to src/views/emergency/house/dialog/add-house-dialog.vue index ace14e0..ef242d0 100644 --- a/src/views/emergency/equip/details.vue +++ b/src/views/emergency/house/dialog/add-house-dialog.vue @@ -3,12 +3,12 @@
- - - - - + + - + - + - -
@@ -123,7 +91,11 @@ import { reactive, ref, onMounted, watch } from "vue"; import useUserStore from "@/store/modules/user"; import { ElMessage, FormInstance, FormRules } from "element-plus"; import { getYears, getUUID, FileType } from "@/utils/common"; -import { delOthpersonHouse, getOtheWareHouseList,getHouseSysUser } from "@/api/Othteam"; +import { + saveOtheWareHouse, + getOtheWareHouseList, + getHouseSysUser, +} from "@/api/Othteam"; import { areaTree } from "@/api/account"; const formRef = ref(); const userStore = useUserStore(); @@ -149,12 +121,12 @@ const ruleForm = reactive({ name: [ { required: true, - message: "请选择仓库管理员", + message: "请输入仓库管理员", trigger: "change", }, ], }); -const adminOptions = ref([]) +const adminOptions = ref([]); const props = defineProps({ visible: { type: Boolean, @@ -174,29 +146,32 @@ const emits = defineEmits(["close", "onSubmit"]); const handleSubmit = () => { formRef.value?.validate((valid) => { if (valid) { - // addPostFactorForm.value.chinaname = adminId.value; addPostFactorForm.value.houseId = addPostFactorForm.value.houseId || uuid.value; addPostFactorForm.value.userId = userId.value; - delOthpersonHouse(addPostFactorForm.value).then((res: any) => { + saveOtheWareHouse(addPostFactorForm.value).then((res: any) => { if (res.code == 1) { ElMessage.success({ message: "保存成功", type: "success", }); onclone(); - } + } else + ElMessage.error({ + message: res.message, + type: "success", + }); }); } return false; }); }; - // 政府用户列表 +// 政府用户列表 const getGovUserList = () => { - getHouseSysUser(userId.value).then((res:any) => { + getHouseSysUser(userId.value).then((res: any) => { adminOptions.value = res.data; - }) -} + }); +}; //获取地区 const orgList = ref([]); const getareaTree = () => { @@ -205,22 +180,23 @@ const getareaTree = () => { }); }; const handleAreaChange = (val) => { - addPostFactorForm.value.orgCode = addPostFactorForm.value.orgCode[addPostFactorForm.value.orgCode.length - 1]; + addPostFactorForm.value.orgCode = + addPostFactorForm.value.orgCode[addPostFactorForm.value.orgCode.length - 1]; addPostFactorForm.value.streetCode = val[1] || ""; addPostFactorForm.value.communityCode = val[2] || ""; -} +}; //选择管理员数据处理 -const condition =ref('') +const condition = ref(""); const remoteMethod = (val) => { condition.value = val; getGovUserList(); -} +}; //选择管理员数据处理 -const adminId =ref('') +const adminId = ref(""); const adminOption = (val) => { adminId.value = val; -} +}; //关闭弹窗 const onclone = () => { emits("close"); diff --git a/src/views/emergency/matter/index.vue b/src/views/emergency/house/index.vue similarity index 79% rename from src/views/emergency/matter/index.vue rename to src/views/emergency/house/index.vue index 3920db3..3273b3c 100644 --- a/src/views/emergency/matter/index.vue +++ b/src/views/emergency/house/index.vue @@ -22,7 +22,7 @@