From bcac500a760877dc9140f1f381739793706c1af6 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期五, 10 十一月 2023 10:29:38 +0800
Subject: [PATCH] 修改图片大小

---
 ruoyi-ui/src/views/economy/index.vue |  339 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 179 insertions(+), 160 deletions(-)

diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index 1a994f5..32f6914 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -2,11 +2,14 @@
   <div class="app-container" style="opacity: 1;">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 
-      <el-form-item label="鏃堕棿" >
+      <el-form-item label="鏃堕棿"  prop="createTime">
         <el-date-picker
           v-model="dateRange"
-          style="width: 240px;"
-          value-format="yyyy-MM-dd HH-MM"
+          style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
+          value-format="yyyy-MM-dd"
           type="daterange"
           range-separator="-"
           start-placeholder="寮�濮嬫棩鏈�"
@@ -18,32 +21,24 @@
           v-model="queryParams.usePeople"
           placeholder="璇疯緭鍏ヤ娇鐢ㄤ汉"
           clearable
-          style="width: 240px"
+          style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="鍩洪噾/鍙拌处" prop="type" >
-          <el-select
-        v-model="queryParams.type"
-        placeholder="鍩洪噾/鍙拌处"
-        clearable
-        style="width: 240px"
-      >
-        <el-option
-          v-for="dict in typeOptions"
-          :key="dict.value"
-          :label="dict.label"
-          :value="dict.value"
-        />
-      </el-select>
-      </el-form-item>
+
 
       <el-form-item label="鐢ㄩ��" prop="useFor">
         <el-input
           v-model="queryParams.useFor"
           placeholder="璇疯緭鍏ョ敤閫�"
           clearable
-          style="width: 240px"
+          style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -52,7 +47,6 @@
         <el-button  size="mini" @click="resetQuery" style=" width: 65px;height: 32px; background: #FFDDE3; border-radius:6px 6px 6px 6px;opacity: 1;">閲嶇疆</el-button>
       </el-form-item>
     </el-form>
-
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -88,85 +82,87 @@
         >瀵煎嚭</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.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-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.2">
+        <el-upload
+          action=""
+          class="upload-demo"
+          :show-file-list="false"
+          :http-request="handleEnport"
+        >
+          <el-button size="mini"   type="primary"
+                     plain
+                     icon="el-icon-top" >瀵煎叆</el-button>
 
-		  </el-upload>
-		</el-col>
+        </el-upload>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <!-- 搴忓彿銆佸熀閲�/鍙拌处銆佹椂闂淬�佹敹鍏�/鏀嚭銆佺敤閫斻�佷娇鐢ㄤ汉銆佺幇閲�/鑷姩鎵e垝銆佷綑棰濄�佺數瀛愭枃浠躲�佸娉� 鎿嶄綔-->
     <!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 -->
-    <el-table v-loading="loading" :data="economyList"  @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
+    <el-table v-loading="loading" :data="economyList"  @selection-change="handleSelectionChange" @row-click="handleCheck" :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  label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
-      <el-table-column label="鍩洪噾/鍙拌处" prop="type" sortable width="120" >
-          <template slot-scope="scope">
-          {{ getSrc1(scope.row.type) }}
-           </template>
-          </el-table-column>
-      <el-table-column label="鏃堕棿" align="center" sortable prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
 
-      <el-table-column label="鏀跺叆/鏀嚭" prop="price" sortable width="100" />
+      <el-table-column label="鍙戠敓鏃堕棿" prop="createTime" sortable width="150" align="center">
+        <template slot-scope="scope">{{scope.row.createTime? scope.row.createTime: '鈥斺�斺�斺��'}}</template>
+      </el-table-column>
+      <el-table-column label="鍙拌处" prop="type" sortable width="100" />
+      <el-table-column label="鏀跺叆/鏀嚭" prop="price" sortable width="100" >
+
+      </el-table-column>
+      <el-table-column label="閲戦" prop="balance" sortable width="100" />
       <el-table-column label="鐢ㄩ��" prop="useFor" sortable width="100" />
