Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/Hotel/roomReservationsDetails.vue

@@ -104,6 +104,11 @@
                 </el-option>
               </el-select>
             </div>
+            <el-upload
+              :http-request="uploadFileBtn"
+              :multiple="true" :show-file-list="false" action="">
+              <el-button size="small" type="danger" icon="el-icon-upload2">合同上传</el-button>
+            </el-upload>
           </td>
           <td>
             <div class="w80">
@@ -285,6 +290,7 @@
                   item.ReserveNo = this.$route.query.NewCombinationNum;
               } 
             })
+            console.log(this.list,'lists');
           } else {
             this.$message.error(res.data.message);
           }
@@ -359,7 +365,30 @@
             this.Error(res.data.message);
           }
         }, err => {})
-      }
+      },
+       //合同上传
+      uploadFileBtn(file) {
+        //上传
+        if (file.file.size > 1024 * 1024 * 100) {
+          this.$message.warning("文件大小不能超过100M！");
+          return;
+        }
+        let newArr = [];
+        newArr.push(file.file);
+        let path = "/Upload/DMC/";
+        this.$message.info("上传中...");
+        this.UploadSelfFileT(path, newArr, x => {
+          let fileSize =
+            file.file.size < 1024
+              ? file.file.size
+              : (file.file.size / 1024).toFixed(0);
+              console.log(x);
+          // this.uploadList.push({
+          //   Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
+          //   Name: file.file.name
+          // });
+        });
+      },
     },
     mounted() {
       this.TCNUM = this.$route.query.TCNUM;
@@ -370,6 +399,10 @@
   }
 </script>
 <style>
+  .roomReservationsDetailsTalbe .el-button--small{
+    padding:5px;
+    margin-top:10px;
+  }
   .roomReservationsDetailsTalbe .roomBtn {
     color: #fff;
     padding: 0 10px !important;