From 60ae08e4437faa2c881bda539d57921b837cc8df Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期六, 05 八月 2023 00:39:41 +0800
Subject: [PATCH] 家谱中配偶的第几代不显示

---
 ruoyi-ui/src/views/genealogy/index.vue |  162 +++++++++++++++++------------------------------------
 1 files changed, 52 insertions(+), 110 deletions(-)

diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index 5b654da..3c1da1d 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -152,8 +152,9 @@
       <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">
-          <span>绗瑊{scope.row.identity}}浠�</span>
+        <template slot-scope="scope" >
+          <span v-if="scope.row.isMyFamily==1">绗瑊{scope.row.identity}}浠�</span>
+          <span v-else>鈥斺��</span>
         </template>
 <!--        <template slot-scope="scope">{{ getSrc(scope.row.identity) }}</template>-->
       </el-table-column>
@@ -208,105 +209,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 +251,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>
 
@@ -409,6 +345,7 @@
         secondFamilyId:undefined,
         childList:undefined,
         identity:undefined,
+        isMyFamily:undefined,
         url: undefined,
 
       },
@@ -492,30 +429,30 @@
       this.reset();
     },
      //鎷垮埌閰嶅伓鐨勫鍚�
-   //   getPerson(id)
-   //   {
-   //   //  alert(id)
-   // //    alert(typeof(id))
-   //     // this.listRoot.forEach(function(item, index) {
-   //     //             //item 灏辨槸褰撴棩鎸夊惊鐜埌鐨勫璞�
-   //     //             //index鏄惊鐜殑绱㈠紩锛屼粠0寮�濮�
-   //     //              //alert(typeof(item.userId))
-   //     //             if(item.userId==id){
-   //     //            //   alert(89)
-   //     //            alert(item.nickName)
-   //     //               return item.nickName
-   //     //             }
-   //
-   //     // })
-   //     let username = ""
-   //     for(let i = 0; i < this.listRoot.length;i++)
-   //     {
-   //       if(this.listRoot[i].userId==id)
-   //        username = this.listRoot[i].nickName
-   //     }
-   //     return username;
-   //    // return "12ddd"
-   //   },
+     getPerson(id)
+     {
+     //  alert(id)
+   //    alert(typeof(id))
+       // this.listRoot.forEach(function(item, index) {
+       //             //item 灏辨槸褰撴棩鎸夊惊鐜埌鐨勫璞�
+       //             //index鏄惊鐜殑绱㈠紩锛屼粠0寮�濮�
+       //              //alert(typeof(item.userId))
+       //             if(item.userId==id){
+       //            //   alert(89)
+       //            alert(item.nickName)
+       //               return item.nickName
+       //             }
+
+       // })
+       let username = ""
+       for(let i = 0; i < this.listRoot.length;i++)
+       {
+         if(this.listRoot[i].userId==id)
+          username = this.listRoot[i].nickName
+       }
+       return username;
+      // return "12ddd"
+     },
     //闅旇鍙樿壊
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 == 0) {
@@ -524,7 +461,12 @@
         return "statistics-warning-row";
       }
     },
-
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "娣诲姞璇佷欢/鑽h獕/璧勮川淇℃伅";
+    },
     /** 鏌ヨ閫氳褰曞垪琛� */
     getList() {
       this.loading = true;
@@ -716,7 +658,7 @@
           ...this.queryParams
         }, `zGenealogy_${new Date().getTime()}.xlsx`)
       }else{
-        this.download('/self/user/export/genealogy/'+Ids, {
+        this.download('/self/user/export/genealogy1/'+Ids, {
 
         }, `zGenealogy_${new Date().getTime()}.xlsx`)
       }

--
Gitblit v1.9.1