From 843597135d7d3dacb3b1078afca11405ee6f2815 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 30 Nov 2022 15:23:57 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=A7=9F=E6=88=BF?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plirentcontractinfolog-add-or-update.vue  | 334 ++++++++++++++++++
 .../plugins/rent/plirentcontractinfolog.vue   | 102 ++++++
 .../modules/plugins/rent/rentcontractinfo.vue |   4 +-
 3 files changed, 438 insertions(+), 2 deletions(-)
 create mode 100644 src/views/modules/plugins/rent/plirentcontractinfolog-add-or-update.vue
 create mode 100644 src/views/modules/plugins/rent/plirentcontractinfolog.vue

diff --git a/src/views/modules/plugins/rent/plirentcontractinfolog-add-or-update.vue b/src/views/modules/plugins/rent/plirentcontractinfolog-add-or-update.vue
new file mode 100644
index 000000000..74dcade31
--- /dev/null
+++ b/src/views/modules/plugins/rent/plirentcontractinfolog-add-or-update.vue
@@ -0,0 +1,334 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="社区ID" prop="communityId">
+          <el-input v-model="dataForm.communityId" placeholder="社区ID"></el-input>
+      </el-form-item>
+          <el-form-item label="社区" prop="communityName">
+          <el-input v-model="dataForm.communityName" placeholder="社区"></el-input>
+      </el-form-item>
+          <el-form-item label="网格ID" prop="gridId">
+          <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
+      </el-form-item>
+          <el-form-item label="网格" prop="gridName">
+          <el-input v-model="dataForm.gridName" placeholder="网格"></el-input>
+      </el-form-item>
+          <el-form-item label="房屋小区ID" prop="villageId">
+          <el-input v-model="dataForm.villageId" placeholder="房屋小区ID"></el-input>
+      </el-form-item>
+          <el-form-item label="房屋小区" prop="villageName">
+          <el-input v-model="dataForm.villageName" placeholder="房屋小区"></el-input>
+      </el-form-item>
+          <el-form-item label="楼号ID" prop="buildId">
+          <el-input v-model="dataForm.buildId" placeholder="楼号ID"></el-input>
+      </el-form-item>
+          <el-form-item label="楼号" prop="buildName">
+          <el-input v-model="dataForm.buildName" placeholder="楼号"></el-input>
+      </el-form-item>
+          <el-form-item label="单元ID" prop="unitId">
+          <el-input v-model="dataForm.unitId" placeholder="单元ID"></el-input>
+      </el-form-item>
+          <el-form-item label="单元" prop="unitName">
+          <el-input v-model="dataForm.unitName" placeholder="单元"></el-input>
+      </el-form-item>
+          <el-form-item label="房屋ID" prop="homeId">
+          <el-input v-model="dataForm.homeId" placeholder="房屋ID"></el-input>
+      </el-form-item>
+          <el-form-item label="房屋" prop="homeName">
+          <el-input v-model="dataForm.homeName" placeholder="房屋"></el-input>
+      </el-form-item>
+          <el-form-item label="房主姓名" prop="ownerName">
+          <el-input v-model="dataForm.ownerName" placeholder="房主姓名"></el-input>
+      </el-form-item>
+          <el-form-item label="状态：0未审核，1审核通过，2审核不通过（盈余字段）" prop="state">
+          <el-input v-model="dataForm.state" placeholder="状态：0未审核，1审核通过，2审核不通过（盈余字段）"></el-input>
+      </el-form-item>
+          <el-form-item label="出租人姓名" prop="lessorName">
+          <el-input v-model="dataForm.lessorName" placeholder="出租人姓名"></el-input>
+      </el-form-item>
+          <el-form-item label="出租人身份证" prop="lessorIdCard">
+          <el-input v-model="dataForm.lessorIdCard" placeholder="出租人身份证"></el-input>
+      </el-form-item>
+          <el-form-item label="出租人手机" prop="lessorMobile">
+          <el-input v-model="dataForm.lessorMobile" placeholder="出租人手机"></el-input>
+      </el-form-item>
+          <el-form-item label="出租人关系" prop="lessorRelation">
+          <el-input v-model="dataForm.lessorRelation" placeholder="出租人关系"></el-input>
+      </el-form-item>
+          <el-form-item label="承租人姓名" prop="lesseeName">
+          <el-input v-model="dataForm.lesseeName" placeholder="承租人姓名"></el-input>
+      </el-form-item>
+          <el-form-item label="承租人身份证" prop="lesseeIdCard">
+          <el-input v-model="dataForm.lesseeIdCard" placeholder="承租人身份证"></el-input>
+      </el-form-item>
+          <el-form-item label="承租人手机" prop="lesseeMobile">
+          <el-input v-model="dataForm.lesseeMobile" placeholder="承租人手机"></el-input>
+      </el-form-item>
+          <el-form-item label="承租人工作单位" prop="lesseeUnit">
+          <el-input v-model="dataForm.lesseeUnit" placeholder="承租人工作单位"></el-input>
+      </el-form-item>
+          <el-form-item label="签署日期" prop="signDate">
+          <el-input v-model="dataForm.signDate" placeholder="签署日期"></el-input>
+      </el-form-item>
+          <el-form-item label="审核日期" prop="reviewDate">
+          <el-input v-model="dataForm.reviewDate" placeholder="审核日期"></el-input>
+      </el-form-item>
+          <el-form-item label="合同开始日期" prop="startDate">
+          <el-input v-model="dataForm.startDate" placeholder="合同开始日期"></el-input>
+      </el-form-item>
+          <el-form-item label="合同结束日期" prop="endDate">
+          <el-input v-model="dataForm.endDate" placeholder="合同结束日期"></el-input>
+      </el-form-item>
+          <el-form-item label="审核-原因" prop="reason">
+          <el-input v-model="dataForm.reason" placeholder="审核-原因"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标记 0：未删除，1：已删除" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+          <el-form-item label="客户ID" prop="customerId">
+          <el-input v-model="dataForm.customerId" placeholder="客户ID"></el-input>
+      </el-form-item>
+          <el-form-item label="出租人现居住地" prop="lessorLiveAddress">
+          <el-input v-model="dataForm.lessorLiveAddress" placeholder="出租人现居住地"></el-input>
+      </el-form-item>
+          <el-form-item label="承租人户籍地地址" prop="lesseeHouseAddress">
+          <el-input v-model="dataForm.lesseeHouseAddress" placeholder="承租人户籍地地址"></el-input>
+      </el-form-item>
+          <el-form-item label="是否来源于PC端录入（0:否；1:是）" prop="isPcInput">
+          <el-input v-model="dataForm.isPcInput" placeholder="是否来源于PC端录入（0:否；1:是）"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        communityId: '',
+        communityName: '',
+        gridId: '',
+        gridName: '',
+        villageId: '',
+        villageName: '',
+        buildId: '',
+        buildName: '',
+        unitId: '',
+        unitName: '',
+        homeId: '',
+        homeName: '',
+        ownerName: '',
+        state: '',
+        lessorName: '',
+        lessorIdCard: '',
+        lessorMobile: '',
+        lessorRelation: '',
+        lesseeName: '',
+        lesseeIdCard: '',
+        lesseeMobile: '',
+        lesseeUnit: '',
+        signDate: '',
+        reviewDate: '',
+        startDate: '',
+        endDate: '',
+        reason: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: '',
+        customerId: '',
+        lessorLiveAddress: '',
+        lesseeHouseAddress: '',
+        isPcInput: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        communityId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        communityName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        gridId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        gridName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        villageId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        villageName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        unitId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        unitName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        homeId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        homeName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        ownerName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        state: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        lessorName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        lessorIdCard: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        lessorMobile: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        lessorRelation: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        lesseeName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        lesseeIdCard: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        lesseeMobile: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        lesseeUnit: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        signDate: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        reviewDate: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        startDate: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        endDate: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        reason: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        customerId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        lessorLiveAddress: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        lesseeHouseAddress: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        isPcInput: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/pli/power/plirentcontractinfolog/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/pli/power/plirentcontractinfolog/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/plugins/rent/plirentcontractinfolog.vue b/src/views/modules/plugins/rent/plirentcontractinfolog.vue
new file mode 100644
index 000000000..3eb0a2df1
--- /dev/null
+++ b/src/views/modules/plugins/rent/plirentcontractinfolog.vue
@@ -0,0 +1,102 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-/pli/power__plirentcontractinfolog}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('/pli/power:plirentcontractinfolog:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('/pli/power:plirentcontractinfolog:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <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="id" label="主键" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="communityId" label="社区ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="communityName" label="社区" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gridName" label="网格" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="villageId" label="房屋小区ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="villageName" label="房屋小区" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="buildId" label="楼号ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="buildName" label="楼号" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="unitId" label="单元ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="unitName" label="单元" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="homeId" label="房屋ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="homeName" label="房屋" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="ownerName" label="房主姓名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="state" label="状态：0未审核，1审核通过，2审核不通过（盈余字段）" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lessorName" label="出租人姓名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lessorIdCard" label="出租人身份证" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lessorMobile" label="出租人手机" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lessorRelation" label="出租人关系" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lesseeName" label="承租人姓名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lesseeIdCard" label="承租人身份证" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lesseeMobile" label="承租人手机" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lesseeUnit" label="承租人工作单位" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="signDate" label="签署日期" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="reviewDate" label="审核日期" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="startDate" label="合同开始日期" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="endDate" label="合同结束日期" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="reason" label="审核-原因" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="delFlag" label="删除标记 0：未删除，1：已删除" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="customerId" label="客户ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lessorLiveAddress" label="出租人现居住地" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lesseeHouseAddress" label="承租人户籍地地址" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="isPcInput" label="是否来源于PC端录入（0:否；1:是）" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('/pli/power:plirentcontractinfolog:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('/pli/power:plirentcontractinfolog:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</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>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './plirentcontractinfolog-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/pli/power/plirentcontractinfolog/page',
+        getDataListIsPage: true,
+        deleteURL: '/pli/power/plirentcontractinfolog',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/plugins/rent/rentcontractinfo.vue b/src/views/modules/plugins/rent/rentcontractinfo.vue
index 4ee321e33..7ae1c67ea 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo.vue
@@ -203,9 +203,9 @@ export default {
     data: function () {
         return {
             mixinViewModuleOptions: {
-                getDataListURL: '/pli/power/rentContractInfo/page',
+                getDataListURL: '/pli/power/plirentcontractinfolog/page',
                 getDataListIsPage: true,
-                deleteURL: '/pli/power/rentContractInfo',
+                deleteURL: '/pli/power/plirentcontractinfolog',
                 deleteIsBatch: true
             },
             optionsV: [],

From a1139f38fd3355b37751fb06ae6aa229b02a4d12 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 1 Dec 2022 09:15:36 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=85=A5=E6=8C=89=E9=92=AE=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/change/changewelfare.vue              | 2 +-
 .../modules/plugins/rent/rentcontractinfo-add-or-update.vue     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/plugins/change/changewelfare.vue b/src/views/modules/plugins/change/changewelfare.vue
index bb4ce7828..e7f30bc90 100644
--- a/src/views/modules/plugins/change/changewelfare.vue
+++ b/src/views/modules/plugins/change/changewelfare.vue
@@ -58,7 +58,6 @@
 <!--        </div>-->
           <div class="exportBtn">
         <div class="resi-row-btn">
-          <el-button type="warning" size="small" class="diy-button--reset" @click="exportHandle()">{{ $t('export') }}</el-button>
             <el-button style="margin-left: 10px"
                        class="diy-button--export"
                        size="small"
@@ -84,6 +83,7 @@
                            size="small"
                            class="diy-button--delete">导入</el-button>
             </el-upload>
+            <el-button type="warning" size="small" class="diy-button--reset" @click="exportHandle()">{{ $t('export') }}</el-button>
         </div>
 
           </div>
diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
index bb50164b7..fe0e55e8b 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@@ -756,7 +756,7 @@ export default {
     },
     getAgencyList() {
       return new Promise((resolve, reject) => {
-        this.$http.post('/gov/org/agency/communityListByCustomerId')
+        this.$http.post('/gov/org/customeragency/getCurrentUserCommunityInfo')
           .then(({ data: res }) => {
             if (res.code !== 0) {
             reject(false)

From 5902c69464d8699fc4cdae5d6372e64825020e06 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Mon, 5 Dec 2022 15:05:30 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rent/rentcontractinfo-add-or-update.vue   | 408 +++++++++++++-----
 1 file changed, 297 insertions(+), 111 deletions(-)

diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
index fe0e55e8b..15027b974 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@@ -149,118 +149,242 @@
           <br/>
           <el-button @click="addMember()" type="primary">添加成员</el-button>
           <div><br/></div>
-          <el-table v-loading="dataListLoading" :data="dataForm.tenantList" border style="width: 100%">
-              <el-table-column label="序号" header-align="center" align="center" width="50px" fixed="left">
-                  <template slot-scope="scope">
-                      {{scope.$index+1}}
-                  </template>
-              </el-table-column>
-              <el-table-column prop="name" label="姓名" :render-header="renderHeader" header-align="center" align="center" width="120">
-                <template slot-scope="scope">
-                  <el-form-item :prop="'tenantList['+scope.$index+'].name'" required :show-message="false">
-                    <el-input v-model="scope.row.name"></el-input>
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column prop="yfzgx" label="与户主关系" :render-header="renderHeader" header-align="center" align="center" width="120">
-                <template slot-scope="scope">
-                  <el-form-item :prop="'tenantList['+scope.$index+'].yfzgx'" required :show-message="false">
-                  <!--<el-input v-model="dataForm.tenantList[scope.$index].yfzgx" placeholder="租客"></el-input>-->
-                    <el-select v-model="scope.row.yfzgx" placeholder="与房主关系">
-                        <el-option v-for="item in lessorRelationArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
-                        </el-option>
-                    </el-select>
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column prop="mobile" label="手机" :render-header="renderHeader" header-align="center" align="center" width="145">
-                <template slot-scope="scope">
-                  <el-form-item :prop="'tenantList['+scope.$index+'].mobile'" required :show-message="false">
-                    <el-input v-model="dataForm.tenantList[scope.$index].mobile"></el-input>
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column prop="idCard" label="证件号" :render-header="renderHeader" header-align="center" align="center" width="180">
-                <template slot-scope="scope">
-                  <el-form-item :prop="'tenantList['+scope.$index+'].idCard'" required :show-message="false">
-                    <el-input v-model="dataForm.tenantList[scope.$index].idCard"></el-input>
-                  </el-form-item>
-                </template>
-              </el-table-column>
+          <div style="border-bottom: 1px dashed #dcdfe6;margin-bottom: 20px;" v-for="(item, index) in dataForm.tenantList" :key="index">
+              <el-form-item label="姓名" :prop="'tenantList['+ index +'].name'" required :show-message="false">
+                  <el-input v-model="dataForm.tenantList[index].name" placeholder="请输入" ></el-input>
+              </el-form-item>
 
-              <el-table-column prop="hjszd" label="户籍地" :render-header="renderHeader" header-align="center" align="center" width="180">
-                <template slot-scope="scope">
-                  <el-form-item :prop="'tenantList['+scope.$index+'].hjszd'" required :show-message="false">
-                    <el-input v-model="dataForm.tenantList[scope.$index].hjszd"></el-input>
-                  </el-form-item>
-                </template>
-              </el-table-column>
+              <el-form-item label="与户主关系" :prop="'tenantList['+index+'].yfzgx'" required :show-message="false">
+                <el-select v-model="dataForm.tenantList[index].yfzgx" placeholder="请选择">
+                    <el-option v-for="item in lessorRelationArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+                    </el-option>
+                </el-select>
+              </el-form-item>
 
-              <el-table-column prop="unit" label="工作单位" :render-header="renderHeader" header-align="center" align="center" width="180" show-overflow-tooltip>
-                <template slot-scope="scope">
-                  <el-form-item :prop="'tenantList['+scope.$index+'].unit'" required :show-message="false">
-                    <el-input v-model="dataForm.tenantList[scope.$index].unit"></el-input>
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column prop="politicalStatus" label="政治面貌" :render-header="renderHeader" header-align="center" align="center" width="120">
-                <template slot-scope="scope">
-                  <el-form-item :prop="'tenantList['+scope.$index+'].politicalStatus'" required :show-message="false">
-                    <el-select v-model="dataForm.tenantList[scope.$index].politicalStatus" placeholder="请选择">
-                      <el-option
-                        v-for="item in zzmmOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column prop="isMilitary" label="是否服过兵役" :render-header="renderHeader" header-align="center" align="center" width="120">
-                <template slot-scope="scope">
-                  <el-form-item :prop="'tenantList['+scope.$index+'].isMilitary'" required :show-message="false">
-                    <el-select v-model="dataForm.tenantList[scope.$index].isMilitary" placeholder="请选择">
-                      <el-option
-                        v-for="item in shifouOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
+              <el-form-item label="手机" :prop="'tenantList['+ index +'].mobile'" required :show-message="false">
+                <el-input v-model="dataForm.tenantList[index].mobile" placeholder="请输入"></el-input>
+              </el-form-item>
+
+
+              <br/>
+
+              <el-form-item label="证件号" :prop="'tenantList['+index+'].idCard'" required :show-message="false">
+                <el-input v-model="dataForm.tenantList[index].idCard" placeholder="请输入"></el-input>
+              </el-form-item>
+
+
+              <el-form-item label="户籍地" :prop="'tenantList['+index+'].hjszd'" required :show-message="false">
+                <el-input v-model="dataForm.tenantList[index].hjszd" placeholder="请输入"></el-input>
+              </el-form-item>
+
+              <el-form-item label="工作单位" :prop="'tenantList['+index+'].unit'" required :show-message="false">
+                <el-input v-model="dataForm.tenantList[index].unit" placeholder="请输入"></el-input>
+              </el-form-item>
+
+              <br/>
+
+
+              <el-form-item label="政治面貌" :prop="'tenantList['+index+'].politicalStatus'" required :show-message="false">
+                <el-select v-model="dataForm.tenantList[index].politicalStatus" placeholder="请选择">
+                  <el-option
+                    v-for="item in zzmmOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="是否服过兵役" label-width="140px" :prop="'tenantList['+index+'].isMilitary'" required :show-message="false">
+                <el-select v-model="dataForm.tenantList[index].isMilitary" placeholder="请选择">
+                  <el-option
+                    v-for="item in shifouOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+
+
+              <el-form-item label="国籍" :prop="'tenantList['+index+'].nation'" required :show-message="false">
+                <el-select v-model="dataForm.tenantList[index].nation" placeholder="请选择">
+                  <el-option
+                    v-for="item in nationOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <br/>
+
+              <el-form-item label="证件照片">
+                <template>
+                  <upload-image 
+                      :defaultFileList="dataForm.tenantList[index].idCardImgList" 
+                      :limit="2" 
+                      :rowIndex="index" 
+                      @change="onChangeTenantListIdImgList"></upload-image>
                 </template>
-              </el-table-column>
-              <el-table-column prop="nation" label="国籍" :render-header="renderHeader" header-align="center" align="center" width="120">
-                <template slot-scope="scope">
-                  <el-form-item :prop="'tenantList['+scope.$index+'].nation'" required :show-message="false">
-                    <el-select v-model="dataForm.tenantList[scope.$index].nation" placeholder="请选择">
-                      <el-option
-                        v-for="item in nationOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
+              </el-form-item>
+
+              <el-form-item label="照片">
+                <template>
+                  <upload-image 
+                    :defaultFileList="dataForm.tenantList[index].imgList" 
+                    :limit="3" 
+                    :rowIndex="index" 
+                    @change="onChangeImgList"></upload-image>
                 </template>
-              </el-table-column>
-              <el-table-column label="证件照片" header-align="center" align="center" width="245px">
-                  <template slot-scope="scope">
-                    <upload-image :defaultFileList="dataForm.tenantList[scope.$index].idCardImgList" :limit="2" :rowIndex="scope.$index" @change="onChangeTenantListIdImgList"></upload-image>
-                  </template>
-              </el-table-column>
-              <el-table-column prop="imgList" label="照片" header-align="center" align="center" width="215px">
-                  <template slot-scope="scope">
-                    <upload-image :defaultFileList="dataForm.tenantList[scope.$index].imgList" :limit="3" :rowIndex="scope.$index" @change="onChangeImgList"></upload-image>
-                  </template>
-              </el-table-column>
-              <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="100">
-                  <template slot-scope="scope">
-                      <el-button type="text" size="small" @click="deleteMember(scope.$index)">删除</el-button>
-                  </template>
-              </el-table-column>
-          </el-table>
+              </el-form-item>
+              <br/>
+              <el-form-item label="民族" :prop="'tenantList['+index+'].mz'" required :show-message="false">
+                <el-select v-model="dataForm.tenantList[index].mz" placeholder="请选择">
+                  <el-option
+                    v-for="item in mzOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+
+
+              <el-form-item label="性别" :prop="'tenantList['+index+'].gender'" required :show-message="false">
+                <el-select v-model="dataForm.tenantList[index].gender" placeholder="请选择">
+                  <el-option
+                    v-for="item in genderOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+
+
+              <el-form-item label="出生日期" :prop="'tenantList['+index+'].birthday'" required :show-message="false" label-width="150px">
+                <el-date-picker
+                    v-model="dataForm.tenantList[index].birthday"
+                    type="date"
+                    clearable
+                    placeholder="选择日期时间"
+                    value-format="yyyy-MM-dd"
+                    style="width: 200px; margin-right: 20px"
+                >
+                </el-date-picker>
+              </el-form-item>
+
+
+
+              <el-form-item label="是否接种" :prop="'tenantList['+index+'].isVaccination'" required :show-message="false">
+                <el-select v-model="dataForm.tenantList[index].isVaccination" placeholder="请选择">
+                  <el-option
+                    v-for="item in isVaccinationOption"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <br/>
+              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第一次接种时间" :prop="'tenantList['+index+'].firstVacTime'" required :show-message="false" label-width="150px">
+                <el-date-picker
+                    v-model="dataForm.tenantList[index].firstVacTime"
+                    type="date"
+                    clearable
+                    placeholder="选择日期时间"
+                    value-format="yyyy-MM-dd"
+                    style="width: 200px; margin-right: 20px"
+                >
+                </el-date-picker>
+              </el-form-item>
+
+
+              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第一次接种地点" :prop="'tenantList['+index+'].firstVacSite'" required :show-message="false" label-width="150px">
+                <el-select v-model="dataForm.tenantList[index].firstVacSite" placeholder="请选择">
+                  <el-option
+                    v-for="item in vacSiteOption"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <br/>
+              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第二次接种时间" :prop="'tenantList['+index+'].secondVacTime'" required :show-message="false" label-width="150px">
+                <el-date-picker
+                    v-model="dataForm.tenantList[index].secondVacTime"
+                    type="date"
+                    clearable
+                    placeholder="选择日期时间"
+                    value-format="yyyy-MM-dd"
+                    style="width: 200px; margin-right: 20px"
+                >
+                </el-date-picker>
+              </el-form-item>
+
+              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第二次接种地点" :prop="'tenantList['+index+'].secondVacSite'" required :show-message="false" label-width="150px">
+                <el-select v-model="dataForm.tenantList[index].secondVacSite" placeholder="请选择">
+                  <el-option
+                    v-for="item in vacSiteOption"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <br/>
+              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第三次接种时间" :prop="'tenantList['+index+'].thirdVacTime'" required :show-message="false" label-width="150px">
+                <el-date-picker
+                    v-model="dataForm.tenantList[index].thirdVacTime"
+                    type="date"
+                    clearable
+                    placeholder="选择日期时间"
+                    value-format="yyyy-MM-dd"
+                    style="width: 200px; margin-right: 20px"
+                >
+                </el-date-picker>
+              </el-form-item>
+
+
+              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第三次接种地点" :prop="'tenantList['+index+'].thirdVacSite'" required :show-message="false" label-width="150px">
+                <el-select v-model="dataForm.tenantList[index].thirdVacSite" placeholder="请选择">
+                  <el-option
+                    v-for="item in vacSiteOption"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <br/>
+
+              <el-form-item label="原因" :prop="'tenantList['+index+'].reason'" required :show-message="false">
+                <el-select v-model="dataForm.tenantList[index].reason" placeholder="请选择">
+                  <el-option
+                    v-for="item in reasonOption"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <br/>
+              <el-form-item label="备注" :prop="'tenantList['+ index +'].note'" required :show-message="false">
+                <el-input
+                    type="textarea"
+                    maxlength="500"
+                    show-word-limit
+                    :rows="3"
+                    placeholder="请输入备注，不超过500字"
+                    v-model="dataForm.tenantList[index].note"></el-input>
+              </el-form-item>
+              <br/>
+              <el-form-item>
+                <el-button type="primary" size="small" @click="deleteMember(index)">删除</el-button>
+              </el-form-item>
+          </div>
         </div>
         <div style="margin-left: 30px;height: 30px;font-weight: bold;">合同内容</div>
         <el-form-item label="签署日期" prop="signDate" label-width="140px">
@@ -383,11 +507,23 @@ export default {
           yfzgx: '',
           type: 1,
           politicalStatus: '',
+          mz:'',
+          gender:'',
+          birthday:'',
+          isVaccination:'1',
           isMilitary: '',
           nation: '',
           imgList: [],
           idCardImgList: [],
-          unit: ''
+          unit: '',
+          firstVacTime: '',
+          firstVacSite:'',
+          secondVacTime:'',
+          secondVacSite:'',
+          thirdVacTime:'',
+          thirdVacSite:'',
+          reason:'',
+          note:'',
         }],
         fileList: [],
         docList: []
@@ -404,6 +540,22 @@ export default {
         { name: '中国', value: '中国' },
         { name: '其他', value: '其他' }
       ],
+      mzOptions:[],
+      isVaccinationOption: [
+        { value: '0', label: '否' },
+        { value: '1', label: '是' },
+      ],
+      vacSiteOption: [
+        { value: '本街道内接种', label: '本街道内接种' },
+        { value: '区内其他街道接种', label: '区内其他街道接种' },
+        { value: '区外其他地区接种', label: '区外其他地区接种' },
+      ],
+      reasonOption: [
+        { value: '禁忌症', label: '禁忌症' },
+        { value: '拒绝接种', label: '拒绝接种' },
+        { value: '其他原因', label: '其他原因' },
+      ],
+      genderOptions:[{label: "男", value: "1"}, {label: "女", value: "2"}],
         dataListLoading: false,
         dialogVisible: false,
         dialogImageUrl: '',
@@ -568,11 +720,23 @@ export default {
           yfzgx: '',
           type: 1,
           politicalStatus: '',
+          mz: '',
+          gender:'',
+          birthday:'',
+          isVaccination:'1',
           isMilitary: '',
           nation: '',
           imgList: [],
           idCardImgList: [],
-          unit: ''
+          unit: '',
+          firstVacTime:'',
+          firstVacSite:'',
+          secondVacTime:'',
+          secondVacSite:'',
+          thirdVacTime:'',
+          thirdVacSite:'',
+          reason:'',
+          note:'',
         }],
         fileList: [],
         docList: [],
@@ -581,6 +745,7 @@ export default {
     },
     init () {
       this.visible = true
+      this.getMz()
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         this.dataFormReset()
@@ -668,11 +833,23 @@ export default {
         yfzgx: '',
         type: 1,
         politicalStatus: '',
+        mz: '',
+        gender:'',
+        birthday:'',
+        isVaccination: '1',
         isMilitary: '',
         nation: '',
         imgList: [],
         idCardImgList: [],
-        unit: ''
+        unit: '',
+        firstVacTime:'',
+        firstVacSite:'',
+        secondVacTime:'',
+        secondVacSite:'',
+        thirdVacTime:'',
+        thirdVacSite:'',
+        reason:'',
+        note:'',
       }
       this.dataForm.tenantList.push(ob)
     },
@@ -905,6 +1082,15 @@ export default {
         this.editModeGetList()
       }).catch(() => {})
     },
+    getMz() {
+      this.$http.post(`/sys/dict/data/nation`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.mzOptions = res.data
+        console.log(res)
+      }).catch(() => {})
+    },
     handleFlieSuccess(res, file) {
         if (res.code === 0 && res.msg === "success") {
             let ob = {

From eeac2665b8e34d35161bf689e37312cd63385c64 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Mon, 5 Dec 2022 16:25:24 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E5=B1=85=E4=BD=8F=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rent/rentcontractinfo-add-or-update.vue   |   6 +-
 .../rent/rentcontractinfo-look-or-check.vue   | 154 ++++++++++++++----
 2 files changed, 128 insertions(+), 32 deletions(-)

diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
index 15027b974..5f1f6d4b9 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@@ -275,6 +275,8 @@
                 </el-date-picker>
               </el-form-item>
 
+              <br/>
+
 
 
               <el-form-item label="是否接种" :prop="'tenantList['+index+'].isVaccination'" required :show-message="false">
@@ -360,7 +362,7 @@
               </el-form-item>
               <br/>
 
-              <el-form-item label="原因" :prop="'tenantList['+index+'].reason'" required :show-message="false">
+              <el-form-item label="原因" :show-message="false">
                 <el-select v-model="dataForm.tenantList[index].reason" placeholder="请选择">
                   <el-option
                     v-for="item in reasonOption"
@@ -371,7 +373,7 @@
                 </el-select>
               </el-form-item>
               <br/>
-              <el-form-item label="备注" :prop="'tenantList['+ index +'].note'" required :show-message="false">
+              <el-form-item label="备注" :show-message="false">
                 <el-input
                     type="textarea"
                     maxlength="500"
diff --git a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
index 36e556d40..be668fb5d 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
@@ -74,35 +74,118 @@
 
         <div style="padding:20px 30px">
           <div style="height: 30px;font-weight: bold;">居住成员信息</div>
-          <el-table v-loading="dataListLoading" :data="dataForm.tenantList" border style="width: 100%">
-              <el-table-column label="序号" header-align="center" align="center" width="50px">
-                  <template slot-scope="scope">
-                      {{scope.$index+1}}
-                  </template>
-              </el-table-column>
-              <el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="yfzgx" label="与户主关系" header-align="center" align="center" width="120"></el-table-column>
-              <el-table-column prop="mobile" label="手机" header-align="center" align="center" width="120"></el-table-column>
-              <el-table-column prop="idCard" label="证件号" header-align="center" align="center" width="180"></el-table-column>
-              <el-table-column prop="unit" label="工作单位" header-align="center" align="center" width="180" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="politicalStatus" label="政治面貌" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="isMilitary" label="是否服过兵役" header-align="center" align="center" width="120"></el-table-column>
-              <el-table-column prop="nation" label="国籍" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="idCardImgList" label="证件照片" header-align="center" align="center">
-                  <template slot-scope="scope">
-                      <div v-for="(item,index) in scope.row.idCardImgList" :key="index">
-                          <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="40" height="40"  />
-                      </div>
-                  </template>
-              </el-table-column>
-              <el-table-column prop="imgList" label="照片" header-align="center" align="center">
-                  <template slot-scope="scope">
-                      <div v-for="(item,index) in scope.row.imgList" :key="index">
-                          <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="40" height="40"  />
-                      </div>
-                  </template>
-              </el-table-column>
-          </el-table>
+        </div>
+
+        <div style="border-bottom: 1px dashed #dcdfe6;margin-bottom: 20px;" v-for="(item, index) in dataForm.tenantList" :key="index">
+          <el-form-item label="姓名" :prop="'tenantList['+ index +'].name'">
+              <el-input v-model="dataForm.tenantList[index].name" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item label="与户主关系" :prop="'tenantList['+ index +'].yfzgx'">
+              <el-input v-model="dataForm.tenantList[index].yfzgx" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item label="手机" :prop="'tenantList['+ index +'].mobile'">
+              <el-input v-model="dataForm.tenantList[index].mobile" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item label="证件号" :prop="'tenantList['+ index +'].idCard'">
+              <el-input v-model="dataForm.tenantList[index].idCard" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item label="工作单位" :prop="'tenantList['+ index +'].unit'">
+              <el-input v-model="dataForm.tenantList[index].unit" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item label="政治面貌" :prop="'tenantList['+ index +'].politicalStatus'">
+              <el-input v-model="dataForm.tenantList[index].politicalStatus" disabled></el-input>
+          </el-form-item>
+          <el-form-item label="是否服过兵役" :prop="'tenantList['+ index +'].isMilitary'">
+              <el-input v-model="dataForm.tenantList[index].isMilitary" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item label="国籍" :prop="'tenantList['+ index +'].nation'">
+              <el-input v-model="dataForm.tenantList[index].nation" disabled></el-input>
+          </el-form-item>
+          <br/>
+
+          <el-form-item label="证件照片" :prop="'tenantList['+ index +'].idCardImgList'">
+            <template>
+                <div v-for="(item,index) in dataForm.tenantList[index].idCardImgList" :key="index">
+                    <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="40" height="40"  />
+                </div>
+            </template>
+          </el-form-item>
+
+          <el-form-item label="照片" :prop="'tenantList['+ index +'].imgList'">
+            <template>
+                <div v-for="(item,index) in dataForm.tenantList[index].imgList" :key="index">
+                    <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="40" height="40"  />
+                </div>
+            </template>
+          </el-form-item>
+          <br/>
+
+
+          <el-form-item label="民族" :prop="'tenantList['+index+'].mz'">
+            <el-select v-model="dataForm.tenantList[index].mz" placeholder="请选择" disabled>
+              <el-option
+                v-for="item in mzOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="性别" :prop="'tenantList['+ index +'].gender'">
+              <el-input v-model="dataForm.tenantList[index].gender === '1' ? '男' : '女'" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item label="出生日期" :prop="'tenantList['+ index +'].birthday'">
+              <el-input v-model="dataForm.tenantList[index].birthday" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item label="是否接种" :prop="'tenantList['+ index +'].isVaccination'">
+              <el-input v-model="dataForm.tenantList[index].isVaccination === '0' ? '否' : '是'" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第一次接种时间" :prop="'tenantList['+ index +'].firstVacTime'">
+              <el-input v-model="dataForm.tenantList[index].firstVacTime" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第一次接种地点" :prop="'tenantList['+ index +'].firstVacSite'">
+              <el-input v-model="dataForm.tenantList[index].firstVacSite" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第二次接种时间" :prop="'tenantList['+ index +'].secondVacTime'">
+              <el-input v-model="dataForm.tenantList[index].secondVacTime" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第二次接种地点" :prop="'tenantList['+ index +'].secondVacSite'">
+              <el-input v-model="dataForm.tenantList[index].secondVacSite" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第三次接种时间" :prop="'tenantList['+ index +'].thirdVacTime'">
+              <el-input v-model="dataForm.tenantList[index].thirdVacTime" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第三次接种地点" :prop="'tenantList['+ index +'].thirdVacSite'">
+              <el-input v-model="dataForm.tenantList[index].thirdVacSite" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item label="原因" :prop="'tenantList['+ index +'].reason'">
+              <el-input v-model="dataForm.tenantList[index].reason" disabled></el-input>
+          </el-form-item>
+          <br/>
+          <el-form-item label="备注">
+              <el-input
+                  type="textarea"
+                  maxlength="500"
+                  show-word-limit
+                  :rows="3"
+                  v-model="dataForm.tenantList[index].note" disabled></el-input>
+            </el-form-item>
         </div>
         <div style="margin-left: 50px;height: 30px;font-weight: bold;">合同内容</div>
         <el-form-item label="签署日期" prop="signDate">
@@ -210,7 +293,8 @@ export default {
         ],
         checkReason: '',
         checkVisible: false,
-        disabledBtn: false
+        disabledBtn: false,
+        mzOptions:[],
     }
   },
   computed: {
@@ -301,6 +385,7 @@ export default {
           ...this.dataForm,
           ...res.data
         }
+        this.getMz()
       }).catch(() => {})
     },
       // 打开审核不通过对话框
@@ -356,6 +441,15 @@ export default {
     downFile(fileUrl) {
         window.open(fileUrl)
     },
+    getMz() {
+      this.$http.post(`/sys/dict/data/nation`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.mzOptions = res.data
+        console.log(res)
+      }).catch(() => {})
+    },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
       this.$refs['dataForm'].validate((valid) => {

From 220da3d0179e3fc57422efe9191eae9f7832e977 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Mon, 5 Dec 2022 16:44:14 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E4=B8=8D=E6=A0=A1=E9=AA=8C=E4=BA=8C?=
 =?UTF-8?q?=E4=B8=89=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/rent/rentcontractinfo-add-or-update.vue       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
index 5f1f6d4b9..280be6596 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@@ -314,7 +314,7 @@
                 </el-select>
               </el-form-item>
               <br/>
-              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第二次接种时间" :prop="'tenantList['+index+'].secondVacTime'" required :show-message="false" label-width="150px">
+              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第二次接种时间" label-width="150px">
                 <el-date-picker
                     v-model="dataForm.tenantList[index].secondVacTime"
                     type="date"
@@ -326,7 +326,7 @@
                 </el-date-picker>
               </el-form-item>
 
-              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第二次接种地点" :prop="'tenantList['+index+'].secondVacSite'" required :show-message="false" label-width="150px">
+              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第二次接种地点" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].secondVacSite" placeholder="请选择">
                   <el-option
                     v-for="item in vacSiteOption"
@@ -337,7 +337,7 @@
                 </el-select>
               </el-form-item>
               <br/>
-              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第三次接种时间" :prop="'tenantList['+index+'].thirdVacTime'" required :show-message="false" label-width="150px">
+              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第三次接种时间" :show-message="false" label-width="150px">
                 <el-date-picker
                     v-model="dataForm.tenantList[index].thirdVacTime"
                     type="date"
@@ -350,7 +350,7 @@
               </el-form-item>
 
 
-              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第三次接种地点" :prop="'tenantList['+index+'].thirdVacSite'" required :show-message="false" label-width="150px">
+              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第三次接种地点" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].thirdVacSite" placeholder="请选择">
                   <el-option
                     v-for="item in vacSiteOption"

From be7f9ce77397dc5edef58b10ea157765f9d7fa13 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Tue, 6 Dec 2022 14:41:09 +0800
Subject: [PATCH 6/8] bug

---
 .../rent/rentcontractinfo-add-or-update.vue   | 92 ++++++++++---------
 .../rent/rentcontractinfo-look-or-check.vue   | 68 ++++++++------
 2 files changed, 93 insertions(+), 67 deletions(-)

diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
index 280be6596..9bb14f981 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@@ -112,7 +112,7 @@
         <el-form-item label="与房主关系" prop="lessorRelation" label-width="140px">
             <!--<el-input v-model="dataForm.lessorRelation" placeholder="与房主关系"></el-input>-->
             <el-select v-model="dataForm.lessorRelation" placeholder="与房主关系">
-                <el-option v-for="item in lessorRelationArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+                <el-option v-for="item in lessorRelationArr_" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
                 </el-option>
             </el-select>
         </el-form-item>
@@ -149,42 +149,35 @@
           <br/>
           <el-button @click="addMember()" type="primary">添加成员</el-button>
           <div><br/></div>
-          <div style="border-bottom: 1px dashed #dcdfe6;margin-bottom: 20px;" v-for="(item, index) in dataForm.tenantList" :key="index">
-              <el-form-item label="姓名" :prop="'tenantList['+ index +'].name'" required :show-message="false">
+          <div class="add-member" v-for="(item, index) in dataForm.tenantList" :key="index">
+              <el-form-item label="姓名" :prop="'tenantList['+ index +'].name'" required :show-message="false" label-width="150px">
                   <el-input v-model="dataForm.tenantList[index].name" placeholder="请输入" ></el-input>
               </el-form-item>
 
-              <el-form-item label="与户主关系" :prop="'tenantList['+index+'].yfzgx'" required :show-message="false">
-                <el-select v-model="dataForm.tenantList[index].yfzgx" placeholder="请选择">
-                    <el-option v-for="item in lessorRelationArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
-                    </el-option>
-                </el-select>
-              </el-form-item>
-
-              <el-form-item label="手机" :prop="'tenantList['+ index +'].mobile'" required :show-message="false">
+              <el-form-item label="手机" :prop="'tenantList['+ index +'].mobile'" required :show-message="false" label-width="150px">
                 <el-input v-model="dataForm.tenantList[index].mobile" placeholder="请输入"></el-input>
               </el-form-item>
 
-
-              <br/>
-
-              <el-form-item label="证件号" :prop="'tenantList['+index+'].idCard'" required :show-message="false">
+              <el-form-item label="证件号" :prop="'tenantList['+index+'].idCard'" required :show-message="false" label-width="150px">
                 <el-input v-model="dataForm.tenantList[index].idCard" placeholder="请输入"></el-input>
               </el-form-item>
 
-
-              <el-form-item label="户籍地" :prop="'tenantList['+index+'].hjszd'" required :show-message="false">
+              <el-form-item label="户籍地" :prop="'tenantList['+index+'].hjszd'" required :show-message="false" label-width="150px">
                 <el-input v-model="dataForm.tenantList[index].hjszd" placeholder="请输入"></el-input>
               </el-form-item>
 
-              <el-form-item label="工作单位" :prop="'tenantList['+index+'].unit'" required :show-message="false">
+              <el-form-item label="工作单位" :prop="'tenantList['+index+'].unit'" required :show-message="false" label-width="150px">
                 <el-input v-model="dataForm.tenantList[index].unit" placeholder="请输入"></el-input>
               </el-form-item>
 
-              <br/>
-
+              <el-form-item label="与户主关系" :prop="'tenantList['+index+'].yfzgx'" required :show-message="false" label-width="150px">
+                <el-select v-model="dataForm.tenantList[index].yfzgx" placeholder="请选择">
+                    <el-option v-for="item in lessorRelationArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+                    </el-option>
+                </el-select>
+              </el-form-item>
 
-              <el-form-item label="政治面貌" :prop="'tenantList['+index+'].politicalStatus'" required :show-message="false">
+              <el-form-item label="政治面貌" :prop="'tenantList['+index+'].politicalStatus'" required :show-message="false" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].politicalStatus" placeholder="请选择">
                   <el-option
                     v-for="item in zzmmOptions"
@@ -195,7 +188,7 @@
                 </el-select>
               </el-form-item>
 
-              <el-form-item label="是否服过兵役" label-width="140px" :prop="'tenantList['+index+'].isMilitary'" required :show-message="false">
+              <el-form-item label="是否服过兵役" :prop="'tenantList['+index+'].isMilitary'" required :show-message="false" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].isMilitary" placeholder="请选择">
                   <el-option
                     v-for="item in shifouOptions"
@@ -206,8 +199,7 @@
                 </el-select>
               </el-form-item>
 
-
-              <el-form-item label="国籍" :prop="'tenantList['+index+'].nation'" required :show-message="false">
+              <el-form-item label="国籍" :prop="'tenantList['+index+'].nation'" required :show-message="false" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].nation" placeholder="请选择">
                   <el-option
                     v-for="item in nationOptions"
@@ -219,7 +211,7 @@
               </el-form-item>
               <br/>
 
-              <el-form-item label="证件照片">
+              <el-form-item label="证件照片" label-width="150px">
                 <template>
                   <upload-image 
                       :defaultFileList="dataForm.tenantList[index].idCardImgList" 
@@ -229,7 +221,7 @@
                 </template>
               </el-form-item>
 
-              <el-form-item label="照片">
+              <el-form-item label="照片" label-width="150px">
                 <template>
                   <upload-image 
                     :defaultFileList="dataForm.tenantList[index].imgList" 
@@ -239,7 +231,7 @@
                 </template>
               </el-form-item>
               <br/>
-              <el-form-item label="民族" :prop="'tenantList['+index+'].mz'" required :show-message="false">
+              <el-form-item label="民族" :prop="'tenantList['+index+'].mz'" required :show-message="false" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].mz" placeholder="请选择">
                   <el-option
                     v-for="item in mzOptions"
@@ -251,7 +243,7 @@
               </el-form-item>
 
 
-              <el-form-item label="性别" :prop="'tenantList['+index+'].gender'" required :show-message="false">
+              <!-- <el-form-item label="性别" :prop="'tenantList['+index+'].gender'" required :show-message="false">
                 <el-select v-model="dataForm.tenantList[index].gender" placeholder="请选择">
                   <el-option
                     v-for="item in genderOptions"
@@ -260,10 +252,10 @@
                     :value="item.value">
                   </el-option>
                 </el-select>
-              </el-form-item>
+              </el-form-item> -->
 
 
-              <el-form-item label="出生日期" :prop="'tenantList['+index+'].birthday'" required :show-message="false" label-width="150px">
+              <!-- <el-form-item label="出生日期" :prop="'tenantList['+index+'].birthday'" required :show-message="false" label-width="150px">
                 <el-date-picker
                     v-model="dataForm.tenantList[index].birthday"
                     type="date"
@@ -273,13 +265,9 @@
                     style="width: 200px; margin-right: 20px"
                 >
                 </el-date-picker>
-              </el-form-item>
-
-              <br/>
-
-
+              </el-form-item> -->
 
-              <el-form-item label="是否接种" :prop="'tenantList['+index+'].isVaccination'" required :show-message="false">
+              <el-form-item label="是否接种" :prop="'tenantList['+index+'].isVaccination'" required :show-message="false" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].isVaccination" placeholder="请选择">
                   <el-option
                     v-for="item in isVaccinationOption"
@@ -362,7 +350,7 @@
               </el-form-item>
               <br/>
 
-              <el-form-item label="原因" :show-message="false">
+              <el-form-item label="原因" :show-message="false" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].reason" placeholder="请选择">
                   <el-option
                     v-for="item in reasonOption"
@@ -372,8 +360,7 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <br/>
-              <el-form-item label="备注" :show-message="false">
+              <el-form-item label="备注" :show-message="false" label-width="150px">
                 <el-input
                     type="textarea"
                     maxlength="500"
@@ -382,9 +369,8 @@
                     placeholder="请输入备注，不超过500字"
                     v-model="dataForm.tenantList[index].note"></el-input>
               </el-form-item>
-              <br/>
               <el-form-item>
-                <el-button type="primary" size="small" @click="deleteMember(index)">删除</el-button>
+                <el-button style="float: right" type="primary" size="small" @click="deleteMember(index)">删除</el-button>
               </el-form-item>
           </div>
         </div>
@@ -573,6 +559,18 @@ export default {
             { dictValue: '兄弟姐妹', dictName: '兄弟姐妹' },
             { dictValue: '其他', dictName: '其他' }
         ],
+        lessorRelationArr_: [
+            { dictValue: '本人', dictName: '本人' },
+            { dictValue: '配偶', dictName: '配偶' },
+            { dictValue: '子女', dictName: '子女' },
+            { dictValue: '父母', dictName: '父母' },
+            { dictValue: '岳父母或公婆', dictName: '岳父母或公婆' },
+            { dictValue: '祖父母', dictName: '祖父母' },
+            { dictValue: '媳婿', dictName: '媳婿' },
+            { dictValue: '孙子女', dictName: '孙子女' },
+            { dictValue: '兄弟姐妹', dictName: '兄弟姐妹' },
+            { dictValue: '中介', dictName: '中介' }
+        ],
         checkVisible: false,
         disabledBtn: false,
         gridOptions: [],
@@ -1194,6 +1192,16 @@ export default {
     margin-bottom: 0;
   }
 }
