From 7c33a1164d3019feb3ad9e4844b3d364e5c6eb44 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 17 十一月 2024 11:31:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

---
 ruoyi-ui/src/views/genealogy/index.vue |  259 ++++++++-------------------------------------------
 1 files changed, 44 insertions(+), 215 deletions(-)

diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index c3238d9..45edc93 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -1,22 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-      <el-form-item label="" prop="phone wx qq twitter isAlways remark" >
-        <el-input
-          v-model:phone="queryParams.phone"
-          v-model:wx="queryParams.wx"
-          v-model:qq="queryParams.qq"
-          v-model:twitter="queryParams.twitter"
-          v-model:isAlways="queryParams.isAlways"
-          v-model:remark="queryParams.remark"
-          placeholder="鍦ㄢ�滃紶姘忎竴瑙堣〃鈥濅腑鎼滅储"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery">
-          <i slot="prefix" class="el-input__icon el-icon-search"></i>
-        </el-input>
-        <!--        v-model="queryParams.id"-->
-      </el-form-item>
 
       <el-form-item label="韬唤" prop="identity" >
         <el-select
@@ -55,10 +39,10 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="鐢熸棩" prop="birth">
+      <el-form-item label="鐢熸棩" prop="birth deadDay">
         <el-date-picker
           v-model="dateRange"
-          style="width:  197px;
+          style="width:  240px;
           height: 30px;
           background: #FFFFFF;
           border-radius: 14px 14px 14px 14px;
@@ -69,9 +53,11 @@
           range-separator="-"
           start-placeholder="寮�濮嬫棩鏈�"
           end-placeholder="缁撴潫鏃ユ湡"
+          @keyup.enter.native="handleQuery"
         ></el-date-picker>
 
       </el-form-item>
+
       <el-form-item>
         <el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
             border-radius: 7px 7px 7px 7px;opacity: 1; " >鎼滅储</el-button>
@@ -81,48 +67,7 @@
       </el-form-item>
     </el-form>
     <div>
-<!--      <div style="width: 149px;-->
-<!--      height: 24px;-->
-<!--      font-size: 18px;-->
-<!--      font-family: Microsoft YaHei-Regular, Microsoft YaHei;-->
-<!--      font-weight: 400;-->
-<!--      color: #000000;-->
-<!--      line-height: 21px;-->
-<!--      ">寮犳皬涓�瑙堣〃</div>-->
-
       <el-row :gutter="10" class="mb8">
-<!--        <el-col :span="1.5">-->
-<!--          <el-button-->
-<!--            type="primary"-->
-<!--            plain-->
-<!--            icon="el-icon-plus"-->
-<!--            size="mini"-->
-<!--            @click="handleAdd"-->
-<!--            v-hasPermi="['system:role:add']"-->
-<!--          >鏂板</el-button>-->
-<!--        </el-col>-->
-
-<!--        <el-col :span="1.5">-->
-<!--          <el-button-->
-<!--            type="danger"-->
-<!--            plain-->
-<!--            icon="el-icon-delete"-->
-<!--            size="mini"-->
-<!--            :disabled="multiple"-->
-<!--            @click="handleDelete"-->
-<!--            v-hasPermi="['system:role:remove']"-->
-<!--          >鍒犻櫎</el-button>-->
-<!--        </el-col>-->
-        <el-col :span="1.5">
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-            v-hasPermi="['family:note:export']"
-          >瀵煎嚭</el-button>
-        </el-col>
 <!--        <el-col :span="1.5">-->
 <!--          <el-button-->
 <!--            type="warning"-->
@@ -131,42 +76,33 @@
 <!--            size="mini"-->
 <!--            @click="handleExport"-->
 <!--            v-hasPermi="['family:note:export']"-->
-<!--          >瀵煎叆妯℃澘涓嬭浇</el-button>-->
-<!--        </el-col>-->
-<!--        <el-col :span="1.2">-->
-
-<!--          <el-upload-->
-<!--            action=""-->
-<!--            class="upload-demo"-->
-<!--            :show-file-list="false"-->
-<!--            :http-request="handleEnport"-->
-<!--          >-->
-<!--            <el-button size="mini"   type="primary"-->
-<!--                       plain-->
-<!--                       icon="el-icon-plus" >瀵煎叆</el-button>-->
-<!--          </el-upload>-->
+<!--          >瀵煎嚭</el-button>-->
 <!--        </el-col>-->
 
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
     </div>
 
