-
-
+
-
+
-
-
\ No newline at end of file
diff --git a/src/views/emergency/equip/inventory/AddWarehouse.vue b/src/views/emergency/house/dialog/add-equip-dialog.vue
similarity index 79%
rename from src/views/emergency/equip/inventory/AddWarehouse.vue
rename to src/views/emergency/house/dialog/add-equip-dialog.vue
index ed0b159..da227cf 100644
--- a/src/views/emergency/equip/inventory/AddWarehouse.vue
+++ b/src/views/emergency/house/dialog/add-equip-dialog.vue
@@ -3,7 +3,13 @@
-
+
@@ -30,7 +36,7 @@
@@ -40,14 +46,14 @@
:min="0"
:step="1"
step-strictly
- v-model="addPostFactorForm.equnum"
+ v-model="addForm.equnum"
>
@@ -55,7 +61,7 @@
@@ -63,7 +69,7 @@
@@ -71,7 +77,7 @@
@@ -79,7 +85,7 @@
@@ -111,9 +117,15 @@
:disabled="props.readonly"
>
![]()
>>>>>> e36af856493c21fdd846c5881a8f69d73962aad5:src/views/emergency/house/dialog/add-equip-dialog.vue
/>
();
const userStore = useUserStore();
const user = ref(JSON.parse(userStore.userInfo));
@@ -220,22 +234,28 @@ 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: "保存成功",
type: "success",
});
onclone();
+ } else {
+ ElMessage.error({
+ message: res.message,
+ type: "success",
+ });
}
});
}
@@ -253,7 +273,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) {
@@ -268,38 +288,30 @@ 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_IMG_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 = () => {
emits("close");
};
-//获取仓库
-const houseNameList = ref([]);
-const OtheWareHouseList = () => {
- getOtheWareHouseList({}).then((res: any) => {
- houseNameList.value = res.data;
- });
-};
-onMounted(() => {
- OtheWareHouseList();
-});
+
+onMounted(() => {});
+
watch(
() => props.form,
(val) => {
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/house/index.vue b/src/views/emergency/house/index.vue
new file mode 100644
index 0000000..3273b3c
--- /dev/null
+++ b/src/views/emergency/house/index.vue
@@ -0,0 +1,228 @@
+
+
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/emergency/plan/index.vue b/src/views/emergency/plan/index.vue
index 3b0b7e4..16c467d 100644
--- a/src/views/emergency/plan/index.vue
+++ b/src/views/emergency/plan/index.vue
@@ -3,7 +3,7 @@
-
+
-
+
{
- tableCheckBoxs.value = [];
- for (let index = 0; index < val.length; index++) {
- const element = val[index];
- tableCheckBoxs.value.push(element.othteamid);
- }
-};
//获取应急队伍列表
-const getCompanyList = () => {
+const getList = () => {
tableDataloading.value = true;
let params = {
limit: pageSize.value,
@@ -173,14 +145,14 @@ const getCompanyList = () => {
});
};
//删除
-const del = () => {
+const del = (id) => {
ElMessageBox.confirm("是否确认删除?", "提示", {
confirmButtonText: "是",
cancelButtonText: "否",
type: "warning",
}).then(() => {
let params = {
- othteamid: tableCheckBoxs.value.join(","),
+ othteamid: id,
userId: userId.value,
};
delOthteam(params).then((res: any) => {
@@ -195,24 +167,26 @@ const del = () => {
type: "error",
});
}
- getCompanyList();
+ getList();
});
});
};
//详情
const todetail = (id) => {
router.push({
- name: "form_details",
+ name: "team-detail",
query: { id: id },
});
};
-//关闭职清单详情弹窗
+//关闭详情弹窗
const onclone = () => {
dialogVisible.value = false;
form.value = {};
};
-onMounted(() => {});
+onMounted(() => {
+ getList();
+});
+
新增
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/emergency/matter/details.vue b/src/views/emergency/matter/details.vue
deleted file mode 100644
index 0e83cf5..0000000
--- a/src/views/emergency/matter/details.vue
+++ /dev/null
@@ -1,162 +0,0 @@
-
-
-
+
+
+
+ {{ scope.row.nameText || "-" }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{};
//获取列表
const tableDataloading = ref(false);
-const getCompanyList = () => {
+const getList = () => {
tableDataloading.value = true;
let params = {
planname: search.value,
@@ -183,10 +182,10 @@ const OthtypeList = () => {
const onclone = () => {
dialogVisible.value = false;
form.value = {};
- getCompanyList();
+ getList();
};
onMounted(() => {
- getCompanyList();
+ getList();
OthtypeList();
});
diff --git a/src/views/emergency/procession/addMemberDialog.vue b/src/views/emergency/procession/add-member-dialog.vue
similarity index 88%
rename from src/views/emergency/procession/addMemberDialog.vue
rename to src/views/emergency/procession/add-member-dialog.vue
index 99106ec..c1b1141 100644
--- a/src/views/emergency/procession/addMemberDialog.vue
+++ b/src/views/emergency/procession/add-member-dialog.vue
@@ -3,7 +3,7 @@
{});
const emits = defineEmits(["close", "onSubmit"]);
//保存并退出
const handleSubmit = () => {
formRef.value?.validate((valid) => {
if (valid) {
- let str = addPostFactorForm.value.othpersonid?'编辑成功':'新增成功'
- if(addPostFactorForm.value.othpersonid)addPostFactorForm.value.othpersonid = addPostFactorForm.value.othpersonid || getUUID();
- addPostFactorForm.value.othteamid = othteamid.value;
- addPostFactorForm.value.userId = userId.value;
+ let str = addPostFactorForm.value.othpersonid ? "编辑成功" : "新增成功";
+ addPostFactorForm.value.othpersonid =
+ addPostFactorForm.value.othpersonid || getUUID();
+ addPostFactorForm.value.othteamid = othteamid.value;
+ addPostFactorForm.value.userId = userId.value;
saveOthperson(addPostFactorForm.value).then((res: any) => {
if (res.code == 1) {
ElMessage.success({
@@ -113,6 +114,7 @@ watch(
if (val) {
if (!props.visible) return;
addPostFactorForm.value = val;
+ othteamid.value = props.id;
}
}
);
diff --git a/src/views/emergency/procession/details.vue b/src/views/emergency/procession/add-team-dialog.vue
similarity index 100%
rename from src/views/emergency/procession/details.vue
rename to src/views/emergency/procession/add-team-dialog.vue
diff --git a/src/views/emergency/procession/index.vue b/src/views/emergency/procession/index.vue
index 00007ea..124e250 100644
--- a/src/views/emergency/procession/index.vue
+++ b/src/views/emergency/procession/index.vue
@@ -8,30 +8,22 @@
-
+
-
+
-
新增
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
-