From fae5df1d3f1ae875ac546cacfb4744b2e8230ca2 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期一, 29 七月 2024 11:07:24 +0800
Subject: [PATCH] 修改了bug

---
 ruoyi-ui/src/views/wish/index.vue |  465 ++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 294 insertions(+), 171 deletions(-)

diff --git a/ruoyi-ui/src/views/wish/index.vue b/ruoyi-ui/src/views/wish/index.vue
index 54919f4..ea6bfbf 100644
--- a/ruoyi-ui/src/views/wish/index.vue
+++ b/ruoyi-ui/src/views/wish/index.vue
@@ -1,65 +1,14 @@
 <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>
-        <!--        <el-input
-                  v-model="searchVal"
-                  placeholder="鍦ㄢ�滈�氳褰曗�濅腑鎼滅储"
-                  clearable
-                  style="width: 240px"
-                  @input="inputChange">
-                  <i slot="prefix" class="el-input__icon el-icon-search"></i>
-                </el-input>
-                <div class="outer-table">
-                   姝ょ埗缁勪欢寮曠敤瀛愮粍浠秚ablemax
-                  <tablemax label="myLabel" :tableData="contactList">
-                    <template v-slot:table>
-                      <el-table-column label="鎿嶄綔" width="180">
-                        <template slot-scope="scope">
-                          <el-button @click="handleCheck(scope.row)" type="text" size="small"
-                          >璋冪敤</el-button
-                          >
-                        </template>
-                      </el-table-column>
-                    </template>
-                  </tablemax>
-                </div>-->
-
-
-        <!--        v-model="queryParams.id"
-
-                  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"
-                  @keyup.enter.native="handleQuery"
-                  -->
-      </el-form-item>
-
       <el-form-item label="鏃堕棿" prop="happenTime">
         <el-date-picker
           v-model="dateRange"
-          style="width:  197px;
+          style="width:  240px;
           height: 30px;
           background: #FFFFFF;
           border-radius: 14px 14px 14px 14px;
-          opacity: 0.5;
-          border: 1px solid rgba(0,0,0,0.25);"
+          opacity: 0.5;"
           value-format="yyyy-MM-dd"
           type="daterange"
           range-separator="-"
@@ -68,61 +17,82 @@
           @keyup.enter.native="handleQuery"
         ></el-date-picker>
       </el-form-item>
-
       <el-form-item label="鐞嗘兂鏍囬" prop="title">
         <el-input
           v-model="queryParams.title"
           placeholder="璇疯緭鍏ョ悊鎯虫爣棰�"
           clearable
-          style="width: 240px"
+          style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
           @keyup.enter.native="handleQuery">
           <i slot="prefix" class="el-input__icon el-icon-search"></i>
         </el-input>
       </el-form-item>
-
       <el-form-item label="鍙楁儬浜�" prop="beneficiary" >
         <el-input
           v-model="queryParams.beneficiary"
           placeholder="璇疯緭鍏ュ彈鎯犱汉"
           clearable
-          style="width: 240px"
+          style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
           @keyup.enter.native="handleQuery">
           <i slot="prefix" class="el-input__icon el-icon-search"></i>
         </el-input>
       </el-form-item>
-
       <el-form-item label="缁ф壙浜�" prop="heir">
         <el-input
           v-model="queryParams.heir"
           placeholder="璇疯緭鍏ョ户鎵夸汉"
           clearable
-          style="width: 240px"
+          style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
           @keyup.enter.native="handleQuery">
           <i slot="prefix" class="el-input__icon el-icon-search"></i>
         </el-input>
       </el-form-item>