+
+.add-member{
+  border-bottom: 1px dashed #dcdfe6;
+  margin-bottom: 20px;
+  .el-form-item {
+    .el-form-item__content{
+      width: 190px !important;
+    }
+  }
+}
 </style>
 <style lang="scss" scoped>
     ::v-deep .el-upload-list__item.is-success.focusing .el-icon-close-tip {
@@ -1220,4 +1228,6 @@ export default {
     .margin_left10 {
         margin-left: 10px;
     }
+
+
 </style>
diff --git a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
index be668fb5d..794f39b3f 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
@@ -76,40 +76,44 @@
           <div style="height: 30px;font-weight: bold;">居住成员信息</div>
         </div>
 
-        <div style="border-bottom: 1px dashed #dcdfe6;margin-bottom: 20px;" v-for="(item, index) in dataForm.tenantList" :key="index">
-          <el-form-item label="姓名" :prop="'tenantList['+ index +'].name'">
+        <div class="add-member" v-for="(item, index) in dataForm.tenantList" :key="index">
+          <el-form-item label="姓名">
               <el-input v-model="dataForm.tenantList[index].name" disabled></el-input>
           </el-form-item>
 
-          <el-form-item label="与户主关系" :prop="'tenantList['+ index +'].yfzgx'">
-              <el-input v-model="dataForm.tenantList[index].yfzgx" disabled></el-input>
-          </el-form-item>
-
-          <el-form-item label="手机" :prop="'tenantList['+ index +'].mobile'">
+          <el-form-item label="手机">
               <el-input v-model="dataForm.tenantList[index].mobile" disabled></el-input>
           </el-form-item>
 
-          <el-form-item label="证件号" :prop="'tenantList['+ index +'].idCard'">
+          <el-form-item label="证件号">
               <el-input v-model="dataForm.tenantList[index].idCard" disabled></el-input>
           </el-form-item>
 
-          <el-form-item label="工作单位" :prop="'tenantList['+ index +'].unit'">
+          <el-form-item label="户籍地">
+            <el-input v-model="dataForm.tenantList[index].hjszd" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item label="工作单位">
               <el-input v-model="dataForm.tenantList[index].unit" disabled></el-input>
           </el-form-item>
 
-          <el-form-item label="政治面貌" :prop="'tenantList['+ index +'].politicalStatus'">
+          <el-form-item label="与户主关系">
+              <el-input v-model="dataForm.tenantList[index].yfzgx" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item label="政治面貌">
               <el-input v-model="dataForm.tenantList[index].politicalStatus" disabled></el-input>
           </el-form-item>
-          <el-form-item label="是否服过兵役" :prop="'tenantList['+ index +'].isMilitary'">
+          <el-form-item label="是否服过兵役">
               <el-input v-model="dataForm.tenantList[index].isMilitary" disabled></el-input>
           </el-form-item>
 
-          <el-form-item label="国籍" :prop="'tenantList['+ index +'].nation'">
+          <el-form-item label="国籍">
               <el-input v-model="dataForm.tenantList[index].nation" disabled></el-input>
           </el-form-item>
           <br/>
 
-          <el-form-item label="证件照片" :prop="'tenantList['+ index +'].idCardImgList'">
+          <el-form-item label="证件照片">
             <template>
                 <div v-for="(item,index) in dataForm.tenantList[index].idCardImgList" :key="index">
                     <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="40" height="40"  />
@@ -117,7 +121,7 @@
             </template>
           </el-form-item>
 
-          <el-form-item label="照片" :prop="'tenantList['+ index +'].imgList'">
+          <el-form-item label="照片">
             <template>
                 <div v-for="(item,index) in dataForm.tenantList[index].imgList" :key="index">
                     <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="40" height="40"  />
@@ -127,7 +131,7 @@
           <br/>
 
 
-          <el-form-item label="民族" :prop="'tenantList['+index+'].mz'">
+          <el-form-item label="民族">
             <el-select v-model="dataForm.tenantList[index].mz" placeholder="请选择" disabled>
               <el-option
                 v-for="item in mzOptions"
@@ -138,43 +142,43 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="性别" :prop="'tenantList['+ index +'].gender'">
+          <!-- <el-form-item label="性别" :prop="'tenantList['+ index +'].gender'">
               <el-input v-model="dataForm.tenantList[index].gender === '1' ? '男' : '女'" disabled></el-input>
           </el-form-item>
 
           <el-form-item label="出生日期" :prop="'tenantList['+ index +'].birthday'">
               <el-input v-model="dataForm.tenantList[index].birthday" disabled></el-input>
-          </el-form-item>
+          </el-form-item> -->
 
-          <el-form-item label="是否接种" :prop="'tenantList['+ index +'].isVaccination'">
+          <el-form-item label="是否接种">
               <el-input v-model="dataForm.tenantList[index].isVaccination === '0' ? '否' : '是'" disabled></el-input>
           </el-form-item>
 
-          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第一次接种时间" :prop="'tenantList['+ index +'].firstVacTime'">
+          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第一次接种时间">
               <el-input v-model="dataForm.tenantList[index].firstVacTime" disabled></el-input>
           </el-form-item>
 
-          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第一次接种地点" :prop="'tenantList['+ index +'].firstVacSite'">
+          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第一次接种地点">
               <el-input v-model="dataForm.tenantList[index].firstVacSite" disabled></el-input>
           </el-form-item>
 
-          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第二次接种时间" :prop="'tenantList['+ index +'].secondVacTime'">
+          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第二次接种时间">
               <el-input v-model="dataForm.tenantList[index].secondVacTime" disabled></el-input>
           </el-form-item>
 
-          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第二次接种地点" :prop="'tenantList['+ index +'].secondVacSite'">
+          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第二次接种地点">
               <el-input v-model="dataForm.tenantList[index].secondVacSite" disabled></el-input>
           </el-form-item>
 
-          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第三次接种时间" :prop="'tenantList['+ index +'].thirdVacTime'">
+          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第三次接种时间">
               <el-input v-model="dataForm.tenantList[index].thirdVacTime" disabled></el-input>
           </el-form-item>
 
-          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第三次接种地点" :prop="'tenantList['+ index +'].thirdVacSite'">
+          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第三次接种地点">
               <el-input v-model="dataForm.tenantList[index].thirdVacSite" disabled></el-input>
           </el-form-item>
 
-          <el-form-item label="原因" :prop="'tenantList['+ index +'].reason'">
+          <el-form-item label="原因">
               <el-input v-model="dataForm.tenantList[index].reason" disabled></el-input>
           </el-form-item>
           <br/>
@@ -222,7 +226,7 @@
         <!--<el-button v-if="dataForm.state === '0'" type="danger" @click="openCheckReasonDialog">{{ $t('checkBTGBtn') }}</el-button>-->
         <!--<el-button v-if="dataForm.state === '0'" type="primary" @click="checkHandle('1')">{{ $t('checkTGBtn') }}</el-button>-->
             <el-button type="danger" @click="openCheckReasonDialog">{{ $t('checkBTGBtn') }}</el-button>
-            <el-button type="primary" @click="checkHandle('1')">{{ $t('checkTGBtn') }}</el-button>
+            <el-button type="primary" @click="checkHandle('1')" :disabled="disabledBtn_check">{{ $t('checkTGBtn') }}</el-button>
         </div>
     </template>
       <el-dialog :visible.sync="dialogVisible" :modal="false">
@@ -294,6 +298,7 @@ export default {
         checkReason: '',
         checkVisible: false,
         disabledBtn: false,
+        disabledBtn_check: false,
         mzOptions:[],
     }
   },
@@ -411,7 +416,9 @@ export default {
           lessorRelation: this.dataForm.lessorRelation,
           reason: this.checkReason
         }
+        this.disabledBtn_check = true,
         this.$http.post('/pli/power/rentContractInfo/review', params).then(({ data: res }) => {
+          this.disabledBtn_check = false
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
@@ -492,4 +499,13 @@ export default {
     // width: 280px;
   }
 }
+.add-member{
+  border-bottom: 1px dashed #dcdfe6;
+  margin-bottom: 20px;
+  .el-form-item {
+    .el-form-item__content{
+      width: 190px !important;
+    }
+  }
+}
 </style>

From 1e4abeb448e997b20d602a765f8c0a2f74997e81 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Tue, 6 Dec 2022 15:01:00 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rent/rentcontractinfo-add-or-update.vue   | 71 +++++++++++++++----
 1 file changed, 58 insertions(+), 13 deletions(-)

diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
index 9bb14f981..4154a30bc 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@@ -150,34 +150,34 @@
           <el-button @click="addMember()" type="primary">添加成员</el-button>
           <div><br/></div>
           <div class="add-member" v-for="(item, index) in dataForm.tenantList" :key="index">
-              <el-form-item label="姓名" :prop="'tenantList['+ index +'].name'" required :show-message="false" label-width="150px">
+              <el-form-item label="姓名" prop="name" label-width="150px">
                   <el-input v-model="dataForm.tenantList[index].name" placeholder="请输入" ></el-input>
               </el-form-item>
 
-              <el-form-item label="手机" :prop="'tenantList['+ index +'].mobile'" required :show-message="false" label-width="150px">
+              <el-form-item label="手机" prop="mobile" label-width="150px">
                 <el-input v-model="dataForm.tenantList[index].mobile" placeholder="请输入"></el-input>
               </el-form-item>
 
-              <el-form-item label="证件号" :prop="'tenantList['+index+'].idCard'" required :show-message="false" label-width="150px">
+              <el-form-item label="证件号" prop="idCard" label-width="150px">
                 <el-input v-model="dataForm.tenantList[index].idCard" placeholder="请输入"></el-input>
               </el-form-item>
 
-              <el-form-item label="户籍地" :prop="'tenantList['+index+'].hjszd'" required :show-message="false" label-width="150px">
+              <el-form-item label="户籍地" prop="hjszd" label-width="150px">
                 <el-input v-model="dataForm.tenantList[index].hjszd" placeholder="请输入"></el-input>
               </el-form-item>
 
-              <el-form-item label="工作单位" :prop="'tenantList['+index+'].unit'" required :show-message="false" label-width="150px">
+              <el-form-item label="工作单位" prop="unit" label-width="150px">
                 <el-input v-model="dataForm.tenantList[index].unit" placeholder="请输入"></el-input>
               </el-form-item>
 
-              <el-form-item label="与户主关系" :prop="'tenantList['+index+'].yfzgx'" required :show-message="false" label-width="150px">
+              <el-form-item label="与户主关系" prop="yfzgx" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].yfzgx" placeholder="请选择">
                     <el-option v-for="item in lessorRelationArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
                     </el-option>
                 </el-select>
               </el-form-item>
 
-              <el-form-item label="政治面貌" :prop="'tenantList['+index+'].politicalStatus'" required :show-message="false" label-width="150px">
+              <el-form-item label="政治面貌" prop="politicalStatus" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].politicalStatus" placeholder="请选择">
                   <el-option
                     v-for="item in zzmmOptions"
