Merge branch 'ren' into develop

src/pages/contractCreate/creat-rent-info.vue

@@ -459,32 +459,15 @@ export default {
           //   name: 'CreateEnclosureInfo',
           // })
         })
-      }
-      if (vm.isComputed) {
-        let url = process.env.basePath + 'prj_product_info_save'
-        let param = {
-          master: {
-            division_n: vm.saveInfo.division_n,
-            bp_name: vm.$route.params.bp_name,
-            ...vm.productInfo,
-          },
-        }
-        hlsPopup.showLoading('请稍候')
-        vm.$post(url, param).then(function (res) {
-          vm.hlsPopup.hideLoading()
-          if (res.result === 'S') {
-            vm.$router.push({
-              name: 'CreateEnclosureInfo',
-            })
-          } else {
-            hlsPopup.showLongCenter(res.message)
-          }
-        })
       } else {
         if (vm.isComputed) {
           let url = process.env.basePath + 'prj_product_info_save'
           let param = {
-            master: vm.productInfo,
+            master: {
+              division_n: vm.saveInfo.division_n,
+              bp_name: vm.$route.params.bp_name,
+              ...vm.productInfo,
+            },
           }
           hlsPopup.showLoading('请稍候')
           vm.$post(url, param).then(function (res) {

src/pages/contractCreate/create-enclosure-info.vue

@@ -185,7 +185,16 @@ export default {
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
+          res.lists.forEach(item => {
+            item['url'] =
+              process.env.filePath +
+              'attachment_id=' +
+              item.attachment_id +
+              '&access_token=' +
+              window.localStorage.access_token
+          })
           vm.dowload_list = res.lists
+          console.log('下载图片', vm.dowload_list)
         }
       })
     },
@@ -685,11 +694,11 @@ export default {
           }
         }
   }
-  .house:nth-of-type(2) {
-    margin-top: 0
-  }
   .house:last-child {
-    margin-top: 0
+    margin-top: 0;
+    div {
+      float: left;
+    }
   }
 
   .upload-box {