-      <el-cntainer>
-        <el-col :span="9" >
-          <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>
-            <el-button  size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
-            border-radius: 7px 7px 7px 7px;opacity: 1; ">閲嶇疆</el-button>
-          </el-form-item>
-        </el-col>
-      </el-cntainer>
-    </el-form>
-    <div>
-      <!--      <div style="width: 100px;-->
-      <!--      height: 24px;-->
-      <!--      font-size: 18px;-->
-      <!--      font-family: Microsoft YaHei-Regular, Microsoft YaHei;-->
-      <!--      font-weight: 400;-->
-      <!--      color: #000000;-->
-      <!--      line-height: 21px;-->
-      <!--      ">鏀惰棌鍜岃崳瑾�</div>-->
+      <el-form-item label="濮嬩簬浣曞洜" prop="cause">
+        <el-input
+          v-model="queryParams.cause"
+          placeholder="璇疯緭鍏ュ師鍥�"
+          clearable
+          style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
+          @keyup.enter.native="handleQuery">
+          <i slot="prefix" class="el-input__icon el-icon-search"></i>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="鏄惁鏈夋晥" prop="isEffective">
+        <el-select v-model="queryParams.isEffective" placeholder="璇烽�夋嫨鏄惁鏈夋晥" clearable
+                   style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;" @keyup.enter.native="handleQuery">
+          <el-option v-for="item in typeOptions"
+                     :key="item.value" :label="item.label" :value="item.value"/>
+        </el-select>
+      </el-form-item>
 
-      <el-row :gutter="10" class="mb8">
+      <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>
+        <el-button  size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
+        border-radius: 7px 7px 7px 7px;opacity: 1; ">閲嶇疆</el-button>
+      </el-form-item>
+
+
+    </el-form>
+
+    <div>
+
+      <el-row :gutter="10" class="mb8" v-if="userId != 2">
         <el-col :span="1.5">
           <el-button
             type="primary"
@@ -165,7 +135,7 @@
             v-hasPermi="['family:note:export']"
           >瀵煎叆妯℃澘涓嬭浇</el-button>
         </el-col>
-        <el-col :span="1.2">
+        <el-col :span="1.5">
 
           <el-upload
             action=""
@@ -176,7 +146,7 @@
           >
             <el-button size="mini"   type="primary"
                        plain
-                       icon="el-icon-plus" >瀵煎叆</el-button>
+                     icon="el-icon-top" >瀵煎叆</el-button>
           </el-upload>
         </el-col>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -185,22 +155,22 @@
     <el-table v-loading="loading" :data="wishList" :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" :reserve-selection="true" width="55"  align="center" />
       <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
-      <el-table-column label="鏃堕棿" prop="happenTime" sortable width="100" align="center">
+      <el-table-column label="鏃堕棿" prop="happenTime" sortable width="150" align="center">
         <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
       </el-table-column>
-      <el-table-column label="鐞嗘兂鏍囬/鐧惧勾蹇冩効" prop="title" sortable width="160" align="center">
+      <el-table-column label="鐞嗘兂鏍囬/鐧惧勾蹇冩効" prop="title" sortable :show-overflow-tooltip="true" width="160" align="center">
         <template slot-scope="scope">{{scope.row.title? scope.row.title: '鈥斺�斺�斺��'}}</template>
       </el-table-column>
-      <el-table-column label="濮嬩簬浣曞洜" prop="cause" sortable :show-overflow-tooltip="true" width="120" align="center" >
+      <el-table-column label="濮嬩簬浣曞洜" prop="cause" sortable :show-overflow-tooltip="true" width="140" align="center" >
         <template slot-scope="scope">{{scope.row.cause? scope.row.cause: '鈥斺�斺�斺��'}}</template>
       </el-table-column>
-      <el-table-column label="鍙楁儬浜�" prop="beneficiary" sortable width="120" align="center" >
+      <el-table-column label="鍙楁儬浜�" prop="beneficiary" sortable :show-overflow-tooltip="true" width="140" align="center" >
         <template slot-scope="scope">{{scope.row.beneficiary? scope.row.beneficiary: '鈥斺�斺�斺��'}}</template>
       </el-table-column>
-      <el-table-column label="缁ф壙浜�" prop="heir" sortable width="110" align="center">
+      <el-table-column label="缁ф壙浜�" prop="heir" sortable :show-overflow-tooltip="true" width="140" align="center">
         <template slot-scope="scope">{{scope.row.heir? scope.row.heir: '鈥斺�斺�斺��'}}</template>
       </el-table-column>