@@ -188,7 +188,7 @@
                 </el-select>
               </el-form-item>
 
-              <el-form-item label="是否服过兵役" :prop="'tenantList['+index+'].isMilitary'" required :show-message="false" label-width="150px">
+              <el-form-item label="是否服过兵役" prop="isMilitary" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].isMilitary" placeholder="请选择">
                   <el-option
                     v-for="item in shifouOptions"
@@ -199,7 +199,7 @@
                 </el-select>
               </el-form-item>
 
-              <el-form-item label="国籍" :prop="'tenantList['+index+'].nation'" required :show-message="false" label-width="150px">
+              <el-form-item label="国籍" prop="nation" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].nation" placeholder="请选择">
                   <el-option
                     v-for="item in nationOptions"
@@ -231,7 +231,7 @@
                 </template>
               </el-form-item>
               <br/>
-              <el-form-item label="民族" :prop="'tenantList['+index+'].mz'" required :show-message="false" label-width="150px">
+              <el-form-item label="民族" prop="mz" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].mz" placeholder="请选择">
                   <el-option
                     v-for="item in mzOptions"
@@ -267,7 +267,7 @@
                 </el-date-picker>
               </el-form-item> -->
 
-              <el-form-item label="是否接种" :prop="'tenantList['+index+'].isVaccination'" required :show-message="false" label-width="150px">
+              <el-form-item label="是否接种" prop="isVaccination" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].isVaccination" placeholder="请选择">
                   <el-option
                     v-for="item in isVaccinationOption"
