v1.9 修复客户反馈车位结构图部分bug

wuxw
1 parent 6ec243d6
Showing 11 changed files with 90 additions and 63 deletions
src/components/community/RoomDecorationAcceptance.vue
src/components/community/RoomDecorationRecord.vue
src/components/community/RoomToExamine.vue
src/components/owner/ownerDetailRoom.vue
src/components/owner/ownerExitRoom.vue
src/components/owner/showOwnerRoom.vue
src/components/room/deletePropertyRightRegistration.vue
src/components/room/editPropertyRightRegistrationDetail.vue
src/views/car/carStructureList.vue
src/views/community/roomRenovationManageList.vue
src/views/work/addItemReleaseViewList.vue
@@ -5,7 +5,7 @@
     width="40%"
     @close="resetForm"
   >
-    <el-form :model="form" ref="form" label-width="120px">
+    <el-form :model="form" ref="form" :rules="rules" label-width="120px">
       <el-form-item :label="$t('roomRenovationManage.room')" prop="roomName">
         <el-input 
           v-model.trim="form.roomName" 
@@ -13,7 +13,7 @@
         />
       </el-form-item>
-      <el-form-item :label="$t('roomRenovationManage.status')" prop="state" required>
+      <el-form-item :label="$t('roomRenovationManage.status')" prop="state" >
         <el-select v-model="form.state">
           <el-option 
             :label="$t('roomRenovationManage.acceptanceSuccess')" 
@@ -26,7 +26,7 @@
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('roomRenovationManage.acceptanceOpinion')" prop="remark" required>
+      <el-form-item :label="$t('roomRenovationManage.acceptanceOpinion')" prop="remark" >
         <el-input 
           v-model.trim="form.remark" 
           type="textarea"
@@ -61,6 +61,14 @@ export default {
         remark: '',
         detailType: '1001',
         communityId: ''
+      },
+      rules: {
+        state: [
+          { required: true, message: this.$t('common.required'), trigger: 'change' }
+        ],
+        remark: [
+          { required: true, message: this.$t('common.required'), trigger: 'blur' }
+        ]
       }
     }
   },
@@ -118,7 +118,11 @@ export default {
-        await updateRoomDecorationRecord(this.roomDecorationRecordInfo)
+        const {code,msg} = await updateRoomDecorationRecord(this.roomDecorationRecordInfo)
+        if(code != 0){
+          this.$message.error(msg);
+          return;
+        }
         this.$message.success(this.$t('common.operationSuccess'))
         this.$emit('success')
         this.visible = false
 <template>
   <el-dialog :title="$t('roomRenovationManage.review')" :visible.sync="visible" width="40%" @close="resetForm">
-    <el-form :model="form" ref="form" label-width="120px">
+    <el-form :model="form" :rules="rules" ref="form" label-width="120px">
       <el-form-item :label="$t('roomRenovationManage.room')" prop="roomName">
         <el-input v-model.trim="form.roomName" disabled />
       </el-form-item>
-      <el-form-item :label="$t('roomRenovationManage.status')" prop="state" required>
+      <el-form-item :label="$t('roomRenovationManage.status')" prop="state">
         <el-select v-model="form.state">
           <el-option :label="$t('roomRenovationManage.reviewPass')" value="3000" />
           <el-option :label="$t('roomRenovationManage.reviewReject')" value="2000" />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('roomRenovationManage.reviewOpinion')" prop="examineRemark" required>
+      <el-form-item :label="$t('roomRenovationManage.reviewOpinion')" prop="examineRemark">
         <el-input v-model.trim="form.examineRemark" type="textarea" />
       </el-form-item>
     </el-form>
@@ -42,6 +42,14 @@ export default {
         state: '',
         examineRemark: '',
         communityId: ''
+      },
+      rules: {
+        state: [
+          { required: true, message: this.$t('common.pleaseSelect'), trigger: 'change' }
+        ],
+        examineRemark: [
+          { required: true, message: this.$t('common.pleaseInput'), trigger: 'blur' }
+        ]
       }
     }
   },
