From 2d881714a7b35ec6208946a06243c9db6690aff7 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 23 十一月 2024 15:26:47 +0800
Subject: [PATCH] 修改性别

---
 ruoyi-ui/src/views/travel/index.vue |  131 ++++++++++---------------------------------
 1 files changed, 31 insertions(+), 100 deletions(-)

diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index 205a542..c915e83 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -113,26 +113,26 @@
         <template slot-scope="props">
           <div  >
             <el-table  :header-row-class-name="tableHeaderRowClassName"  v-loading="loading" :data="travelBase[props.row.id]"  style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;" :row-class-name="tableRowClassName1" >
-              <el-table-column  label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="50px"/>
+              <el-table-column  label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="114px"/>
 
               <el-table-column label="鏃堕棿" prop="happenDate" sortable width="100" align="center" >
                 <template slot-scope="scope">{{scope.row.happenDate? scope.row.happenDate: '鈥斺�斺�斺��'}}</template>
               </el-table-column>
 
-              <el-table-column label="鍦扮偣" prop="address" sortable width="100" />
+              <el-table-column label="鍦扮偣" prop="address" sortable width="200" />
 
               <el-table-column label="寤虹瓚" prop="scenic" sortable width="100" />
               <!-- <el-table-column label="鏃呮湡" prop="travelPeriod" sortable width="100" /> -->
               <el-table-column label="浣跨敤璇佷欢" prop="document" sortable width="100" />
               <el-table-column label="杞︽/鑸彮" prop="flight" sortable width="120px" />
-              <el-table-column label="椁愯垂" prop="eat" sortable width="70px" />
-              <el-table-column label="浣忓璐�" prop="stay" sortable width="100px" />
-              <el-table-column label="浜ら��" prop="travel" sortable width="70px" />
-              <el-table-column label="闂ㄧエ" prop="entrance" sortable width="70px" />
-             <el-table-column label="鍏跺畠璐圭敤" prop="otherCost" sortable width="120px" />
-			 <el-table-column label="澶囨敞" prop="backInfo" sortable width="120px" />
+              <el-table-column label="椁愯垂" prop="eat" sortable width="80px" />
+              <el-table-column label="浣忓璐�" prop="stay" sortable width="110px" />
+              <el-table-column label="浜ら��" prop="travel" sortable width="80px" />
+              <el-table-column label="闂ㄧエ" prop="entrance" sortable width="80px" />
+             <el-table-column label="鍏跺畠璐圭敤" prop="otherCost" sortable width="130px" />
+			 <el-table-column label="澶囨敞" prop="backInfo" sortable width="130px" />
 
-              <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" >
+              <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="201px" >
                 <template slot-scope="scope" >
                   <img
                     class="el-upload-list__item-thumbnail"
@@ -155,7 +155,7 @@
 <!--              <el-table-column label="澶囨敞" prop="remark" sortable width="100" />-->
 
 
-              <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" v-if="userId != 2">
+              <el-table-column label="鎿嶄綔" align="center" class-name="small-padding " v-if="userId != 2">
                 <template slot-scope="scope" v-if="scope.row.roleId !== 1">
                   <el-button
                     size="mini"
@@ -190,21 +190,21 @@
         <template slot-scope="scope">{{scope.row.endTime? scope.row.endTime: '鈥斺�斺�斺��'}}</template>
       </el-table-column>
 <!--      <el-table-column label="鎬诲ぉ鏁�" prop="totalDay" sortable width="85px" />-->
-      <el-table-column label="鏃呮父鍚嶇О" prop="name" sortable width="200px" />
-      <el-table-column label="鍘诲悜" prop="destination" sortable width="150px" />
-      <el-table-column label="鏃呮父鎬ц川" prop="property" sortable width="100" />
+      <el-table-column label="鏃呮父鍚嶇О" prop="name" sortable width="160px" />
+      <el-table-column label="鍘诲悜" prop="destination" sortable width="120px" />
+      <el-table-column label="鏃呮父鎬ц川" prop="property" sortable width="100px" />
 	       <el-table-column label="鎰熻█" prop="spee" sortable width="120px" />
       <el-table-column label="鏃呮父鏂瑰紡" prop="manner" sortable width="100" />
       <el-table-column label="鎬婚噾棰�" prop="totalPrice" sortable width="100" />
-      <el-table-column label="椁愯垂" prop="eatTotal" sortable width="70px" />
-      <el-table-column label="浣忓" prop="stayTotal" sortable width="70px" />
-      <el-table-column label="浜ら��" prop="travelTotal" sortable width="70px" />
-      <el-table-column label="闂ㄧエ" prop="entranceTotal" sortable width="70px" />
-      <el-table-column label="鍥㈣垂" prop="groupTotal" sortable width="70px" />
+      <el-table-column label="椁愯垂" prop="eatTotal" sortable width="80px" />
+      <el-table-column label="浣忓" prop="stayTotal" sortable width="80px" />
+      <el-table-column label="浜ら��" prop="travelTotal" sortable width="80px" />
+      <el-table-column label="闂ㄧエ" prop="entranceTotal" sortable width="80px" />
+      <el-table-column label="鍥㈣垂" prop="groupTotal" sortable width="80px" />
 
 
 
-      <el-table-column  label="鎿嶄綔" align="center" sortable width="250" v-if="userId != 2">
+      <el-table-column  fixed="right" label="鎿嶄綔" align="center" sortable width="250px" v-if="userId != 2">
         <template slot-scope="scope" v-if="scope.row.roleId !== 1">
           <el-button
             size="mini"
@@ -264,7 +264,7 @@
             <el-table-column label="闂ㄧエ" prop="entrance" sortable :show-overflow-tooltip="true" width="100px" />
             <el-table-column label="璐墿" prop="shopping" sortable :show-overflow-tooltip="true" width="100px" />
 
