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

src/components/Hotel/roomReservationsDetails.vue

@@ -104,10 +104,11 @@
                 </el-option>
               </el-select>
             </div>
-            <el-upload
-              :http-request="uploadFileBtn"
-              :multiple="true" :show-file-list="false" action="" style="display:none">
-              <el-button size="small" type="danger" icon="el-icon-upload2">合同上传</el-button>
+            <el-upload :http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
+              <el-button size="small" type="danger" icon="el-icon-upload2">
+                <i class="el-icon-plus avatar-uploader-icon" @click="ClickItem=item"></i>
+                <div class="el-upload__text" @click="ClickItem=item">点击上传</div>
+              </el-button>
             </el-upload>
           </td>
           <td>
@@ -218,6 +219,8 @@
         CreateByAccount: '',
         //创建人姓名
         CreateByName: '',
+        //点击项
+        ClickItem: {},
       }
     },
     methods: {
@@ -270,11 +273,15 @@
             this.CreateByPhoto = res.data.data.CreateByPhoto;
             this.CreateByAccount = res.data.data.CreateByAccount;
             this.list.forEach(item => {
-              this.calculationPrice(item)
+              this.calculationPrice(item);
               item.hotelList.push({
                 Name: item.NewHotelName,
                 ID: item.NewHotelId
               })
+              item.ContractUrlArray = [];
+              if (item.ContractUrl && item.ContractUrl != '') {
+                item.ContractUrlArray = item.ContractUrl.split(',');
+              }
               item.PayStyle = item.PayStyle.toString()
               item.OrderDetailsList.forEach((x, index1) => {
                 if (x.HouseTypeCount <= 0) {
@@ -286,11 +293,11 @@
                 x.UnitPrice = x.UnitPrice.toString();
                 x.HotelDiscount = x.HotelDiscount.toString();
               })
-              if(item.ReserveNo==''||item.ReserveNo==null){
-                  item.ReserveNo = this.$route.query.NewCombinationNum;
-              } 
+              if (item.ReserveNo == '' || item.ReserveNo == null) {
+                item.ReserveNo = this.$route.query.NewCombinationNum;
+              }
             })
-            console.log(this.list,'lists');
+            console.log("this.List", this.list);
           } else {
             this.$message.error(res.data.message);
           }
@@ -366,9 +373,9 @@
           }
         }, err => {})
       },
-       //合同上传
+      //合同上传
       uploadFileBtn(file) {
-        //上传
+        console.log("clickItem", this.ClickItem);
         if (file.file.size > 1024 * 1024 * 100) {
           this.$message.warning("文件大小不能超过100M！");
           return;
@@ -378,16 +385,15 @@
         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
-          // });
+          var fileUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
+          this.ClickItem.ContractUrlArray.push(fileUrl);
+          var str = "";
+          this.ClickItem.ContractUrlArray.forEach(subItem => {
+            str += subItem + ",";
+          })
+          this.ClickItem.ContractUrl = str != "" ? str.substring(0, str.length - 1) : str;
         });
+
       },
     },
     mounted() {
@@ -397,12 +403,14 @@
       this.getList();
     },
   }
+
 </script>
 <style>
-  .roomReservationsDetailsTalbe .el-button--small{
-    padding:5px;
-    margin-top:10px;
+  .roomReservationsDetailsTalbe .el-button--small {
+    padding: 5px;
+    margin-top: 10px;
   }
+
   .roomReservationsDetailsTalbe .roomBtn {
     color: #fff;
     padding: 0 10px !important;