@@ -67,18 +75,24 @@ export default {
         examineRemark: '',
         communityId: ''
       }
+      this.$refs.form && this.$refs.form.resetFields()
     },
     async saveRoomToExamine() {
-      try {
-        await updateRoomToExamine(this.form)
-        this.$message.success(this.$t('common.operationSuccess'))
-        this.visible = false
-        this.$emit('success')
-      } catch (error) {
-        console.error('保存审核信息失败:', error)
-        this.$message.error(error.message || this.$t('common.operationFailed'))
-      }
+      this.$refs.form.validate(async (valid) => {
+        if (!valid) {
+          return false
+        }
+        try {
+          await updateRoomToExamine(this.form)
+          this.$message.success(this.$t('common.operationSuccess'))
+          this.visible = false
+          this.$emit('success')
+        } catch (error) {
+          console.error('保存审核信息失败:', error)
+          this.$message.error(error.message || this.$t('common.operationFailed'))
+        }
+      })
     }
   }
 }
@@ -76,7 +76,7 @@
     </div>
     <edit-room ref="editRoom" @refresh="_loadOwnerDetailRoomData" />
-    <owner-exit-room ref="ownerExitRoom" @refresh="_loadOwnerDetailRoomData" />
+    <owner-exit-room ref="ownerExitRoom" @success="_loadOwnerDetailRoomData" />
   </div>
 </template>
