From d03c0c366862d917bdac6ba9cab8d338e722da10 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期二, 11 六月 2024 14:12:38 +0800
Subject: [PATCH] 修改

---
 ruoyi-ui/src/views/travel/index.vue |  291 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 236 insertions(+), 55 deletions(-)

diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index 52c771f..7e0221e 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -59,7 +59,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8" v-if="userId != 2">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -78,7 +78,7 @@
           icon="el-icon-delete"
           size="mini"
           :disabled="multiple"
-          @click="handleDelete1"
+          @click="handleDelete"
           v-hasPermi="['system:role:remove']"
         >鍒犻櫎</el-button>
       </el-col>
@@ -88,6 +88,7 @@
     <!-- 搴忓彿銆佸熀閲�/鍙拌处銆佹椂闂淬�佹敹鍏�/鏀嚭銆佺敤閫斻�佷娇鐢ㄤ汉銆佺幇閲�/鑷姩鎵e垝銆佷綑棰濄�佺數瀛愭枃浠躲�佸娉� 鎿嶄綔-->
     <!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 -->
     <el-table v-loading="loading" :data="travelpriceList" @row-click="getRowId" @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 type="expand" :cell-class-name="expandRowClassName">
         <template slot-scope="props">
           <div  >
@@ -110,7 +111,7 @@
               <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
@@ -119,22 +120,22 @@
                     alt=""
                     style="width: 35px; height: 35px;"
                     fit="cover"
-                    v-if="scope.row.url"
+                    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"
-                    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">
+              <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"
@@ -180,10 +181,10 @@
       <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="鎿嶄綔" align="center" sortable width="180" >
+
+      <el-table-column  label="鎿嶄綔" align="center" sortable width="180" v-if="userId != 2">
         <template slot-scope="scope" v-if="scope.row.roleId !== 1">
           <el-button
             size="mini"
@@ -235,7 +236,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">
+            <el-table-column 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
@@ -356,7 +357,7 @@
           <el-input v-model="formDat.flight" placeholder="璇疯緭鍏ヨ溅娆�/鑸彮" clearable :style="{width: '100%'}" ></el-input>
         </el-form-item>
 		<el-form-item label="鍏跺畠璐圭敤" prop="otherCost">
-		  <el-input v-model="formDat.otherCost" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
+		  <el-input v-model="formDat.otherCost" type="number" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
 		</el-form-item>
 		<el-form-item label="澶囨敞" prop="backInfo">
 		  <el-input v-model="formDat.backInfo" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
@@ -370,9 +371,11 @@
         <el-upload
           action="#"
           list-type="picture-card"
-          multiple
-          :http-request="requestUpload"
-          :file-list="fileList"
+		  multiple
+		  :http-request="requestUpload"
+		  :file-list="fileList"
+		  :on-change="handleChange"
+		  :auto-upload="false"
         >
           <i slot="default" class="el-icon-plus"></i>
           <div slot="file" slot-scope="{file}">
@@ -404,6 +407,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=""
@@ -412,16 +422,63 @@
           multiple
 
           :on-remove="handleRemove"
-          :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"
+
+        >
+
+     <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>
       </el-form>
       <el-form ref="elForm" :model="formDat" :rules="rules1" size="medium" label-width="100px">
         <h4 class="form-header">璐圭敤鏄庣粏 </h4>
@@ -461,7 +518,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";
 
 
 //鍦╯ystem/note/index.js涓鍏ユ帴鍙e嚱鏁�  --鎺ュソ浜�
@@ -484,6 +541,7 @@
   dicts: ['sys_normal_disable'],
   data() {
     return {
+      userId: undefined,
       // 閬僵灞�
       disabled: false,
       loading: true,
@@ -527,9 +585,10 @@
 
       fileList:[
       ],
-      fileListOther:[
-
-      ],
+      fileList1:[],
+      	  uploadFileList: [],
+      		uploadFileList1: [],
+      fileListOther:[],
       dsb:true,
       btn:false,
       formDat: {
@@ -543,7 +602,7 @@
         self: undefined,
         remark: undefined,
         groupTotal:undefined,
-        url: undefined,
+        url: "",
 		otherCost: undefined,
 		backInfo: undefined
       },
@@ -725,8 +784,16 @@
   },
   created() {
     this.getList();
+    this.getInfo()
   },
   methods: {
+    getInfo(){
+          console.log('-----------------')
+          getInfo().then(response=>{
+            console.log(response.user.roles[0].roleId,'roleID')
+            this.userId = response.user.roles[0].roleId
+          })
+        },
     //灞曞紑琛�
     expandRowClassName({ row, rowIndex }) {
       // 杩斿洖瀵瑰簲琛岀殑鏍峰紡閰嶇疆瀵硅薄
@@ -772,7 +839,7 @@
         this.travelpriceList = response.data.data;
 		//alert(this.travelpriceList.url)
 		console.log("0000")
-		console.log(this.travelpriceList)
+		console.log(this.travelpriceList,'1111111111111111111111111')
         this.total = response.data.total;
         this.loading = false;
 
@@ -841,7 +908,7 @@
           deptCheckStrictly: true,
           remark: undefined
         };
-      this.resetForm("form");
+      this.resetForm("elForm");
     },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {
@@ -884,13 +951,13 @@
       const id = this.row.id
 
       this.formDat.cid = id;
-      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
       console.log(this.formDat)
       this.$refs["elForm"].validate(valid => {
         if (valid) {
@@ -898,15 +965,40 @@
           addTravelBase(this.formDat).then(response => {
             this.$modal.msgSuccess("鏂板鎴愬姛");
             this.centerDialogVisible = false;
+			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();
+
+
           });
         }
       });
+      // Object.keys(this.formDat).forEach(key => {
+      //   this.formDat[key] = '';
+      // });
+      // this.handleRemove(this.fileList[0]);
+      // this.handleRemoveFile(this.fileListOther[0]);
+      // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
       Object.keys(this.formDat).forEach(key => {
         this.formDat[key] = '';
       });
-      this.handleRemove(this.fileList[0]);
-      this.handleRemoveFile(this.fileListOther[0]);
+      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]);
+      }
     },
     //  寮圭獥
     handleShow(row){
@@ -959,11 +1051,42 @@
       });
     },
 
-
+  handleRemove(file) {
+		//alert(98)
+		//alert(this.fileList.length)
+     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);
+		 }
+     }
+	 // let ul = this.fileList.map(function (elem){
+	 //   return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+	 // }).join(",")
+	 // alert(this.fileListOther.length)
+	 // let uls = this.fileListOther.map(function (elem){
+	 //   return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+	 // }).join(",")
+	 // this.formDat.url = ul+","+uls;
+    },
+    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);
+		  }
+      }
+    },
     handlePictureCardPreview(file) {
+		//alert(123)
       this.dialogImageUrl = file.url;
       this.dialogVisible = true;
     },
+
     /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
     submitDataScope: function() {
 
@@ -986,29 +1109,87 @@
       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
+	handleChange(file, fileList1) {
+	   //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
 
-      uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+	 // 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;
 
-        if(_this.fot.includes(pth) === true)
-        {
-          _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+		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
+		alert(_this.formDat.url)
+		_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
+			  	//  alert(_this.formDat.url)
+			  _this.uploadFileList = []
+			  _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+
+		  });
+		},
+	    requestUpload(params) {
+	//alert(98)
+	 //    this.uploadFileList.push(params.file);
+	    },
+
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const Ids = row.id || this.ids;

--
Gitblit v1.9.1