Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-web

src/utils/personalUtil.js

@@ -208,13 +208,23 @@ function weightCalculate(params){
 
 //计算出让金
 function allotFee(rollingLevel){
-    if (rollingLevel==1){
-        return 12000 * 0.01;
-    }
-    if (rollingLevel==2){
-        return 10800 * 0.01;
-    }
-    if (rollingLevel==3){
+    // 以前计算出让金方式
+    // if (rollingLevel==1){
+    //     return 12000 * 0.01;
+    // }
+    // if (rollingLevel==2){
+    //     return 10800 * 0.01;
+    // }
+    // if (rollingLevel==3){
+    //     return 10100 * 0.01;
+    // }
+    // 新的计算方式
+    if (rollingLevel == 1){
+        //选择——四川天府新区、成都高新区、锦江区、青羊区、金牛区、武侯区、成华区，
+        //计算以上各区2019-2023年上半年清水房总价的平均值
+        //(191+213+234+253+281+283+290+299+330)/9 = 2637777.78 / 144 * 0.7 * 0.01 = 128.23 单位元
+        return 128.23;
+    }else {
         return 10100 * 0.01;
     }
 

src/views/personal/todoDetail.vue

@@ -475,13 +475,15 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="4" :span="6" v-show="compareList.rightsType === 'ALLOT'">
-              <el-form-item label="环线位置：" prop="rollingLevel" label-width="120px"
-                :rules="{ required: compareList.rightsType === 'ALLOT', message: '是否划拨不能为空', trigger: 'blur' }"
+              <el-form-item label="所处位置：" prop="rollingLevel" label-width="120px"
+                :rules="{ required: compareList.rightsType === 'ALLOT', message: '所处位置不能为空', trigger: 'blur' }"
                 class="postInfo-container-item">
                 <el-select v-model="compareList.rollingLevel" placeholder="请选择" @change="selectRoll()">
-                  <el-option label="二环内" :value=1>二环内</el-option>
+                  <!-- <el-option label="二环内" :value=1>二环内</el-option>
                   <el-option label="二至三环" :value=2>二至三环</el-option>
-                  <el-option label="三环外" :value=3>三环外</el-option>
+                  <el-option label="三环外" :value=3>三环外</el-option> -->
+                  <el-option label="五加二区域内" :value=1>五加二区域内</el-option>
+                  <el-option label="五加二区域外" :value=2>五加二区域外</el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -2379,11 +2381,8 @@ export default {
       let roll = this.compareList.rollingLevel;
       this.compareList.sellMoneyRate = 0.01;
       if (roll === 1) {
-        this.compareList.sellMoneyBase = 12000;
-        this.compareList.sellMoney = 12000 * 0.01;
-      } else if (roll === 2) {
-        this.compareList.sellMoneyBase = 10800;
-        this.compareList.sellMoney = 10800 * 0.01;
+        this.compareList.sellMoneyBase = 2637777.78;
+        this.compareList.sellMoney = 128.23;
       } else {
         this.compareList.sellMoneyBase = 10100;
         this.compareList.sellMoney = 10100 * 0.01;
@@ -2550,7 +2549,6 @@ export default {
     saveFeedback() {
       let flag = true;
       const oldFeedback = JSON.parse(this.target.feedback);
-      console.log(oldFeedback)
       if (oldFeedback) {
         oldFeedback.forEach(element => {
           if (!this.feedback.includes(element)) {