-      <!-- <el-table-column label="浜嬮」鍐呭" prop="content" sortable :show-overflow-tooltip="true" width="150" /> -->
+
       <el-table-column label="浣跨敤浜�" prop="usePeople" sortable width="100" />
       <el-table-column label="鐜伴噾/鑷姩鎵e垝" prop="kind" sortable width="130" >
-          <template slot-scope="scope">
-          {{ getSrc2(scope.row.kind) }}
-           </template>
+        <template slot-scope="scope">{{scope.row.kind? scope.row.kind: '鈥斺�斺�斺��'}}</template>
       </el-table-column>
-      <el-table-column label="浣欓" prop="balance" sortable width="100" />
+      <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" sortable width="150px" >
+        <template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template>
+      </el-table-column>
       <el-table-column label="鐢靛瓙鏂囦欢" prop="url" align="center" sortable  width="110" >
         <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 !== ','"
-           >
-    <img
-             class="el-upload-list__item-thumbnail"
-             src="../../assets/images/deviceA.png"
-             alt=""
-             style="width: 35px; height: 35px;"
-             fit="cover"
-              v-if="scope.row.url === ','"
-           >
-         </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">
+          <div  @click="handleCheck(scope.row)">
+            <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"
+
+            ></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="澶囨敞" prop="remark" sortable width="100" >
+        <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
+      </el-table-column>
+      <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width">
         <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+          <div class="button-container">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:role:edit']"
+            v-hasPermi="['familymodel:economy:info']"
           >淇敼</el-button>
           <el-button
             size="mini"
@@ -175,10 +171,11 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:role:remove']"
           >鍒犻櫎</el-button>
-          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
+          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:economy:info']">
             <el-button size="mini" type="text" icon="el-icon-d-arrow-right"  @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
 
           </el-dropdown>
+          </div>
         </template>
       </el-table-column>
     </el-table>
@@ -196,22 +193,24 @@
     <!-- 璁惧鍚嶇О銆佹椂闂淬�佽喘涔颁汉銆佷簨椤瑰唴瀹广�佸瓨鏀惧湴鐐广�佸娉ㄣ�佺數瀛愭枃浠� -->
     <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="type">
-        <el-select v-model="formDat.type" placeholder="璇烽�夋嫨鍩洪噾/鍙拌处" clearable :style="{width: '100%'}"  >
-          <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
-          ></el-option>
-        </el-select>
-      </el-form-item>
+        <el-form-item label="鍙拌处" prop="type">
+          <el-input v-model="formDat.type" placeholder="璇疯緭鍏ュ唴瀹�" clearable :style="{width: '100%'}" ></el-input>
+        </el-form-item>
 
-        <el-form-item label="鏃堕棿" prop="createTime">
-          <el-date-picker
-            v-model='formDat.createTime'
-            type='date'
-            placeholder='閫夋嫨鏃ユ湡'
+        <el-form-item label="鍙戠敓鏃堕棿" prop="creatTime">
+          <el-date-picker v-model="formDat.createTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+                          :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
           ></el-date-picker>
         </el-form-item>
         <el-form-item label="鏀跺叆/鏀嚭" prop="price">
-          <el-input v-model="formDat.price" placeholder="璇疯緭鍏ユ敹鍏�/鏀嚭" clearable :style="{width: '100%'}" ></el-input>
+          <el-select v-model="formDat.price" placeholder="璇烽�夋嫨鏀跺叆/鏀嚭" clearable :style="{width: '100%'}"  >
+            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="閲戦" prop="balance">
+          <el-input v-model="formDat.balance" placeholder="璇疯緭鍏ラ噾棰�" clearable :style="{width: '100%'}" >
+          </el-input>
         </el-form-item>
         <el-form-item label="鐢ㄩ��" prop="useFor">
           <el-input v-model="formDat.useFor" placeholder="璇疯緭鍏ョ敤閫�" clearable :style="{width: '100%'}" >
