1

src/views/buyingBack/buyingBackAdd.vue

@@ -3,12 +3,12 @@
     <el-form ref="form" :model="form" style="width: 100%;padding: 5px" :rules="rules">
       <el-row>
         <el-col style="padding-bottom: 10px">
-          <span class="card_title">增购登记</span>
+          <span class="card_title">回购登记</span>
           <span v-if="!isView">&nbsp;&nbsp;&nbsp;&nbsp;买受人当前最新产权份额占比为（%）:</span>
           <span v-if="!isView">{{ form.buyerProportion }}</span>
           <el-card shadow="always" style="padding-top: 10px">
             <el-row>
-              <el-col :span="4" class="col-txt"><span><span class="red-asterisk">*</span>增购编号</span></el-col>
+              <el-col :span="4" class="col-txt"><span><span class="red-asterisk">*</span>回购编号</span></el-col>
               <el-col :span="20" class="col-input">
                 <el-form-item>
                   <el-input v-model="form.serialNumber" />

src/views/buyingBack/index.vue

@@ -5,7 +5,7 @@
         <span>买受人&nbsp;</span>
         <el-input v-model="search.buyerName" class="ch-input ch-input-size" placeholder="买受人" size="small" @keyup.enter.native="handleSearch()" />
         <span>房屋&nbsp;</span>
-        <el-input v-model="search.houseName" class="ch-input ch-input-size" placeholder="买受人" size="small" @keyup.enter.native="handleSearch()" />
+        <el-input v-model="search.houseName" class="ch-input ch-input-size" placeholder="" size="small" @keyup.enter.native="handleSearch()" />
       </el-col>
     </el-row>
     <el-row class="handle-box" style="margin-bottom: 10px">
@@ -25,7 +25,7 @@
           :header-cell-style="{background:'#f2f2f2'}"
         >
           <el-table-column type="index" width="60" />
-          <el-table-column label="增购编号" prop="serialNumber" />
+          <el-table-column label="回购编号" prop="serialNumber" />
           <el-table-column label="买受人" prop="buyerName" width="200" />
           <el-table-column label="房屋" prop="houseName" width="200" />
           <el-table-column label="转让份额" prop="transferProportionStr" />

src/views/buyingMore/index.vue

@@ -5,7 +5,7 @@
         <span>买受人&nbsp;</span>
         <el-input v-model="search.buyerName" class="ch-input ch-input-size" placeholder="买受人" size="small" @keyup.enter.native="handleSearch()" />
         <span>房屋&nbsp;</span>
-        <el-input v-model="search.houseName" class="ch-input ch-input-size" placeholder="买受人" size="small" @keyup.enter.native="handleSearch()" />
+        <el-input v-model="search.houseName" class="ch-input ch-input-size" placeholder="" size="small" @keyup.enter.native="handleSearch()" />
       </el-col>
     </el-row>
     <el-row class="handle-box" style="margin-bottom: 10px">

src/views/customerManagement/numberManagement/index.vue

@@ -89,6 +89,7 @@
           <el-table-column label="买受人" prop="buyerName" width="300" />
           <el-table-column label="选房日期" prop="roomSelectionDate" width="180" />
           <el-table-column label="购房状态" prop="statusStr" />
+          <el-table-column label="意向金状态" prop="intentionalDepositStatusStr" />
           <el-table-column label="意向房屋" prop="houseName" width="180" />
           <el-table-column label="操作" width="600">
             <template scope="scope">
@@ -265,7 +266,7 @@ export default {
     mixins: [Base, BaseData, BaseDept],
     data() {
         return {
-            dc_key: ['BUYING_HOUSE_STATUS'],
+            dc_key: ['BUYING_HOUSE_STATUS', 'INTENTIONAL_DEPOSIT_STATUS'],
             search: {},
             AllData: [],
             loading: false,
@@ -315,6 +316,7 @@ export default {
         },
         getItemJson: function(item) {
             item.statusStr = this.dc_map.BUYING_HOUSE_STATUS[item.status]
+            item.intentionalDepositStatusStr = this.dc_map.INTENTIONAL_DEPOSIT_STATUS[item.intentionalDepositStatus]
             return item
         },
         handleSearch() {

src/views/receiveRefundsManagement/refundManagement/addRefund.vue

@@ -303,7 +303,7 @@ export default {
                     }
                     this.dateStr = this.form.createdAt
                     this.username = this.form.createdName
-                    this.form.app
+                    this.form.applicantObject = this.form.applicantBuyerId
                     this.getHouseList()
                     this.getPaymentListById()
                 }
@@ -347,6 +347,7 @@ export default {
             const user = this.nameOption.find(item => item.id === data)
             this.form.identityCard = user.value
             this.form.applicant = user.label
+            this.form.applicantBuyerId = data
             this.identityCardChange()
         },
         identityCardChange() {
@@ -477,8 +478,6 @@ export default {
                         fileList: JSON.stringify(_this.fileList)
                     }
                     const postData = Object.assign({}, _this.form, extraData)
-                    console.log('postData', postData)
-                    return
                     this.baseRequest(this.url, postData).then(res => {
                         const data = res.data
                         if (data.code == 200) {

src/views/workbench/components/myMenu.vue

@@ -18,7 +18,7 @@
                           <span class="keyName">{{ item.name }}</span>
                       </div> -->
             <el-row
-              style="margin-left: 5px;margin-top: 5px;width: 100%;overflow-y:scroll;height: 739px;overflow-y: scroll;"
+              style="margin-left: 5px;margin-top: 5px;width: 100%;overflow-y:scroll;height: 300px;overflow-y: scroll;"
               class="myRow"
             >
               <el-col