-      <el-table-column label="瀹炵幇闅惧害" prop="difficulty" sortable width="120" align="center">
+      <el-table-column label="瀹炵幇闅惧害" prop="difficulty" :show-overflow-tooltip="true" sortable width="120" align="center">
         <template slot-scope="scope">{{scope.row.difficulty? scope.row.difficulty: '鈥斺�斺�斺��'}}</template>
       </el-table-column>
       <el-table-column label="鏄惁渚濇棫鏈夋晥" prop="isEffective" sortable width="160" align="center">
@@ -232,38 +202,35 @@
             ></div>
         </template>
       </el-table-column>
-      <el-table-column label="澶囨敞" prop="remark" sortable width="90" align="center">
+      <el-table-column label="澶囨敞" prop="remark" sortable :show-overflow-tooltip="true" width="90" align="center">
         <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
       </el-table-column>
-      <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" >
+      <el-table-column label="鎿嶄綔" align="center" width="250" 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="handleUpdate(scope.row)"
-            v-hasPermi="['system:role:edit']"
-          >淇敼</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @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']">
+          <div class="button-container">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['system:role:edit']"
+            >
+              <span style="font-size: 14px;">淇敼</span>
+            </el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['system:role:remove']"
+            ><span style="font-size: 14px;">鍒犻櫎</span></el-button>
             <el-button
               size="mini"
               type="text"
               icon="el-icon-d-arrow-right"
-              @click="handleCheck(scope.row)"
-
-            >鏌ョ湅璇︽儏</el-button>
-
-          </el-dropdown>
+              @click="handleCheck(scope.row)">
+              <span style="font-size: 14px;">鏌ョ湅璇︽儏</span></el-button>
+          </div>
         </template>
       </el-table-column>
     </el-table>
@@ -284,8 +251,9 @@
         <!--          <el-input v-model="formDat.happenTime" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" ></el-input>-->
         <!--        </el-form-item>-->
         <el-form-item label="鏃堕棿" prop="happenTime">
-          <el-input v-model="formDat.happenTime" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" ></el-input>
-        </el-form-item>
+          <el-date-picker v-model="formDat.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+                          :editable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
+          ></el-date-picker></el-form-item>
         <el-form-item label="鐞嗘兂鏍囬/鐧惧勾蹇冩効" prop="title">
           <el-input v-model="formDat.title" placeholder="璇疯緭鍏ョ悊鎯虫爣棰�/鐧惧勾蹇冩効" clearable :style="{width: '100%'}" >
           </el-input>
@@ -317,24 +285,31 @@
           <el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
         </el-form-item>
 
-        <h4 class="form-header">鐢靛瓙鏂囦欢 </h4>
+        <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
         <el-upload
           action="#"
+          accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
           list-type="picture-card"
           multiple
           :http-request="requestUpload"
           :file-list="fileList"
+
+		  :on-change="handleChange"
+		  :auto-upload="false"
+		  	ref="upload"
         >
-          <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]"
-            >
+          <i  slot="default" class="el-icon-plus"></i>
+          <div slot="file" slot-scope="{ file }">
+            <template v-if="fileList">
+              <img
+                class="el-upload-list__item-thumbnail"
+                :src="file.url"
+                alt=""
+                style="width: 100%; height: 100%; object-fit: cover;"
+                fit="cover"
+                :preview-src-list="[file.url]"
+              >
+            </template>
             <span class="el-upload-list__item-actions">
         <span
           class="el-upload-list__item-preview"
@@ -355,6 +330,13 @@
 
           </div>
         </el-upload>
+		<el-button
+		         style="margin-left: 10px"
+		         size="small"
+		         type="success"
+
+		         @click="picUpload"
+		       >涓婁紶鍒版湇鍔″櫒</el-button>
         <h4 class="form-header">鍏朵粬闄勪欢 </h4>
         <el-upload
           action=""
@@ -363,16 +345,63 @@
           multiple
 
           :on-remove="handleRemoveFile"
-          :http-request="requestUpload"
           :show-file-list="true"
-        >
-          <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
-          <template #tip>
-            <div class="el-upload__tip">
-            </div>
-          </template>
-        </el-upload>
 
