feats

src/store/models/room.js

@@ -25,7 +25,8 @@ export default () => {
       .then((res) => {
         const { result, ...pageInfo } = res || {}
         Object.assign(page, pageInfo)
-        list.value = pageInfo.pageNo <= 1 ? result : list.value.concat(list.value)
+        list.value =
+          pageInfo.pageNo <= 1 ? result : list.value.concat(list.value)
         loading.value = false
         return res
       })
@@ -156,10 +157,11 @@ export default () => {
   }
 
   // 房源编辑
-  const houseEdit = (data) => {
+  const houseEdit = (data, params) => {
     return request({
       url: '/room/save',
       data,
+      params,
       toast: '请稍候...',
     })
   }

src/view/addhouse/addrenting/components/BuildingSelector.vue

@@ -90,8 +90,8 @@ export default {
         .then((res) => {
           params.pageNo += 1
           loading.value = false
-          finished.value = res.currentPage >= res.totalPages
-          if (res.currentPage === 1) {
+          finished.value = res.pageNo >= res.totalPages
+          if (res.pageNo === 1) {
             list.value = res.result || []
           } else {
             list.value = list.value.concat(res.result || [])

src/view/addhouse/addsecondhand/components/BuildingSelector.vue

@@ -37,9 +37,9 @@
 </template>
 
 <script>
-import { reactive, ref } from "vue"
-import { Button, Search, List, Cell, Icon } from "vant"
-import { useModel } from "@zjxpcyc/vue-tiny-store"
+import { reactive, ref } from 'vue'
+import { Button, Search, List, Cell, Icon } from 'vant'
+import { useModel } from '@zjxpcyc/vue-tiny-store'
 
 export default {
   components: {
@@ -50,7 +50,7 @@ export default {
     [Icon.name]: Icon,
   },
 
-  emits: ["change", "cancel"],
+  emits: ['change', 'cancel'],
 
   setup(props, { emit }) {
     const loading = ref(false)
@@ -64,7 +64,7 @@ export default {
       pageSize: 20,
     })
 
-    const { dicts, getBuilding } = useModel("dicts")
+    const { dicts, getBuilding } = useModel('dicts')
     const list = ref(dicts.building || [])
 
     const handleSearch = () => {
@@ -90,8 +90,8 @@ export default {
         .then((res) => {
           params.pageNo += 1
           loading.value = false
-          finished.value = res.currentPage >= res.totalPages
-          if (res.currentPage === 1) {
+          finished.value = res.pageNo >= res.totalPages
+          if (res.pageNo === 1) {
             list.value = res.result || []
           } else {
             list.value = list.value.concat(res.result || [])
@@ -109,11 +109,11 @@ export default {
     }
 
     const handleSubmit = () => {
-      emit("change", { id: selectedId.value, item: selectedItem.value })
+      emit('change', { id: selectedId.value, item: selectedItem.value })
     }
 
     const handleCancel = () => {
-      emit("cancel")
+      emit('cancel')
     }
 
     return {

src/view/secondhand/components/secondhandscreen.vue

@@ -25,11 +25,11 @@
 </template>
 
 <script>
-import { computed, onMounted, reactive } from "vue"
-import { DropdownMenu, DropdownItem, row, col, cell } from "vant"
-import { useModel } from "@zjxpcyc/vue-tiny-store"
+import { computed, onMounted, reactive } from 'vue'
+import { DropdownMenu, DropdownItem, row, col, cell } from 'vant'
+import { useModel } from '@zjxpcyc/vue-tiny-store'
 export default {
-  name: "secondhandscreen",
+  name: 'secondhandscreen',
   components: {
     [cell.name]: cell,
     // [popup.name]: popup,
@@ -44,14 +44,14 @@ export default {
   data() {
     return {
       overlayStyle: {
-        top: "88px",
-        position: "absolute",
+        top: '88px',
+        position: 'absolute',
       },
       popupStyle: {
-        top: "88px",
-        minHeight: "200px",
+        top: '88px',
+        minHeight: '200px',
       },
-      value: "0",
+      value: '0',
       //   options: [
       //     {
       //       id: 0,
@@ -90,7 +90,7 @@ export default {
   mounted() {},
 
   setup(props, cex) {
-    const { dicts, getDict, getBusinessCity } = useModel("dicts")
+    const { dicts, getDict, getBusinessCity } = useModel('dicts')
     console.log(dicts.roomType, getDict, getBusinessCity)
 
     // const roomDistrict = dicts.roomDistrict;
@@ -110,8 +110,8 @@ export default {
     const options = computed(() => [
       {
         id: 0,
-        value: "districtCode",
-        title: "区域",
+        value: 'districtCode',
+        title: '区域',
         option: (dicts.roomDistrict || []).map((x) => {
           return {
             text: x.label,
@@ -121,37 +121,37 @@ export default {
       },
       {
         id: 2,
-        value: "price",
-        title: "价格(万)",
+        value: 'price',
+        title: '价格(万)',
         option: [
-          { text: "0-100", value: "0-100" },
-          { text: "101-200", value: "101-200" },
-          { text: "201-300", value: "201-300" },
-          { text: "301-400", value: "301-400" },
-          { text: "400以上", value: "400" },
+          { text: '0-100', value: '0-100' },
+          { text: '101-200', value: '101-200' },
+          { text: '201-300', value: '201-300' },
+          { text: '301-400', value: '301-400' },
+          { text: '400以上', value: '400' },
         ],
       },
       {
         id: 3,
-        value: "roomType",
-        title: "户型",
+        value: 'roomType',
+        title: '户型',
         option: dicts.roomType,
       },
     ])
 
     const onMore = () => {
-      console.log(props, cex, "3332")
-      cex.emit("onShowMore", 333)
+      console.log(props, cex, '3332')
+      cex.emit('onShowMore', 333)
     }
 
     const onChange = (e) => {
-      console.log(state, e, "3ss332333")
+      console.log(state, e, '3ss332333')
       if (state.price) {
-        const price = state.price.split("-")
+        const price = state.price.split('-')
         state.pirceMin = Number(price[0])
         state.priceMax = Number(price[1])
       }
-      cex.emit("onChange", state)
+      cex.emit('onChange', state)
     }
     return {
       onMore,
@@ -164,7 +164,7 @@ export default {
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
-<style lang="less" scoped>
+<style lang="less">
 .more {
   height: 48px;
   display: flex;
@@ -181,7 +181,7 @@ export default {
     max-width: 100%;
     padding: 0 8px;
     color: #323233;
-    font-size: 15px;
+    font-size: 15px !important;
     line-height: 22px;
   }
 }

src/view/secondhand/edithouse/components/Basic.vue

@@ -10,25 +10,27 @@
       <x-field label="楼盘地址">
         {{ building.address }}
       </x-field>
-      <x-field label="栋号">
-        {{ roomInfo.roomBuild }}
-      </x-field>
-      <x-field label="单元">
-        {{ roomInfo.roomUnit }}
-      </x-field>
-      <x-field label="楼层">
-        {{ floor }}
-      </x-field>
-      <x-field label="房号">
-        {{ roomInfo.roomNum }}
-      </x-field>
+      <template v-if="showDong">
+        <x-field label="栋号">
+          {{ roomInfo.roomBuild }}
+        </x-field>
+        <x-field label="单元">
+          {{ roomInfo.roomUnit }}
+        </x-field>
+        <x-field label="楼层">
+          {{ floor }}
+        </x-field>
+        <x-field label="房号">
+          {{ roomInfo.roomNum }}
+        </x-field>
+      </template>
     </van-collapse-item>
   </van-collapse>
 </template>
 
 <script>
-import { computed, ref } from "vue"
-import { Collapse, CollapseItem } from "vant"
+import { computed, ref } from 'vue'
+import { Collapse, CollapseItem } from 'vant'
 
 export default {
   components: {
@@ -44,12 +46,16 @@ export default {
       type: Object,
       default: () => ({}),
     },
+    showDong: {
+      type: Boolean,
+      default: true,
+    },
   },
   setup(props) {
-    const activeName = ref("1")
+    const activeName = ref('1')
 
     const floor = computed(() => {
-      const roomFloor = (props.roomInfo.roomFloor || "").split(",")
+      const roomFloor = (props.roomInfo.roomFloor || '').split(',')
       return `${roomFloor[0]}/${roomFloor[1]}(${roomFloor[2]})`
     })
 

src/view/secondhand/edithouse/components/Form.vue

@@ -5,9 +5,77 @@
       name="title"
       label="标题"
       placeholder="请输入"
+      required
       :rules="[{ required: true, message: '请填写标题' }]"
     />
 
+    <template v-if="editDong">
+      <van-field
+        v-model="formData.roomBuild"
+        name="roomBuild"
+        label="栋号"
+        required
+        :rules="[{ required: true, message: '请选择栋号' }]"
+      >
+        <template #input>
+          <Picker
+            :options="lockBuilding.dong"
+            v-model="formData.roomBuild"
+            placeholder="请选择"
+          />
+        </template>
+      </van-field>
+
+      <van-field
+        v-model="formData.roomUnit"
+        name="roomUnit"
+        label="单元"
+        required
+        :rules="[{ required: true, message: '请选择单元' }]"
+      >
+        <template #input>
+          <Picker
+            :options="lockBuilding.unit"
+            v-model="formData.roomUnit"
+            placeholder="请选择"
+          />
+        </template>
+      </van-field>
+
+      <van-field
+        v-model="formData.roomFloor"
+        name="roomFloor"
+        label="楼层"
+        required
+        :rules="[{ required: true, message: '请选择楼层' }]"
+      >
+        <template #input>
+          <Picker
+            :options="lockBuilding.floor"
+            v-model="formData.roomFloor"
+            placeholder="请选择"
+          />
+        </template>
+      </van-field>
+
+      <van-field
+        v-model="formData.roomNum"
+        name="roomNum"
+        label="房号"
+        required
+        :rules="[{ required: true, message: '请选择房号' }]"
+      >
+        <template #input>
+          <Picker
+            :options="lockBuilding.room"
+            v-model="formData.roomNum"
+            placeholder="请选择"
+            @change="(x) => (lockRoomNo = x.text)"
+          />
+        </template>
+      </van-field>
+    </template>
+
     <van-field
       v-model="formData.acreage"
       name="acreage"
@@ -155,13 +223,14 @@
 </template>
 
 <script>
-import { reactive, watch } from "vue"
-import { Form, Field, Button } from "vant"
-import { useModel } from "@zjxpcyc/vue-tiny-store"
-import Picker from "@/components/Picker"
-import { showWarn } from "@/utils"
-import RoomType from "./RoomType"
-import Proportion from "./Proportion"
+import { reactive, watch, ref } from 'vue'
+import { Form, Field, Button } from 'vant'
+import { useModel } from '@zjxpcyc/vue-tiny-store'
+import Picker from '@/components/Picker'
+import { showWarn } from '@/utils'
+import request from '@/utils/request'
+import RoomType from './RoomType'
+import Proportion from './Proportion'
 
 export default {
   components: {
@@ -172,30 +241,45 @@ export default {
     Proportion,
     Picker,
   },
-  emits: ["submit"],
+  emits: ['submit'],
+  props: {
+    editDong: Boolean,
+  },
   setup(props, { emit }) {
     const formData = reactive({})
-    const { namedDicts } = useModel("dicts")
-    const { detail } = useModel("room")
+    const { namedDicts } = useModel('dicts')
+    const { detail } = useModel('room')
+
+    const lockRoomNo = ref()
+    const lockBuilding = reactive({
+      // 栋
+      dong: [],
+      // 单元
+      unit: [],
+      // 层
+      floor: [],
+      // 房
+      room: [],
+    })
 
     const validManually = () => {
       if (
         !formData.roomType ||
-        formData.roomType.split(",").filter(Boolean).length != 5
+        formData.roomType.split(',').filter(Boolean).length != 5
       ) {
-        showWarn("请正确设置户型")
+        showWarn('请正确设置户型')
         return false
       }
       if (!formData.decoration) {
-        showWarn("请选择装修")
+        showWarn('请选择装修')
         return false
       }
       if (!formData.aspect) {
-        showWarn("请选择朝向")
+        showWarn('请选择朝向')
         return false
       }
       if (!formData.sourceFrom) {
-        showWarn("请选择房源来源")
+        showWarn('请选择房源来源')
         return false
       }
 
@@ -208,7 +292,10 @@ export default {
         return
       }
 
-      emit("submit", formData)
+      emit('submit', {
+        data: formData,
+        params: { lockRoomNo: lockRoomNo.value || '' },
+      })
     }
 
     //
@@ -222,10 +309,78 @@ export default {
       { immediate: true }
     )
 
+    // 锁盘的情况下监控楼栋的选择
+    // 生成单元字典
+    watch(
+      () => formData.roomBuild,
+      (nw) => {
+        if (props.editDong) {
+          request({
+            url: '/lock/unit',
+            params: { buildingId: formData.estateId, dong: nw },
+          }).then((res) => {
+            lockBuilding.unit = (res || []).map((x) => ({
+              text: x.name,
+              value: x.code,
+            }))
+          })
+        }
+      }
+    )
+
+    // 锁盘的情况下监控单元的选择
+    // 生成楼层字典
+    watch(
+      () => formData.roomUnit,
+      (nw) => {
+        if (props.editDong) {
+          request({
+            url: '/lock/floor',
+            params: {
+              buildingId: formData.estateId,
+              dong: formData.roomBuild,
+              unit: nw,
+            },
+          }).then((res) => {
+            lockBuilding.floor = (res || []).map((x) => ({
+              text: x.name,
+              value: x.code,
+            }))
+          })
+        }
+      }
+    )
+
+    // 锁盘的情况下监控楼层的选择
+    // 生成楼栋-房号字典
+    watch(
+      () => formData.roomFloor,
+      (nw) => {
+        if (props.editDong) {
+          request({
+            url: '/lock/room',
+            params: {
+              buildingId: formData.estateId,
+              dong: formData.roomBuild,
+              unit: formData.roomUnit,
+              floor: nw,
+            },
+          }).then((res) => {
+            lockBuilding.room = (res || []).map((x) => ({
+              text: x.name,
+              value: x.code,
+            }))
+          })
+        }
+      }
+    )
+
     return {
       formData,
+      lockRoomNo,
       handleSumbit,
       namedDicts,
+      lockBuilding,
     }
   },
 }

src/view/secondhand/edithouse/index.vue

@@ -1,17 +1,21 @@
 <template>
   <x-loading x-id="room.view">
     <div class="secondhanddetail">
-      <RoomBasic :room-info="detail.roomInfo" :building="detail.building" />
+      <RoomBasic
+        :room-info="detail.roomInfo"
+        :building="detail.building"
+        :show-dong="!mustEdit"
+      />
 
       <div style="margin-top: 1em">
-        <RoomForm @submit="handleSumbit" />
+        <RoomForm @submit="handleSumbit" :edit-dong="mustEdit" />
       </div>
     </div>
   </x-loading>
 </template>
 
 <script>
-import { onMounted } from 'vue'
+import { computed, onMounted } from 'vue'
 import { useModel } from '@zjxpcyc/vue-tiny-store'
 import { useRoute, useRouter } from 'vue-router'
 import { alert, showDanger } from '@/utils'
@@ -30,8 +34,12 @@ export default {
     const router = useRouter()
     const { detail, getDetail, houseEdit } = useModel('room')
 
-    const handleSumbit = (values) => {
-      houseEdit(values)
+    const mustEdit = computed(() => {
+      return detail.mustEdit === '1'
+    })
+
+    const handleSumbit = ({ data, params }) => {
+      houseEdit(data, params)
         .then(() => {
           alert('编辑成功').then(() => {
             router.go(-1)
@@ -49,6 +57,7 @@ export default {
     return {
       handleSumbit,
       detail,
+      mustEdit,
     }
   },
 }

src/view/secondhand/index.vue

@@ -67,10 +67,10 @@ export default {
     const searchParams = ref({})
 
     const finished = computed(() => {
-      return page.currentPage ? page.currentPage >= page.totalPages : true
+      return page.pageNo ? page.pageNo >= page.totalPages : true
     })
     const percent = computed(() =>
-      page.currentPage ? (page.currentPage * 100) / page.totalPages : 100
+      page.pageNo ? (page.pageNo * 100) / page.totalPages : 100
     )
 
     const onShowMore = () => {