From 01adce6d9fc82f29cc2a29b35ee727b642284715 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期一, 31 七月 2023 17:52:11 +0800
Subject: [PATCH] 隐私、财产的修改

---
 ruoyi-ui/src/views/genealogy/index.vue |  134 +++++++++++++++-----------------------------
 1 files changed, 45 insertions(+), 89 deletions(-)

diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index eb291bd..12c07ef 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -149,7 +149,7 @@
 
     <el-table v-loading="loading" :data="listRoot"  @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
       <el-table-column type="selection" width="25"  align="center" />
-      <el-table-column  label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
+      <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
 
       <el-table-column label="韬唤" prop="identity" sortable width="100" >
         <template slot-scope="scope">
@@ -208,105 +208,40 @@
     />
 
 
-  <!--  <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+  <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
 
-        <el-form-item label="鎴愬憳濮撳悕" prop="myName">
-          <el-input v-model="formDat.myName" placeholder="璇疯緭鍏ユ垚鍛樺鍚�" clearable :style="{width: '100%'}" >
+        <el-form-item label="韬唤" prop="identity">
+          <el-input v-model="formDat.identity" placeholder="璇疯緭鍏ユ垚鍛樺鍚�" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
-
-        <el-form-item label="绉板懠" prop="nickName">
+        <el-form-item label="濮撳悕" prop="nickName">
           <el-input v-model="formDat.nickName" placeholder="璇疯緭鍏ョО鍛�" clearable :style="{width: '100%'}" ></el-input>
         </el-form-item>
-        <el-form-item label="濮撳悕" prop="name">
-          <el-input v-model="formDat.name" placeholder="璇疯緭鍏ュ鍚�" clearable :style="{width: '100%'}" >
+        <el-form-item label="鎬у埆" prop="sex">
+          <el-input v-model="formDat.sex" placeholder="璇疯緭鍏ュ鍚�" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
-        <el-form-item label="宸ヤ綔鍗曚綅" prop="work">
-          <el-input v-model="formDat.work" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" clearable :style="{width: '100%'}" >
+        <el-form-item label="鍑虹敓鏃堕棿" prop="birth">
+          <el-input v-model="formDat.birth" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
-        <el-form-item label="鎵嬫満" prop="phone">
-          <el-input v-model="formDat.phone" placeholder="璇疯緭鍏ユ墜鏈�" clearable :style="{width: '100%'}" >
+        <el-form-item label="鍏ㄧ敓鍛藉懆鏈�" prop="deadDay">
+          <el-input v-model="formDat.deadDay" placeholder="璇疯緭鍏ユ墜鏈�" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
-        <el-form-item label="寰俊" prop="wx">
-          <el-input v-model="formDat.wx" placeholder="璇疯緭鍏ュ井淇�" clearable :style="{width: '100%'}" >
+        <el-form-item label="鎵嬫満鍙风爜" prop="phoneNumber">
+          <el-input v-model="formDat.phoneNumber" placeholder="璇疯緭鍏ュ井淇�" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
-        <el-form-item label="QQ" prop="qq">
-          <el-input v-model="formDat.qq" placeholder="璇疯緭鍏Q" clearable :style="{width: '100%'}" >
+        <el-form-item label="鎵�鍦ㄥ崟浣�" prop="unit">
+          <el-input v-model="formDat.unit" placeholder="璇疯緭鍏Q" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
-        <el-form-item label="twitter" prop="twitter">
-          <el-input v-model="formDat.twitter" placeholder="璇疯緭鍏witter" clearable :style="{width: '100%'}" >
+        <el-form-item label="閰嶅伓" prop="spouseName">
+          <el-input v-model="formDat.spouseName" placeholder="璇疯緭鍏witter" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
-        <el-form-item label="鏄惁甯歌仈绯�" prop="isAlways">
-          <el-input v-model="formDat.isAlways" placeholder="鏄惁甯歌仈绯�" clearable :style="{width: '100%'}" >
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="澶囨敞锛堟槸鍚﹀瓨鍦ㄩ噾閽卞叧绯伙級" prop="remark">
-          <el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
-        </el-form-item>
-
-        <h4 class="form-header">鐢靛瓙鍚嶇墖 </h4>
-        <el-upload
-          action="#"
-          list-type="picture-card"
-          multiple
-          :http-request="requestUpload"
-          :file-list="fileList"
-        >
-          <i slot="default" class="el-icon-plus"></i>
-          <div slot="file" slot-scope="{file}">
-            <img
-              class="el-upload-list__item-thumbnail"
-              :src="file.url"
-              alt=""
-              style="width: 126px; height: 126px"
-              fit="cover"
-              :preview-src-list="[file.url]"
-            >
-            <span class="el-upload-list__item-actions">
-        <span
-          class="el-upload-list__item-preview"
-          @click="handlePictureCardPreview(file)"
-        >
-          <i class="el-icon-zoom-in"></i>
-        </span>
-
-        <span
-          v-if="!disabled"
-          class="el-upload-list__item-delete"
-          @click="handleRemove(file)"
-        >
-          <i class="el-icon-delete"></i>
-        </span>
-      </span>
-
-
-          </div>
-        </el-upload>
-        <h4 class="form-header">鍏朵粬闄勪欢 </h4>
-        <el-upload
-          action=""
-          :file-list="fileListOther"
-          class="upload-demo"
-          multiple
-
-          :on-remove="handleRemove"
-          :http-request="requestUpload"
-          :show-file-list="true"
-        >
-          <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
-          <template #tip>
-            <div class="el-upload__tip">
-            </div>
-          </template>
-        </el-upload>
 
       </el-form>
       <h4 class="form-header"> </h4>
