zt 7 månader sedan
förälder
incheckning
ae4d4fb070

+ 1 - 1
.eslintrc.js

@@ -5,7 +5,7 @@ module.exports = {
   },
     root: true,
     parserOptions: {
-        parser: '@babel/eslint-parser',
+        // parser: '@babel/eslint-parser',
         sourceType: 'module'
     },
     env: {

+ 28 - 16
src/views/saleManage/checkIn/checkIn.vue

@@ -6,10 +6,10 @@
         <el-input v-model="search.buyerName" class="ch-input ch-input-size" placeholder="买受人" size="small" @keyup.enter.native="handleSearch()" />
         <span style="margin-left: 20px">房屋&nbsp;</span>
         <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">-->
-<!--      <el-col :span="24" style="margin-top: 20px">-->
+        <!--      </el-col>-->
+        <!--    </el-row>-->
+        <!--    <el-row class="handle-box" style="margin-bottom: 10px">-->
+        <!--      <el-col :span="24" style="margin-top: 20px">-->
         <el-button class="ch-button-warning" size="small" style="float: right" @click="handleReset()"><i class="el-icon-search" />&nbsp;重置</el-button>
         <el-button class="ch-button" size="small" style="float: right" @click="handleSearch()"><i class="el-icon-search" />&nbsp;查询</el-button>
       </el-col>
@@ -28,17 +28,17 @@
           <el-table-column label="买受人" prop="buyerName" />
           <el-table-column label="房屋" prop="houseName" />
           <el-table-column label="入住状态" prop="statusString" />
-<!--          <el-table-column label="备注" prop="remark" />-->
-            <el-table-column label="备注" prop="remark">
-                <template scope="scope">
-                    <el-tooltip placement="bottom" effect="light">
-                        <template slot="content">
-                            <p style="max-width:900px;">{{scope.row.remark}}</p>
-                        </template>
-                        <div class="zt_css">{{scope.row.remark}}</div>
-                    </el-tooltip>
+          <!--          <el-table-column label="备注" prop="remark" />-->
+          <el-table-column label="备注" prop="remark">
+            <template scope="scope">
+              <el-tooltip placement="bottom" effect="light">
+                <template slot="content">
+                  <p style="max-width:900px;">{{ scope.row.remark }}</p>
                 </template>
-            </el-table-column>
+                <div class="zt_css">{{ scope.row.remark }}</div>
+              </el-tooltip>
+            </template>
+          </el-table-column>
           <el-table-column label="经办时间" prop="operateTime" />
           <el-table-column label="经办人" prop="operater" />
 
@@ -117,12 +117,23 @@
                 <el-col :span="3" class="col-txt"><span>入住状态</span></el-col>
                 <el-col :span="8" class="col-input">
                   <el-form-item>
-                    <el-select v-model="form.status" :disabled="dialogTitle=='查看'" clearable filterable placeholder="入住状态" style="width: 100%">
+                    <el-select
+                      v-model="form.status"
+                      :disabled="dialogTitle=='查看'"
+                      clearable
+                      filterable
+                      placeholder="入住状态"
+                      style="width: 100%"
+                      :popper-append-to-body="false"
+                      popper-class="statistic_base"
+                    >
                       <el-option
                         v-for="item in dc_data.RU_ZHU_STATUS"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value"
+                        :popper-append-to-body="false"
+                        popper-class="statistic_base"
                       />
                     </el-select>
                   </el-form-item>
@@ -133,6 +144,7 @@
                     <el-form-item>
                       <el-date-picker
                         v-model="form.inDate"
+                        popper-class="statistic_base"
                         :disabled="dialogTitle=='查看'"
                         placeholder="入住日期"
                         style="width: 100%"
@@ -324,7 +336,7 @@ export default {
 
 <style scoped>
 .zt_css{
-    overflow:hidden;
+    overflow:  hidden;
     white-space: nowrap;
     text-overflow:ellipsis;
 }

+ 34 - 24
src/views/saleManage/propertyRegistration/propertyRegistration.vue

@@ -6,10 +6,10 @@
         <el-input v-model="search.buyerName" class="ch-input ch-input-size" placeholder="买受人" size="small" @keyup.enter.native="handleSearch()" />
         <span style="margin-left: 20px">房屋&nbsp;</span>
         <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">-->
-<!--      <el-col :span="24" style="margin-top: 20px">-->
+        <!--      </el-col>-->
+        <!--    </el-row>-->
+        <!--    <el-row class="handle-box" style="margin-bottom: 10px">-->
+        <!--      <el-col :span="24" style="margin-top: 20px">-->
         <el-button class="ch-button-warning" size="small" style="float: right" @click="handleReset()"><i class="el-icon-search" />&nbsp;重置</el-button>
         <el-button class="ch-button" size="small" style="float: right" @click="handleSearch()"><i class="el-icon-search" />&nbsp;查询</el-button>
       </el-col>
@@ -28,22 +28,21 @@
           <el-table-column label="买受人" prop="buyerName" />
           <el-table-column label="房屋" prop="houseName" />
           <el-table-column label="产权办理状态" prop="statusString" />
-            <el-table-column label="产权证编号" prop="propertyNum" />
+          <el-table-column label="产权证编号" prop="propertyNum" />
 
-
-<!--          <el-table-column label="备注" prop="remark" />-->
-            <el-table-column label="备注" prop="remark" >
-                <template scope="scope">
-                    <el-tooltip placement="bottom" effect="light">
-                        <template slot="content">
-                            <p style="max-width:900px;">{{scope.row.remark}}</p>
-                        </template>
-                        <div class="zt_css">{{scope.row.remark}}</div>
-                    </el-tooltip>
+          <!--          <el-table-column label="备注" prop="remark" />-->
+          <el-table-column label="备注" prop="remark">
+            <template scope="scope">
+              <el-tooltip placement="bottom" effect="light">
+                <template slot="content">
+                  <p style="max-width:900px;">{{ scope.row.remark }}</p>
                 </template>
-            </el-table-column>
+                <div class="zt_css">{{ scope.row.remark }}</div>
+              </el-tooltip>
+            </template>
+          </el-table-column>
 
-            <el-table-column label="经办时间" prop="operateTime" />
+          <el-table-column label="经办时间" prop="operateTime" />
           <el-table-column label="经办人" prop="operater" />
 
           <!--          <el-table-column label="实测建筑面积(㎡)" prop="actualBuildArea" width="110" />-->
@@ -121,12 +120,23 @@
                 <el-col :span="3" class="col-txt"><span>办理状态</span></el-col>
                 <el-col :span="8" class="col-input">
                   <el-form-item>
-                    <el-select v-model="form.status" :disabled="dialogTitle=='查看'" clearable filterable placeholder="办理状态" style="width: 100%">
+                    <el-select
+                      v-model="form.status"
+                      :popper-append-to-body="false"
+                      popper-class="statistic_base"
+                      :disabled="dialogTitle=='查看'"
+                      clearable
+                      filterable
+                      placeholder="办理状态"
+                      style="width: 100%"
+                    >
                       <el-option
                         v-for="item in dc_data.CHAN_QUAN_STATUS"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value"
+                        :popper-append-to-body="false"
+                        popper-class="statistic_base"
                       />
                     </el-select>
                   </el-form-item>
@@ -134,12 +144,12 @@
                 <div v-if="form.status==1">
                   <el-col :span="4" class="col-txt"><span>产权证编号</span></el-col>
                   <el-col :span="8" class="col-input">
-                      <el-form-item>
-                          <el-input
-                              v-model="form.propertyNum"
-                              :disabled="dialogTitle=='查看'"
-                          />
-                      </el-form-item>
+                    <el-form-item>
+                      <el-input
+                        v-model="form.propertyNum"
+                        :disabled="dialogTitle=='查看'"
+                      />
+                    </el-form-item>
                   </el-col>
                 </div>
               </el-row>