@@ -42,7 +42,7 @@ export default {
         const res = await exitRoom(params)
         if (res.code === 0) {
-          this.$emit('exit-success')
+          this.$emit('success')
           this.close()
           this.$message.success('退房成功')
         } else {
@@ -104,7 +104,7 @@
       </el-col>
     </el-row>
-    <owner-exit-room ref="exitRoomDialog" @exit-success="handleExitSuccess" />
+    <owner-exit-room ref="exitRoomDialog" @success="handleExitSuccess" />
   </div>
 </template>
@@ -42,7 +42,7 @@ export default {
     },
     async handleConfirm() {
       try {
-        const res = await deletePropertyRightRegistration(this.deleteData)
+        const res = await deletePropertyRightRegistration(this.deleteData.prrId)
         if (res.code === 0) {
           this.$message.success(this.$t('common.operationSuccess'))
           this.visible = false
@@ -7,21 +7,22 @@
           :placeholder="$t('propertyRightDetail.edit.materialTypePlaceholder')" disabled />
       </el-form-item>
-      <template v-if="editPropertyRightRegistrationDetailInfo.securities === '001'">
+      <template v-if="editPropertyRightRegistrationDetailInfo.securities == '001'">
         <el-form-item :label="$t('propertyRightDetail.edit.idCardPhoto')">
           <upload-image-url ref="idCardUpload" :image-count="2" @notifyUploadCoverImage="handleIdCardImageChange" />
           <p class="help-block">*{{ $t('propertyRightDetail.edit.idCardPhotoTip') }}*</p>
         </el-form-item>
       </template>
-      <template v-if="editPropertyRightRegistrationDetailInfo.securities === '002'">
+      <template v-if="editPropertyRightRegistrationDetailInfo.securities == '002'">
         <el-form-item :label="$t('propertyRightDetail.edit.houseContract')">
-          <upload-image-url ref="housePurchaseUpload" :image-count="10" @notifyUploadCoverImage="handleHousePurchaseImageChange" />
+          <upload-image-url ref="housePurchaseUpload" :image-count="10"
+            @notifyUploadCoverImage="handleHousePurchaseImageChange" />
           <p class="help-block">*{{ $t('propertyRightDetail.edit.houseContractTip') }}*</p>
         </el-form-item>
       </template>
-      <template v-if="editPropertyRightRegistrationDetailInfo.securities === '003'">
+      <template v-if="editPropertyRightRegistrationDetailInfo.securities == '003'">
         <el-form-item :label="$t('propertyRightDetail.edit.repairFund')">
           <el-select v-model="editPropertyRightRegistrationDetailInfo.isTrue" style="width: 100%"
             :placeholder="$t('propertyRightDetail.edit.repairFundPlaceholder')">
@@ -31,14 +32,14 @@
           </el-select>
         </el-form-item>
-        <template v-if="editPropertyRightRegistrationDetailInfo.isTrue === 'true'">
+        <template v-if="editPropertyRightRegistrationDetailInfo.isTrue == 'true'">
           <el-form-item :label="$t('propertyRightDetail.edit.repairFundPhoto')">
             <upload-image-url ref="repairUpload" :image-count="3" @notifyUploadCoverImage="handleRepairImageChange" />
           </el-form-item>
         </template>
       </template>
-      <template v-if="editPropertyRightRegistrationDetailInfo.securities === '004'">
+      <template v-if="editPropertyRightRegistrationDetailInfo.securities == '004'">
         <el-form-item :label="$t('propertyRightDetail.edit.deedTax')">
           <el-select v-model="editPropertyRightRegistrationDetailInfo.isTrue" style="width: 100%"
             :placeholder="$t('propertyRightDetail.edit.deedTaxPlaceholder')">
@@ -48,7 +49,7 @@
           </el-select>
         </el-form-item>
-        <template v-if="editPropertyRightRegistrationDetailInfo.isTrue === 'true'">
+        <template v-if="editPropertyRightRegistrationDetailInfo.isTrue == 'true'">
           <el-form-item :label="$t('propertyRightDetail.edit.deedTaxPhoto')">
             <upload-image-url ref="deedTaxUpload" :image-count="3" @notifyUploadCoverImage="handleDeedTaxImageChange" />
           </el-form-item>
@@ -79,14 +80,9 @@ export default {
   components: {
     UploadImageUrl
   },
-  props: {
-    visible: {
-      type: Boolean,
-      default: false
-    }
-  },
   data() {
     return {
+      visible: false,
       editPropertyRightRegistrationDetailInfo: {
         prrdId: '',
         prrId: '',
@@ -101,7 +97,8 @@ export default {
         housePurchasePhotos: [],
         repairPhotos: [],
         deedTaxPhotos: [],
-        communityId: ''
+        communityId: '',
+
       }
     }
   },
@@ -115,28 +112,28 @@ export default {
     },
     loadPhotos() {
       setTimeout(() => {
-      if (this.editPropertyRightRegistrationDetailInfo.securities === '001' && this.editPropertyRightRegistrationDetailInfo.idCardUrl) {
-        const urls = this.editPropertyRightRegistrationDetailInfo.idCardUrl
-        if (urls) {
-          this.$refs.idCardUpload.setImages(urls.split(','))
+        if (this.editPropertyRightRegistrationDetailInfo.securities == '001' && this.editPropertyRightRegistrationDetailInfo.idCardUrl) {
+          const urls = this.editPropertyRightRegistrationDetailInfo.idCardUrl
+          if (urls) {
+            this.$refs.idCardUpload.setImages(urls)
+          }
         }
-      }
-      if (this.editPropertyRightRegistrationDetailInfo.securities === '002' && this.editPropertyRightRegistrationDetailInfo.housePurchaseUrl) {
-        const urls = this.editPropertyRightRegistrationDetailInfo.housePurchaseUrl
-        if (urls) {
-          this.$refs.housePurchaseUpload.setImages(urls.split(','))
+        if (this.editPropertyRightRegistrationDetailInfo.securities == '002' && this.editPropertyRightRegistrationDetailInfo.housePurchaseUrl) {
+          const urls = this.editPropertyRightRegistrationDetailInfo.housePurchaseUrl
+          if (urls) {
+            this.$refs.housePurchaseUpload.setImages(urls)
+          }
         }
-      }
-      if (this.editPropertyRightRegistrationDetailInfo.securities === '003' && this.editPropertyRightRegistrationDetailInfo.repairUrl) {
-        const urls = this.editPropertyRightRegistrationDetailInfo.repairUrl
-        if (urls) {
-          this.$refs.repairUpload.setImages(urls.split(','))
+        if (this.editPropertyRightRegistrationDetailInfo.securities == '003' && this.editPropertyRightRegistrationDetailInfo.repairUrl) {
+          const urls = this.editPropertyRightRegistrationDetailInfo.repairUrl
+          if (urls) {
+            this.$refs.repairUpload.setImages(urls)
+          }
         }
-      }
-      if (this.editPropertyRightRegistrationDetailInfo.securities === '004' && this.editPropertyRightRegistrationDetailInfo.deedTaxUrl) {
-        const urls = this.editPropertyRightRegistrationDetailInfo.deedTaxUrl
-        if (urls) {
-            this.$refs.deedTaxUpload.setImages(urls.split(','))
+        if (this.editPropertyRightRegistrationDetailInfo.securities == '004' && this.editPropertyRightRegistrationDetailInfo.deedTaxUrl) {
+          const urls = this.editPropertyRightRegistrationDetailInfo.deedTaxUrl
+          if (urls) {
+            this.$refs.deedTaxUpload.setImages(urls)
           }
         }
       }, 1000)
@@ -159,13 +156,13 @@ export default {
       }
       const params = { ...this.editPropertyRightRegistrationDetailInfo }
-      if (params.securities === '001') {
+      if (params.securities == '001') {
         params.idCardUrl = params.idCardPhotos && params.idCardPhotos.length > 0 ? params.idCardPhotos.join(',') : ''
-      } else if (params.securities === '002') {
+      } else if (params.securities == '002') {
         params.housePurchaseUrl = params.housePurchasePhotos && params.housePurchasePhotos.length > 0 ? params.housePurchasePhotos.join(',') : ''
-      } else if (params.securities === '003') {
+      } else if (params.securities == '003') {
         params.repairUrl = params.repairPhotos && params.repairPhotos.length > 0 ? params.repairPhotos.join(',') : ''
-      } else if (params.securities === '004') {
+      } else if (params.securities == '004') {
         params.deedTaxUrl = params.deedTaxPhotos && params.deedTaxPhotos.length > 0 ? params.deedTaxPhotos.join(',') : ''
       }
@@ -6,9 +6,9 @@
       </el-col>
       <el-col :span="20">
         <el-card class="box-card margin-bottom car-list-card">
-          <el-row :gutter="10" class="margin-top">
+          <el-row :gutter="10" class="">
             <el-col v-for="(car, index) in carStructureInfo.cars" :key="index" :span="4"
-              class="text-center margin-bottom padding car-card" :style="{ 'background-color': getBgColor(car) }"
+              class="text-center margin-bottom  car-card margin-sm" :style="{ 'background-color': getBgColor(car) }"
               @dblclick.native="toSimplifyAcceptance(car)">
               <div>{{ car.areaNum }}-{{ car.num }}</div>
               <div>{{ car.carNum }}</div>
@@ -52,6 +52,7 @@ export default {
   },
   methods: {
     switchFloorUnit(data) {
+      this.carStructureInfo.cars = []
       if (!data.unitId) {
         return
       }
@@ -342,8 +342,11 @@ export default {
       this.$router.push({
         path: '/views/community/listRoomDecorationRecord',
         query: {
+          roomId: row.roomId,
           rId: row.rId,
-          roomName: row.roomName
+          roomName: row.roomName,
+          state: row.state,
+          stateName: row.stateName
         }
       })
     }
@@ -111,8 +111,8 @@
       <el-row v-if="form.audit.assignee === '-2'" :gutter="20" class="mt-20">
         <el-col :span="24">
-
-            <div slot="header" class="clearfix">
+          <el-card>
+            <div slot="header" class="flex justify-between">
               <span>{{ $t('addItemReleaseView.approverInfo') }}</span>
             </div>
             <el-form label-width="120px">
@@ -130,7 +130,7 @@
                 </el-col>
               </el-row>
             </el-form>
-
+          </el-card>
         </el-col>
       </el-row>