From 6341634678103211f948667ff8126de09c8c09e0 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 24 Jun 2022 11:16:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E5=87=BA=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/change/verify.vue   |  6 +-
 .../modules/plugins/change/verifyForm.vue     | 58 ++++++++++++++++---
 2 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/plugins/change/verify.vue b/src/views/modules/plugins/change/verify.vue
index 616b366a..52b8043a 100644
--- a/src/views/modules/plugins/change/verify.vue
+++ b/src/views/modules/plugins/change/verify.vue
@@ -199,7 +199,7 @@
         border
         style="width: 100%"
         class="resi-table"
-        :height="tableHeight"
+        :height="maxTableHeight"
       >
         <el-table-column
           label="序号"
@@ -401,8 +401,8 @@ export default {
     ...mapGetters(['clientHeight', 'iframeHeight']),
     maxTableHeight() {
       console.log('computed-searchH---', this.searchH)
-      const h = this.clientHeight - this.searchH + this.iframeHeight
-      const _h = this.clientHeight - this.searchH
+      const h = this.clientHeight - this.searchH - 440 + this.iframeHeight
+      const _h = this.clientHeight - this.searchH - 440
       console.log('computed-searchH---_h', _h)
       return this.$store.state.inIframe ? h : _h
       
diff --git a/src/views/modules/plugins/change/verifyForm.vue b/src/views/modules/plugins/change/verifyForm.vue
index 9dc9bc65..d99e2a74 100644
--- a/src/views/modules/plugins/change/verifyForm.vue
+++ b/src/views/modules/plugins/change/verifyForm.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="dialog-h-content scroll-h">
+    <div v-loading="loadingForm" class="dialog-h-content scroll-h">
       <el-form :model="detailInfo" :disabled="btnType == 'detail'">
         <el-form-item
           label="迁出人姓名:"
@@ -61,7 +61,7 @@
             label="迁至地址:"
             label-width="150px"
           >
-            <span>{{ detailInfo.newHomeName }}</span>
+            <span>{{ detailInfo.xxdz }}</span>
           </el-form-item>
         <el-form-item
           label="迁出时间:"
@@ -81,17 +81,29 @@
         <el-form-item
           label="审核结果:"
           label-width="150px"
+          :rules="[
+            { required: true, message: '请选择审核结果', trigger: 'blur' },
+          ]"
         >
+          <el-input v-if="btnType == 'detail' && confirmResult == ''" value="未审核"></el-input>
           <el-select
+            v-else
               v-model.trim="confirmResult"
               placeholder="请选择结果"
               clearable
+              :disabled="!detailInfo.isInHome"
               class="item_width_1"
             >
               <el-option label="通过" value="1" />
-              <el-option label="不通过" value="2" />
+              <el-option label="未通过" value="2" />
             </el-select>
         </el-form-item>
+        <el-form-item
+          v-if="detailInfo && !detailInfo.isInHome"
+          label-width="150px"
+        >
+          <span style="color: red; font-size: 12px;">当前人员已不在该房屋</span>
+        </el-form-item>
         <el-form-item
           v-if="confirmResult == 2"
           label="审核备注:"
@@ -116,7 +128,7 @@
       </el-form>
       
       <el-form
-        v-if="confirmResult == 1 && btnType == 'edit'"
+        v-if="confirmResult == 1 && btnType == 'edit' && detailInfo.isInHome"
         ref="ref_form"
         :inline="false"
         :model="dataForm"
@@ -275,10 +287,21 @@
         </el-form-item>
       </el-form>
     </div>
+    <div v-if="confirmResult == ''" class="resi-btns">
+      <el-button size="small" @click="handleCancle(false)">取消</el-button>
+    </div>
     <div v-if="confirmResult == 1" class="resi-btns">
       <el-button size="small" @click="handleCancle(false)">取消</el-button>
       <el-button
-        v-if="btnType != 'detail'"
+        v-if="btnType != 'detail' && !detailInfo.isInHome"
+        type="primary"
+        size="small"
+        :loading="btnDisable"
+        @click="handleVerify"
+        >提交</el-button
+      >
+      <el-button
+        v-else-if="btnType != 'detail'"
         type="primary"
         size="small"
         :loading="btnDisable"
@@ -310,11 +333,12 @@ export default {
   data() {
     return {
       btnDisable: false,
+      loadingForm: true,
       communityList: [],
       buildingList: [],
       unitList: [],
       roomList: [],
-      confirmResult: '1',
+      confirmResult: '',
       reason: '',
       dataForm: {
         icUserId: '', // 被调动人ID
@@ -422,11 +446,17 @@ export default {
       this.dataForm.name = row.name
       // this.dataForm.gender = row.GENDER
       // this.dataForm.age = ''
-      this.confirmResult = (row.confirmResult == '1' || row.confirmResult == '2') ? row.confirmResult : '1'
+      if (row.isInHome) {
+        this.confirmResult = (row.confirmResult == '1' || row.confirmResult == '2') ? row.confirmResult : ''
+      } else this.confirmResult = '1'
+      
       this.reason = row.reason
 
       await this.loadRootAgency()
       await this.getAgencylist()
+      setTimeout(() => {
+        this.loadingForm = false
+      }, 500)
     },
     async getDatail(type, id) {
       let url = '/epmetuser/myHome/moveOutConfirmDetail'
@@ -656,11 +686,23 @@ export default {
       })
     },
     async handleVerify() {
-      const params = {
+      let params = {
         id: this.detailInfo.id,
         confirmResult: this.confirmResult,
         reason: this.reason
       }
+      if (this.confirmResult == 1 && this.detailInfo.isInHome) {
+        params = {
+          ...params,
+          gridName: this.dataForm.gridName,
+          villageName: this.dataForm.villageName,
+          buildName: this.dataForm.buildName,
+          unitName: this.dataForm.unitName,
+          homeName: this.dataForm.homeName,
+          xxdz: this.dataForm.address
+        }
+      }
+      
 
       const { data, code, msg } = await requestPost('/epmetuser/myHome/moveOutConfirm', params)