跳转到业务受理页面处理完成

wuxw
1 parent 219071af
Showing 13 changed files with 90 additions and 120 deletions
src/components/community/AddRoomRenovation.vue
src/components/contract/contractDetailRoom.vue
src/components/fee/feeDetailRoom.vue
src/components/index/indexCommunity.vue
src/components/owner/ownerDetailRoom.vue
src/components/system/searchCommunityDataList.vue
src/i18n/commonLang.js
src/views/car/carStructureList.vue
src/views/community/roomRenovationManageLang.js
src/views/fee/roomCreateFeeList.vue
src/views/room/roomList.vue
src/views/room/roomStructureList.vue
src/views/simplify/simplifyAcceptanceList.vue
 <template>
   <el-dialog :title="$t('roomRenovationManage.add')" :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" required>
         <el-input v-model.trim="form.roomName" :placeholder="$t('roomRenovationManage.roomNumberPlaceholder')"
           @blur="queryRoom" />
@@ -78,6 +78,32 @@ export default {
         remark: '',
         isPostpone: 'N',
         communityId: ''
+      },
+      rules: {
+        roomName: [
+          { required: true, message: this.$t('roomRenovationManage.roomNumberPlaceholder'), trigger: 'blur' }
+        ],
+        personName: [
+          { required: true, message: this.$t('roomRenovationManage.contactPersonPlaceholder'), trigger: 'blur' }
+        ],
+        personTel: [
+          { required: true, message: this.$t('roomRenovationManage.phonePlaceholder'), trigger: 'blur' }
+        ],
+        startTime: [
+          { required: true, message: this.$t('roomRenovationManage.startTimePlaceholder'), trigger: 'blur' }
+        ],
+        endTime: [
+          { required: true, message: this.$t('roomRenovationManage.endTimePlaceholder'), trigger: 'blur' }
+        ],
+        renovationCompany: [
+          { required: true, message: this.$t('roomRenovationManage.renovationCompanyPlaceholder'), trigger: 'blur' }
+        ],
+        personMain: [
+          { required: true, message: this.$t('roomRenovationManage.renovationManagerPlaceholder'), trigger: 'blur' }
+        ],
+        personMainTel: [
+          { required: true, message: this.$t('roomRenovationManage.managerPhonePlaceholder'), trigger: 'blur' }
+        ]
       }
     }
   },
