添加家族成员

src/api/system/member.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询家族成员列表
+export function listMember(query) {
+  return request({
+    url: '/system/member/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询家族成员详细
+export function getMember(id) {
+  return request({
+    url: '/system/member/' + id,
+    method: 'get'
+  })
+}
+
+// 新增家族成员
+export function addMember(data) {
+  return request({
+    url: '/system/member',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改家族成员
+export function updateMember(data) {
+  return request({
+    url: '/system/member',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除家族成员
+export function delMember(id) {
+  return request({
+    url: '/system/member/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出家族成员
+export function exportMember(query) {
+  return request({
+    url: '/system/member/export',
+    method: 'get',
+    params: query
+  })
+}

src/layout/components/TagsView/index.vue

@@ -160,7 +160,7 @@ export default {
     },
     closeAllTags(view) {
       this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => {
-        if (this.affixTags.some(tag => tag.path === view.path)) {
+        if (this.affixTags.some(tag => tag.path === this.$route.path)) {
           return
         }
         this.toLastView(visitedViews, view)

src/router/index.js

@@ -152,7 +152,20 @@ export const constantRoutes = [
         component: (resolve) => require(['@/views/system/appUser/detail/publish'], resolve),
         meta: { title: '个人发表' }
       },
-  ]
+    ]
+  },
+  {
+    path: '/family',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'member',
+        name: 'member',
+        component: (resolve) => require(['@/views/system/family/detail/member'], resolve),
+        meta: { title: '家族成员' }
+      },
+    ]
   },
 ]
 

src/utils/generator/config.js

@@ -406,6 +406,21 @@ export const layoutComponents = [
     layoutTree: true,
     children: [],
     document: 'https://element.eleme.cn/#/zh-CN/component/layout'
+  },
+  {
+    layout: 'colFormItem',
+    label: '按钮',
+    changeTag: true,
+    labelWidth: null,
+    tag: 'el-button',
+    tagIcon: 'button',
+    span: 24,
+    default: '主要按钮',
+    type: 'primary',
+    icon: 'el-icon-search',
+    size: 'medium',
+    disabled: false,
+    document: 'https://element.eleme.cn/#/zh-CN/component/button'
   }
 ]
 

src/utils/generator/html.js

@@ -107,6 +107,18 @@ const layouts = {
 }
 
 const tags = {
+  'el-button': el => {
+    const {
+      tag, disabled
+    } = attrBuilder(el)
+    const type = el.type ? `type="${el.type}"` : ''
+    const icon = el.icon ? `icon="${el.icon}"` : ''
+    const size = el.size ? `size="${el.size}"` : ''
+    let child = buildElButtonChild(el)
+
+    if (child) child = `\n${child}\n` // 换行
+    return `<${el.tag} ${type} ${icon} ${size} ${disabled}>${child}</${el.tag}>`
+  },
   'el-input': el => {
     const {
       disabled, vModel, clearable, placeholder, width

src/utils/generator/render.js

@@ -26,6 +26,11 @@ function vModel(self, dataObject, defaultValue) {
 }
 
 const componentChild = {
+  'el-button': {
+    default(h, conf, key) {
+      return conf[key]
+    },
+  },
   'el-input': {
     prepend(h, conf, key) {
       return <template slot="prepend">{conf[key]}</template>

src/views/system/family/detail/member.vue

@@ -0,0 +1,367 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="会员id" prop="appUserId">
+        <el-input
+          v-model="queryParams.appUserId"
+          placeholder="请输入会员id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="配偶id" prop="spouseId">
+        <el-input
+          v-model="queryParams.spouseId"
+          placeholder="请输入配偶id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="姓名" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="生日" prop="birthday">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.birthday"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择生日">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="性别：1-男，2-女，0-未知" prop="gender">
+        <el-input
+          v-model="queryParams.gender"
+          placeholder="请输入性别：1-男，2-女，0-未知"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="文化程度" prop="education">
+        <el-input
+          v-model="queryParams.education"
+          placeholder="请输入文化程度"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态：1读书、2工作、3退休、4过世" prop="state">
+        <el-input
+          v-model="queryParams.state"
+          placeholder="请输入状态：1读书、2工作、3退休、4过世"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:member:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:member:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:member:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:member:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="memberList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键ID" align="center" prop="id" v-if="false"/>
+      <el-table-column label="会员id" align="center" prop="appUserId" />
+      <el-table-column label="配偶id" align="center" prop="spouseId" />
+      <el-table-column label="姓名" align="center" prop="name" />
+      <el-table-column label="生日" align="center" prop="birthday" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="性别：1-男，2-女，0-未知" align="center" prop="gender" />
+      <el-table-column label="文化程度" align="center" prop="education" />
+      <el-table-column label="状态：1读书、2工作、3退休、4过世" align="center" prop="state" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:member:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:member:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改家族成员对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="会员id" prop="appUserId">
+          <el-input v-model="form.appUserId" placeholder="请输入会员id" />
+        </el-form-item>
+        <el-form-item label="配偶id" prop="spouseId">
+          <el-input v-model="form.spouseId" placeholder="请输入配偶id" />
+        </el-form-item>
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="form.name" placeholder="请输入姓名" />
+        </el-form-item>
+        <el-form-item label="生日" prop="birthday">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.birthday"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择生日">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="性别：1-男，2-女，0-未知" prop="gender">
+          <el-input v-model="form.gender" placeholder="请输入性别：1-男，2-女，0-未知" />
+        </el-form-item>
+        <el-form-item label="文化程度" prop="education">
+          <el-input v-model="form.education" placeholder="请输入文化程度" />
+        </el-form-item>
+        <el-form-item label="状态：1读书、2工作、3退休、4过世" prop="state">
+          <el-input v-model="form.state" placeholder="请输入状态：1读书、2工作、3退休、4过世" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listMember, getMember, delMember, addMember, updateMember, exportMember } from "@/api/system/member";
+
+export default {
+  name: "Member",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 家族成员表格数据
+      memberList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        familyId: null,
+        appUserId: null,
+        spouseId: null,
+        name: null,
+        birthday: null,
+        gender: null,
+        education: null,
+        state: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    const fid = this.$route.query.fid;
+    this.queryParams.familyId = fid;
+    this.getList();
+  },
+  methods: {
+    /** 查询家族成员列表 */
+    getList() {
+      this.loading = true;
+      listMember(this.queryParams).then(response => {
+        this.memberList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        appUserId: null,
+        spouseId: null,
+        name: null,
+        birthday: null,
+        gender: null,
+        education: null,
+        state: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加家族成员";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getMember(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改家族成员";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateMember(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          } else {
+            addMember(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除家族成员编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delMember(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(function() {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有家族成员数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportMember(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        }).catch(function() {});
+    }
+  }
+};
+</script>

src/views/system/family/index.vue

@@ -79,20 +79,25 @@
     <el-table v-loading="loading" :data="familyList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="主键" align="center" prop="id" v-if="false"/>
-      <el-table-column label="家族ID" align="center" prop="code" />
-      <el-table-column label="姓氏" align="center" prop="name" />
-      <el-table-column label="家族全称" align="center" prop="fullName" />
-      <el-table-column label="创建者" align="center" prop="createName" />
-      <el-table-column label="家族地址" align="center" prop="address" />
+      <el-table-column label="家族ID" align="center" prop="code" width="120px"/>
+      <el-table-column label="姓氏" align="center" prop="name"  width="80px"/>
+      <el-table-column label="家族全称" align="center" prop="fullName" width="150px"/>
+      <el-table-column label="创建者" align="center" prop="createName" width="100px">
+        <template slot-scope="scope">
+          <span v-if="scope.row.createName">{{scope.row.createName}}</span>
+          <span v-if="scope.row.createName == null">管理员</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="家族地址" align="center" prop="address" width="350px"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            @click="familyMember(scope.row)"
             v-hasPermi="['system:family:edit']"
-          >修改</el-button>
+          >成员</el-button>
           <el-button
             size="mini"
             type="text"
@@ -371,6 +376,14 @@ export default {
         }).then(response => {
           this.download(response.msg);
         }).catch(function() {});
+    },
+    familyMember(row) {
+      this.$router.push({ 
+        path:'/family/member',
+        query: {
+            fid: row.id
+        }
+      })
     }
   }
 };