From e717167307cd29740484741f553e1f7aa3e36dc2 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期二, 07 五月 2024 17:38:03 +0800
Subject: [PATCH] 解决了必选项和封面问题

---
 ruoyi-ui/src/views/self/show.vue |  196 +++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 175 insertions(+), 21 deletions(-)

diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 72919db..4d237b7 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -336,24 +336,67 @@
                  @click="picUpload"
                >涓婁紶鍒版湇鍔″櫒</el-button>
         <h4 class="form-header">鍏朵粬闄勪欢 </h4>
+
+
         <el-upload
           action=""
           :file-list="fileListOther"
           class="upload-demo"
           multiple
-
+          ref="upload1"
+          :on-change="handleChange1"
+          :auto-upload="false"
+          list-type="picture-card"
           :on-remove="handleRemove"
           :http-request="requestUpload1m"
           :show-file-list="true"
         >
-          <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
-          <div v-if="uploading1" class="upload-status">姝e湪涓婁紶...</div>
-          <template #tip>
-            <div class="el-upload__tip">
-            </div>
-          </template>
+
+        <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="file.url"
+                 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>
 
@@ -1063,6 +1106,21 @@
       },
       // 琛ㄥ崟鏍¢獙
       rules: {
+        happenTime: [{
+          required: true,
+          message: '璇烽�夋嫨鏃堕棿',
+          trigger: 'blur'
+        }],
+        people: [{
+          required: true,
+          message: '璇疯緭鍏ヤ汉鐗�',
+          trigger: 'blur'
+        }],
+        title: [{
+          required: true,
+          message: '璇疯緭鍏ヤ簨浠舵爣棰�',
+          trigger: 'blur'
+        }],
         //鍩烘湰淇℃伅
         nickName: [{
           // required: true,
@@ -1158,6 +1216,74 @@
           trigger: 'blur'
         }],
 
+        relation: [{
+          required: true,
+          message: '璇疯緭鍏ュ叧绯�',
+          trigger: 'blur'
+        }],
+        otherName: [{
+          required: true,
+          message: '璇疯緭鍏ュ鍚�',
+          trigger: 'blur'
+        }],
+        otherUnit: [{
+          required: true,
+          message: '璇疯緭鍏ュ崟浣�',
+          trigger: 'blur'
+        }],
+        otherPosition: [{
+          required: true,
+          message: '璇疯緭鍏ヨ亴鍔�',
+          trigger: 'blur'
+        }],
+        otherPolitical: [{
+          required: true,
+          message: '璇疯緭鍏ユ斂娌婚潰璨�',
+          trigger: 'blur'
+        }],
+
+        cerName: [{
+          required: true,
+          message: '璇疯緭鍏ヨ瘉浠跺悕绉�',
+          trigger: 'blur'
+        }],
+        type: [{
+          required: true,
+          message: '璇疯緭鍏ヨ瘉浠剁被鍨�',
+          trigger: 'blur'
+        }],
+        ownStatus: [{
+          required: true,
+          message: '璇疯緭鍏ユ寔鏈夋儏鍐�',
+          trigger: 'blur'
+        }],
+        idNo: [{
+          required: true,
+          message: '璇疯緭鍏ヨ瘉浠跺彿鐮�',
+          trigger: 'blur'
+        }],
+
+        startTime: [{
+          required: true,
+          message: '璇疯緭鍏ュ紑濮嬫椂闂�',
+          trigger: 'blur'
+        }],
+        endTime: [{
+          required: true,
+          message: '璇疯緭鍏ョ粨鏉熸椂闂�',
+          trigger: 'blur'
+        }],
+        destination: [{
+          required: true,
+          message: '璇疯緭鍏ユ墍鍒板湴鍖�',
+          trigger: 'blur'
+        }],
+        cause: [{
+          required: true,
+          message: '璇疯緭鍏ヤ簨鐢�',
+          trigger: 'blur'
+        }]
+
       },
       selectedOption:'',
       typeOptions:[],
@@ -1193,6 +1319,32 @@
       }
      },
 
+	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)
+
+		})
+
+		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();
@@ -1206,16 +1358,17 @@
 	//console.log(this.uploadFileList)
   // alert(this.uploadFileList)
 		this.uploadFileList.forEach((elem)=>{
-			formData.append("uploadFile", elem)
+			formData.append("files", elem)
 
 		})
 		//alert(90)
 		let _this = this
 		//alert(9)
 	    uploadPic(formData).then(response => {
-			// console.log(response)
+			// console.log(response,'123123123')
    //            console.log(_this.formDat.url,'666')
-	      _this.formDat.url = _this.formDat.url+","+response.data.fileName
+	      _this.formDat.url = _this.formDat.url+","+response.fileNames
+
 		  	 // alert(_this.formDat.url)
 		  _this.uploadFileList = []
 		  _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
@@ -1524,7 +1677,7 @@
     {
       var file = params.file;
       var formData = new FormData();
-      formData.append('uploadFile', file);
+      formData.append('files', file);
       let _this = this
       this.uploading = true;
       uploadPic(formData).then(response => {
@@ -1533,7 +1686,7 @@
         this.$modal.msgSuccess("涓婁紶鎴愬姛");
         if(_this.fot.includes(pth) === true)
         {
-          _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+          _this.fileList.push({name:response.fileNames, "url":response.data.url})
         }
       })
     },
@@ -1541,7 +1694,7 @@
     {
       var file = params.file;
       var formData = new FormData();
-      formData.append('uploadFile', file);
+      formData.append('files', file);
       let _this = this
       this.uploading1 = true;
       uploadPic(formData).then(response => {
@@ -1550,7 +1703,7 @@
         this.$modal.msgSuccess("涓婁紶鎴愬姛");
         if(_this.fot.includes(pth) !== true)
         {
-          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+          _this.fileListOther.push({name:response.fileNames, url:response.data.url})
         }
       })
     },
@@ -1593,17 +1746,18 @@
     /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
     submitDataScopem: 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) {
 
           addNote(this.formDat).then(response => {
+            console.log(this.formDat)
             this.$modal.msgSuccess("鏂板鎴愬姛");
             this.getList();
             this.open = false;

--
Gitblit v1.9.1