Merge branch 'feature/dev_zz_wgh' into dev

src/assets/scss/modules/management/list-main.scss

@@ -2,6 +2,9 @@
 
 .div_main {
   width: 100%;
+  .marginl-20{
+    margin-left: 16px;
+  }
 
   .div_search {
     background: #ffffff;

src/assets/scss/modules/visual/communityManage.scss

@@ -49,7 +49,7 @@
 
 .div_btn {
   display: flex;
-  margin-top: 20px;
+  margin-top: 10px;
 
   .btn_upload {
     margin-left: 10px;

src/router/index.js

@@ -377,7 +377,7 @@ router.beforeEach((to, from, next) => {
       ],
     },
   ];
-  fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]);
+  // fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]);
 
   http
     .get("/gov/access/menu/nav?tableName=data_menu")
@@ -391,8 +391,8 @@ router.beforeEach((to, from, next) => {
         });
       }
 
-      // window.SITE_CONFIG["menuShujuList"] = res.data;
-      // fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]);
+      window.SITE_CONFIG["menuShujuList"] = res.data;
+      fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]);
 
       next({
         ...to,

src/views/modules/base/community/buildTable.vue

@@ -241,7 +241,7 @@ export default {
   computed: {
     tableHeight () {
 
-      return this.$store.state.inIframe ? this.clientHeight - 310 + this.iframeHeight : this.clientHeight - 310
+      return this.$store.state.inIframe ? this.clientHeight - 425 + this.iframeHeight : this.clientHeight - 425
 
     },
 
@@ -603,6 +603,10 @@ export default {
         ownerName: this.ownerName,
         ownerPhone: this.ownerPhone,
         rentFlag: this.rentFlag,
+        purpose: this.purpose,
+        remark: this.remark,
+        updateStartDate: this.updateStartDate,
+        updateEndDate: this.updateEndDate,
         neighborHoodId: this.agencyObj.id
 
       }
@@ -778,6 +782,22 @@ export default {
       type: String,
       default: '',
     },
+    purpose: {
+      type: String,
+      default: '',
+    },
+    remark: {
+      type: String,
+      default: '',
+    },
+    updateStartDate: {
+      type: String,
+      default: '',
+    },
+    updateEndDate: {
+      type: String,
+      default: '',
+    },
   }
 }
 </script>

src/views/modules/base/community/community.vue

@@ -30,18 +30,106 @@
     </div>
 
     <div :style="{height:rowHeight}"
-         class="div_table">
-      <div class="div_search">
-        <div class="resi-cell">
-          <div class="resi-cell-label">房主姓名</div>
-          <div class="resi-cell-value">
-            <el-input v-model="ownerName"
-                      class="resi-cell-input"
-                      size="small"
-                      clearable
-                      placeholder="请输入内容">
-            </el-input>
-
+         class=div_left>
+
+      <div class="div_search marginl-20">
+        <el-form :inline="true"
+                 ref="ref_searchform"
+                 :label-width="'80px'">
+          <div>
+
+            <el-form-item label="房主姓名"
+                          prop="ownerName">
+              <el-input v-model="ownerName"
+                        class="item_width_2"
+                        size="small"
+                        clearable
+                        placeholder="请输入内容">
+
+              </el-input>
+            </el-form-item>
+            <el-form-item label="房主手机"
+                          prop="ownerPhone">
+              <el-input v-model="ownerPhone"
+                        class="item_width_2"
+                        size="small"
+                        clearable
+                        placeholder="请输入手机">
+              </el-input>
+
+            </el-form-item>
+
+            <el-form-item label="房屋状态"
+                          prop="rentFlag">
+              <el-select class="item_width_2"
+                         v-model="rentFlag"
+                         placeholder="请选择"
+                         size="small"
+                         clearable>
+                <el-option v-for="item in rentList"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label="房屋用途"
+                          prop="purpose">
+              <el-select v-model="purpose"
+                         class="item_width_2"
+                         placeholder="请选择"
+                         size="small"
+                         clearable>
+                <el-option v-for="item in purposeArr"
+                           :key="item.dictValue"
+                           :label="item.dictName"
+                           :value="item.dictValue">
+                </el-option>
+              </el-select>
+
+            </el-form-item>
+
+            <el-form-item label="备注"
+                          prop="remark">
+              <el-input v-model="remark"
+                        class="item_width_2"
+                        size="small"
+                        clearable
+                        placeholder="请输入备注">
+              </el-input>
+            </el-form-item>
+            <el-form-item label="更新时间"
+                          prop="updateStartDate">
+              <el-date-picker v-model="updateStartDate"
+                              :picker-options="startPickerOptions"
+                              class="item_width_2"
+                              size="small"
+                              type="date"
+                              value-format="yyyyMMdd"
+                              value="yyyy-MM-dd"
+                              placeholder="开始时间">
+              </el-date-picker>
+              <span class="data-tag">至</span>
+              <el-date-picker v-model="updateEndDate"
+                              :picker-options="endPickerOptions"
+                              class="item_width_2 data-tag"
+                              size="small"
+                              type="date"
+                              value-format="yyyyMMdd"
+                              value="yyyy-MM-dd"
+                              placeholder="结束时间">
+              </el-date-picker>
+            </el-form-item>
+
+            <el-button style="margin-left:30px"
+                       size="small"
+                       class="diy-button--search"
+                       @click="handleSearch">查询</el-button>
+            <el-button style="margin-left:10px"
+                       size="small"
+                       class="diy-button--reset"
+                       @click="resetSearch">重置</el-button>
           </div>
         </div>
         <div class="resi-cell">
@@ -53,106 +141,6 @@
                       placeholder="请输入内容">
             </el-input>
 
-          </div>
-        </div>
-
-        <div class="resi-cell">
-          <div class="resi-cell-label">房屋状态</div>
-          <div class="resi-cell-value">
-
-            <el-select class="item_width_1"
-                       v-model="rentFlag"
-                       placeholder="请选择"
-                       size="small"
-                       clearable>
-              <el-option v-for="item in rentList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-
-          </div>
-        </div>
-
-        <div class="resi-cell">
-          <div class="resi-cell-label">房屋用途</div>
-          <div class="resi-cell-value">
-
-            <el-select v-model="purpose"
-                       placeholder="房屋用途"
-                       clearable>
-              <el-option v-for="item in purposeArr"
-                         :key="item.dictValue"
-                         :label="item.dictName"
-                         :value="item.dictValue">
-              </el-option>
-            </el-select>
-
-          </div>
-        </div>
-
-        <div class="resi-cell">
-          <div class="resi-cell-label">备注</div>
-          <div class="resi-cell-value">
-
-            <el-input v-model="remark"
-                      size="small"
-                      clearable
-                      placeholder="请输入备注">
-            </el-input>
-
-          </div>
-        </div>
-        <el-button style="margin-left:10px"
-                   class="diy-button--search"
-                   size="small"
-                   @click="handleSearch">查询</el-button>
-        <el-button style="margin-left:10px"
-                   class="diy-button--reset"
-                   size="small"
-                   @click="resetSearch">重置</el-button>
-        <!-- <el-button style="margin-left:10px"
-                 class="diy-button--reset"
-                 size="small"
-                 @click="resetSearch">重置</el-button> -->
-      </div>
-      <build-table v-if="selTreeObj.level==='neighborHood'&&!showRoomTable"
-                   ref="ref_neighTable"
-                   :staffAgencyId="staffAgencyId"
-                   :showImportBtn="showImportBtn"
-                   :ownerName="ownerName"
-                   :ownerPhone="ownerPhone"
-                   :rentFlag="rentFlag"
-                   :purpose="purpose"
-                   :remark="remark"
-                   @toNextLevel="toNextLevel"
-                   @refreshTree="refreshTree"></build-table>
-
-      <room-table v-if="showRoomTable||selTreeObj.level==='building'"
-                  :staffAgencyId="staffAgencyId"
-                  :showImportBtn="showImportBtn"
-                  :ownerName="ownerName"
-                  :ownerPhone="ownerPhone"
-                  :rentFlag="rentFlag"
-                  :purpose="purpose"
-                  :remark="remark"
-                  ref="ref_buildingTable"
-                  @refreshTree="refreshTree"></room-table>
-
-      <community-table v-if="selTreeObj.level!=='building'&&selTreeObj.level!=='neighborHood'&&!showRoomTable"
-                       @toNextLevel="toNextLevel"
-                       :staffAgencyId="staffAgencyId"
-                       :ownerName="ownerName"
-                       :ownerPhone="ownerPhone"
-                       :rentFlag="rentFlag"
-                       :purpose="purpose"
-                       :remark="remark"
-                       ref="ref_communityTable"
-                       @refreshTree="refreshTree"></community-table>
-
-    </div>
-
   </div>
 </template>
 
@@ -168,6 +156,20 @@ import { Loading } from 'element-ui' // 引入Loading服务
 let loading // 加载动画
 export default {
   data () {
+    let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+      let nowData = Date.now()
+      if (this.updateStartDate) {
+        let startTime = new Date(this.updateStartDate)
+        return time.getTime() > nowData || time.getTime() < startTime || time.getTime() === startTime
+      } else {
+        return time.getTime() > nowData
+      }
+
+    }
+    let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+      let nowData = Date.now()
+      return time.getTime() > nowData
+    }
     return {
       filterText: '',
       treeLoading: true,
@@ -203,6 +205,8 @@ export default {
       rentFlag: '',
       purpose: '',
       remark: '',
+      updateStartDate: '',
+      updateEndDate: '',
       showRoomTable: false,
       selObj: {},
       purposeArr: [
@@ -213,7 +217,13 @@ export default {
         { dictValue: '5', dictName: '仓储' },
         { dictValue: '6', dictName: '商住混用' },
         { dictValue: '7', dictName: '其他' }
-      ]
+      ],
+      endPickerOptions: {
+        disabledDate: endDisabledDate
+      },
+      startPickerOptions: {
+        disabledDate: startDisabledDate
+      },
     }
   },
   components: {
@@ -252,15 +262,15 @@ export default {
   methods: {
 
     handleSearch () {
-      if (this.ownerName || this.ownerPhone || this.rentFlag || this.purpose || this.remark) {
-        this.showRoomTable = true
+      // if (this.ownerName || this.ownerPhone || this.rentFlag || this.purpose || this.remark) {
+      this.showRoomTable = true
 
-        this.$nextTick(() => {
-          this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj)
-        })
-      } else {
-        this.$message.warning('请输入查询条件')
-      }
+      this.$nextTick(() => {
+        this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj)
+      })
+      // } else {
+      //   this.$message.warning('请输入查询条件')
+      // }
 
 
     },
@@ -272,10 +282,12 @@ export default {
       this.rentFlag = ''
       this.purpose = ''
       this.remark = ''
+      this.updateStartDate = ''
+      this.updateEndDate = ''
 
       this.pageSize = 10
       this.pageNo = 1
-      this.handleNodeClick(this.selObj)
+      // this.handleNodeClick(this.selObj)
       // this.loadTable()
     },
 
@@ -345,6 +357,8 @@ export default {
       this.rentFlag = ''
       this.purpose = ''
       this.remark = ''
+      this.updateStartDate = ''
+      this.updateEndDate = ''
       this.showRoomTable = false
 
       this.selObj = JSON.parse(JSON.stringify(obj))
@@ -487,42 +501,6 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped >
-.div_main {
-  display: flex;
-}
-.scrollar {
-  margin-top: 10px;
-}
-
-.div_tree {
-  flex: 0 0 280px;
-  background-color: #ffffff;
-  border-radius: 5px;
-  padding: 10px;
-  overflow-y: hidden;
-}
-.filter_tree {
-  overflow-x: auto;
-}
-
-.div_table {
-  margin-left: 15px;
-  // flex: 1;
-  width: calc(100% - 300px);
-  background-color: #ffffff;
-  border-radius: 5px;
-  padding: 10px;
-}
-
-.div_btn {
-  margin-top: 20px;
-}
-
-.row {
-  padding: 10px;
-}
-</style>
 
 <style>
 /* .aui-content > .el-tabs > .el-tabs__content {
@@ -545,3 +523,5 @@ export default {
 <style lang="scss" scoped >
 @import "@/assets/scss/modules/visual/communityManage.scss";
 </style>
+
+

src/views/modules/base/community/communityTable.vue

@@ -236,7 +236,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return this.$store.state.inIframe ? this.clientHeight - 310 + this.iframeHeight : this.clientHeight - 310
+      return this.$store.state.inIframe ? this.clientHeight - 425 + this.iframeHeight : this.clientHeight - 425
 
     },
 
@@ -583,6 +583,10 @@ export default {
         ownerName: this.ownerName,
         ownerPhone: this.ownerPhone,
         rentFlag: this.rentFlag,
+        purpose: this.purpose,
+        remark: this.remark,
+        updateStartDate: this.updateStartDate,
+        updateEndDate: this.updateEndDate,
       }
 
       if (this.agencyObj.level === 'grid') {
@@ -777,6 +781,22 @@ export default {
       type: String,
       default: '',
     },
+    purpose: {
+      type: String,
+      default: '',
+    },
+    remark: {
+      type: String,
+      default: '',
+    },
+    updateStartDate: {
+      type: String,
+      default: '',
+    },
+    updateEndDate: {
+      type: String,
+      default: '',
+    },
 
   }
 }

src/views/modules/base/organization/organization.vue

@@ -463,12 +463,12 @@
 
                 <!-- 组织区划 -->
                 <el-form-item label="组织区划">
-                    <el-select v-model="zonings.areaCode" placeholder="请选择组织区划" @change="handelZoing">
+                    <el-select v-model="agencyForm.areaCode" placeholder="请选择组织区划" @change="handelZoing">
                         <el-option 
                         v-for="item in zonings"
                         :key="item.areaCode"
                         :label="item.areaName"
-                        :value="item">
+                        :value="item.areaCode">
                         </el-option>
                     </el-select>
                 </el-form-item>
@@ -537,12 +537,12 @@
 
                  <!-- 组织区划 -->
                 <el-form-item label="组织区划">
-                    <el-select v-model="OrgDetailsForm.areaName" placeholder="请选择组织区划" @change="handelStreeOrCommunityZoing">
+                    <el-select v-model="OrgDetailsForm.areaCode" placeholder="请选择组织区划" @change="handelStreeOrCommunityZoing">
                         <el-option 
                         v-for="item in zonings"
                         :key="item.areaCode"
                         :label="item.areaName"
-                        :value="item">
+                        :value="item.areaCode">
                         </el-option>
                     </el-select>
                 </el-form-item>
@@ -1932,19 +1932,27 @@ export default {
         },
 
         handelZoing(val){
-            this.agencyForm.level = val.level
-            this.agencyForm.areaName = val.areaName
-            this.agencyForm.areaCode = val.areaCode
-            
+            this.zonings.forEach(item => {
+                if (item.areaCode == val) {
+                    this.agencyForm.level = item.level
+                    this.agencyForm.areaName = item.areaName
+                    this.agencyForm.areaCode = item.areaCode
+                }
+            })
         },
         handelStreeOrCommunityZoing(val){
-            this.OrgDetailsForm.level = val.level
-            this.OrgDetailsForm.areaName = val.areaName
-            this.OrgDetailsForm.areaCode = val.areaCode
+            this.zonings.forEach(item => {
+                if (item.areaCode == val) {
+                    this.OrgDetailsForm.level = item.level
+                    this.OrgDetailsForm.areaName = item.areaName
+                    this.OrgDetailsForm.areaCode = item.areaCode
+                }
+            })
         },
 
         addAgency(row){
             this.createAgencyDialogFlag = true
+            this.addNewAgencyRest()
             this.getUser()
         },
         // 新增组织确定按钮

src/views/modules/cabaseinfo/caloudong.vue

@@ -1,78 +1,155 @@
 <template>
-    <div class="mod-axis__caLoudong}">
-      <el-card>
-        <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-          <el-form-item label="楼宇名称" prop="buildingName" >
-            <el-input v-model="dataForm.buildingName" placeholder="楼宇名称" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="小区（单位）名称" prop="communityName" >
-            <el-input v-model="dataForm.communityName" placeholder="小区（单位）名称" clearable></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
-          </el-form-item>
-          <!-- <el-form-item>
+  <div class="mod-axis__caLoudong}">
+    <el-card>
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="楼宇名称" prop="buildingName">
+          <el-input
+            v-model="dataForm.buildingName"
+            placeholder="楼宇名称"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="小区（单位）名称" prop="communityName">
+          <el-input
+            v-model="dataForm.communityName"
+            placeholder="小区（单位）名称"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{ $t("query") }}</el-button>
+        </el-form-item>
+        <!-- <el-form-item>
             <el-button v-if="$hasPermission('axis:caResident:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
           </el-form-item>
           <el-form-item>
             <el-button v-if="$hasPermission('axis:caResident:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
           </el-form-item> -->
-        </el-form>
-      </el-card>
-      <el-card shadow="never" class="aui-card--fill">
-        <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
-          <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-          <el-table-column prop="buildingName" label="楼宇名称" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="buildingUse" label="用途分类" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="buildingAddr" label="所处位置" header-align="center" align="center" :show-overflow-tooltip="true" ></el-table-column>
-          <el-table-column prop="communityName" label="小区（单位）名称" header-align="center" align="center" :show-overflow-tooltip="true" ></el-table-column>
-          <el-table-column prop="layerCount" label="楼层数" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="unitCount" label="单元数" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="roomCount" label="总房屋数" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="elevatorCount" label="电梯数量" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="buildingPmc" label="物业公司" header-align="center" align="center"></el-table-column>
-          <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
-            <template slot-scope="scope">
-              <el-button type="text" class="div-table-button--detail" size="small" @click="addOrUpdateHandle(scope.row.buildingId)">查看</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-pagination
-          :current-page="page"
-          :page-sizes="[10, 20, 50, 100]"
-          :page-size="limit"
-          :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="pageSizeChangeHandle"
-          @current-change="pageCurrentChangeHandle">
-        </el-pagination>
-        <!-- 弹窗, 新增 / 修改 -->
-        <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-      </el-card>
-    </div>
+      </el-form>
+    </el-card>
+    <el-card shadow="never" class="aui-card--fill">
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%"
+      >
+        <el-table-column
+          type="selection"
+          header-align="center"
+          align="center"
+          width="50"
+        ></el-table-column>
+        <el-table-column
+          prop="buildingName"
+          label="楼宇名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="buildingUse"
+          label="用途分类"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="buildingAddr"
+          label="所处位置"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="communityName"
+          label="小区（单位）名称"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="layerCount"
+          label="楼层数"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="unitCount"
+          label="单元数"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="roomCount"
+          label="总房屋数"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="elevatorCount"
+          label="电梯数量"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="buildingPmc"
+          label="物业公司"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+              @click="addOrUpdateHandle(scope.row.buildingId)"
+              >查看</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update
+        v-if="addOrUpdateVisible"
+        ref="addOrUpdate"
+        @refreshDataList="getDataList"
+      ></add-or-update>
+    </el-card>
+  </div>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './caloudong-add-or-update'
+import mixinViewModule from "@/mixins/view-post";
+import AddOrUpdate from "./caloudong-add-or-update";
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/opendata/caLoudong/getPage',
+        getDataListURL: "/opendata/caLoudong/getPage",
         getDataListIsPage: true,
-        deleteURL: '',
-        deleteIsBatch: true
+        deleteURL: "",
+        deleteIsBatch: true,
       },
       dataForm: {
-        buildingName: '',
-        communityName: ''
-      }
-    }
+        buildingName: "",
+        communityName: "",
+      },
+    };
   },
   components: {
-    AddOrUpdate
-  }
-}
+    AddOrUpdate,
+  },
+};
 </script>

src/views/modules/cabaseinfo/capingfang.vue

@@ -1,78 +1,155 @@
 <template>
-    <div class="mod-axis__caPingfang}">
-      <el-card>
-        <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-          <el-form-item label="楼宇名称" prop="buildingName" >
-            <el-input v-model="dataForm.buildingName" placeholder="楼宇名称" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="小区（单位）名称" prop="communityName" >
-            <el-input v-model="dataForm.communityName" placeholder="小区（单位）名称" clearable></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
-          </el-form-item>
-          <!-- <el-form-item>
+  <div class="mod-axis__caPingfang}">
+    <el-card>
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="楼宇名称" prop="buildingName">
+          <el-input
+            v-model="dataForm.buildingName"
+            placeholder="楼宇名称"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="小区（单位）名称" prop="communityName">
+          <el-input
+            v-model="dataForm.communityName"
+            placeholder="小区（单位）名称"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{ $t("query") }}</el-button>
+        </el-form-item>
+        <!-- <el-form-item>
             <el-button v-if="$hasPermission('axis:caResident:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
           </el-form-item>
           <el-form-item>
             <el-button v-if="$hasPermission('axis:caResident:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
           </el-form-item> -->
-        </el-form>
-      </el-card>
-      <el-card shadow="never" class="aui-card--fill">
-        <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
-          <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-          <el-table-column prop="buildingName" label="楼宇名称" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="buildingUse" label="用途分类" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="buildingAddr" label="所处位置" header-align="center" align="center" :show-overflow-tooltip="true" ></el-table-column>
-          <el-table-column prop="communityName" label="小区（单位）名称" header-align="center" align="center" :show-overflow-tooltip="true" ></el-table-column>
-          <el-table-column prop="layerCount" label="楼层数" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="unitCount" label="单元数" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="roomCount" label="总房屋数" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="elevatorCount" label="电梯数量" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="buildingPmc" label="物业公司" header-align="center" align="center"></el-table-column>
-          <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
-            <template slot-scope="scope">
-              <el-button type="text" class="div-table-button--detail" size="small" @click="addOrUpdateHandle(scope.row.buildingId)">查看</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-pagination
-          :current-page="page"
-          :page-sizes="[10, 20, 50, 100]"
-          :page-size="limit"
-          :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="pageSizeChangeHandle"
-          @current-change="pageCurrentChangeHandle">
-        </el-pagination>
-        <!-- 弹窗, 新增 / 修改 -->
-        <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-      </el-card>
-    </div>
+      </el-form>
+    </el-card>
+    <el-card shadow="never" class="aui-card--fill">
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%"
+      >
+        <el-table-column
+          type="selection"
+          header-align="center"
+          align="center"
+          width="50"
+        ></el-table-column>
+        <el-table-column
+          prop="buildingName"
+          label="楼宇名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="buildingUse"
+          label="用途分类"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="buildingAddr"
+          label="所处位置"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="communityName"
+          label="小区（单位）名称"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="layerCount"
+          label="楼层数"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="unitCount"
+          label="单元数"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="roomCount"
+          label="总房屋数"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="elevatorCount"
+          label="电梯数量"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="buildingPmc"
+          label="物业公司"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+              @click="addOrUpdateHandle(scope.row.buildingId)"
+              >查看</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update
+        v-if="addOrUpdateVisible"
+        ref="addOrUpdate"
+        @refreshDataList="getDataList"
+      ></add-or-update>
+    </el-card>
+  </div>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './capingfang-add-or-update'
+import mixinViewModule from "@/mixins/view-post";
+import AddOrUpdate from "./capingfang-add-or-update";
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/opendata/caPingfang/getPage',
+        getDataListURL: "/opendata/caPingfang/getPage",
         getDataListIsPage: true,
-        deleteURL: '',
-        deleteIsBatch: true
+        deleteURL: "",
+        deleteIsBatch: true,
       },
       dataForm: {
-        buildingName: '',
-        communityName: ''
-      }
-    }
+        buildingName: "",
+        communityName: "",
+      },
+    };
   },
   components: {
-    AddOrUpdate
-  }
-}
+    AddOrUpdate,
+  },
+};
 </script>

src/views/modules/cabaseinfo/carental.vue

@@ -1,81 +1,156 @@
 <template>
-    <div class="mod-axis__caRental}">
-      <el-card>
-        <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-          <el-form-item label="房屋编号" prop="houseName" >
-            <el-input v-model="dataForm.houseName" placeholder="房屋编号" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="房主姓名" prop="residentName" >
-            <el-input v-model="dataForm.residentName" placeholder="房主姓名" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="承租人姓名" prop="renterName" >
-            <el-input v-model="dataForm.renterName" placeholder="承租人姓名" clearable></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
-          </el-form-item>
-          <!-- <el-form-item>
+  <div class="mod-axis__caRental}">
+    <el-card>
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="房屋编号" prop="houseName">
+          <el-input
+            v-model="dataForm.houseName"
+            placeholder="房屋编号"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="房主姓名" prop="residentName">
+          <el-input
+            v-model="dataForm.residentName"
+            placeholder="房主姓名"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="承租人姓名" prop="renterName">
+          <el-input
+            v-model="dataForm.renterName"
+            placeholder="承租人姓名"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{ $t("query") }}</el-button>
+        </el-form-item>
+        <!-- <el-form-item>
             <el-button v-if="$hasPermission('axis:caResident:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
           </el-form-item>
           <el-form-item>
             <el-button v-if="$hasPermission('axis:caResident:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
           </el-form-item> -->
-        </el-form>
-      </el-card>
-      <el-card shadow="never" class="aui-card--fill">
-        <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
-          <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-          <el-table-column prop="houseName" label="房屋编号" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="houseAddress" label="房屋地址" header-align="center" align="center" :show-overflow-tooltip="true" ></el-table-column>
-          <el-table-column prop="houseArea" label="建筑面积（平方米）" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="residentName" label="房主姓名" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="telephone" label="房主联系方式" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="rentUse" label="出租用途" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="renterName" label="承租人姓名" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="renterPhone" label="承租人联系方式" header-align="center" align="center"></el-table-column>
-          <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
-            <template slot-scope="scope">
-              <el-button type="text" class="div-table-button--detail" size="small" @click="addOrUpdateHandle(scope.row.rentalId)">查看</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-pagination
-          :current-page="page"
-          :page-sizes="[10, 20, 50, 100]"
-          :page-size="limit"
-          :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="pageSizeChangeHandle"
-          @current-change="pageCurrentChangeHandle">
-        </el-pagination>
-        <!-- 弹窗, 新增 / 修改 -->
-        <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-      </el-card>
-    </div>
+      </el-form>
+    </el-card>
+    <el-card shadow="never" class="aui-card--fill">
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%"
+      >
+        <el-table-column
+          type="selection"
+          header-align="center"
+          align="center"
+          width="50"
+        ></el-table-column>
+        <el-table-column
+          prop="houseName"
+          label="房屋编号"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="houseAddress"
+          label="房屋地址"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="houseArea"
+          label="建筑面积（平方米）"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="residentName"
+          label="房主姓名"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="telephone"
+          label="房主联系方式"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="rentUse"
+          label="出租用途"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="renterName"
+          label="承租人姓名"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="renterPhone"
+          label="承租人联系方式"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+              @click="addOrUpdateHandle(scope.row.rentalId)"
+              >查看</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update
+        v-if="addOrUpdateVisible"
+        ref="addOrUpdate"
+        @refreshDataList="getDataList"
+      ></add-or-update>
+    </el-card>
+  </div>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './carental-add-or-update'
+import mixinViewModule from "@/mixins/view-post";
+import AddOrUpdate from "./carental-add-or-update";
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/opendata/caRental/getPage',
+        getDataListURL: "/opendata/caRental/getPage",
         getDataListIsPage: true,
-        deleteURL: '',
-        deleteIsBatch: true
+        deleteURL: "",
+        deleteIsBatch: true,
       },
       dataForm: {
-        houseName: '',
-        residentName: '',
-        renterName: ''
-      }
-    }
+        houseName: "",
+        residentName: "",
+        renterName: "",
+      },
+    };
   },
   components: {
-    AddOrUpdate
-  }
-}
+    AddOrUpdate,
+  },
+};
 </script>

src/views/modules/cabaseinfo/caresident.vue

@@ -1,80 +1,147 @@
 <template>
-    <div class="mod-axis__caResident}">
-      <el-card>
-        <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-          <el-form-item label="身份证号" prop="idCard" >
-            <el-input v-model="dataForm.idCard" placeholder="身份证号" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="姓名" prop="residentName" >
-            <el-input v-model="dataForm.residentName" placeholder="姓名" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="联系方式" prop="telephone" >
-            <el-input v-model="dataForm.telephone" placeholder="联系方式" clearable></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
-          </el-form-item>
-          <!-- <el-form-item>
+  <div class="mod-axis__caResident}">
+    <el-card>
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="身份证号" prop="idCard">
+          <el-input v-model="dataForm.idCard" placeholder="身份证号" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="姓名" prop="residentName">
+          <el-input
+            v-model="dataForm.residentName"
+            placeholder="姓名"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="联系方式" prop="telephone">
+          <el-input
+            v-model="dataForm.telephone"
+            placeholder="联系方式"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{ $t("query") }}</el-button>
+        </el-form-item>
+        <!-- <el-form-item>
             <el-button v-if="$hasPermission('axis:caResident:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
           </el-form-item>
           <el-form-item>
             <el-button v-if="$hasPermission('axis:caResident:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
           </el-form-item> -->
-        </el-form>
-      </el-card>
-      <el-card shadow="never" class="aui-card--fill">
-        <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
-          <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-          <el-table-column prop="idCard" label="证件号码（公民身份证号）" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="residentName" label="姓名" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="sex" label="性别" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="birthday" label="出生日期" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="telephone" label="联系方式" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="householdAddressDetail" label="户籍详址" header-align="center" align="center" :show-overflow-tooltip="true" ></el-table-column>
-          <el-table-column prop="curliveAddressDetail" label="现住详址" header-align="center" align="center" :show-overflow-tooltip="true" ></el-table-column>
-          <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
-            <template slot-scope="scope">
-              <el-button type="text" class="div-table-button--detail" size="small" @click="addOrUpdateHandle(scope.row.idCard)">查看</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-pagination
-          :current-page="page"
-          :page-sizes="[10, 20, 50, 100]"
-          :page-size="limit"
-          :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="pageSizeChangeHandle"
-          @current-change="pageCurrentChangeHandle">
-        </el-pagination>
-        <!-- 弹窗, 新增 / 修改 -->
-        <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-      </el-card>
-    </div>
+      </el-form>
+    </el-card>
+    <el-card shadow="never" class="aui-card--fill">
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%"
+      >
+        <el-table-column
+          type="selection"
+          header-align="center"
+          align="center"
+          width="50"
+        ></el-table-column>
+        <el-table-column
+          prop="idCard"
+          label="证件号码（公民身份证号）"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="residentName"
+          label="姓名"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="sex"
+          label="性别"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="birthday"
+          label="出生日期"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="telephone"
+          label="联系方式"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="householdAddressDetail"
+          label="户籍详址"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="curliveAddressDetail"
+          label="现住详址"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+              @click="addOrUpdateHandle(scope.row.idCard)"
+              >查看</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update
+        v-if="addOrUpdateVisible"
+        ref="addOrUpdate"
+        @refreshDataList="getDataList"
+      ></add-or-update>
+    </el-card>
+  </div>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './caresident-add-or-update'
+import mixinViewModule from "@/mixins/view-post";
+import AddOrUpdate from "./caresident-add-or-update";
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/opendata/caResident/getPage',
+        getDataListURL: "/opendata/caResident/getPage",
         getDataListIsPage: true,
-        deleteURL: '',
-        deleteIsBatch: true
+        deleteURL: "",
+        deleteIsBatch: true,
       },
       dataForm: {
-        idCard: '',
-        residentName: '',
-        telephone: ''
-      }
-    }
+        idCard: "",
+        residentName: "",
+        telephone: "",
+      },
+    };
   },
   components: {
-    AddOrUpdate
-  }
-}
+    AddOrUpdate,
+  },
+};
 </script>

src/views/modules/cabaseinfo/carotators.vue

@@ -1,79 +1,141 @@
 <template>
-    <div class="mod-axis__caRotators}">
-      <el-card>
-        <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-          <el-form-item label="身份证号" prop="idCard" >
-            <el-input v-model="dataForm.idCard" placeholder="身份证号" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="姓名" prop="residentName" >
-            <el-input v-model="dataForm.residentName" placeholder="姓名" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="联系方式" prop="telephone" >
-            <el-input v-model="dataForm.telephone" placeholder="联系方式" clearable></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
-          </el-form-item>
-          <!-- <el-form-item>
+  <div class="mod-axis__caRotators}">
+    <el-card>
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="身份证号" prop="idCard">
+          <el-input v-model="dataForm.idCard" placeholder="身份证号" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="姓名" prop="residentName">
+          <el-input
+            v-model="dataForm.residentName"
+            placeholder="姓名"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="联系方式" prop="telephone">
+          <el-input
+            v-model="dataForm.telephone"
+            placeholder="联系方式"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{ $t("query") }}</el-button>
+        </el-form-item>
+        <!-- <el-form-item>
             <el-button v-if="$hasPermission('axis:caResident:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
           </el-form-item>
           <el-form-item>
             <el-button v-if="$hasPermission('axis:caResident:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
           </el-form-item> -->
-        </el-form>
-      </el-card>
-      <el-card shadow="never" class="aui-card--fill">
-        <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
-          <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-          <el-table-column prop="idCard" label="公民身份证号" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="rotatorsName" label="姓名" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="sex" label="性别" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="birthday" label="出生日期" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="householdAddressDetail" label="户籍门(楼)详址" header-align="center" align="center" :show-overflow-tooltip="true" ></el-table-column>
-          <el-table-column prop="curliveAddressDetail" label="现住门(楼)详址" header-align="center" align="center" :show-overflow-tooltip="true" ></el-table-column>
-          <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
-            <template slot-scope="scope">
-              <el-button type="text" class="div-table-button--detail" size="small" @click="addOrUpdateHandle(scope.row.idCard)">查看</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-pagination
-          :current-page="page"
-          :page-sizes="[10, 20, 50, 100]"
-          :page-size="limit"
-          :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="pageSizeChangeHandle"
-          @current-change="pageCurrentChangeHandle">
-        </el-pagination>
-        <!-- 弹窗, 新增 / 修改 -->
-        <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-      </el-card>
-    </div>
+      </el-form>
+    </el-card>
+    <el-card shadow="never" class="aui-card--fill">
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%"
+      >
+        <el-table-column
+          type="selection"
+          header-align="center"
+          align="center"
+          width="50"
+        ></el-table-column>
+        <el-table-column
+          prop="idCard"
+          label="公民身份证号"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="rotatorsName"
+          label="姓名"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="sex"
+          label="性别"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="birthday"
+          label="出生日期"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="householdAddressDetail"
+          label="户籍门(楼)详址"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="curliveAddressDetail"
+          label="现住门(楼)详址"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+              @click="addOrUpdateHandle(scope.row.idCard)"
+              >查看</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update
+        v-if="addOrUpdateVisible"
+        ref="addOrUpdate"
+        @refreshDataList="getDataList"
+      ></add-or-update>
+    </el-card>
+  </div>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './carotators-add-or-update'
+import mixinViewModule from "@/mixins/view-post";
+import AddOrUpdate from "./carotators-add-or-update";
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/opendata/caRotators/getPage',
+        getDataListURL: "/opendata/caRotators/getPage",
         getDataListIsPage: true,
-        deleteURL: '',
-        deleteIsBatch: true
+        deleteURL: "",
+        deleteIsBatch: true,
       },
       dataForm: {
-        idCard: '',
-        residentName: '',
-        telephone: ''
-      }
-    }
+        idCard: "",
+        residentName: "",
+        telephone: "",
+      },
+    };
   },
   components: {
-    AddOrUpdate
-  }
-}
+    AddOrUpdate,
+  },
+};
 </script>

src/views/modules/shequzhili/xiangmu/cpts/project-info.vue

@@ -127,7 +127,7 @@
                     placeholder="请选择"
                     @change="handleTagChange"
                     size="medium"
-                    style="width: 350px;"
+                    style="width: 350px"
                   >
                     <el-option-group label="自定义标签">
                       <el-option
@@ -866,7 +866,6 @@ export default {
       this.pageType = "info";
     },
 
-    //加载组织数据
     async submitBack() {
       const url = "/gov/project/trace/return-v2";
       const { fmData } = this;
@@ -897,7 +896,6 @@ export default {
       }
     },
 
-    //加载组织数据
     async submitClose() {
       const url = "/gov/project/trace/closeproject-v2";
       const { fmData } = this;
@@ -917,6 +915,8 @@ export default {
         projectStaffId: fmData.projectStaffId,
         publicReply: fmData.publicReply,
         internalFile: fmData.internalFile,
+        assistanceUnitId: fmData.assistanceUnitId,
+        assistanceUnitType: fmData.assistanceUnitType,
       });
 
       loading.close();
@@ -928,7 +928,6 @@ export default {
       }
     },
 
-    //加载组织数据
     async submitTurn() {
       const url = "/gov/project/trace/transfer-v2";
       const { fmData } = this;
@@ -949,6 +948,8 @@ export default {
         publicReply: fmData.publicReply,
         internalFile: fmData.internalFile,
         staffList: fmData.staffList,
+        assistanceUnitId: fmData.assistanceUnitId,
+        assistanceUnitType: fmData.assistanceUnitType,
       });
 
       loading.close();
@@ -960,7 +961,6 @@ export default {
       }
     },
 
-    //加载组织数据
     async submitDispose() {
       const url = "/gov/project/trace/response-v2";
       const { fmData } = this;