From 0bed59a7c83975e466e31aa2fa14d8ee15473813 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期四, 16 一月 2025 11:20:35 +0800
Subject: [PATCH] 修改了对应的bug

---
 ruoyi-ui/src/views/selfeconomy/index.vue |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index a34f37b..aad13e9 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/ruoyi-ui/src/views/selfeconomy/index.vue
@@ -172,7 +172,7 @@
         <el-table-column label="鏈熼檺" prop="timeLimit" sortable width="110" align="center">
           <template slot-scope="scope">{{scope.row.timeLimit? scope.row.timeLimit: '鈥斺�斺�斺��'}}</template>
         </el-table-column>
-        <el-table-column label="鍙樻洿/娉ㄩ攢" prop="isChange" sortable width="140" align="center">
+        <el-table-column label="鍙樻洿/娉ㄩ攢/璐拱" prop="isChange" sortable width="140" align="center">
           <template slot-scope="scope">{{scope.row.isChange? scope.row.isChange: '鈥斺�斺�斺��'}}</template>
         </el-table-column>
         <el-table-column label="浜ф潈" prop="propertyRight" sortable width="110" align="center">
@@ -211,7 +211,7 @@
         <el-table-column label="澶囨敞" prop="remark" sortable align="center">
           <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
         </el-table-column>
-        <el-table-column label="鎿嶄綔" align="center" width="220" class-name="small-padding fixed-width" v-if="userId != 2">
+        <el-table-column fixed="right" label="鎿嶄綔" align="center" width="220" class-name="small-padding fixed-width" v-if="userId != 2">
           <template slot-scope="scope" v-if="scope.row.roleId !== 1">
             <div class="button-container">
             <el-button
@@ -262,8 +262,8 @@
       />
 
       <!-- 娣诲姞鏀惰棌涓庤崳瑾変俊鎭厤缃璇濇 -->
-      <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body    @click.native="handleDialogClick">
-        <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
+      <el-dialog :title="title" :visible.sync="open" width="840px" append-to-body    @click.native="handleDialogClick">
+        <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="120px">
           <!--        <el-form-item label="鑾峰緱鏃堕棿" prop="happenTime">-->
           <!--          <el-input v-model="formDat.happenTime" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" ></el-input>-->
           <!--        </el-form-item>-->
@@ -294,8 +294,8 @@
             <el-input v-model="formDat.propertyRight" placeholder="璇疯緭鍏ヤ骇鏉�" clearable :style="{width: '100%'}" >
             </el-input>
           </el-form-item>
-          <el-form-item label="鍙樻洿/娉ㄩ攢" prop="isChange">
-            <el-select ref="multiSelect" v-model="formDat.isChange" placeholder="璇烽�夋嫨鍙樻洿/娉ㄩ攢" clearable :style="{width: '100%'}"  >
+          <el-form-item label="鍙樻洿/娉ㄩ攢/璐拱" prop="isChange">
+            <el-select ref="multiSelect" v-model="formDat.isChange" placeholder="璇烽�夋嫨鍙樻洿/娉ㄩ攢/璐拱" clearable :style="{width: '100%'}"  >
               <el-option v-for="(item, index) in typeOptions1" :key="index" :label="item.label" :value="item.value"
               ></el-option>
             </el-select>
@@ -498,7 +498,7 @@
                 <el-table-column label="鏈熼檺" prop="timeLimit" sortable width="110" align="center">
                   <template slot-scope="scope">{{scope.row.timeLimit? scope.row.timeLimit: '鈥斺�斺�斺��'}}</template>
                 </el-table-column>
-                <el-table-column label="鍙樻洿/娉ㄩ攢" prop="isChange" sortable width="140" align="center">
+                <el-table-column label="鍙樻洿/娉ㄩ攢/璐拱" prop="isChange" sortable width="140" align="center">
                   <template slot-scope="scope">{{scope.row.isChange? scope.row.isChange: '鈥斺�斺�斺��'}}</template>
                 </el-table-column>
                 <el-table-column label="浜ф潈" prop="propertyRight" sortable width="110" align="center">
@@ -667,7 +667,7 @@
         // 鏁版嵁鑼冨洿閫夐」
     // 鏁版嵁鑼冨洿閫夐」
     fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
-      '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
+      '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'],
 
         fileList:[
         ],
@@ -737,7 +737,7 @@
           }],
           isChange: [{
             required: true,
-            message: '璇疯緭鍏ュ彉鏇�/娉ㄩ攢',
+            message: '璇疯緭鍏ュ彉鏇�/娉ㄩ攢/璐拱',
             trigger: 'blur'
           }],
           price: [{
@@ -939,7 +939,7 @@
          this.loading1 = true;
          		  let userId = this.$store.state.user.userId
          		//  alert(userId)
-         		  
+
          		  showShareUser(userId, 2026).then(response=>{
          			  console.log("===========ddddddddddddd")
          			  console.log(response.data)
@@ -953,6 +953,7 @@
          		// //  alert(this.$store.state.user.clanId)
          		//       this.listRoot = []
          		 let clanId = this.$store.state.user.clanId
+				  if(clanId!=null){
                  getAllInfo(clanId).then(response => {
                      this.listRoot = response.data;
                      const kon = {}
@@ -970,6 +971,7 @@
                      this.loading1 = false;
                    }
                  );
+				 }
           },
       // 纭鍒嗕韩
       subShare(row) {
@@ -1139,7 +1141,7 @@
       /** 鏌ョ湅璇︾粏淇℃伅 */
       handleCheck(row){
         const id = row.id;
-		this.open2 = false; 
+		this.open2 = false;
         this.$router.push("/self/selfeconomy/selfeconomyInfo/" + id);
       },
       /** 淇敼鎸夐挳鎿嶄綔 */

--
Gitblit v1.9.1