BUG修改

src/views/land/api/noLand.js

@@ -2,280 +2,305 @@ import request from '@/router/axios'
 
 // 查询拟挂牌地块
 export function fetchNoHandLandList(query) {
-  return request({
-    url: '/api/landtolist',
-    method: 'get',
-    params: query
-  })
+    return request({
+        url: '/api/landtolist',
+        method: 'get',
+        params: query
+    })
 }
 
 // 保存、编辑地块
 export function saveNoHandLandList(param, type) {
-  return request({
-    url: '/api/landtolist',
-    method: type,
-    headers: {
-      'Content-Type': 'application/json'
-    },
-    data: param
-  })
+    return request({
+        url: '/api/landtolist',
+        method: type,
+        headers: {
+            'Content-Type': 'application/json'
+        },
+        data: param
+    })
 }
+
 // 字典表查询
 export function getDict(data) {
-  return request({
-    url: "/api/dict/type/" + data,
-    method: "get",
-    // params:data
-  })
+    return request({
+        url: "/api/dict/type/" + data,
+        method: "get",
+        // params:data
+    })
 }
 
 // 通过ID删除拟挂牌地块
 export function delNoHandLandObj(ids) {
-  return request({
-    url: '/api/landtolist',
-    headers: {
-      'Content-Type': 'application/json'
-    },
-    method: 'delete',
-    data: JSON.stringify(ids)
-  })
+    return request({
+        url: '/api/landtolist',
+        headers: {
+            'Content-Type': 'application/json'
+        },
+        method: 'delete',
+        data: JSON.stringify(ids)
+    })
 }
 
 // 通过ID查询挂牌地块
 export function queryNoHandLandObj(id) {
-  return request({
-    url: '/api/landtolist/' + id,
-    method: 'get'
-  })
+    return request({
+        url: '/api/landtolist/' + id,
+        method: 'get'
+    })
 }
 
 // 发送到已挂牌
 export function sendNoHandLandList(proposedseriaId) {
-  return request({
-    url: '/api/landtolist/sendLandList?',
-    method: 'post',
-    params: {
-      proposedseriaId: proposedseriaId
-    }
-  })
+    return request({
+        url: '/api/landtolist/sendLandList?',
+        method: 'post',
+        params: {
+            proposedseriaId: proposedseriaId
+        }
+    })
 }
 
 // 导出拟挂牌地块信息
 export function exportNoHandLandToListExcel(ids) {
-  return request({
-    url: '/api/landtolist/exportLandToListExcel?ids=' + ids,
-    method: 'get'
-  })
+    return request({
+        url: '/api/landtolist/exportLandToListExcel?ids=' + ids,
+        method: 'get'
+    })
 }
 
 // 下载模板
 export function downloadNoHandLandTemplate() {
-  return request({
-    url: '/api/landtolist/getTemplate',
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded'
-    },
-    method: 'get'
-  })
+    return request({
+        url: '/api/landtolist/getTemplate',
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded'
+        },
+        method: 'get'
+    })
 }
 
 // 通过公告序号经纬度列表查询
 export function queryLonLatList(proposedseriaId) {
-  return request({
-    url: '/api/landtolistlonlat/list/' + proposedseriaId,
-    method: 'get'
-  })
+    return request({
+        url: '/api/landtolistlonlat/list/' + proposedseriaId,
+        method: 'get'
+    })
 }
+
 // 通过公告序号经营企业列表查询
 export function conductenterList(data) {
-  return request({
-    url: '/api/landtolistconductenterprise/page',
-    method: 'get',
-    params: data
-  })
+    return request({
+        url: '/api/landtolistconductenterprise/page',
+        method: 'get',
+        params: data
+    })
 }
+
 // 通过公告序号经营配件列表查询
 export function constructionPlanList(data) {
-  return request({
-    url: '/api/landtolistconstructionplan/page',
-    method: 'get',
-    params: data
-  })
+    return request({
+        url: '/api/landtolistconstructionplan/page',
+        method: 'get',
+        params: data
+    })
 }
+
 // 新增已挂牌地块经纬度
 export function addLonLat(param) {
-  return request({
-    url: '/api/landtolistlonlat',
-    method: 'post',
-    headers: {
-      'Content-Type': 'application/json'
-    },
-    data: param
-  })
+    return request({
+        url: '/api/landtolistlonlat',
+        method: 'post',
+        headers: {
+            'Content-Type': 'application/json'
+        },
+        data: param
+    })
 }
+
 // 新增已挂牌地块经营企业
 export function addConductenter(param) {
-  return request({
-    url: '/api/landtolistconductenterprise',
-    method: 'post',
-    headers: {
-      'Content-Type': 'application/json'
-    },
-    data: param
-  })
+    return request({
+        url: '/api/landtolistconductenterprise',
+        method: 'post',
+        headers: {
+            'Content-Type': 'application/json'
+        },
+        data: param
+    })
 }