-    <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 v-loading="loading" border :data="listRoot" :row-key="getRowId" ref="multipleTable"  @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
       <el-table-column type="selection" width="55"  align="center" />
       <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 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>
-      <el-table-column label="濮撳悕" prop="nickName" sortable :show-overflow-tooltip="true" width="100" align="center"/>
+      <el-table-column label="濮撳悕" prop="nickName" sortable :show-overflow-tooltip="true" width="100" align="center">
+		    <template slot-scope="scope" >
+				
+			<el-button @click="handleCheck(scope.row)">{{scope.row.nickName}}</el-button>
+		         </template>
+		      </el-table-column> 
+		  
       <el-table-column label="鎬у埆" prop="sex" sortable width="100" align="center" >
         <template slot-scope="scope">
-          <span v-if="scope.row.sex===1">鐢�</span>
-          <span v-if="scope.row.sex===0">濂�</span>
+          <span v-if="scope.row.sex===0">鐢�</span>
+          <span v-if="scope.row.sex===1">濂�</span>
           <span v-if="scope.row.sex== null">鈥斺��</span>
         </template>
       </el-table-column>
@@ -189,16 +125,17 @@
         <template slot-scope="scope">{{scope.row.spouseName? scope.row.spouseName: '鈥斺�斺�斺��'}}</template>
       </el-table-column>
 
-  <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+      <el-table-column fixed="right" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope" v-if="scope.row.roleId !== 1">
 
 
-<el-button
+        <el-button
              size="mini"
               type="text"
              icon="el-icon-d-arrow-right"
               @click="handleCheck(scope.row)">
-鏌ョ湅璇︽儏</el-button>
+          鏌ョ湅璇︽儏
+        </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -212,49 +149,8 @@
       @pagination="getList"
     />
 
-
   <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="identity">
-          <el-input v-model="formDat.identity" placeholder="璇疯緭鍏ヨ韩浠�" clearable :style="{width: '100%'}" >
-          </el-input>
-        </el-form-item>
-        <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="sex">
-          <el-input v-model="formDat.sex" placeholder="璇疯緭鍏ユ�у埆" clearable :style="{width: '100%'}" >
-          </el-input>
-        </el-form-item>
-        <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="deadDay">
-          <el-input v-model="formDat.deadDay" placeholder="璇疯緭鍏ュ叏鐢熷懡鍛ㄦ湡" clearable :style="{width: '100%'}" >
-          </el-input>
-        </el-form-item>
-        <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="鎵�鍦ㄥ崟浣�" prop="unit">
-          <el-input v-model="formDat.unit" placeholder="璇疯緭鍏ユ墍鍦ㄥ崟浣�" clearable :style="{width: '100%'}" >
-          </el-input>
-        </el-form-item>
-        <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>
-      <h4 class="form-header"> </h4>
-
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitDataScope">淇� 瀛�</el-button>
-        <el-button @click="cancelData">鍙� 娑�</el-button>
-      </div>
     </el-dialog>
 
     <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
@@ -273,6 +169,8 @@
 //瀵煎叆鎺ュ彛鍑芥暟
 import {enload, uploadPic} from "@/api/contacts/index";
 import {getRoot,listUserAll} from "@/api/root/index";
+
+
 export default {
   name: "index",
   dicts: ['sys_normal_disable'],
@@ -291,7 +189,8 @@
       multiple: true,
       // 鏄剧ず鎼滅储鏉′欢
       showSearch: true,
-      // 鎬绘潯鏁�
+      pageSize: 10, // 姣忛〉鏄剧ず鏁版嵁鏉℃暟
+      pageNum: 1, // 褰撳墠椤电爜      // 鎬绘潯鏁�
       total: 0,
       // 瀹惰氨琛ㄦ牸鏁版嵁
       listRoot: [],
@@ -314,7 +213,7 @@
       dsb:true,
       btn:false,
       fit:['fill'],
-
+      uploading: false,
       formDat: {
         //寮犳皬涓�瑙堣〃
         userid:undefined,
@@ -362,6 +261,7 @@
         nickName:undefined,
         sex:undefined,
         birth:undefined,
+		clanId: undefined
       },
       // searchVal:"",
 
@@ -402,11 +302,11 @@
 
       },
       typeOption: [{
-        value: '1',
+        value: '0',
         label: '鐢�',
       },
         {
-          value: '0',
+          value: '1',
           label: '濂�',
         }],
       typeOptions: [{
@@ -426,10 +326,6 @@
   },
   created() {
     this.getList();
-    // this.getCateInfor()
-    // for (let i = 0; i < this.contactList.length; i++) {
-    //   this.formDat[i] = this.contactList[i];
-    // }
   },
   methods: {
     // 鍙栨秷鎸夐挳
@@ -470,45 +366,31 @@
         return "statistics-warning-row";
       }
     },