@@ -105,6 +131,11 @@ export default {
     async saveRoomRenovation() {
       try {
+                // 表单验证
+        const valid = await this.$refs.form.validate()
+        if (!valid) return
+
+
         this.form.communityId = getCommunityId()
         await addRoomRenovation(this.form)
         this.$message.success(this.$t('common.operationSuccess'))
@@ -121,8 +152,8 @@ export default {
       try {
         // 这里需要根据实际API实现查询房屋信息
-        const {rooms} = await queryRooms({ roomName: this.form.roomName,page:1,row:10,communityId:getCommunityId() })
-        if(rooms.length > 0){
+        const { rooms } = await queryRooms({ roomName: this.form.roomName, page: 1, row: 10, communityId: getCommunityId() })
+        if (rooms.length > 0) {
           this.form.personName = rooms[0].ownerName
           this.form.personTel = rooms[0].link
           this.form.roomId = rooms[0].roomId
@@ -139,13 +170,19 @@ export default {
 }
 </script>
 <style scoped>
-.el-date-editor{  
+.el-date-editor {
   width: 100%;
 }
-.el-date-editor.el-input{
+
+.el-date-editor.el-input {
   width: 100%;
 }
-.el-form-item{
+
+.el-form-item {
   width: 95%;
 }
+
+.el-form-item__error {
+  display: none !important;
+}
 </style>
 \ No newline at end of file
@@ -101,20 +101,8 @@ export default {
       return totalArea.toFixed(2)
     },
     _toSimplifyAcceptance(room) {
-      const date = new Date()
-      this.$store.dispatch('app/saveData', {
-        key: 'JAVA110_IS_BACK',
-        value: date.getTime()
-      })
-      this.$store.dispatch('app/saveData', {
-        key: 'simplifyAcceptanceSearch',
-        value: {
-          searchType: '1',
-          searchValue: `${room.floorNum}-${room.unitNum}-${room.roomNum}`,
-          searchPlaceholder: this.$t('contractDetailRoom.searchPlaceholder')
-        }
-      })
-      this.$router.push('/property/simplifyAcceptance?tab=businessAcceptance')
+        this.$router.push('/pages/property/simplifyAcceptance?tab=业务受理&searchType=1&searchValue=' + `${room.floorNum}-${room.unitNum}-${room.roomNum}`)
+
     },
     _openAddContractRoom() {
       this.$router.push('/admin/contractChangeDetail?param=contractChangeAssets')
@@ -83,20 +83,9 @@ export default {
       this._loadFeeDetailRoomData()
     },
     _toSimplifyAcceptance(room) {
-      const date = new Date()
-      this.$store.dispatch('app/saveData', {
-        key: 'JAVA110_IS_BACK',
-        value: date.getTime()
-      })
-      this.$store.dispatch('app/saveData', {
-        key: 'simplifyAcceptanceSearch',
-        value: {
-          searchType: '1',
-          searchValue: `${room.floorNum}-${room.unitNum}-${room.roomNum}`,
-          searchPlaceholder: this.$t('feeDetailRoom.searchPlaceholder')
-        }
-      })
-      this.$router.push('/pages/property/simplifyAcceptance?tab=businessAcceptance')
+
+      this.$router.push('/pages/property/simplifyAcceptance?tab=业务受理&searchType=1&searchValue=' + `${room.floorNum}-${room.unitNum}-${room.roomNum}`)
+
     }
   }
 }
@@ -95,10 +95,10 @@ export default {
         })
     },
     _toOwner() {
-      this.$router.push('/property/listOwner?tab=ownerInfo')
+      this.$router.push('/pages/property/listOwner?tab=ownerInfo')
     },
     _toCar() {
-      this.$router.push('/property/listOwnerCar?tab=ownerCar')
+      this.$router.push('/pages/property/listOwnerCar?tab=ownerCar')
     }
   }
 }
@@ -171,20 +171,8 @@ export default {
       })
     },
     _toSimplifyAcceptance(room) {
-      const date = new Date()
-      this.$store.dispatch('app/saveData', {
-        key: 'JAVA110_IS_BACK',
-        value: date.getTime()
-      })
-      this.$store.dispatch('app/saveData', {
-        key: 'simplifyAcceptanceSearch',
-        value: {
-          searchType: '1',
-          searchValue: `${room.floorNum}-${room.unitNum}-${room.roomNum}`,
-          searchPlaceholder: this.$t('ownerDetailRoom.roomNumberPlaceholder')
-        }
-      })
-      this.$router.push('/property/simplifyAcceptance?tab=businessAcceptance')
+      this.$router.push('/pages/property/simplifyAcceptance?tab=业务受理&searchType=1&searchValue=' + `${room.floorNum}-${room.unitNum}-${room.roomNum}`)
+
     },
     _openEditRoomModel(room) {
       this.$refs.editRoom.open(room)
@@ -247,14 +247,8 @@ export default {
       })
     },
     toSimplifyAcceptance(room) {
-      const date = new Date()
-      localStorage.setItem("JAVA110_IS_BACK", date.getTime())
-      localStorage.setItem('simplifyAcceptanceSearch', JSON.stringify({
-        searchType: '1',
-        searchValue: `${room.floorNum}-${room.unitNum}-${room.roomNum}`,
-        searchPlaceholder: this.$t('searchCommunityData.roomPlaceholder')
-      }))
-      window.open('/#/pages/property/simplifyAcceptance?tab=businessAcceptance')
+      this.$router.push('/pages/property/simplifyAcceptance?tab=业务受理&searchType=1&searchValue=' + `${room.floorNum}-${room.unitNum}-${room.roomNum}`)
+
     },
     clearSearchData() {
       const ws = this.ws
@@ -58,7 +58,8 @@ export const messages = {
         submitSuccess:'Submit successfully',
         saveSuccess:'successfully',
         noData:'No Data',
-        file:'File'
+        file:'File',
+        hide:'Hide'
       }
     },
     zh: {
@@ -120,7 +121,8 @@ export const messages = {
         submitSuccess:'提交成功',
         saveSuccess:'成功',
         noData:'暂无数据',
-        file:'附件'
+        file:'附件',
+        hide:'隐藏'
       }
     }
   } 
 \ No newline at end of file
@@ -81,20 +81,8 @@ export default {
       return "#1296db"
     },
     toSimplifyAcceptance(car) {
-      const date = new Date()
-      this.$store.dispatch('app/saveData', {
-        key: "JAVA110_IS_BACK",
-        value: date.getTime()
-      })
-      this.$store.dispatch('app/saveData', {
-        key: 'simplifyAcceptanceSearch',
-        value: {
-          searchType: '1',
-          searchValue: `${car.floorNum}-${car.unitNum}-${car.roomNum}`,
-          searchPlaceholder: this.$t('carStructure.searchPlaceholder')
-        }
-      })
-      this.$router.push('/pages/property/simplifyAcceptance?tab=业务受理')
+      this.$router.push('/pages/property/simplifyAcceptance?tab=业务受理&searchType=1&searchValue=' + `${car.floorNum}-${car.unitNum}-${car.roomNum}`)
+
     }
   }
 }