+
 // 新增已挂牌地块配件
 export function addConstructionPlan(param) {
-  return request({
-    url: '/api/landtolistconstructionplan',
-    method: 'post',
-    headers: {
-      'Content-Type': 'application/json'
-    },
-    data: param
-  })
+    return request({
+        url: '/api/landtolistconstructionplan',
+        method: 'post',
+        headers: {
+            'Content-Type': 'application/json'
+        },
+        data: param
+    })
 }
+
 // 更新已挂牌地块配件
 export function updateConstructionPlan(param) {
-  return request({
-    url: '/api/landtolistconstructionplan',
-    method: 'put',
-    headers: {
-      'Content-Type': 'application/json'
-    },
-    data: param
-  })
+    return request({
+        url: '/api/landtolistconstructionplan',
+        method: 'put',
+        headers: {
+            'Content-Type': 'application/json'
+        },
+        data: param
+    })
 }
+
 // 更新已挂牌地块经营企业
 export function updateConductenter(param) {
-  return request({
-    url: '/api/landtolistconductenterprise',
-    method: 'put',
-    headers: {
-      'Content-Type': 'application/json'
-    },
-    data: param
-  })
+    return request({
+        url: '/api/landtolistconductenterprise',
+        method: 'put',
+        headers: {
+            'Content-Type': 'application/json'
+        },
+        data: param
+    })
 }
+
 // 通过ID删除经营企业
 export function delConductenter(conductEnterpriseId) {
-  return request({
-    url: '/api/landtolistconductenterprise/' + conductEnterpriseId,
-    method: 'delete'
-  })
+    return request({
+        url: '/api/landtolistconductenterprise/' + conductEnterpriseId,
+        method: 'delete'
+    })
 }
+
 // 通过ID删除配件
 export function delConstructionPlan(constructionPlanId) {
-  return request({
-    url: '/api/landtolistconstructionplan/' + constructionPlanId,
-    method: 'delete'
-  })
+    return request({
+        url: '/api/landtolistconstructionplan/' + constructionPlanId,
+        method: 'delete'
+    })
 }
+
 // 更新已挂牌地块经纬度
 export function updateLonLat(param) {
-  return request({
-    url: '/api/landtolistlonlat',
-    method: 'put',
-    headers: {
-      'Content-Type': 'application/json'
-    },
-    data: param
-  })
+    return request({
+        url: '/api/landtolistlonlat',
+        method: 'put',
+        headers: {
+            'Content-Type': 'application/json'
+        },
+        data: param
+    })
 }
 
 export function importLonLat(data) {
-  return request({
-    url: '/api/landtolistlonlat/importLandToListLatExcel',
-    method: 'post',
-    data: data,
-  })
+    return request({
+        url: '/api/landtolistlonlat/importLandToListLatExcel',
+        method: 'post',
+        data: data,
+    })
 }
 
 // 通过ID删除拟挂牌地块
 export function delLandLonLat(landListedId) {
-  return request({
-    url: '/api/landtolistlonlat/' + landListedId,
-    method: 'delete'
-  })
+    return request({
+        url: '/api/landtolistlonlat/' + landListedId,
+        method: 'delete'
+    })
 }
 
 // 通过序号和文件类型查询文件列表
 export function queryFileList(param) {
-  return request({
-    url: '/api/landToListAttachment/',
-    method: 'get',
-    params: param
-  })
+    return request({
+        url: '/api/landToListAttachment/',
+        method: 'get',
+        params: param
+    })
 }
 
 // 保存地块文件
 export function saveLandResFile(fileName, filePath, fileType, proposedseriaId) {
-  return request({
-    url: '/api/landToListAttachment/',
-    method: 'post',
-    headers: {
-      'Content-Type': 'application/json'
-    },
-    data: {
-      fileName: fileName,
-      filePath: filePath,
-      fileType: fileType,
-      proposedseriaId: proposedseriaId
-    }
-  })
+    return request({
+        url: '/api/landToListAttachment/',
+        method: 'post',
+        headers: {
+            'Content-Type': 'application/json'
+        },
+        data: {
+            fileName: fileName,
+            filePath: filePath,
+            fileType: fileType,
+            proposedseriaId: proposedseriaId
+        }
+    })
 }
 
 // 通过id删除地块文件
 export function delLandResFile(id) {
-  return request({
-    url: '/api/landToListAttachment/' + id,
-    method: 'delete'
-  })
+    return request({
+        url: '/api/landToListAttachment/' + id,
+        method: 'delete'
+    })
 }
+
 // 批量删除
 export function multiDeteleList(data) {
-  return request({
-    url: '/api/landtolist/',
-    method: 'delete',
-    data: data,
-  })
+    return request({
+        url: '/api/landtolist/',
+        method: 'delete',
+        data: data,
+    })
 }
+
 //导入
 export function importFile(data) {
-  return request({
-    url: '/api/landtolist/importLandListExcel',
-    method: 'post',
-    data: data,
-  })
+    return request({
+        url: '/api/landtolist/importLandToListExcel',
+        method: 'post',
+        data: data,
+    })
 }