-    /** 鏂板鎸夐挳鎿嶄綔 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "娣诲姞璇佷欢/鑽h獕/璧勮川淇℃伅";
-    },
-    /** 鏌ヨ閫氳褰曞垪琛� */
+    /** 鏌ヨ瀹惰氨鍒楄〃 */
     getList() {
       this.loading = true;
      //  console.log(this.queryParams)
       //alert(23)
       this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
       this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
+	  this.queryParams.clanId = this.$store.state.user.clanId
+      this.listRoot = []
       //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
       listUserAll(this.queryParams).then(response => {
-          //  alert(123)
           //   console.log(response.data)
-       //   alert(76)
           this.listRoot = response.data.data;
-        //  alert(this.listRoot)
-          this.total = response.data.length;
-          this.pageNum=1;
-          this.pageSize=10;
-       //   alert(this.total)
+          this.total = response.data.total;
+          // this.pageNum=1;
+          // this.pageSize=10;
+        // this.pageNum = response.data.pageNum;
           this.loading = false;
         }
       );
     },
-    /** 鏌ヨ绫诲埆淇℃伅 */
-    // getCateInfor()
-    // {
-    //   let _this = this
-    //   getCategory().then(response=>{
-    //
-    //     response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
-    //       _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
-    //     })
-    //   })
-    // },
+    handlePageChange(currentPage) {
+      this.pageNum = currentPage; // 鏍规嵁 currentPage 璁$畻鍑� pageNum 鍊�
+      this.getList();
+    },
     //韬唤閫夋嫨
     getSrc(identity) {
       if (identity === '1'){
@@ -523,10 +405,11 @@
         return '鍏跺畠'
       }
     },
-
-    handleRemove(file) {
-      alert(323)
+    getRowId(row)
+    {
+      return row.id
     },
+
     // 鍙栨秷鎸夐挳
     cancel() {
       this.open = false;
@@ -535,7 +418,6 @@
     // 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級
     cancelDataScope() {
       this.openDataScope = false;
-      this.reset();
     },
     // 琛ㄥ崟閲嶇疆
     reset() {
@@ -558,7 +440,7 @@
           deptCheckStrictly: true,
           remark: undefined
         };
-      this.resetForm("form");
+      this.resetForm("elForm");
     },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {
@@ -595,65 +477,12 @@
      this.$router.push("/familymodel/jiagenwang/personInfo/" + id);
     },
 
-
     handlePictureCardPreview(file) {
       this.dialogImageUrl = file.url;
       this.dialogVisible = true;
     },
-    /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
-    submitDataScope: function() {
 
-      let ul = this.fileList.map(function (elem){
-        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
-      }).join(",")
-      let uls = this.fileListOther.map(function (elem){
-        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
-      }).join(",")
-      this.formDat.url = ul+","+uls
-      this.$refs["elForm"].validate(valid => {
-        if (valid) {
 
-          addContact(this.formDat).then(response => {
-            this.$modal.msgSuccess("鏂板鎴愬姛");
-            this.open = false;
-            this.getList();
-          });
-        }
-      });
-    },
-    requestUpload(params)
-    {
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
-
-      uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
-        if(_this.fot.includes(pth) === true)
-        {
-          _this.fileList.push({name:response.data.fileName, "url":response.data.url})
-
-        }
-
-        else{
-          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
-        }
-      })
-
-    },
-    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
-    handleDelete(row) {
-      const Ids = row.id || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎缂栧彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
-        return delContact(Ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-      }).catch(() => {});
-    },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     // handleExport() {
     //   this.download('/self/user/export/genealogy', {
@@ -680,7 +509,7 @@
 };
 </script>
 
-<style >
+<style scoped>
 .app-container{
   background-color: #FEF7FC;
 }

--
Gitblit v1.9.1