Quellcode durchsuchen

修改新增会员出现的问题

Alex vor 4 Jahren
Ursprung
Commit
ea960a1384
2 geänderte Dateien mit 31 neuen und 58 gelöschten Zeilen
  1. 17 7
      src/views/system/appUser/index.vue
  2. 14 51
      src/views/system/family/detail/member.vue

+ 17 - 7
src/views/system/appUser/index.vue

@@ -409,13 +409,23 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          updateUser(this.form).then(response => {
-            if (response.code === 200) {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }
-          });
+          if (this.form.userId != undefined) {
+            updateUser(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          } else {
+            addUser(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          }
         }
       });
     },

+ 14 - 51
src/views/system/family/detail/member.vue

@@ -1,24 +1,6 @@
 <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"
@@ -28,14 +10,6 @@
           @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"
@@ -45,16 +19,7 @@
           @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-form-item label="状态" prop="state">
         <el-input
           v-model="queryParams.state"
           placeholder="请输入状态:1读书、2工作、3退休、4过世"
@@ -99,33 +64,22 @@
           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="主键ID" align="center" prop="memberId" v-if="false"/>
       <el-table-column label="姓名" align="center" prop="name" />
+      <el-table-column label="性别" align="center" prop="gender" :formatter="genderFormat"/>
+      <el-table-column label="配偶" align="center" prop="spouse" />
       <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="手机号" align="center" prop="mobile" />
       <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
@@ -220,6 +174,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 性别 数据字典
+      genderOptions: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -244,6 +200,9 @@ export default {
     const fid = this.$route.query.fid;
     this.queryParams.familyId = fid;
     this.getList();
+    this.getDicts("sys_user_sex").then((response) => {
+      this.genderOptions = response.data;
+    });
   },
   methods: {
     /** 查询家族成员列表 */
@@ -255,6 +214,10 @@ export default {
         this.loading = false;
       });
     },
+    // 性别 字典翻译
+    genderFormat(row, column) {
+      return this.selectDictLabel(this.genderOptions, row.gender);
+    },
     // 取消按钮
     cancel() {
       this.open = false;