@@ -278,7 +278,10 @@
                 </el-select>
               </el-form-item>
               <br/>
-              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第一次接种时间" :prop="'tenantList['+index+'].firstVacTime'" required :show-message="false" label-width="150px">
+              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" 
+                            label="第一次接种时间" 
+                            prop="firstVacTime" 
+                            label-width="150px">
                 <el-date-picker
                     v-model="dataForm.tenantList[index].firstVacTime"
                     type="date"
@@ -291,7 +294,10 @@
               </el-form-item>
 
 
-              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第一次接种地点" :prop="'tenantList['+index+'].firstVacSite'" required :show-message="false" label-width="150px">
+              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" 
+                            label="第一次接种地点" 
+                            prop="firstVacSite" 
+                            label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].firstVacSite" placeholder="请选择">
                   <el-option
                     v-for="item in vacSiteOption"
@@ -656,6 +662,45 @@ export default {
         endDate: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
+        name: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        idCard: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        hjszd: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        unit: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        yfzgx: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        politicalStatus: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        isMilitary: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        nation: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        mz: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        isVaccination: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        firstVacTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        firstVacSite: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
         // fileList: [
         //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         // ],

From 803b4b7c603702aec008846cdd5bf3519c18ed30 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Tue, 6 Dec 2022 16:36:35 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rent/rentcontractinfo-add-or-update.vue   | 75 ++++---------------
 1 file changed, 16 insertions(+), 59 deletions(-)

diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
index 4154a30bc..e64242d71 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@@ -150,34 +150,34 @@
           <el-button @click="addMember()" type="primary">添加成员</el-button>
           <div><br/></div>
           <div class="add-member" v-for="(item, index) in dataForm.tenantList" :key="index">
-              <el-form-item label="姓名" prop="name" label-width="150px">
+              <el-form-item label="姓名" :prop="'tenantList['+ index +'].name'" :rules="tip" label-width="150px">
                   <el-input v-model="dataForm.tenantList[index].name" placeholder="请输入" ></el-input>
               </el-form-item>
 
-              <el-form-item label="手机" prop="mobile" label-width="150px">
+              <el-form-item label="手机" :prop="'tenantList['+ index +'].mobile'" :rules="tip" label-width="150px">
                 <el-input v-model="dataForm.tenantList[index].mobile" placeholder="请输入"></el-input>
               </el-form-item>
 
-              <el-form-item label="证件号" prop="idCard" label-width="150px">
+              <el-form-item label="证件号" :prop="'tenantList['+index+'].idCard'" :rules="tip" label-width="150px">
                 <el-input v-model="dataForm.tenantList[index].idCard" placeholder="请输入"></el-input>
               </el-form-item>
 
-              <el-form-item label="户籍地" prop="hjszd" label-width="150px">
+              <el-form-item label="户籍地" :prop="'tenantList['+index+'].hjszd'" :rules="tip" label-width="150px">
                 <el-input v-model="dataForm.tenantList[index].hjszd" placeholder="请输入"></el-input>
               </el-form-item>
 
-              <el-form-item label="工作单位" prop="unit" label-width="150px">
+              <el-form-item label="工作单位" :prop="'tenantList['+index+'].unit'" :rules="tip" label-width="150px">
                 <el-input v-model="dataForm.tenantList[index].unit" placeholder="请输入"></el-input>
               </el-form-item>
 
-              <el-form-item label="与户主关系" prop="yfzgx" label-width="150px">
+              <el-form-item label="与户主关系" :prop="'tenantList['+index+'].yfzgx'" :rules="tip_select" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].yfzgx" placeholder="请选择">
                     <el-option v-for="item in lessorRelationArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
                     </el-option>
                 </el-select>
               </el-form-item>
 