@@ -221,20 +220,12 @@
           <el-input v-model="formDat.usePeople" placeholder="璇疯緭鍏ヤ娇鐢ㄤ汉" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
-        <el-form-item label="鐜伴噾/鑷姩鎵e垝" prop="kind">
-        <el-select v-model="formDat.kind" placeholder="璇烽�夋嫨鐜伴噾/鑷姩鎵e垝" clearable :style="{width: '100%'}"  >
-          <el-option v-for="(item, index) in typeOptions1" :key="index" :label="item.label" :value="item.value"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-        <el-form-item label="浣欓" prop="balance">
-          <el-input v-model="formDat.balance" placeholder="璇疯緭鍏ヤ綑棰�" clearable :style="{width: '100%'}" >
+        <el-form-item label="鏀粯鏂瑰紡" prop="kind">
+          <el-input v-model="formDat.kind" placeholder="璇疯緭鍏ユ敮浠樻柟寮�" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
-        <!-- <el-form-item label="瀹跺涵鍙�" prop="familyId">
-          <el-input v-model="formDat.familyId" 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>
@@ -284,11 +275,12 @@
           class="upload-demo"
           multiple
 
-          :on-remove="handleRemove"
+          :on-remove="handleRemoveFile"
           :http-request="requestUpload"
           :show-file-list="true"
         >
-          <el-button type="primary">涓婁紶</el-button>
+          <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
+          <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div>
           <template #tip>
             <div class="el-upload__tip">
             </div>
@@ -319,7 +311,7 @@
 
 
 //鍦╯ystem/note/index.js涓鍏ユ帴鍙e嚱鏁�  --鎺ュソ浜�
-import {listEconomy,enload,getEconomyInfo,delEconomy, addEconomy, uploadPic} from "@/api/economy/index";
+import {listEconomy,enload,delEconomy, addEconomy, uploadPic} from "@/api/economy/index";
 
 export default {
   name: "Role",
@@ -363,6 +355,7 @@
       ],
       dsb:true,
       btn:false,
+      uploading: false,
       formDat: {
         type: undefined,
         createTime: undefined,
@@ -383,7 +376,8 @@
         type:undefined,
         useFor:undefined,
         usePeople:undefined,
-        createTime:undefined,
+
+        createTime:undefined
 
       },
       // 琛ㄥ崟鍙傛暟