@@ -62,7 +62,16 @@ export const messages = {
       reviewPass: "Review Pass",
       reviewReject: "Review Reject",
       acceptanceSuccess: "Acceptance Success",
-      acceptanceFailed: "Acceptance Failure"
+      acceptanceFailed: "Acceptance Failure",
+      // 表单验证消息
+      roomRequired: "Please enter room number",
+      contactPersonRequired: "Please enter contact person name",
+      phoneRequired: "Please enter phone number",
+      startTimeRequired: "Please select renovation start time",
+      endTimeRequired: "Please select renovation end time",
+      renovationCompanyRequired: "Please enter renovation company",
+      renovationManagerRequired: "Please enter renovation manager",
+      managerPhoneRequired: "Please enter manager phone number"
     }
   },
   zh: {
@@ -128,7 +137,16 @@ export const messages = {
       reviewPass: "审核通过",
       reviewReject: "审核不通过",
       acceptanceSuccess: "验收成功",
-      acceptanceFailed: "验收失败"
+      acceptanceFailed: "验收失败",
+      // 表单验证消息
+      roomRequired: "请输入房间号",
+      contactPersonRequired: "请输入联系人姓名",
+      phoneRequired: "请输入联系电话",
+      startTimeRequired: "请选择装修开始时间",
+      endTimeRequired: "请选择装修结束时间",
+      renovationCompanyRequired: "请输入装修公司",
+      renovationManagerRequired: "请输入装修负责人",
+      managerPhoneRequired: "请输入负责人电话"
     }
   }
 }
 \ No newline at end of file