@@ -315,7 +250,7 @@
         <el-button type="primary" @click="submitDataScope">淇� 瀛�</el-button>
         <el-button @click="cancelData">鍙� 娑�</el-button>
       </div>
-    </el-dialog>  -->
+    </el-dialog>
 
     <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
 
@@ -480,7 +415,7 @@
   },
   created() {
     this.getList();
-    this.getCateInfor()
+    // this.getCateInfor()
     // for (let i = 0; i < this.contactList.length; i++) {
     //   this.formDat[i] = this.contactList[i];
     // }
@@ -524,7 +459,12 @@
         return "statistics-warning-row";
       }
     },
-
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "娣诲姞璇佷欢/鑽h獕/璧勮川淇℃伅";
+    },
     /** 鏌ヨ閫氳褰曞垪琛� */
     getList() {
       this.loading = true;
@@ -637,7 +577,7 @@
     /** 鏌ョ湅璇︾粏淇℃伅 */
     handleCheck(row){
       const id = row.userId;
-      alert(id)
+      // alert(id)
      this.$router.push("/familymodel/jiagenwang/personInfo/" + id);
     },
 
@@ -701,11 +641,27 @@
       }).catch(() => {});
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+    // handleExport() {
+    //   this.download('/self/user/export/genealogy', {
+    //     ...this.queryParams
+    //   }, `zGenealogy_${new Date().getTime()}.xlsx`)
+    // },
+
     handleExport() {
-      this.download('/self/user/export/genealogy', {
-        ...this.queryParams
-      }, `zGenealogy_${new Date().getTime()}.xlsx`)
+      const Ids = this.ids;
+
+      if(Ids.length==0)
+      {
+        this.download('/self/user/export/genealogy', {
+          ...this.queryParams
+        }, `zGenealogy_${new Date().getTime()}.xlsx`)
+      }else{
+        this.download('/self/user/export/genealogy/'+Ids, {
+
+        }, `zGenealogy_${new Date().getTime()}.xlsx`)
+      }
     },
+
     /** 瀵煎叆鎿嶄綔*/
     // handleEnport(params){
     //   var file = params.file;

--
Gitblit v1.9.1