+
 //新增编辑参拍
 export function updateRecord(data) {
-  return request({
-    url: '/api/auction_record',
-    method: 'post',
-    data: data,
-  })
+    return request({
+        url: '/api/auction_record',
+        method: 'post',
+        data: data,
+    })
 }
+
 //查询参拍
 export function queryRecord(data) {
-  return request({
-    url: '/api/auction_record/list',
-    method: 'get',
-    params: data,
-  })
+    return request({
+        url: '/api/auction_record/list',
+        method: 'get',
+        params: data,
+    })
 }
+
 //删除参拍
 export function deleteRecord(data) {
-  return request({
-    url: '/api/auction_record/' + data,
-    method: 'delete',
-  })
+    return request({
+        url: '/api/auction_record/' + data,
+        method: 'delete',
+    })
 }
+
 //保存已挂牌地块文件
 export function allFileUpload(data) {
-  return request({
-    url: '/api/landToListAttachment',
-    method: 'post',
-    data: data
-  })
+    return request({
+        url: '/api/landToListAttachment',
+        method: 'post',
+        data: data
+    })
+}
+
+//导出
+export function exportHandLandListExcel(ids) {
+    return request({
+        url: '/api/landtolist/exportLandToListExcel?ids=' + ids,
+        method: 'get'
+    })
 }

src/views/land/handLand/index.vue

@@ -973,7 +973,7 @@ export default {
         const aLink = document.createElement("a");
         let blob = new Blob([res.data], {type: "application/vnd.ms-excel"});
         aLink.href = URL.createObjectURL(blob);
-        aLink.setAttribute("download", "kg" + ".xls"); // 设置下载文件名称
+        aLink.setAttribute("download", "kg" + ".xlsx"); // 设置下载文件名称
         aLink.click();
       });
     },
@@ -1557,5 +1557,9 @@ export default {
 /deep/ .el-form-item__label {
   width: 160px;
 }
+
+/deep/ .el-table th.is-hidden {
+  visibility: visible;
+}
 </style>
 

src/views/land/handLand/newLand.vue

@@ -359,13 +359,12 @@
           <el-row>
             <el-col :span="6">
               <el-form-item label="装配建筑：">
-                <el-input-number controls-position="right" :precision="zero"
+                <el-input-number controls-position="right" :precision="two"
                                  v-model="editForm.assemblyBuilding"></el-input-number>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="绿色建筑：">
-                <!--                <el-input v-model="editForm.greenBuilding"></el-input>-->
                 <el-select
                     v-model="editForm.greenBuilding"
                     placeholder="请选择"
@@ -1763,6 +1762,9 @@ export default {
           //成交楼面价(元/㎡)
           this.editForm.dealFloorPrice = (this.editForm.dealPrice * 10000 / this.editForm.totalConsArea).toFixed(0)
         }
+        if (this.editForm.transferPrice && this.editForm.transferPrice != 0) {
+          this.editForm.premiumRate = ((this.editForm.dealPrice - this.editForm.transferPrice) / this.editForm.transferPrice).toFixed(2)
+        }
       },
       deep: true,
     },
@@ -1930,7 +1932,7 @@ export default {
       });
     },
     queryRecordList(landListedId) {
-      queryRecord({landListedId: landListedId,size:9999}).then((response) => {
+      queryRecord({landListedId: landListedId, size: 9999}).then((response) => {
         if (response.data.success) {
           let index = 0;
           this.landRecord = response.data.data.records;

src/views/land/noneHandLand/index.vue

@@ -313,6 +313,7 @@ import {
   saveNoHandLandList,
   delNoHandLandObj,
   exportHandLandListExcel,
+  importFile,
   downloadNoHandLandTemplate,
   queryLonLatList,
   addLonLat,
@@ -825,14 +826,14 @@ export default {
         const aLink = document.createElement("a");
         let blob = new Blob([res.data], {type: "application/vnd.ms-excel"});
         aLink.href = URL.createObjectURL(blob);
-        aLink.setAttribute("download", "kg" + ".xls"); // 设置下载文件名称
+        aLink.setAttribute("download", "kg" + ".xlsx"); // 设置下载文件名称
         aLink.click();
       });
     },
 
     //导入数据
     importData(e) {
-      const file = e.target.files[0];
+      const file = e;
       let formData = new FormData();
       formData.append("uploadFile", file);
       importFile(formData).then((res) => {

src/views/land/noneHandLand/newLand.vue

@@ -395,13 +395,12 @@
           <el-row>
             <el-col :span="6">
               <el-form-item label="装配建筑：">
-                <el-input-number controls-position="right" :precision="zero"
+                <el-input-number controls-position="right" :precision="two"
                                  v-model="editForm.assemblyBuilding"></el-input-number>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="绿色建筑：">
-                <!--                <el-input v-model="editForm.greenBuilding"></el-input>-->
                 <el-select
                     v-model="editForm.greenBuilding"
                     placeholder="请选择"