Merge branch 'dev' of http://222.212.85.86:8222/bdzl2/bxztApp into dev

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);
     }

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 =

packages/screen/src/views/MaterialManagement/addDialog.vue

@@ -2,6 +2,8 @@
   <div class="detail-container">
     <el-form
       ref="formRef"
+      :model="form"
+      :rules="rules"
       label-position="right"
       label-width="150px"
       style="max-height: 60vh; overflow-y: auto; padding-right: 50px"
@@ -9,23 +11,26 @@
       <el-form-item label="所属服务站：">
         <span>{{ yhzData.rawName }}</span>
       </el-form-item>
-      <el-form-item label="物资名称：">
+      <el-form-item label="物资名称：" prop="wzmc">
         <el-input
           maxlength="20"
           show-word-limit
           v-model="form.material.wzmc"
         ></el-input>
       </el-form-item>
-      <el-form-item label="数量与单位：">
+      <el-form-item label="数量与单位：" required>
         <el-row :gutter="20">
           <el-col :span="16">
+            <el-form-item prop="sl">
               <el-input
-              v-model="form.material.sl"
+                v-model.number="form.material.sl"
                 type="number"
                 placeholder="请输入数量"
               ></el-input>
+            </el-form-item>
           </el-col>
           <el-col :span="8">
+            <el-form-item prop="dw">
               <el-select
                 v-model="form.material.dw"
                 filterable
@@ -40,6 +45,7 @@
                 <el-option label="箱" value="箱"></el-option>
                 <el-option label="袋" value="袋"></el-option>
               </el-select>
+            </el-form-item>
           </el-col>
         </el-row>
       </el-form-item>
@@ -54,7 +60,7 @@
 </template>
     
     <script setup>
-import { ref } from "vue";
+import { ref, computed } from "vue";
 const formRef = ref(null);
 defineExpose({ formRef });
 
@@ -68,6 +74,51 @@ const props = defineProps({
     default: () => ({}),
   },
 });
+
+const rules = computed(() => {
+  return {
+    wzmc: [
+      {
+        required: true,
+        validator: (rule, value, callback) => {
+          if (props.form.material.wzmc) {
+            callback();
+          } else {
+            callback(new Error("请输入物资名称"));
+          }
+        },
+        trigger: "blur",
+      },
+    ],
+    sl: [
+      {
+        required: true,
+        type: "number",
+        validator: (rule, value, callback) => {
+          if (props.form.material.sl) {
+            callback();
+          } else {
+            callback(new Error("请输入数量"));
+          }
+        },
+        trigger: "blur",
+      },
+    ],
+    dw: [
+      {
+        required: true,
+        validator: (rule, value, callback) => {
+          if (props.form.material.dw) {
+            callback();
+          } else {
+            callback(new Error("请选择或输入单位"));
+          }
+        },
+        trigger: "change",
+      },
+    ],
+  };
+});
 </script>
     
     <style>

packages/screen/src/views/MaterialManagement/index.js