+		  ref="upload1"
+		  :on-change="handleChange1"
+		  :auto-upload="false"
+		  list-type="picture-card"
+		    :http-request="requestUpload1"
+
+        >
+
+          <div v-if="uploading1" class="upload-status">姝e湪涓婁紶...</div>
+     <i slot="default" class="el-icon-plus"></i>
+             <div slot="file" slot-scope="{file}">
+               <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
+               <video
+                 v-if="file.url.includes('.mp4')"
+                 class="el-upload-list__item-thumbnail"
+                 :src="file.url"
+                 style="width: 147px; height: 147px"
+                 fit="cover"
+               ></video>
+               <img v-else
+                    class="el-upload-list__item-thumbnail"
+                    src="../../assets/images/deviceLis.png"
+                    alt=""
+                    style="width: 100%; height: 100%"
+                    fit="cover"></img>
+
+               <span class="el-upload-list__item-actions">
+                    <span class="el-upload-list__item-name">{{ file.name }}</span>
+                         <span
+                           class="el-upload-list__item-preview"
+                           @click="handleFileCardPreview(file)"
+                         >
+                           <i class="el-icon-zoom-in"></i>
+                         </span>
+
+                         <span
+
+                           class="el-upload-list__item-delete"
+                           @click="handleRemoveFile(file)"
+                         >
+                           <i class="el-icon-delete"></i>
+                         </span>
+                   </span>
+
+             </div>
+
+
+           </el-upload>
+
+	 <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+		          @click="fileUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
       </el-form>
       <h4 class="form-header"> </h4>
 
@@ -393,7 +422,7 @@
 <script>
 import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
 import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
-
+import {getInfo} from "@/api/login";
 
 
 //瀵煎叆鎺ュ彛鍑芥暟
@@ -407,6 +436,7 @@
   dicts: ['sys_normal_disable'],
   data() {
     return {
+      userId: undefined,
       // 閬僵灞�
       disabled: false,
 
@@ -437,14 +467,20 @@
       // 鏃ユ湡鑼冨洿
       dateRange: [],
       // 鏁版嵁鑼冨洿閫夐」
+      // 鏁版嵁鑼冨洿閫夐」
       fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
         '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
       fileList:[],
+      fileList1:[],
+      uploadFileList: [],
+      		uploadFileList1: [],
       fileListOther:[],
       dsb:true,
       btn:false,
       fit:['fill'],
-
+      uploading: false,
+      uploading1: false,
       formDat: {
         //鐧惧勾蹇冩効璁板綍
         id:undefined,
@@ -456,7 +492,7 @@
         difficulty:undefined,
         isEffective:undefined,
         remark:undefined,
-        url: undefined,
+        url: "",
 
       },
       // 鑿滃崟鍒楄〃
@@ -470,6 +506,8 @@
         title:undefined,
         heir:undefined,
         beneficiary:undefined,
+        cause:undefined,
+        isEffective:undefined
         // happenTime:undefined,
       },
       // searchVal:"",
@@ -532,18 +570,27 @@
   },
   created() {
     this.getList();
-    this.getCateInfor()
+    this.getInfo()
+    // this.getCateInfor()
     // for (let i = 0; i < this.contactList.length; i++) {
     //   this.formDat[i] = this.contactList[i];
     // }
   },
   methods: {
-
+    getInfo(){
+          console.log('-----------------')
+          getInfo().then(response=>{
+            console.log(response.user.roles[0].roleId,'roleID')
+            this.userId = response.user.roles[0].roleId
+          })
+        },
     getSrc1(isEffective) {
       if (isEffective === 1) {
         return '鏄�'
-      }else {
+      }else if(isEffective === 0){
         return '鍚�'
+      }else {
+        return '---'
       }
     },
 
@@ -617,14 +664,20 @@
       for(let i = 0; i < this.fileList.length; i++)
       {
         if(this.fileList[i].url==file.url)
+        {
           this.$delete(this.fileList,i);
+        		 this.$delete(this.uploadFileList,i);
+        		 }
       }
     },
     handleRemoveFile(file) {
       for(let i = 0; i < this.fileListOther.length; i++)
       {
         if(this.fileListOther[i].url==file.url)
+        {
           this.$delete(this.fileListOther,i);
+          this.$delete(this.uploadFileList1,i);
+          }
       }
     },
     // 鍙栨秷鎸夐挳
