bug

src/views/customerManagement/numberManagement/addAbandon.vue

@@ -119,7 +119,7 @@ export default {
             this.baseRequest('getById', data).then(res => {
                 if (res.data) {
                     this.form = res.data
-                    if (this.form.fileList) {
+                    if (this.form.abandonmentFileList) {
                         this.fileList = JSON.parse(this.form.abandonmentFileList)
                     }
                     this.dateStr = this.form.abandonmentAt == null ? this.dateStr : this.form.abandonmentAt
@@ -133,7 +133,7 @@ export default {
                 if (valid) {
                     const soaUrl = 'giveUp'
                     const extraData = {
-                        fileList: JSON.stringify(_this.fileList)
+                        abandonmentFileList: JSON.stringify(_this.fileList)
                     }
                     const postData = Object.assign({}, _this.form, extraData)
                     this.baseRequest(soaUrl, postData).then(res => {

src/views/customerManagement/roomChose/roomIndex.vue

@@ -112,9 +112,31 @@
             <el-col :span="4">
               <el-input v-model="queryParam.actualBuildArea" size="small" placeholder="请输入面积" class="ch-input-size" @keyup.enter.native="handleSearch()" />
             </el-col>
+            <el-col :span="4">
+              <div style="margin-top: 6px">选房状态：</div>
+            </el-col>
+            <el-col :span="4">
+              <el-select
+                v-model="queryParam.isChooseStr"
+                placeholder="请选择"
+                size="small"
+                clearable
+                :popper-append-to-body="false"
+                popper-class="statistic_base"
+              >
+                <el-option
+                  v-for="item in chooseOptions"
+                  :key="item.value"
+                  :popper-append-to-body="false"
+                  popper-class="statistic_base"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-col>
           </el-row>
           <el-row class="lineheight20">
-            <el-col :span="2">
+            <el-col :span="4">
               <div style="margin-top: 6px">关键字：</div>
             </el-col>
             <el-col :span="4">
@@ -152,6 +174,7 @@
               <el-table-column label="装修情况" prop="decorationSituationStr" />
               <el-table-column label="可售状态" prop="saleStatusStr" />
               <el-table-column label="已售状态" prop="soldStatusStr" />
+              <el-table-column label="选房状态" prop="isChooseStr" />
               <el-table-column label="操作" header-align="center" width="250">
                 <template scope="scope">
                   <el-button size="mini" type="text" @click="handleEdit(scope.row)">编辑</el-button>
@@ -523,7 +546,17 @@ export default {
             uploadTitle: [],
             loadingFlag: false,
             selectList: [],
-            expandedDeptKey: []
+            expandedDeptKey: [],
+            chooseOptions: [
+                {
+                    value: '1',
+                    label: '已选房'
+                },
+                {
+                    value: '0',
+                    label: '未选房'
+                }
+            ]
         }
     },
     mounted() {
@@ -712,6 +745,8 @@ export default {
             item.saleStatusStr = this.dc_map.SALE_STATUS[item.saleStatus]
             // 可售状态
             item.soldStatusStr = this.dc_map.SOLD_STATUS[item.soldStatus]
+            // 可售状态
+            item.isChooseStr = item.isChoose === 1 ? '已选房' : '未选房'
             return item
         },
 

src/views/parkAssets/parkRoom/index.vue

@@ -198,8 +198,8 @@
             <!--            <span class="card_title">基本信息</span>-->
             <el-card shadow="always" style="padding-top: 10px">
               <el-row>
-                <el-col :span="2" class="col-txt"><span>*父级</span></el-col>
-                <el-col :span="22" class="col-input">
+                <el-col :span="3" class="col-txt"><span>*父级</span></el-col>
+                <el-col :span="21" class="col-input">
                   <el-form-item prop="findids">
                     <el-cascader
                       v-model="houseForm.findids"
@@ -214,14 +214,14 @@
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="2" class="col-txt"><span>*户室号</span></el-col>
-                <el-col :span="10" class="col-input">
+                <el-col :span="3" class="col-txt"><span>*户室号</span></el-col>
+                <el-col :span="9" class="col-input">
                   <el-form-item prop="roomNo">
                     <el-input v-model="houseForm.roomNo" :disabled="isView" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="2" class="col-txt"><span>*所在层</span></el-col>
-                <el-col :span="10" class="col-input">
+                <el-col :span="3" class="col-txt"><span>*所在层</span></el-col>
+                <el-col :span="9" class="col-input">
                   <el-form-item prop="floor">
                     <el-input v-model="houseForm.floor" :disabled="isView" />
                   </el-form-item>
@@ -285,8 +285,8 @@
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="2" class="col-txt"><span>*用途:</span></el-col>
-                <el-col :span="10" class="col-input">
+                <el-col :span="3" class="col-txt"><span>*用途:</span></el-col>
+                <el-col :span="9" class="col-input">
                   <el-form-item prop="roomUse">
                     <el-select
                       v-model="houseForm.roomUse"
@@ -308,16 +308,16 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="2" class="col-txt"><span>*户编号</span></el-col>
-                <el-col :span="10" class="col-input">
+                <el-col :span="3" class="col-txt"><span>*户编号</span></el-col>
+                <el-col :span="9" class="col-input">
                   <el-form-item prop="roomNumber">
                     <el-input v-model="houseForm.roomNumber" :disabled="isView" />
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="2" class="col-txt"><span>装修情况:</span></el-col>
-                <el-col :span="10" class="col-input">
+                <el-col :span="3" class="col-txt"><span>装修情况:</span></el-col>
+                <el-col :span="9" class="col-input">
                   <el-form-item>
                     <el-select
                       v-model="houseForm.decorationSituation"
@@ -347,8 +347,8 @@
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="2" class="col-txt"><span>户型</span></el-col>
-                <el-col :span="10" class="col-input">
+                <el-col :span="3" class="col-txt"><span>户型</span></el-col>
+                <el-col :span="9" class="col-input">
                   <el-form-item>
                     <el-select
                       v-model="houseForm.houseTypeId"
@@ -372,7 +372,7 @@
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="2" class="col-txt"><span>户型图:</span></el-col>
+                <el-col :span="3" class="col-txt"><span>户型图:</span></el-col>
                 <el-col v-if="fileList.length>0" :span="20" class="col-input">
                   <el-form-item>
                     <el-upload
@@ -395,21 +395,23 @@
                     </el-upload>
                   </el-form-item>
                 </el-col>
-                <el-col v-else :span="20" class="col-input">
-                  <span>未上传</span>
+                <el-col v-else :span="9" class="col-input">
+                  <el-form-item>
+                    <span>未上传</span>
+                  </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="2" class="col-txt"><span>备注:</span></el-col>
-                <el-col :span="22" class="col-input">
+                <el-col :span="3" class="col-txt"><span>备注:</span></el-col>
+                <el-col :span="21" class="col-input">
                   <el-form-item>
                     <el-input v-model="houseForm.remark" type="textarea" maxlength="2000" show-word-limit :disabled="isView" />
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="2" class="col-txt"><span>可售状态:</span></el-col>
-                <el-col :span="22" class="col-input">
+                <el-col :span="3" class="col-txt"><span>可售状态:</span></el-col>
+                <el-col :span="21" class="col-input">
                   <el-form-item>
                     <el-select
                       v-model="houseForm.saleStatus"

src/views/signingManagement/contractManagement/contractAdd.vue

@@ -148,6 +148,7 @@
                 <el-form-item>
                   <el-date-picker
                     v-model="form.signingDate"
+                    popper-class="statistic_base"
                     type="date"
                     placeholder="年月日"
                     value-format="yyyy-MM-dd"
@@ -184,10 +185,10 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="5" class="col-txt"><span>买受人产权份额占比为</span></el-col>
+              <el-col :span="5" class="col-txt"><span>买受人产权份额占比为（%）</span></el-col>
               <el-col :span="18" class="col-input">
                 <el-form-item>
-                  <el-input v-model="form.buyerProportion" @input="proportionChange" />
+                  <el-input v-model="form.buyerProportion" @input="proportionChange" type="number" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -253,6 +254,7 @@
                 <el-form-item>
                   <el-date-picker
                     v-model="form.deadline"
+                    popper-class="statistic_base"
                     type="date"
                     placeholder="年月日"
                     value-format="yyyy-MM-dd"
@@ -294,7 +296,7 @@
                     multiple
                     :file-list="contractOriginalList"
                   >
-                    <el-button size="small" type="primary">点击上传</el-button>
+                    <el-button v-if="!isView" size="small" type="primary">点击上传</el-button>
                     <div slot="file" slot-scope="{file}">
                       <a :href="file.url">{{ file.name }}</a>
                       <span class="el-upload-list__item-actions">
@@ -315,7 +317,7 @@
                     multiple
                     :file-list="contractOtherList"
                   >
-                    <el-button size="small" type="primary">点击上传</el-button>
+                    <el-button v-if="!isView" size="small" type="primary">点击上传</el-button>
                     <div slot="file" slot-scope="{file}">
                       <a :href="file.url">{{ file.name }}</a>
                       <span class="el-upload-list__item-actions">
@@ -429,6 +431,8 @@ export default {
                         if (price && area) {
                             _this.form.maintenanceTotalPrice = price * area
                         }
+                        // 初始化 买受人产权份额占比为
+                        this.form.buyerProportion = 50
                     }
                 }).catch(() => {
                 })

src/views/signingManagement/contractManagement/index.vue

@@ -7,12 +7,29 @@
         <span>房屋&nbsp;</span>
         <el-input v-model="search.houseName" class="ch-input ch-input-size" placeholder="房屋" size="small" @keyup.enter.native="handleSearch()" />
         <span>合同状态&nbsp;</span>
-        <el-select v-model="search.status" clearable filterable placeholder="合同状态" size="small" @change="handleSearch">
-          <el-option v-for="item in dc_data.CONTRACT_STATUS" :key="item.value" :label="item.label" :value="item.value" />
+        <el-select
+          v-model="search.status"
+          clearable
+          filterable
+          placeholder="合同状态"
+          :popper-append-to-body="false"
+          popper-class="statistic_base"
+          size="small"
+          @change="handleSearch"
+        >
+          <el-option
+            v-for="item in dc_data.CONTRACT_STATUS"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+            :popper-append-to-body="false"
+            popper-class="statistic_base"
+          />
         </el-select>
         <span>签约日期&nbsp;</span>
         <el-date-picker
           v-model="search.signingDateFrom"
+          popper-class="statistic_base"
           type="date"
           placeholder="年月日"
           value-format="yyyy-MM-dd"
@@ -20,6 +37,7 @@
         <span>至&nbsp;</span>
         <el-date-picker
           v-model="search.signingDateTo"
+          popper-class="statistic_base"
           type="date"
           placeholder="年月日"
           value-format="yyyy-MM-dd"