Merge branch 'dev' of http://bj.gitlab.cnlive.com/cnlive_project/cnlive-community-web-vue into dev

杨泽宇
2 parents 4961d065 edd59199
Showing 4 changed files with 163 additions and 114 deletions
src/api/housekeeper/buildinMganager.ts
src/api/request.ts
src/views/housekeeper/buildinMganager/detail.vue
src/views/housekeeper/buildinMganager/index.vue
@@ -8,52 +8,19 @@ export function getTableList(params:any) {
     params: params
   })
 }
-// 根据条件查询列表
-export function residentListByCondition(params:any) {
-  return request({
-    method: 'get',
-    url: '/resident/residentListByCondition',
-    params: params
-  })
-}
-
-// 房屋信息
-export function getHouse(params:any) {
+// 修改
+export function insertOrUpdate(params:any) {
   return request({
     method: 'post',
-    url: '/house/getHouse',
-    params: params
-  })
-}
-// 删除
-export function deleteResident(params:any) {
-  return request({
-    method: 'delete',
-    url: '/resident/deleteResident',
-    params: params
+    url: '/housekeeper/insertOrUpdate',
+    data: params
   })
 }
 // 删除
-export function changeBinding(params:any) {
+export function deleteHousekeeper(params:any) {
   return request({
     method: 'PUT',
-    url: '/resident/changeBinding',
-    params: params
-  })
-}
-// 获取详情
-export function getResidentById(params:any) {
-  return request({
-    method: 'get',
-    url: '/resident/getResidentById',
+    url: '/housekeeper/deleteHousekeeper',
     params: params
   })
 }
-// 修改
-export function update(params:any) {
-  return request({
-    method: 'post',
-    url: '/resident/update',
-    data: params
-  })
-}
@@ -27,23 +27,25 @@ instance.interceptors.request.use(
 instance.interceptors.response.use(
   response => {
     if (response) {
-      console.log(response?.data?.errorCode)
-      switch (~~response?.data?.errorCode) {
-        case 0:
-          return response
-        break;
-        case 10002:
-          ElMessage.error(response?.data?.errorMessage || '登录失效');
-          router.push({
-            path: 'login'
-          })
-        break;
-        case 500:
-          ElMessage.error(`${response?.data?.errorMessage},请联系管理员`)
-          Promise.reject(response?.data)
-        break;
-        default:
-          ElMessage.error(response?.data?.errorMessage || '操作失败');
+      if (response?.data?.errorCode === 0) {
+        return response
+      } else {
+
+        switch (~~response?.data?.errorCode) {
+          case 10002:
+            ElMessage.error(response?.data?.errorMessage || '登录失效');
+            router.push({
+              path: 'login'
+            })
+            break;
+          case 500:
+            ElMessage.error(`${response?.data?.errorMessage}`)
+            break;
+          default:
+            ElMessage.error(response?.data?.errorMessage || '操作失败');
+            break
+        }
+        return Promise.reject()
       }
     }
   },
 <script setup lang="ts">
-import { reactive, ref, onMounted,getCurrentInstance } from "vue";
+import { reactive, ref, getCurrentInstance,defineExpose } from "vue";
 import type { ElForm } from "element-plus";
-import { addOrUpdate } from "@/api/community/residence.ts";
+import { insertOrUpdate } from "@/api/housekeeper/buildinMganager.ts";
  
 const ruleFormRef = ref<InstanceType<typeof ElForm>>();
-let instance: ComponentInternalInstance | null = getCurrentInstance();//获取app实例
+let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
 // 声明props
 const props = defineProps({
   formObj: {
     type: Object,
     default: {
       name: null,
-      address: null,
-      locality: null,
-      buildingCount: null,
-      storeroomCount: null,
-      truckSpaceCount: null,
+      mobile: null,
+      idcard: null,
+      type: null,
+      gender: null,
+      censusRegister: null,
+      birthdate: null,
+      nationality: null,
     },
   },
 });
  
 let loading = ref(false);
  
+const data = reactive({
+  options: [
+    { label: "选举", value: 0 },
+    { label: "派驻", value: 1 },
+  ],
+  genderList: [
+    { label: "男", value: 1 },
+    { label: "女", value: 0 },
+  ],
+});
+
 // 表单验证
 const rules = reactive({
   name: [
     {
       required: true,
-      message: "请输入小区名",
+      message: "请输入姓名",
       trigger: "blur",
     },
   ],
-  locality: [
+  mobile: [
     {
       required: true,
-      message: "请输入所在地区",
+      message: "请输入手机号",
       trigger: "blur",
     },
   ],
-  address: [
+  idcard: [
     {
       required: true,
-      message: "请输入地址",
+      message: "请输入身份证号",
       trigger: "blur",
     },
   ],
-  buildingCount: [
+  type: [
     {
       required: true,
-      message: "请输入楼座数",
-      trigger: "blur",
+      message: "请选择类型",
+      trigger: "change",
     },
   ],
-  storeroomCount: [
+  gender: [
     {
       required: true,
-      message: "请输入储藏室数",
-      trigger: "blur",
-    },
-  ],
-  truckSpaceCount: [
-    {
-      required: true,
-      message: "请输入车位数",
-      trigger: "blur",
+      message: "请输入选择性别",
+      trigger: "change",
     },
   ],
 });
@@ -82,54 +88,124 @@ let submitForm = (formEl: InstanceType&lt;typeof ElForm&gt; | undefined) =&gt; {
   if (!formEl) return;
   formEl.validate((valid) => {
     if (valid) {
-      addOrUpdate(props.formObj).then((res) => {
-         loading.value = false;
-         emit("success");
+      insertOrUpdate(props.formObj).then((res) => {
+        loading.value = false;
+        emit("success");
       });
     } else {
-      instance?.proxy?.$message.error('请完善信息')//调用
+      instance?.proxy?.$message.error("请完善信息"); //调用
       loading.value = false;
       return false;
     }
   });
 };
-
+/**
+ * 重置
+ */
+let resetForm = () => {
+  ruleFormRef.value.resetFields();
+};
 /**
  * 取消提交
  */
 const cancel: void = () => {
   emit("cancel");
 };
+
+defineExpose({
+  resetForm
+});
 </script>
  
 <template>
-  <el-form ref="ruleFormRef" :model="props.formObj" :rules="rules" label-width="100px">
-    <el-form-item label="小区名称:" prop="name">
-      <el-input v-model="props.formObj.name" placeholder="请输入名称"></el-input>
+  <el-form
+    ref="ruleFormRef"
+    :model="props.formObj"
+    :rules="rules"
+    label-width="100px"
+    :inline="true"
+  >
+    <el-form-item label="姓名:" prop="name">
+      <el-input
+        v-model="props.formObj.name"
+        placeholder="请输入名称"
+      ></el-input>
     </el-form-item>
-    <el-form-item label="所在地区:" prop="locality">
-      <el-input v-model="props.formObj.locality" placeholder="请输入所在地区"></el-input>
+    <el-form-item label="手机号:" prop="mobile">
+      <el-input
+        v-model="props.formObj.mobile"
+        placeholder="请输入所在地区"
+      ></el-input>
     </el-form-item>
-    <el-form-item label="详细地址:" prop="address">
-      <el-input v-model="props.formObj.address" placeholder="请输入详细地址"></el-input>
+    <el-form-item label="身份证号:" prop="idcard">
+      <el-input
+        v-model="props.formObj.idcard"
+        placeholder="请输入详细地址"
+      ></el-input>
     </el-form-item>
-    <el-form-item label="楼座数:" prop="buildingCount">
-      <el-input v-model="props.formObj.buildingCount" onkeyup="value=value.replace(/[^\d]/g,'')" placeholder="请输入楼座数"></el-input>
+    <el-form-item label="类型:" prop="type">
+      <el-select
+        style="width: 200px"
+        v-model="props.formObj.type"
+        placeholder="请选择类型"
+        clearable
+      >
+        <el-option
+          v-for="item in data.options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
     </el-form-item>
-    <el-form-item label="储藏室数:" prop="storeroomCount">
-      <el-input v-model="props.formObj.storeroomCount" onkeyup="value=value.replace(/[^\d]/g,'')" placeholder="请输入储藏室数"></el-input>
+
+    <el-form-item label="性别:" prop="gender">
+      <el-select
+        v-model="props.formObj.gender"
+        placeholder="请选择"
+        style="width: 200px"
+      >
+        <el-option
+          v-for="item in data.genderList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
     </el-form-item>
-    <el-form-item label="车位数:" prop="truckSpaceCount">
-      <el-input v-model="props.formObj.truckSpaceCount" onkeyup="value=value.replace(/[^\d]/g,'')" placeholder="请输入车位数"></el-input>
+    <el-form-item label="户籍所在地:" prop="censusRegister">
+      <el-input
+        v-model="props.formObj.censusRegister"
+        placeholder="请输入车位数"
+      ></el-input>
     </el-form-item>
-    <el-form-item>
-      <el-button
-        type="primary"
-        @click="submitForm(ruleFormRef)"
-        :loading="loading"
-        >保存</el-button
+    <el-form-item label="出生日期:" prop="birthdate">
+      <el-date-picker
+        style="width: 200px"
+        v-model="props.formObj.birthdate"
+        type="date"
+        placeholder="选择时间"
       >
-      <el-button @click="cancel">取消</el-button>
+      </el-date-picker>
+    </el-form-item>
+    <el-form-item label="民族:" prop="nationality">
+      <el-input
+        v-model="props.formObj.nationality"
+        placeholder="请输入车位数"
+      ></el-input>
     </el-form-item>
+    <el-row>
+      <el-form-item>
+        <el-button
+          type="primary"
+          @click="submitForm(ruleFormRef)"
+          :loading="loading"
+          >保存</el-button
+        >
+        <el-button @click="cancel">取消</el-button>
+      </el-form-item>
+    </el-row>
   </el-form>
 </template>
 <script setup lang="ts">
-import { reactive, onMounted, getCurrentInstance } from "vue";
-import { getTableList } from "@/api/housekeeper/buildinMganager.ts";
+import { reactive, onMounted,ref, getCurrentInstance } from "vue";
+import { getTableList,deleteHousekeeper } from "@/api/housekeeper/buildinMganager.ts";
 import Detail from "./detail.vue";
 import Pagination from "@/components/Pagination/index.vue";
  
 let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
+
+const detailRef = ref(null);
 // 数据筛选
 const searchData = reactive({
   type: "",
@@ -33,6 +35,7 @@ const search = (): void =&gt; {
   data.loading = true;
   getTableList(searchData)
     .then((res) => {
+      console.log(res)
       data.tableList = res.data.data;
       data.total = res.data.data.total;
       data.loading = false;
@@ -53,16 +56,16 @@ const edit = (row: Object) =&gt; {
 };
 /**
  * 删除
- * @param { number } neighborhoodId 小区ID
+ * @param { number } housekeeperId 唯一标识
  */
-const remove = (neighborhoodId: number) => {
+const remove = (housekeeperId: number) => {
   instance?.proxy?.$messageBox
     .confirm("确认要进行此操作？", "提示", {
       confirmButtonText: "确定",
       cancelButtonText: "取消",
     })
     .then(() => {
-      deleteNeighborhood({ neighborhoodId: neighborhoodId }).then((res) => {
+      deleteHousekeeper({ housekeeperId: housekeeperId }).then((res) => {
         instance?.proxy?.$message.success("操作成功"); //调用
         search();
       });
@@ -81,8 +84,9 @@ const changeData: void = () =&gt; {
  * 弹框关闭
  */
 const dialogClose: void = () => {
-  data.title = "新增小区";
+  data.title = "新增楼管";
   data.formObj = {};
+  detailRef.value.resetForm();
 };
 onMounted(() => {
   search();
@@ -161,10 +165,10 @@ onMounted(() =&gt; {
     <el-dialog
       v-model="data.dialogVisible"
       :title="data.title"
-      width="30%"
       @close="dialogClose"
     >
       <Detail
+      ref="detailRef"
         @cancel="data.dialogVisible = false"
         @success="changeData"
         :formObj="data.formObj"