@@ -720,53 +773,118 @@
     /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
     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
+      // 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) {
 
           addWish(this.formDat).then(response => {
             this.$modal.msgSuccess("鏂板鎴愬姛");
             this.open = false;
+            // 娓呯┖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]);
+            }
             this.getList();
           });
         }
       });
-      // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
-      Object.keys(this.formDat).forEach(key => {
-        this.formDat[key] = '';
-      });
-      this.handleRemove(this.fileList[0]);
-      this.handleRemoveFile(this.fileListOther[0]);
     },
-    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)
+ 	handleChange(file, fileList1) {
+ 	   //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
 
-        if(_this.fot.includes(pth) === true)
-        {
-          _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+ 	 // this.uploadFileList.push(file.raw);
+ 	  console.log("=========5555=========")
+ 	  console.log(file)
+ 	//  console.log(this.uploadFileList)
+ 	//  this.fileList = fileList
+ 	//alert(file)
+ 	    this.uploadFileList.push(file.raw);
+ 	     this.fileList.push({name:file.name,url:file.url})
+ 	//alert(fileList1.length)
+ 	},
+ 	handleChange1(file, fileOtherList1) {
+ 	   //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+ 	this.uploadFileList1.push(file.raw);
+ 	 this.fileListOther.push({name:file.name,url:file.url})
+ 	 // this.uploadFileList.push(file.raw);
+ 	  console.log("=========5555=========")
+ 	  //console.log(file)
+ 	//  console.log(this.uploadFileList)
+ 	//  this.fileList = fileList
+ 	},
+ 	fileUpload(){
+ 	//	var file = params.file;
 
-        }
+ 		var formData = new FormData();
+ 		this.$refs.upload1.submit();
+ 		// formData.append('uploadFile', file);
+ 		if(this.uploadFileList1.length==0){
+ 			  this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖!");
+ 			  return
+ 		}
+ 		this.uploadFileList1.forEach((elem)=>{
+ 			formData.append("files", elem)
 
-        else{
-          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+ 		})
 
-        }
-      })
+ 		let _this = this
 
-    },
+ 		this.uploading = true;
+ 		uploadPic(formData).then(response => {
+ 		_this.uploadFileList1 = []
+ 		_this.formDat.url = _this.formDat.url+","+response.fileNames
+ 		_this.$modal.msgSuccess("鏂囦欢涓婁紶鎴愬姛!");
+ 		  })
+
+ 	},
+ 	picUpload()
+ 	{
+ 		var formData = new FormData();
+ 		//alert(976)
+ 		//this.$refs.upload.submit();
+ 		//alert(8)
+ 		//alert(this.uploadFileList.length)
+ 	if(this.uploadFileList.length==0){
+ 		  this.$modal.msgSuccess("鍥剧墖涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+ 		  return}
+ 	//console.log(this.uploadFileList)
+ 		this.uploadFileList.forEach((elem)=>{
+ 			formData.append("files", elem)
+
+ 		})
+ 		//alert(90)
+ 		let _this = this
+ 		//alert(9)
+ 	    uploadPic(formData).then(response => {
+ 		//	alert("dds")
+ 	      _this.formDat.url = _this.formDat.url+","+response.fileNames
+ 		  _this.uploadFileList = []
+ 		  _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+
+ 	  });
+ 	},
+     requestUpload(params) {
+ //alert(98)
+  //    this.uploadFileList.push(params.file);
+     },
+     requestUpload1(params)
+     {
+ 		//     this.uploadFileList1.push(params.file);
+     },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const Ids = row.id || this.ids;
@@ -829,6 +947,11 @@
   background: #FFEFF2;
 
 }
-
+.el-table__cell {
+  font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */
+}
+.button-container {
+  display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
+}
 
 </style>

--
Gitblit v1.9.1