@@ -280,17 +280,9 @@ export default {
       }, 500)
     },
     _roomCreateFeetoSimplifyAcceptance() {
-      const date = new Date()
-      localStorage.setItem('JAVA110_IS_BACK', date.getTime())
-      localStorage.setItem(
-        'simplifyAcceptanceSearch',
-        JSON.stringify({
-          searchType: '1',
-          searchValue: `${this.roomCreateFeeInfo.floorNum}-${this.roomCreateFeeInfo.unitNum}-${this.roomCreateFeeInfo.roomNum}`,
-          searchPlaceholder: this.$t('inputSearchRoomDemo.searchPlaceholder')
-        })
-      )
-      this.$router.push('/pages/property/simplifyAcceptance?tab=业务受理')
+
+      this.$router.push('/pages/property/simplifyAcceptance?tab=业务受理&searchType=1&searchValue=' + `${this.roomCreateFeeInfo.floorNum}-${this.roomCreateFeeInfo.unitNum}-${this.roomCreateFeeInfo.roomNum}`)
+
     },
     _toBatchCreateFee() {
       this.$router.push('/pages/fee/roomCreatePayFee')
@@ -618,14 +618,7 @@ export default {
     },
     toSimplifyAcceptance(room) {
-      const date = new Date()
-      localStorage.setItem('JAVA110_IS_BACK', date.getTime())
-      localStorage.setItem('simplifyAcceptanceSearch', JSON.stringify({
-        searchType: '1',
-        searchValue: `${room.floorNum}-${room.unitNum}-${room.roomNum}`,
-        searchPlaceholder: '请输入房屋编号 楼栋-单元-房屋 如1-1-1',
-      }))
-      this.$router.push('/pages/property/simplifyAcceptance?tab=业务受理')
+      this.$router.push('/pages/property/simplifyAcceptance?tab=业务受理&searchType=1&searchValue=' + `${room.floorNum}-${room.unitNum}-${room.roomNum}`)
     },
     viewOwnerRooms(room) {
@@ -2,7 +2,7 @@
   <div class="room-structure-container">
     <el-row :gutter="20">
       <el-col :span="4">
-        <floor-unit-tree ref="floorUnitTree"  @switchFloorUnit="switchFloorUnit" />
+        <floor-unit-tree ref="floorUnitTree" @switchFloorUnit="switchFloorUnit" />
       </el-col>
       <el-col :span="20">
         <el-card v-if="roomStructureInfo.layerRoomCount < 5" class="room-list-card">
@@ -137,20 +137,7 @@ export default {
       return "#1296db"
     },
     toSimplifyAcceptance(room) {
-      const date = new Date()
-      this.$store.dispatch('app/saveData', {
-        key: "JAVA110_IS_BACK",
-        value: date.getTime()
-      })
-      this.$store.dispatch('app/saveData', {
-        key: 'simplifyAcceptanceSearch',
-        value: {
-          searchType: '1',
-          searchValue: `${room.floorNum}-${room.unitNum}-${room.roomNum}`,
-          searchPlaceholder: this.$t('roomStructure.searchPlaceholder')
-        }
-      })
-      this.$router.push('/pages/property/simplifyAcceptance?tab=业务受理')
+      this.$router.push('/pages/property/simplifyAcceptance?tab=业务受理&searchType=1&searchValue=' + `${room.floorNum}-${room.unitNum}-${room.roomNum}`)
     },
     supportPark() {
       const parkRooms = this.roomStructureInfo.parkRooms
@@ -381,18 +381,12 @@ export default {
   },
   methods: {
     _initMethod() {
-      if (!this.$route.query.isBack) {
+      if (!this.$route.query.searchValue) {
         return
       }
-      // 检查是否有缓存数据
-      let _tempData = localStorage.getItem(this.TEMP_SEARCH)
-      if (_tempData == null) {
-        return
-      }
-      _tempData = JSON.parse(_tempData)
-      this.simplifyAcceptanceInfo.searchType = _tempData.searchType
-      this.simplifyAcceptanceInfo.searchValue = _tempData.searchValue
-      this.simplifyAcceptanceInfo.searchPlaceholder = _tempData.searchPlaceholder
+      this.simplifyAcceptanceInfo.searchType = '1'
+      this.simplifyAcceptanceInfo.searchValue = this.$route.query.searchValue
+      this.simplifyAcceptanceInfo.searchPlaceholder = 'simplifyAcceptance.houseNumberPlaceholder'
       this._doSearch()
     },
     _changeSearchType() {