修改家族树

src/api/system/member.js

@@ -16,6 +16,14 @@ export function listTree(query) {
     params: query
   })
 }
+// 查询未在家族树的成员 列表
+export function listNotTree(query) {
+  return request({
+    url: '/system/member/notTreeList',
+    method: 'get',
+    params: query
+  })
+}
 
 // 查询家族成员详细
 export function getMember(id) {

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

@@ -203,9 +203,6 @@ export default {
       stateOptions: [],
       // 配偶
       spouseOptions:[],
-      spouseValues:[],
-      spouseList:[],
-      spouseStates:[],
       // 查询参数
       spouseParams: {
         enable: 0,
@@ -264,7 +261,6 @@ export default {
         this.spouseParams.searchValue = query;
         listUser(this.spouseParams).then(response => {
           this.loadings = false;
-          debugger
           this.spouseOptions = response.data;
         });
       }
@@ -350,9 +346,6 @@ export default {
         this.form.familyId = this.queryParams.familyId;
         this.open = true;
         this.title = "修改家族成员";
-        if(this.form.spouseUserId !== ''){
-          this.findSpouse(this.form.spouseUserId)
-        }
       });
     },
     /** 提交按钮 */

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

@@ -26,7 +26,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:member:add']"
-        >新增</el-button>
+        >添加</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -56,9 +56,9 @@
       <el-table-column label="主键ID" align="center" prop="memberId" v-if="false"/>
       <el-table-column label="ID" align="center" prop="qrcode" width="150" />
       <el-table-column label="姓名" align="center" prop="name" width="100" />
+      <el-table-column label="性别" align="center" prop="gender" :formatter="genderFormat" width="50" />
       <el-table-column label="父辈" align="center" prop="father" width="100" />
       <el-table-column label="手机号" align="center" prop="mobile" width="200" />
-      <el-table-column label="性别" align="center" prop="gender" :formatter="genderFormat" width="50" />
       <el-table-column label="配偶" align="center" prop="spouse" width="100" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -88,12 +88,64 @@
       @pagination="getList"
     />
 
+    <!-- 添加或修改家族成员对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal=false>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+
+        <!-- <el-form-item label="姓名" prop="memberId">
+          <el-select
+            v-model="form.name"
+            filterable
+            remote
+            clearable
+            placeholder="请输入名字/手机号"
+            :remote-method="findMember"
+            @change="memberChange"
+            :loading="loadings">
+            <el-option
+              v-for="item in memberOptions"
+              :key="item.memberId"
+              :label="item.name"
+              :value="item.memberId">
+            </el-option>
+          </el-select>
+        </el-form-item> -->
+
+        <el-form-item label="父辈" prop="father">
+          <el-input v-model="form.father" placeholder="" :readonly="readonly"/>
+        </el-form-item>
+
+        <el-form-item label="姓名" prop="name">
+          <el-select v-model="form.name" placeholder="请选择">
+            <el-option v-for="member in memberOptions" :key="member.memberId" :label="member.name" :value="dict.memberId"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="性别" prop="gender">
+          <el-select v-model="form.gender" placeholder="请选择">
+            <el-option v-for="dict in genderOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="手机号" prop="mobile">
+          <el-input v-model="form.mobile" placeholder="请输入手机号" />
+        </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 { getFamily } from "@/api/system/family";
-import { listTree } from "@/api/system/member";
+import { listTree,listNotTree,getMember, delMember, addMember, updateMember } from "@/api/system/member";
 
 export default {
   name: "Tree",
@@ -102,6 +154,7 @@ export default {
       familyName: null,
       // 遮罩层
       loading: true,
+      loadings: false,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -118,8 +171,16 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      // 配偶
-      spouseOptions:[],
+      readonly: false,
+      // 成员
+      memberOptions:[],
+      genderOptions:[],
+      // 查询参数
+      memberParams: {
+        enable: 0,
+        familyId: null,
+        searchValue: null,
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -152,6 +213,11 @@ export default {
         this.familyName = response.data.fullName;
       });
     },
+    getNotTree() {
+      listNotTree(this.memberParams).then(response => {
+        this.memberOptions = response.data;
+      });
+    },
     /** 查询家族成员列表 */
     getList() {
       this.loading = true;
@@ -169,7 +235,107 @@ export default {
     stateFormat(row, column) {
       return this.selectDictLabel(this.stateOptions, row.state);
     },
-
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        memberId: null,
+        userId: null,
+        spouseUserId: 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.memberId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset();
+      this.form.parentId = row.memberId;
+      this.form.father = row.name;
+      this.open = true;
+      this.title = "添加成员至家族树";
+      this.getNotTree();
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.memberId || this.ids
+      getMember(id).then(response => {
+        this.form = response.data;
+        this.form.familyId = this.queryParams.familyId;
+        this.open = true;
+        this.title = "修改家族树成员";
+        this.getNotTree();
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.form.familyId = this.queryParams.familyId;
+          if (this.form.memberId != 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.memberId || this.ids;
+      var familyId = this.queryParams.familyId;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delMember(familyId,ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(function() {});
+    },
   }    
 }
 </script>