@@ -392,6 +392,9 @@ const openAddModel = () => {
         modelVisible.value = false;
     };
     model.onConfirm = async () => {
+        await dialogRef?.value?.dynamicComponentRef?.formRef
+            .validate()
+            .then(async () => {
                 try {
                     console.log('form', toRaw(form))
                     const res = await request({
@@ -411,6 +414,10 @@ const openAddModel = () => {
                     ElMessage.error(error.message);
                     console.log('error', error)
                 }
+            })
+            .catch((err) => {
+                ElMessage.error('请处理表单中的错误项');
+            });
     };
     model.width = '40%';
     modelVisible.value = true;

packages/screen/src/views/ServiceStationManagePage/addDialog.vue

@@ -0,0 +1,265 @@
+<template>
+  <div class="detail-container">
+    <el-form
+      ref="formRef"
+      :model="form"
+      label-position="right"
+      label-width="140px"
+      style="max-height: 60vh; overflow-y: auto; padding-right: 50px"
+      :rules="rules"
+    >
+      <el-row>
+        <el-form-item label="所属区县" prop="qxmc">
+          <el-select
+            v-model="qx"
+            filterable
+            remote
+            reserve-keyword
+            clearable
+            placeholder="输入区县名称查询"
+            :remote-method="remoteMethod_qx"
+            :loading="loading"
+            @change="handleSelect_qx"
+            value-key="index"
+          >
+            <el-option
+              v-for="(item, index) in qxList"
+              :key="index"
+              :label="item.qxmc"
+              :value="item.qxmc"
+            />
+          </el-select>
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="服务站名称" prop="mc">
+            <el-input maxlength="20" show-word-limit v-model="form.mc" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="负责人:" prop="fzr">
+            <el-select
+              v-model="ryxx"
+              filterable
+              remote
+              reserve-keyword
+              clearable
+              placeholder="输入人员名称 / 联系方式 查询"
+              :remote-method="remoteMethod"
+              :loading="loading"
+              @change="handleSelect"
+              value-key="userId"
+            >
+              <el-option
+                v-for="item in selectOptions"
+                :key="item.userId"
+                :label="item.realName"
+                :value="item"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="负责人添加经纬度:">
+            <el-select v-model="sfjwd">
+              <el-option label="是" value="是"></el-option>
+              <el-option label="否" value="否"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="sfjwd === '否'">
+        <el-col :span="12">
+          <el-form-item label="站点经度:" prop="jd">
+            <el-input v-model="form.jd" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="站点纬度:" prop="wd">
+            <el-input v-model="form.wd" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+      
+      <script setup>
+import { ref, onMounted, watch, computed } from "vue";
+import { request } from "@/utils/request";
+const formRef = ref(null);
+defineExpose({ formRef });
+
+const props = defineProps({
+  form: {
+    type: Object,
+    default: () => ({}),
+  },
+});
+const sfjwd = ref("是");
+const qx = ref("");
+const ryxx = ref("");
+const loading = ref(false);
+const selectOptions = ref([]);
+const qxList = ref([]);
+
+// 根据用户信息 查询角色列表
+const getUserList = async (key) => {
+  try {
+    const keyword = key;
+    let url = "";
+    if (keyword) {
+      url = `/snow-ops-platform/yhzry/getUserByKey?key=${keyword}`;
+    } else {
+      url = `/snow-ops-platform/yhzry/getUserByKey?key=`;
+    }
+    const res = await request({
+      url: url,
+      method: "GET",
+    });
+    if (res.code === "00000") {
+      return res.data;
+    } else {
+      throw new Error(res.message);
+    }
+  } catch (error) {
+    ElMessage.error(error.message);
+    console.log(error);
+  }
+};
+
+// 选择人员筛选
+const remoteMethod = async (query) => {
+  if (query === "") {
+    selectOptions.value = [];
+    return [];
+  }
+  loading.value = true;
+  const res = await getUserList(query);
+  if (res) {
+    selectOptions.value = res;
+  }
+  loading.value = false;
+};
+
+// 根据区县名称 查询区县列表
+const getQxList = async (key) => {
+  try {
+    const keyword = key;
+    let url = "";
+    if (keyword) {
+      url = `/snow-ops-platform/district/listDistricts?qxmc=${keyword}`;
+    } else {
+      url = `/snow-ops-platform/district/listDistricts?qxmc=`;
+    }
+    const res = await request({
+      url: url,
+      method: "GET",
+    });
+    if (res.code === "00000") {
+      return res.data;
+    } else {
+      throw new Error(res.message);
+    }
+  } catch (error) {}
+};
+
+// 选择区县筛选
+const remoteMethod_qx = async (query) => {
+  loading.value = true;
+  const res = await getQxList(query);
+  if (res) {
+    qxList.value = res;
+  }
+  loading.value = false;
+};
+
+// 选择区县
+const handleSelect_qx = (value) => {
+  props.form.qxmc = value;
+};
+
+// 选择人员
+const handleSelect = (value) => {
+  console.log("value", value);
+  props.form.fzrXm = value.realName;
+  props.form.fzrSjhm = value.phone;
+  props.form.fzrUserId = value.userId;
+};
+
+const rules = computed(() => {
+  return {
+    mc: [
+      {
+        required: true,
+        validator: (rule, value, callback) => {
+          if (props.form.mc) {
+            callback();
+          } else {
+            callback(new Error("请输入服务站名称"));
+          }
+        },
+        trigger: "blur",
+      },
+    ],
+    qxmc: [
+      {
+        required: true,
+        validator: (rule, value, callback) => {
+          if (props.form.qxmc) {
+            callback();
+          } else {
+            callback(new Error("请选择所属区县"));
+          }
+        },
+        trigger: "blur",
+      },
+    ],
+    fzr: [
+      {
+        required: true,
+        validator: (rule, value, callback) => {
+          if (props.form.fzrUserId && props.form.fzrXm && props.form.fzrSjhm) {
+            callback();
+          } else {
+            callback(new Error("请选择负责人"));
+          }
+        },
+        trigger: "blur",
+      },
+    ],
+    jd: [
+      {
+        required: sfjwd.value === "否",
+        validator: (rule, value, callback) => {
+          if (props.form.jd) {
+            callback();
+          } else {
+            callback(new Error("请输入站点经度"));
+          }
+        },
+        trigger: "blur",
+      },
+    ],
+    wd: [
+      {
+        required: sfjwd.value === "否",
+        validator: (rule, value, callback) => {
+          if (props.form.wd) {
+            callback();
+          } else {
+            callback(new Error("请输入站点纬度"));
+          }
+        },
+        trigger: "blur",
+      },
+    ],
+  };
+});
+</script>
+      
+<style>
+</style>

packages/screen/src/views/ServiceStationManagePage/component/MaterialAddDialog.vue

@@ -2,6 +2,8 @@
   <div class="detail-container">
     <el-form
       ref="formRef"
+      :model="form"
+      :rules="rules"
       label-position="right"
       label-width="150px"
       style="max-height: 60vh; overflow-y: auto; padding-right: 50px"
@@ -9,23 +11,26 @@
       <el-form-item label="所属服务站：">
         <span>{{ basicData.mc }}</span>
       </el-form-item>
-      <el-form-item label="物资名称：">
+      <el-form-item label="物资名称：" prop="wzmc">
         <el-input
           maxlength="20"
           show-word-limit
           v-model="form.material.wzmc"
         ></el-input>
       </el-form-item>
-      <el-form-item label="数量与单位：">
+      <el-form-item label="数量与单位：" required>
         <el-row :gutter="20">
           <el-col :span="16">
+            <el-form-item prop="sl">
               <el-input
-              v-model="form.material.sl"
+                v-model.number="form.material.sl"
                 type="number"
                 placeholder="请输入数量"
               ></el-input>
+            </el-form-item>
           </el-col>
           <el-col :span="8">
+            <el-form-item prop="dw">
               <el-select
                 v-model="form.material.dw"
                 filterable
@@ -40,6 +45,7 @@
                 <el-option label="箱" value="箱"></el-option>
                 <el-option label="袋" value="袋"></el-option>
               </el-select>
+            </el-form-item>
           </el-col>
         </el-row>
       </el-form-item>
@@ -54,7 +60,7 @@
 </template>
     
     <script setup>
-import { ref } from "vue";
+import { ref, computed } from "vue";
 const formRef = ref(null);
 defineExpose({ formRef });
 
@@ -65,9 +71,54 @@ const props = defineProps({
   },
   basicData: {
     type: Object,
-    default: () => ({})
+    default: () => ({}),
-  }
+  },
+});
 
+// 表单校验规则
+const rules = computed(() => {
+  return {
+    wzmc: [
+      {
+        required: true,
+        validator: (rule, value, callback) => {
+          if (props.form.material.wzmc) {
+            callback();
+          } else {
+            callback(new Error("请输入物资名称"));
+          }
+        },
+        trigger: "blur",
+      },
+    ],
+    sl: [
+      {
+        required: true,
+        type: "number",
+        validator: (rule, value, callback) => {
+          if (props.form.material.sl) {
+            callback();
+          } else {
+            callback(new Error("请输入数量"));
+          }
+        },
+        trigger: "blur",
+      },
+    ],
+    dw: [
+      {
+        required: true,
+        validator: (rule, value, callback) => {
+          if (props.form.material.dw) {
+            callback();
+          } else {
+            callback(new Error("请选择或输入单位"));
+          }
+        },
+        trigger: "change",
+      },
+    ],
+  };
 });
 </script>
     

packages/screen/src/views/ServiceStationManagePage/component/PersonAddDialog.vue

@@ -2,16 +2,19 @@
   <div class="detail-container">
     <el-form
       ref="formRef"
+      :model="form"
+      :rules="rules"
       label-position="right"
       label-width="150px"
       style="max-height: 60vh; overflow-y: auto; padding-right: 50px"
     >
-      <el-form-item label="负责人:">
+      <el-form-item label="负责人:" prop="fzr">
         <el-select
           v-model="ryxx"
           filterable
           remote
           reserve-keyword
+          clearable
           placeholder="输入人员名称 / 联系方式 查询"
           :remote-method="remoteMethod"
           :loading="loading"
@@ -27,21 +30,24 @@
         </el-select>
       </el-form-item>
       <el-form-item label="负责人添加经纬度:">
-        <el-select v-model="form.sfjwd">
+        <el-select v-model="sfjwd">
           <el-option label="是" value="是"></el-option>
           <el-option label="否" value="否"></el-option>
         </el-select>
       </el-form-item>
 
-      <el-form-item label="站点经纬度:">
+      <el-form-item v-if="sfjwd === '否'" label="站点经度:" prop="jd">
-        <el-input v-model="form.jwd" />
+        <el-input v-model="form.jd" />
+      </el-form-item>
+      <el-form-item v-if="sfjwd === '否'" label="站点纬度:" prop="wd">
+        <el-input v-model="form.wd" />
       </el-form-item>
     </el-form>
   </div>
 </template>
     
     <script setup>
-import { ref, onMounted, watch } from "vue";
+import { ref, onMounted, watch, computed } from "vue";
 import { request } from "@/utils/request";
 const formRef = ref(null);
 defineExpose({ formRef });
@@ -53,6 +59,7 @@ const props = defineProps({
   },
 });
 