-            <el-table-column label="鎿嶄綔" align="center" sortable class-name="small-padding fixed-width" v-if="userId != 2">
+            <el-table-column fixed="right" label="鎿嶄綔" align="center" sortable class-name="small-padding fixed-width" v-if="userId != 2">
               <template slot-scope="scope" v-if="scope.row.roleId !== 1">
 
                 <el-button
@@ -580,78 +580,7 @@
 
       <el-table v-loading="loading2" border :data="shareList1" :row-key="getRowId2" ref="multipleTable"  @selection-change="handleSelectionChange2"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
 
-            <el-table-column type="expand" :cell-class-name="expandRowClassName">
-                    <template slot-scope="props">
-                      <div  >
-                        <el-table  :header-row-class-name="tableHeaderRowClassName"  v-loading="loading" :data="travelBase[props.row.id]"  style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;" :row-class-name="tableRowClassName1" >
-                          <el-table-column  label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="50px"/>
-
-                          <el-table-column label="鏃堕棿" prop="happenDate" sortable width="100" align="center" >
-                            <template slot-scope="scope">{{scope.row.happenDate? scope.row.happenDate: '鈥斺�斺�斺��'}}</template>
-                          </el-table-column>
-
-                          <el-table-column label="鍦扮偣" prop="address" sortable width="100" />
-
-                          <el-table-column label="寤虹瓚" prop="scenic" sortable width="100" />
-                          <!-- <el-table-column label="鏃呮湡" prop="travelPeriod" sortable width="100" /> -->
-                          <el-table-column label="浣跨敤璇佷欢" prop="document" sortable width="100" />
-                          <el-table-column label="杞︽/鑸彮" prop="flight" sortable width="120px" />
-                          <el-table-column label="椁愯垂" prop="eat" sortable width="70px" />
-                          <el-table-column label="浣忓璐�" prop="stay" sortable width="100px" />
-                          <el-table-column label="浜ら��" prop="travel" sortable width="70px" />
-                          <el-table-column label="闂ㄧエ" prop="entrance" sortable width="70px" />
-                         <el-table-column label="鍏跺畠璐圭敤" prop="otherCost" sortable width="120px" />
-            			 <el-table-column label="澶囨敞" prop="backInfo" sortable width="120px" />
-
-                          <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" >
-                            <template slot-scope="scope" >
-                              <img
-                                class="el-upload-list__item-thumbnail"
-                                src="../../assets/images/deviceLis.png"
-                                alt=""
-                                style="width: 35px; height: 35px;"
-                                fit="cover"
-                                v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
-                              >
-                              <img
-                                v-else
-                                class="el-upload-list__item-thumbnail"
-                                src="../../assets/images/deviceA.png"
-                                alt=""
-                                style="width: 35px; height: 35px;"
-                                fit="cover"
-                              >
-                            </template>
-                          </el-table-column>
-            <!--              <el-table-column label="澶囨敞" prop="remark" sortable width="100" />-->
-
-
-                          <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" v-if="userId != 2">
-                            <template slot-scope="scope" v-if="scope.row.roleId !== 1">
-<!--                              <el-button
-                                size="mini"
-                                type="text"
-                                icon="el-icon-edit"
-                                @click="handleUpdate1(scope.row)"
-                                v-hasPermi="['familymodel:economy:info']"
-                              >淇敼</el-button>
-                              <el-button
-                                size="mini"
-                                type="text"
-                                icon="el-icon-delete"
-                                @click="handleDelete1(scope.row)"
-                                v-hasPermi="['system:role:remove']"
-                              >鍒犻櫎</el-button> -->
-                              <el-button size="mini" type="text" icon="el-icon-d-arrow-right"  @click="handleCheck1(scope.row)">鏌ョ湅璇︽儏</el-button>
-
-                            </template>
-                          </el-table-column>
-                        </el-table>
-                      </div>
-
-
-                    </template>
-                  </el-table-column>
+      
                   <!-- <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="60px"/>
                   <el-table-column label="璧�" prop="startTime" sortable width="100" align="center">
@@ -743,7 +672,7 @@
 import {delFamilyevent, listFamilyevent} from "@/api/bignote";
 
 export default {
-  name: "Role",
+  name: "Ztravel",
   dicts: ['sys_normal_disable'],
   data() {
     return {
@@ -1181,13 +1110,13 @@
 		        this.listRoot.forEach(element => {
 		          kon[element['nickName']] = element['userId']
 		        })
-		        for(let i in kon){
-		          this.userOptions.push({label: i,value: kon[i]})
-		        }
-		        for(let i in this.userOptions){
-		          this.userList.push(this.userOptions[i].value)
-		        }
-		        console.log(this.userList,'userListuserListuserList99999999999999')
+		        // for(let i in kon){
+		        //   this.userOptions.push({label: i,value: kon[i]})
+		        // }
+		        // for(let i in this.userOptions){
+		        //   this.userList.push(this.userOptions[i].value)
+		        // }
+		        // console.log(this.userList,'userListuserListuserList99999999999999')
 		        this.loading1 = false;
 		      }
 		    );
@@ -1203,6 +1132,7 @@
       }).then(() => {
 
         this.getList();
+		this.getList1();
         this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
         this.id1 = undefined
         this.open1 = false;
@@ -1440,6 +1370,7 @@
     /** 鏌ョ湅璇︾粏淇℃伅 */
     handleCheck(row){
       const id = row.id;
+	  this.open2 = false; 
       // alert(id)
       //  alert(row.fee_id)
       this.$router.push("/self/travel/Info/" + id);

--
Gitblit v1.9.1