@@ -407,17 +401,17 @@
         }],
         type: [{
           required: true,
-          message: '璇烽�夋嫨鍩洪噾/鍙拌处',
-          trigger: 'change'
+          message: '璇疯緭鍏ュ彴璐﹀唴瀹�',
+          trigger: 'blur'
         }],
         balance: [{
           required: true,
-          message: '璇疯緭鍏ヤ綑棰�',
+          message: '璇疯緭鍏ラ噾棰�',
           trigger: 'blur'
         }],
         kind: [{
-          required: true,
-          message: '璇疯緭鍏ュ搴彿',
+          // required: true,
+          message: '璇疯緭鍏ユ敮浠樻柟寮�',
           trigger: 'blur'
         }],
         createTime: [{
@@ -432,50 +426,50 @@
         }],
       },
       typeOptions: [
-      {
-  value: '0',
-  label: '鍩洪噾',
-},
-{
-  value: '1',
-  label: '鍙拌处',
-}
+        {
+          value: '鏀跺叆',
+          label: '鏀跺叆',
+        },
+        {
+          value: '鏀嚭',
+          label: '鏀嚭',
+        }
       ],
       typeOptions1: [
-      {
-  value: '0',
-  label: '鐜伴噾',
-},
-{
-  value: '1',
-  label: '鑷姩鎵e垝',
-}
+        {
+          value: '0',
+          label: '鐜伴噾',
+        },
+        {
+          value: '1',
+          label: '鑷姩鎵e垝',
+        }
       ],
     };
   },
   created() {
     this.getList();
-      this.getCateInfor()
+    this.getCateInfor()
 
   },
   methods: {
 
-  //鍩洪噾/鍙拌处鐨勯�夋嫨
-  getSrc1(type) {
-    if (type === 0) {
-      return '鍩洪噾'
-    }else {
-      return '鍙拌处'
-    }
-  },
+    //鍩洪噾/鍙拌处鐨勯�夋嫨
+    getSrc1(type) {
+      if (type === 0) {
+        return '鍩洪噾'
+      }else {
+        return '鍙拌处'
+      }
+    },
 
-  getSrc2(kind) {
-    if (kind == 0) {
-      return '鐜伴噾'
-    }else  {
-      return '鑷姩鎵e垝'
-    }
-  },
+    getSrc2(kind) {
+      if (kind == 0) {
+        return '鐜伴噾'
+      }else  {
+        return '鑷姩鎵e垝'
+      }
+    },
 
     // 鍙栨秷鎸夐挳
     cancelData() {
@@ -503,7 +497,7 @@
       // console.log(this.queryParams)
       //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
 
-        listEconomy(this.queryParams).then(response => {
+      listEconomy(this.queryParams).then(response => {
           //  alert(123)
           //   console.log(response.data)
           this.economyList = response.data.data;
@@ -514,6 +508,13 @@
       );
     },
     handleRemove(file) {
+      for(let i = 0; i < this.fileList.length; i++)
+      {
+        if(this.fileList[i].url==file.url)
+          this.$delete(this.fileList,i);
+      }
+    },
+    handleRemoveFile(file) {
       for(let i = 0; i < this.fileListOther.length; i++)
       {
         if(this.fileListOther[i].url==file.url)
@@ -521,15 +522,15 @@
       }
     },
     getCateInfor()
-  {
-    let _this = this
-    getCategory().then(response=>{
+    {
+      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]})
+        response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+          _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+        })
       })
-    })
-  },
+    },
     // 鍙栨秷鎸夐挳
     cancel() {
       this.open = false;
@@ -633,6 +634,17 @@
           });
         }
       });
+      // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+      Object.keys(this.formDat).forEach(key => {
+        this.formDat[key] = '';
+      });
+      for(let i = 0; i <= this.fileList.length; i++)
+      {
+        this.handleRemove(this.fileList[0]);
+      }
+      for(let i = 0; i < this.fileListOther.length; i++){
+        this.handleRemoveFile(this.fileListOther[0]);
+      }
     },
     requestUpload(params)
     {
@@ -640,10 +652,11 @@
       var formData = new FormData();
       formData.append('uploadFile', file);
       let _this = this
-
+      this.uploading = true;
       uploadPic(formData).then(response => {
         let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+        this.uploading = false;
+        this.$modal.msgSuccess("涓婁紶鎴愬姛");
         if(_this.fot.includes(pth) === true)
         {
           _this.fileList.push({name:response.data.fileName, "url":response.data.url})
@@ -660,7 +673,7 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const Ids = row.id || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎搴忓彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
+      this.$modal.confirm('鏄惁纭鍒犻櫎鎵�閫夋暟鎹」锛�').then(function() {
         return delEconomy(Ids);
       }).then(() => {
         this.getList();
@@ -682,7 +695,7 @@
     let _this = this
     alert(file)
     enload(formData).then(response => {
-       _this.getList();
+      _this.getList();
       Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
 
     }).catch(err)
@@ -690,7 +703,7 @@
       Message({ message: "瀵煎叆澶辫触", type: 'error' })
     }
 
-    }
+  }
 
 };
 </script>
@@ -704,4 +717,10 @@
   background: #FFEFF2;
 
 }
+.el-table__cell {
+  font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */
+}
+.button-container {
+  display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
+}
 </style>

--
Gitblit v1.9.1