+const sfjwd = ref("是");
 const ryxx = ref("");
 const loading = ref(false);
 const selectOptions = ref([]);
@@ -103,8 +110,37 @@ const handleSelect = (value) => {
   props.form.userId = value.userId;
 };
 
-onMounted(async () => {
+// 表单校验规则
-  props.form.yhzid = props.yhzdata.id;
+const rules = computed(() => {
+  return {
+    fzr: [
+      {
+        required: true,
+        validator: (rule, value, callback) => {
+          if (props.form.userId && props.form.sjhm && props.form.xm) {
+            callback();
+          } else {
+            callback(new Error("请选择负责人"));
+          }
+        },
+        trigger: "blur",
+      },
+    ],
+    jd: [
+      {
+        required: sfjwd.value === "否",
+        message: "请输入站点经度",
+        trigger: "blur",
+      },
+    ],
+    wd: [
+      {
+        required: sfjwd.value === "否",
+        message: "请输入站点纬度",
+        trigger: "blur",
+      },
+    ],
+  };
 });
 </script>
     

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: "",
+  jd: "",
-  jwd: "",
+  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,11 +488,14 @@ const handleAdd = () => {
 
 // 新增负责人
 const handleAddPeopleConfirm = async () => {
+  await dialogRef?.value?.dynamicComponentRef?.formRef
+    .validate()
+    .then(async () => {
       try {
         const res = await request({
           url: "/snow-ops-platform/yhzry/add",
           method: "post",
-      data: toRaw(peopleForm.value),
+          data: toRaw(peopleForm),
         });
         if (res.code === "00000") {
           ElMessage.success("新增成功");
@@ -459,10 +508,17 @@ const handleAddPeopleConfirm = async () => {
         console.log(error);
         ElMessage.error(error.message);
       }
+    })
+    .catch((err) => {
+      ElMessage.error("请处理表单中的错误项");
+    });
 };
 
 // 新增物资
 const handleAddMaterialConfirm = async () => {
+  await dialogRef?.value?.dynamicComponentRef?.formRef
+    .validate()
+    .then(async () => {
       try {
         const res = await request({
           url: "/snow-ops-platform/yjwz/add",
@@ -480,6 +536,10 @@ const handleAddMaterialConfirm = async () => {
         console.log(error);
         ElMessage.error(error.message);
       }
+    })
+    .catch((err) => {
+      ElMessage.error("请处理表单中的错误项");
+    });
 };
 
 // 新增设备

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 = () => {
-
+    model.title = '新增养护站';
-    console.log('新增',)
+    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();