-              <el-form-item label="政治面貌" prop="politicalStatus" label-width="150px">
+              <el-form-item label="政治面貌" :prop="'tenantList['+index+'].politicalStatus'" :rules="tip_select" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].politicalStatus" placeholder="请选择">
                   <el-option
                     v-for="item in zzmmOptions"
@@ -188,7 +188,7 @@
                 </el-select>
               </el-form-item>
 
-              <el-form-item label="是否服过兵役" prop="isMilitary" label-width="150px">
+              <el-form-item label="是否服过兵役" :prop="'tenantList['+index+'].isMilitary'" :rules="tip_select" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].isMilitary" placeholder="请选择">
                   <el-option
                     v-for="item in shifouOptions"
@@ -199,7 +199,7 @@
                 </el-select>
               </el-form-item>
 
-              <el-form-item label="国籍" prop="nation" label-width="150px">
+              <el-form-item label="国籍" :prop="'tenantList['+index+'].nation'" :rules="tip_select" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].nation" placeholder="请选择">
                   <el-option
                     v-for="item in nationOptions"
@@ -231,7 +231,7 @@
                 </template>
               </el-form-item>
               <br/>
-              <el-form-item label="民族" prop="mz" label-width="150px">
+              <el-form-item label="民族" :prop="'tenantList['+index+'].mz'" :rules="tip_select" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].mz" placeholder="请选择">
                   <el-option
                     v-for="item in mzOptions"
