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

src/store/models/renting.js

@@ -13,7 +13,7 @@ export default () => {
   const page = reactive({})
   const detail = reactive({})
   const rentRole = reactive({})
-  const rentKeyBox = reactive({})
+  const roomKeyBox = reactive({})
   const getList = (data) => {
     loading.value = true
     request({
@@ -95,7 +95,7 @@ export default () => {
         },
       })
       .then((res) => {
-        Object.assign(rentKeyBox, res)
+        Object.assign(roomKeyBox, res)
       })
       .catch((e) => {
         console.error(e)
@@ -145,9 +145,10 @@ export default () => {
   }
 
   // 房源编辑
-  const houseEdit = (data) => {
+  const houseEdit = (query, data) => {
     return request({
       url: "/rent/save",
+      query,
       data,
       toast: "请稍候...",
     })
@@ -238,7 +239,7 @@ export default () => {
     getRole,
     rentRole,
     getKey,
-    rentKeyBox,
+    roomKeyBox,
     addOwnerTel,
     getBuilding,
     closeHouse,

src/view/renting/detail/components/Key.vue

@@ -1,68 +1,166 @@
 <template>
-  <x-loading x-id="rent.key.view">
-    <p v-if="!rentKey">暂无钥匙信息</p>
-    <p v-else-if="rentKey.status === '1'">当前委托书正在审核中</p>
+  <x-loading x-id="room.key">
+    <div v-if="!roomKey">
+      <p>暂无钥匙信息</p>
+      <!-- <template v-if="roomInfo.status !== '7'"> -->
+      <template v-if="roomInfo.status === '0'">
+        <van-button
+          block
+          size="small"
+          type="warning"
+          v-shiro="'room:info:addKey'"
+          @click="
+            $router.push({
+              name: 'room.key',
+              query: { roomId: roomInfo.id, type: 'rent' },
+            })
+          "
+        >
+          上传钥匙委托
+        </van-button>
+      </template>
+    </div>
+    <p v-else-if="roomKey.status === '1'">当前钥匙协议正在审核中</p>
     <div v-else>
       <shiro name="room:info:key">
         <template #callback>
-          <van-empty image="error" description="无钥匙协议查看权限" />
+          <div v-if="!roomKeyBox.isCreate">
+            <x-field label="上传人">
+              {{ roomKey.keyUserName }} ({{ roomKey.keyUserPhone }})
+            </x-field>
+
+            <x-field label="上传时间">
+              {{ roomKey.updateTime }}
+            </x-field>
+          </div>
+          <p>无钥匙协议查看权限</p>
         </template>
 
-        <x-field label=" " v-if="rentKeyBox.isCreate">
-          <van-button size="small" type="danger">删除钥匙</van-button>
+        <x-field
+          label=" "
+          v-if="
+            roomKeyBox.isCreate &&
+            roomKey.status === '0' &&
+            roomInfo.status === '0'
+          "
+          v-shiro="'room:info:delKey'"
+        >
+          <van-button block size="small" type="danger" @click="toggleDialog"
+            >删除钥匙</van-button
+          >
         </x-field>
 
         <x-field label="上传人">
-          {{ rentKey.keyUserName }} ({{ rentKey.keyUserPhone }})
+          {{ roomKey.keyUserName }} ({{ roomKey.keyUserPhone }})
         </x-field>
 
         <x-field label="上传时间">
-          {{ rentKey.updateTime }}
+          {{ roomKey.updateTime }}
         </x-field>
 
         <x-field label="钥匙编号">
-          {{ rentKey.keyNo }}
+          {{ roomKey.keyNo }}
         </x-field>
 
         <x-field label="存储位置">
-          {{ rentKey.address }}
+          {{ roomKey.address }}
         </x-field>
 
-        <van-image width="100" height="100" :src="rentKey.url" />
+        <van-image width="100" height="100" :src="roomKey.url" />
       </shiro>
     </div>
+
+    <!-- 删除钥匙 -->
+    <van-dialog
+      v-model:show="showDialog"
+      title="删除钥匙"
+      @confirm="handleDelete"
+      @cancel="toggleDialog"
+    >
+      <van-field
+        v-model="delReason"
+        rows="3"
+        autosize
+        label="留言"
+        type="textarea"
+        placeholder="请输入留言"
+        required
+      />
+    </van-dialog>
   </x-loading>
 </template>
 
 <script>
-import { Empty, Button, Image } from "vant"
-import { useModel } from "@zjxpcyc/vue-tiny-store"
-import { computed, onMounted } from "vue"
+import { Button, Image } from 'vant'
+import { useModel } from '@zjxpcyc/vue-tiny-store'
+import { computed, onMounted, ref } from 'vue'
+import { showDanger, showSuccess, showWarn } from '@/utils'
+import request from '@/utils/request'
 
 export default {
   components: {
-    [Empty.name]: Empty,
     [Button.name]: Button,
     [Image.name]: Image,
   },
   props: {
     roomId: undefined,
+    roomInfo: {
+      type: Object,
+      default: () => ({}),
+    },
   },
   setup(props) {
-    const { detail, rentKeyBox, getKey } = useModel("renting")
+    const { detail, roomKeyBox, getKey } = useModel('renting')
+
+    const roomKey = computed(() => roomKeyBox.roomKey)
+
+    const delReason = ref()
+    const showDialog = ref(false)
+
+    const toggleDialog = () => {
+      showDialog.value = !showDialog.value
+    }
 
-    const rentKey = computed(() => rentKeyBox.roomKey)
+    const handleDelete = () => {
+      if (!delReason.value) {
+        showWarn('请填写删除原因')
+        return
+      }
+
+      showDialog.value = false
+
+      const params = {
+        id: roomKey.value.id,
+        reason: delReason.value,
+        roomId: props.roomInfo.id,
+      }
+
+      request({
+        url: '/rent/key/delete',
+        params,
+        toast: '请稍候...',
+      })
+        .then(() => {
+          roomKeyBox.roomKey = undefined
+          showSuccess('删除成功')
+        })
+        .catch((e) => {
+          showDanger(e.message)
+        })
+    }
 
     onMounted(() => {
-      if (!rentKeyBox.roomKey) {
+      if (!roomKeyBox.roomKey) {
         getKey(props.roomId)
       }
     })
 
     return {
       detail,
-      rentKeyBox,
-      rentKey,
+      roomKeyBox,
+      roomKey,
+      toggleDialog,
+      handleDelete,
     }
   },
 }

src/view/renting/detail/components/Main.vue

@@ -28,7 +28,7 @@
     </x-field>
 
     <x-field label="创建方式">
-      {{ roomInfo.createMethod === "1" ? "外部录入" : "荟居录入" }}
+      {{ roomInfo.createMethod === '1' ? '外部录入' : '荟居录入' }}
     </x-field>
 
     <div
@@ -39,9 +39,9 @@
       "
     >
       <x-field label="关闭原因">
-        {{ getDictLabel(roomLog.type, "closeType")
+        {{ getDictLabel(roomLog.type, 'closeType')
         }}<span v-show="roomLog.type == '1'"
-          >({{ getDictLabel(roomLog.reason, "closeReason") }})</span
+          >({{ getDictLabel(roomLog.reason, 'closeReason') }})</span
         >
       </x-field>
 
@@ -55,23 +55,23 @@
     </div>
 
     <x-field label="楼栋">
-      {{ securityInfo.roomBuild || "敏感信息" }}
+      {{ securityInfo.roomBuild || '敏感信息' }}
     </x-field>
 
     <x-field label="单元">
-      {{ securityInfo.roomUnit || "敏感信息" }}
+      {{ securityInfo.roomUnit || '敏感信息' }}
     </x-field>
 
     <x-field label="楼房号">
-      {{ securityInfo.roomNum || "敏感信息" }}
+      {{ securityInfo.roomNum || '敏感信息' }}
     </x-field>
 
     <x-field label="业主姓名">
-      {{ securityInfo.ownerName || "敏感信息" }}
+      {{ securityInfo.ownerName || '敏感信息' }}
     </x-field>
 
     <x-field label="业主电话">
-      {{ securityInfo.ownerTel || "敏感信息" }}
+      {{ securityInfo.ownerTel || '敏感信息' }}
     </x-field>
 
     <x-field label=" " v-shiro="'room:info:security'">
@@ -95,17 +95,17 @@
 </template>
 
 <script>
-import { computed, ref } from "vue"
-import { useRouter } from "vue-router"
-import { Button, Dialog } from "vant"
-import request from "@/utils/request"
-import { showDanger } from "@/utils"
-import { useModel } from "@zjxpcyc/vue-tiny-store"
+import { computed, ref } from 'vue'
+import { useRouter } from 'vue-router'
+import { Button, Dialog } from 'vant'
+import request from '@/utils/request'
+import { showDanger } from '@/utils'
+import { useModel } from '@zjxpcyc/vue-tiny-store'
 
 const getSecurity = (roomId) => {
   return request({
-    loadingId: "room.security",
-    url: "/room/security",
+    loadingId: 'room.security',
+    url: '/room/security',
     params: { roomId },
   })
     .then((res) => {
@@ -142,27 +142,28 @@ export default {
     const router = useRouter()
     const securityInfo = ref({})
     const unfollowRoom = ref()
-    const { dicts, getDict } = useModel("dicts")
+    const { dicts, getDict } = useModel('dicts')
 
     // 关闭类型
     if (!dicts.closeType || !dicts.closeType.length) {
-      getDict("closeType")
+      getDict('closeType')
     }
 
     // 关闭原因
     if (!dicts.closeReason || !dicts.closeReason.length) {
-      getDict("closeReason")
+      getDict('closeReason')
     }
 
     // 居室
     const roomType = computed(() => {
-      const [a, b, c, d] = (props.roomInfo.roomType || "").split(",")
+      console.log(props,'---------console.log(props)----- ----')
+      const [a, b, c, d] = (props.roomInfo.roomType || '').split(',')
       return `${a || 0}室${b || 0}厅${c || 0}厨${d || 0}卫`
     })
     // 出租方式
     const leaseWay = computed(() => {
-      console.log("出租方式", dicts["leaseWay"])
-      return dicts["leaseWay"].filter(
+      console.log('出租方式', dicts['leaseWay'])
+      return dicts['leaseWay'].filter(
         (x) => x.value === props.roomInfo.leaseWay
       )[0]?.text
     })
@@ -177,7 +178,7 @@ export default {
     const payWayOptions = computed(() => {
       const payWayDict = dicts.payWay || []
       if (!payWayDict.length) {
-        getDict("payWay")
+        getDict('payWay')
       }
 
       return payWayDict
@@ -186,7 +187,7 @@ export default {
     const decorationOptions = computed(() => {
       const decorationDict = dicts.decoration || []
       if (!decorationDict.length) {
-        getDict("decoration")
+        getDict('decoration')
       }
 
       return decorationDict
@@ -194,7 +195,7 @@ export default {
 
     const goToAddFollow = () =>
       router.push({
-        name: "secondhand.detail",
+        name: 'secondhand.detail',
         query: { roomId: unfollowRoom.value.id },
       })
 
@@ -206,18 +207,18 @@ export default {
             unfollowRoom.value = undefined
           })
           .catch((e) => {
-            if ("1003" === e.code) {
+            if ('1003' === e.code) {
               unfollowRoom.value = JSON.parse(e.message)
 
               Dialog.alert({
-                title: "去跟进",
+                title: '去跟进',
                 message: `您存在未跟进的房源，房源编号: ${unfollowRoom.value.id}`,
               }).then(() => {
                 // todo
               })
             } else {
               unfollowRoom.value = undefined
-              showDanger("查看敏感信息失败")
+              showDanger('查看敏感信息失败')
             }
           })
       }

src/view/renting/detail/index.vue

@@ -9,23 +9,11 @@
       <div class="title">
         <p class="body">{{ detail.roomInfo?.title }}</p>
         <MoreActions :room-info="detail.roomInfo" />
-        <!-- <van-popover
-          v-model:show="showPopover"
-          :actions="actions"
-          @select="onSelect"
-          placement="bottom-end"
-        >
-          <template #reference>
-            <div class="action">
-              <van-icon name="wap-nav" />
-            </div>
-          </template>
-        </van-popover> -->
       </div>
 
       <van-cell-group title="房源信息">
         <RoomMain
-          :room-info="detail.roomInfo"
+          :roomInfo="detail.roomInfo"
           :building="detail.building"
           :roomLog="detail.roomLog || {}"
           :other-data="roomOtherData"
@@ -44,13 +32,6 @@
             />
           </van-collapse-item>
 
-          <!-- <van-collapse-item name="2">
-            <template #title>
-              <div>物业信息</div>
-            </template>
-            <RoomEstate :build-info="detail.building" />
-          </van-collapse-item> -->
-
           <van-collapse-item name="role">
             <template #title>
               <div>角色人</div>
@@ -58,13 +39,6 @@
             <RoomRole :room-info="detail.roomInfo" />
           </van-collapse-item>
 
-          <!-- <van-collapse-item name="auth">
-            <template #title>
-              <div>委托书</div>
-            </template>
-            <RoomAuth :room-id="roomId" />
-          </van-collapse-item> -->
-
           <van-collapse-item name="key">
             <template #title>
               <div>钥匙</div>
@@ -108,9 +82,9 @@
 </template>
 
 <script>
-import { ref, onMounted, computed } from "vue"
-import { useRouter } from "vue-router"
-import { Swiper } from "../../../components/detailCompents"
+import { ref, onMounted, computed } from 'vue'
+import { useRouter } from 'vue-router'
+import { Swiper } from '../../../components/detailCompents'
 import {
   Icon,
   Popover,
@@ -127,22 +101,18 @@ import {
   CellGroup,
   Collapse,
   CollapseItem,
-} from "vant"
-import { useModel } from "@zjxpcyc/vue-tiny-store"
-import MoreActions from "./components/MoreActions"
-import RoomMain from "./components/Main"
-import RoomBase from "./components/Base"
-// import RoomEstate from './components/Estate'
-import RoomRole from "./components/Role"
-// import RoomAuth from './components/Auth'
-import RoomKey from "./components/Key"
-import RoomFollow from "./components/Follow"
-import RoomLook from "./components/Look"
-// import Contextc from "../../../components/contextC"
-// import { router } from "../../../router";
+} from 'vant'
+import { useModel } from '@zjxpcyc/vue-tiny-store'
+import MoreActions from './components/MoreActions'
+import RoomMain from './components/Main'
+import RoomBase from './components/Base'
+import RoomRole from './components/Role'
+import RoomKey from './components/Key'
+import RoomFollow from './components/Follow'
+import RoomLook from './components/Look'
 
 export default {
-  name: "secondhanddetail",
+  name: 'secondhanddetail',
   components: {
     [CellGroup.name]: CellGroup,
     [Cell.name]: Cell,
@@ -181,36 +151,36 @@ export default {
     const showShare = ref(false)
     const phoneShow = ref(false)
     const collapseItem = ref()
-    const phone = ref("")
+    const phone = ref('')
 
-    const { detail, getDetail } = useModel("renting")
+    const { detail, getDetail } = useModel('renting')
 
-    const { dicts, getDict } = useModel("dicts")
+    const { dicts, getDict } = useModel('dicts')
 
     const getRescType = (val) => {
-      const rescTypes = dicts["roomResc_type"] || []
+      const rescTypes = dicts['roomResc_type'] || []
       return (rescTypes.filter((x) => x.value === val)[0] || {}).text
     }
 
     const imageList = computed(() => {
-      return (detail.RoomResc || [])
-        .filter((x) => x.imgType !== "0")
+      return (detail.rescList || [])
+        .filter((x) => x.imgType !== '0')
         .map((x) => ({ image: x.url, text: getRescType(x.imgType) }))
     })
 
     onMounted(() => {
       getDetail(roomId)
-      getDict("roomResc_type")
+      getDict('roomResc_type')
     })
 
     // 通过 actions 属性来定义菜单选项
     const actions = [
-      { text: "设置房源保护", value: "1" },
-      { text: "新增业主电话", value: "2" },
-      { text: "下架房源", value: "3" },
-      { text: "修改房源", value: "4" },
-      { text: "分享房源", value: "5" },
-      { text: "房源实勘", value: "6" },
+      { text: '设置房源保护', value: '1' },
+      { text: '新增业主电话', value: '2' },
+      { text: '下架房源', value: '3' },
+      { text: '修改房源', value: '4' },
+      { text: '分享房源', value: '5' },
+      { text: '房源实勘', value: '6' },
     ]
     // 设为房源保护后，只有录入人、同部门的上级以及上级部门的上级可以看到房源敏感信息。
     const onSelect = (action) => {
@@ -218,10 +188,10 @@ export default {
       if (action.value == 1) {
         // 设置房源保护
         Dialog.confirm({
-          title: "提示",
+          title: '提示',
           message:
-            "设为房源保护后，只有录入人、同部门的上级以及上级部门的上级可以看到房源敏感信息。",
-          theme: "round-button",
+            '设为房源保护后，只有录入人、同部门的上级以及上级部门的上级可以看到房源敏感信息。',
+          theme: 'round-button',
         })
           .then(() => {
             // on close
@@ -235,25 +205,25 @@ export default {
       } else if (action.value == 3) {
         // 下架房源
 
-        router.push("/closehouse")
+        router.push('/closehouse')
       } else if (action.value == 4) {
         // 修改房源
-        router.push("/editsecondhandhouse")
+        router.push('/editsecondhandhouse')
       } else if (action.value == 5) {
         // 分享房源
         showShare.value = true
       } else if (action.value == 6) {
         // 房源实勘
-        router.push("/resc")
+        router.push('/resc')
       }
     }
 
     const shareOptions = [
-      { name: "微信", icon: "wechat" },
-      { name: "微博", icon: "weibo" },
-      { name: "复制链接", icon: "link" },
-      { name: "分享海报", icon: "poster" },
-      { name: "二维码", icon: "qrcode" },
+      { name: '微信', icon: 'wechat' },
+      { name: '微博', icon: 'weibo' },
+      { name: '复制链接', icon: 'link' },
+      { name: '分享海报', icon: 'poster' },
+      { name: '二维码', icon: 'qrcode' },
     ]
 
     const onShareSelect = (option) => {

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

@@ -69,6 +69,28 @@
       <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>
+
     <van-field
       v-model="formData.innerAcreage"
       name="innerAcreage"
@@ -260,13 +282,13 @@
 </template>
 
 <script>
-import { reactive, computed, 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 RoomType from "./RoomType"
-import Proportion from "./Proportion"
+import { reactive, computed, 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 RoomType from './RoomType'
+import Proportion from './Proportion'
 
 export default {
   components: {
@@ -277,31 +299,43 @@ export default {
     Proportion,
     Picker,
   },
-  emits: ["submit"],
+  emits: ['submit'],
   setup(props, { emit }) {
-    const buildingName = ref("")
+    const buildingName = ref('')
 
     const formData = reactive({})
-    const { dicts, getDict } = useModel("dicts")
-    const { detail } = useModel("renting")
+    const { dicts, getDict } = useModel('dicts')
+    const { detail } = useModel('renting')
 
-    //  const mustEdit = computed(()=>detail.building.is)
+    const mustEdit = computed(() =>
+      detail.building.IsLock == '1' && detail.lockRoom == null ? '1' : '0'
+    )
 
     // 装修
     const decorationOptions = computed(() => {
       const decorationDict = dicts.decoration || []
       if (!decorationDict.length) {
-        getDict("decoration")
+        getDict('decoration')
       }
 
       return decorationDict
     })
 
+    // 栋号
+    const roomBuildOptions = computed(() => {
+      const roomBuildDict = dicts.roomBuild || []
+      if (!roomBuildDict.length) {
+        getDict('roomBuild')
+      }
+
+      return roomBuildDict
+    })
+
     // 朝向
     const aspectOptions = computed(() => {
       const aspectDict = dicts.aspect || []
       if (!aspectDict.length) {
-        getDict("aspect")
+        getDict('aspect')
       }
 
       return aspectDict
@@ -311,7 +345,7 @@ export default {
     const sourceFromOptions = computed(() => {
       const sourceFromDict = dicts.sourceFrom || []
       if (!sourceFromDict.length) {
-        getDict("sourceFrom")
+        getDict('sourceFrom')
       }
 
       return sourceFromDict
@@ -319,9 +353,9 @@ export default {
 
     // 建筑类型
     const buildTypeOptions = computed(() => {
-      const buildTypeDict = dicts["build_type"] || []
+      const buildTypeDict = dicts['build_type'] || []
       if (!buildTypeDict.length) {
-        getDict("build_type")
+        getDict('build_type')
       }
 
       return buildTypeDict
@@ -337,7 +371,7 @@ export default {
     const natureOptions = computed(() => {
       const natureDict = dicts.nature || []
       if (!natureDict.length) {
-        getDict("nature")
+        getDict('nature')
       }
 
       return natureDict
@@ -347,7 +381,7 @@ export default {
     const purposeOptions = computed(() => {
       const purposeDict = dicts.purpose || []
       if (!purposeDict.length) {
-        getDict("purpose")
+        getDict('purpose')
       }
 
       return purposeDict
@@ -357,7 +391,7 @@ export default {
     const mortgageOptions = computed(() => {
       const mortgageDict = dicts.mortgage || []
       if (!mortgageDict.length) {
-        getDict("mortgage")
+        getDict('mortgage')
       }
 
       return mortgageDict
@@ -365,9 +399,9 @@ export default {
 
     // 税费
     const buildTimeOptions = computed(() => {
-      const buildTimeDict = dicts["build_time"] || []
+      const buildTimeDict = dicts['build_time'] || []
       if (!buildTimeDict.length) {
-        getDict("build_time")
+        getDict('build_time')
       }
 
       return buildTimeDict
@@ -375,9 +409,9 @@ export default {
 
     // 付款方式
     const payWayOptions = computed(() => {
-      const payWayDict = dicts["payWay"] || []
+      const payWayDict = dicts['payWay'] || []
       if (!payWayDict.length) {
-        getDict("payWay")
+        getDict('payWay')
       }
 
       return payWayDict
@@ -385,9 +419,9 @@ export default {
 
     // 居住现状
     const liveStatusOptions = computed(() => {
-      const liveStatusDict = dicts["liveStatus"] || []
+      const liveStatusDict = dicts['liveStatus'] || []
       if (!liveStatusDict.length) {
-        getDict("liveStatus")
+        getDict('liveStatus')
       }
 
       return liveStatusDict
@@ -395,9 +429,9 @@ export default {
 
     //性别限制
     const limitSexOptions = computed(() => {
-      const limitSexDict = dicts["limitSex"] || []
+      const limitSexDict = dicts['limitSex'] || []
       if (!limitSexDict.length) {
-        getDict("limitSex")
+        getDict('limitSex')
       }
 
       return limitSexDict
@@ -405,9 +439,9 @@ export default {
 
     //房屋特色
     const roomSpecialOptions = computed(() => {
-      const roomSpecialDict = dicts["roomSpecial"] || []
+      const roomSpecialDict = dicts['roomSpecial'] || []
       if (!roomSpecialDict.length) {
-        getDict("roomSpecial")
+        getDict('roomSpecial')
       }
 
       return roomSpecialDict
@@ -415,9 +449,9 @@ export default {
 
     //车位
     const parkingOptions = computed(() => {
-      const parkingDict = dicts["parking"] || []
+      const parkingDict = dicts['parking'] || []
       if (!parkingDict.length) {
-        getDict("parking")
+        getDict('parking')
       }
 
       return parkingDict
@@ -425,9 +459,9 @@ export default {
 
     //地下室
     const basementOptions = computed(() => {
-      const basementDict = dicts["basement"] || []
+      const basementDict = dicts['basement'] || []
       if (!basementDict.length) {
-        getDict("basement")
+        getDict('basement')
       }
 
       return basementDict
@@ -435,9 +469,9 @@ export default {
 
     //燃气
     const gasOptions = computed(() => {
-      const gasDict = dicts["gas"] || []
+      const gasDict = dicts['gas'] || []
       if (!gasDict.length) {
-        getDict("gas")
+        getDict('gas')
       }
 
       return gasDict
@@ -445,9 +479,9 @@ export default {
 
     //家电
     const electricEquipmentOptions = computed(() => {
-      const electricEquipmentDict = dicts["electricEquipment"] || []
+      const electricEquipmentDict = dicts['electricEquipment'] || []
       if (!electricEquipmentDict.length) {
-        getDict("electricEquipment")
+        getDict('electricEquipment')
       }
 
       return electricEquipmentDict
@@ -455,9 +489,9 @@ export default {
 
     //隔断
     const separateOptions = computed(() => {
-      const separateDict = dicts["separate"] || []
+      const separateDict = dicts['separate'] || []
       if (!separateDict.length) {
-        getDict("separate")
+        getDict('separate')
       }
 
       return separateDict
@@ -466,13 +500,13 @@ export default {
     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) {
@@ -480,7 +514,7 @@ export default {
         return false
       }
       if (!formData.sourceFrom) {
-        showWarn("请选择房源来源")
+        showWarn('请选择房源来源')
         return false
       }
 
@@ -493,8 +527,13 @@ export default {
       if (!validManually()) {
         return
       }
-      console.log(formData, "console.log(formData)")
-      emit("submit", formData)
+      console.log(formData, 'console.log(formData)')
+      const query = {
+        lockRoomNo: detail.roomInfo?.roomNum,
+        leaseWaySelect: formData.leaseWay,
+        type: formData,
+      }
+      emit('submit', query, formData)
     }
 
     //
@@ -510,11 +549,12 @@ export default {
     )
 
     return {
-      // mustEdit,
+      mustEdit,
       buildingName,
       formData,
       handleSumbit,
       decorationOptions,
+      roomBuildOptions,
       aspectOptions,
       sourceFromOptions,
       buildTypeOptions,

src/view/renting/edithouse/index.vue

@@ -11,15 +11,15 @@
 </template>
 
 <script>
-import { watch } from "vue"
-import { useModel } from "@zjxpcyc/vue-tiny-store"
-import { useRoute, useRouter } from "vue-router"
-import { alert, showDanger } from "@/utils"
-import RoomBasic from "./components/Basic"
-import RoomForm from "./components/Form"
+import { watch } from 'vue'
+import { useModel } from '@zjxpcyc/vue-tiny-store'
+import { useRoute, useRouter } from 'vue-router'
+import { alert, showDanger } from '@/utils'
+import RoomBasic from './components/Basic'
+import RoomForm from './components/Form'
 
 export default {
-  name: "secondhanddetail",
+  name: 'secondhanddetail',
   components: {
     RoomBasic,
     RoomForm,
@@ -28,7 +28,7 @@ export default {
   setup() {
     const route = useRoute()
     const router = useRouter()
-    const { detail, getDetail, houseEdit } = useModel("renting")
+    const { detail, getDetail, houseEdit } = useModel('renting')
 
     watch(
       () => route.query.roomId,
@@ -40,10 +40,13 @@ export default {
       { immediate: true }
     )
 
-    const handleSumbit = (values) => {
-      houseEdit(values)
+    const handleSumbit = (query,values) => {
+      values.lockRoomNo = detail.roomInfo?.roomNum
+  
+      console.log(query, values, 'values')
+      houseEdit(query, values)
         .then(() => {
-          alert("编辑成功").then(() => {
+          alert('编辑成功').then(() => {
             router.go(-1)
           })
         })

src/view/room-key/index.vue

@@ -39,16 +39,16 @@
 </template>
 
 <script>
-import { reactive, ref, onMounted } from "vue"
-import { Form, Button, Field, Uploader } from "vant"
-import { useRoute, useRouter } from "vue-router"
-import { useModel } from "@zjxpcyc/vue-tiny-store"
-import uploadImage from "@/utils/uploadImage"
-import request from "@/utils/request"
-import { alert } from "@/utils"
+import { reactive, ref, onMounted } from 'vue'
+import { Form, Button, Field, Uploader } from 'vant'
+import { useRoute, useRouter } from 'vue-router'
+import { useModel } from '@zjxpcyc/vue-tiny-store'
+import uploadImage from '@/utils/uploadImage'
+import request from '@/utils/request'
+import { alert } from '@/utils'
 
 export default {
-  name: "lookrecord",
+  name: 'lookrecord',
   components: {
     [Form.name]: Form,
     [Button.name]: Button,
@@ -59,9 +59,10 @@ export default {
     const route = useRoute()
     const router = useRouter()
     const roomId = route.query.roomId
+    const type = route.query.type
     const imgUrl = ref([])
 
-    const { detail, getDetail } = useModel("room")
+    const { detail, getDetail } = useModel(type === 'rent' ? 'room' : 'rent')
     const formData = reactive({
       roomId: roomId,
       keyNo: undefined,
@@ -71,11 +72,11 @@ export default {
 
     const handleSubmit = () => {
       request({
-        url: "/room/key/save",
+        url: `/${type}/key/save`,
         data: formData,
-        toast: "请稍候...",
+        toast: '请稍候...',
       }).then(() => {
-        alert("添加成功").then(() => {
+        alert('添加成功').then(() => {
           router.go(-1)
         })
       })
@@ -83,7 +84,7 @@ export default {
 
     const handleUpload = (file) => {
       if (file && file.file) {
-        uploadImage(file.file, "", 1).then((url) => {
+        uploadImage(file.file, '', 1).then((url) => {
           formData.url = url
           imgUrl.value = [{ url: url }]
         })