Merge branch 'master' of http://git.ycjcjy.com/ershoufang/mp-agent into master

src/store/models/renting.js

@@ -145,10 +145,10 @@ export default () => {
   }
 
   // 房源编辑
-  const houseEdit = (query, data) => {
+  const houseEdit = (params, data) => {
     return request({
       url: "/rent/save",
-      query,
+      params,
       data,
       toast: "请稍候...",
     })

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

@@ -69,27 +69,48 @@
       <template #extra> ㎡ </template>
     </van-field>
 
-    <van-field v-show="mustEdit != '1'" name="roomBuild" label="栋号" required>
-      <template #input>
-        <Picker
-          :options="roomBuildOptions"
-          v-model="formData.roomBuild"
-          placeholder="请选择"
-        />
-      </template>
-    </van-field>
-
-    <van-field
-      v-model="formData.acreage"
-      name="acreage"
-      label="面积"
-      placeholder="请输入"
-      required
-      type="number"
-      :rules="[{ required: true, message: '请填写面积' }]"
-    >
-      <template #extra> ㎡ </template>
-    </van-field>
+    <div v-show="mustEdit">
+      <van-field name="roomBuild" label="栋号" required>
+        <template #input>
+          <Picker
+            :options="lockBuilding.dong"
+            v-model="formData.roomBuild"
+            placeholder="请选择"
+          />
+        </template>
+      </van-field>
+
+      <van-field name="roomUnit" label="单元" required>
+        <template #input>
+          <Picker
+            :options="lockBuilding.unit"
+            v-model="formData.roomUnit"
+            placeholder="请选择"
+          />
+        </template>
+      </van-field>
+
+      <van-field name="roomFloor" label="楼层" required>
+        <template #input>
+          <Picker
+            :options="lockBuilding.floor"
+            v-model="formData.roomFloor"
+            placeholder="请选择"
+          />
+        </template>
+      </van-field>
+
+      <van-field name="roomNum" label="房号" required>
+        <template #input>
+          <Picker
+            :options="lockBuilding.room"
+            v-model="formData.roomNum"
+            placeholder="请选择"
+            @change="handleRoomNumChange"
+          />
+        </template>
+      </van-field>
+    </div>
 
     <van-field
       v-model="formData.innerAcreage"
@@ -282,13 +303,14 @@
 </template>
 
 <script>
-import { reactive, computed, watch, ref } from 'vue'
+import { reactive, computed, watch, ref, onMounted } 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 request from '@/utils/request'
 
 export default {
   components: {
@@ -303,12 +325,106 @@ export default {
   setup(props, { emit }) {
     const buildingName = ref('')
 
+    const lockBuilding = reactive({
+      // 栋
+      dong: [],
+      // 单元
+      unit: [],
+      // 层
+      floor: [],
+      // 房
+      room: [],
+    })
+
     const formData = reactive({})
     const { dicts, getDict } = useModel('dicts')
     const { detail } = useModel('renting')
+    const mustEdit = computed(
+      () => detail.building?.IsLock == '1' && detail.lockRoom == null
+    )
+    watch(
+      () => formData.estateId,
+      () => {
+        //   // 锁盘的情况下
+        //   // 生成楼栋字典
+        if (mustEdit.value) {
+          request({
+            url: '/lock/dong',
+            params: { buildingId: formData.estateId },
+          }).then((res) => {
+            lockBuilding.dong = (res || []).map((x) => ({
+              text: x.name,
+              value: x.code,
+            }))
+          })
+        }
+      }
+    )
 
-    const mustEdit = computed(() =>
-      detail.building.IsLock == '1' && detail.lockRoom == null ? '1' : '0'
+    // 锁盘的情况下监控楼栋的选择
+    // 生成单元字典
+    watch(
+      () => formData.roomBuild,
+      (nw) => {
+        if (mustEdit.value) {
+          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 (mustEdit.value) {
+          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 (mustEdit.value) {
+          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,
+            }))
+          })
+        }
+      }
     )
 
     // 装修
@@ -321,16 +437,6 @@ export default {
       return decorationDict
     })
 
-    // 栋号
-    const roomBuildOptions = computed(() => {
-      const roomBuildDict = dicts.roomBuild || []
-      if (!roomBuildDict.length) {
-        getDict('roomBuild')
-      }
-
-      return roomBuildDict
-    })
-
     // 朝向
     const aspectOptions = computed(() => {
       const aspectDict = dicts.aspect || []
@@ -527,12 +633,23 @@ export default {
       if (!validManually()) {
         return
       }
-      console.log(formData, 'console.log(formData)')
-      const query = {
-        lockRoomNo: detail.roomInfo?.roomNum,
-        leaseWaySelect: formData.leaseWay,
-        type: formData,
+      let query = {
+        lockRoomNo: '',
+
+        leaseWaySelect: '',
+        type: '',
+      }
+      // lockRoomNo: detail.formData?.roomNum,
+      // leaseWaySelect: formData.leaseWay,
+      // type: formData,
+      if (mustEdit.value) {
+        query = {
+          lockRoomNo: formData.roomNum,
+          leaseWaySelect: formData.leaseWay,
+          type: formData.roomNum,
+        }
       }
+
       emit('submit', query, formData)
     }
 
@@ -548,13 +665,27 @@ export default {
       { immediate: true }
     )
 
+    // //选择楼盘
+    //     const handleEstateChange = ({ id, item }) => {
+    //   roomInfo.estateId = id
+    //   roomInfo.estateName = item.buildingName
+    //   building.value = item
+    //   isLock.value = building.value.isLock - 0
+
+    // }
+
+    // onMounted(()=>{
+
+    // })
+
     return {
+      lockBuilding,
       mustEdit,
       buildingName,
       formData,
       handleSumbit,
       decorationOptions,
-      roomBuildOptions,
+
       aspectOptions,
       sourceFromOptions,
       buildTypeOptions,

src/view/renting/edithouse/index.vue

@@ -40,9 +40,7 @@ export default {
       { immediate: true }
     )
 
-    const handleSumbit = (query,values) => {
-      values.lockRoomNo = detail.roomInfo?.roomNum
-  
+    const handleSumbit = (query, values) => {
       console.log(query, values, 'values')
       houseEdit(query, values)
         .then(() => {