@@ -267,7 +267,7 @@
                 </el-date-picker>
               </el-form-item> -->
 
-              <el-form-item label="是否接种" prop="isVaccination" label-width="150px">
+              <el-form-item label="是否接种" :prop="'tenantList['+index+'].isVaccination'" :rules="tip_select" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].isVaccination" placeholder="请选择">
                   <el-option
                     v-for="item in isVaccinationOption"
@@ -278,10 +278,7 @@
                 </el-select>
               </el-form-item>
               <br/>
-              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" 
-                            label="第一次接种时间" 
-                            prop="firstVacTime" 
-                            label-width="150px">
+              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第一次接种时间" :prop="'tenantList['+index+'].firstVacTime'" :rules="tip_select" label-width="150px">
                 <el-date-picker
                     v-model="dataForm.tenantList[index].firstVacTime"
                     type="date"
@@ -294,10 +291,7 @@
               </el-form-item>
 
 
-              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" 
-                            label="第一次接种地点" 
-                            prop="firstVacSite" 
-                            label-width="150px">
+              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第一次接种地点" :prop="'tenantList['+index+'].firstVacSite'" :rules="tip_select" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].firstVacSite" placeholder="请选择">
                   <el-option
                     v-for="item in vacSiteOption"
@@ -587,7 +581,9 @@ export default {
         agencyOptions: [],
         uploadUrl: `${window.SITE_CONFIG['apiURL']}/oss/file/uploadqrcodeV2`,
         customerId: localStorage.getItem("customerId"),
-        limit: 3
+        limit: 3,
+        tip: { required: true, message: '必填项不能为空', trigger: 'blur' },
+        tip_select: { required: true, message: '必填项不能为空', trigger: 'change' }
     }
   },
   computed: {
@@ -662,45 +658,6 @@ export default {
         endDate: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        name: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        mobile: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        idCard: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        hjszd: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        unit: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        yfzgx: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        politicalStatus: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        isMilitary: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        nation: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        mz: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        isVaccination: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        firstVacTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        firstVacSite: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         // fileList: [
         //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         // ],