feats

src/view/secondhand/detail/components/Estate.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-if="buildInfo">
     <x-field label="物业费">
       {{buildInfo.propertyPrice}} 元/m²/月
     </x-field>
@@ -16,7 +16,7 @@
       {{buildInfo.propertyCompany}}
     </x-field>
   </div>
-
+  <p v-else>暂无物业信息</p>
 </template>
 
 <script>

src/view/secondhand/detail/components/Role.vue

@@ -0,0 +1,128 @@
+<template>
+  <x-loading x-id="room.role">
+    <x-field label="首次录入人">
+      {{firstInputUser}}
+    </x-field>
+    <x-field label="首次录入时间">
+      {{roomRole.createTime}}
+    </x-field>
+    
+    <x-field label="录入人">
+      {{inputUser}}
+    </x-field>
+    <x-field label="录入时间">
+      {{roomRole.recordTime}}
+    </x-field>
+    
+    <x-field label="维护人">
+      {{getNameFormated(roomRole.belongName, roomRole.belongId)}}
+    </x-field>
+    <x-field label=" " v-shiro="'room:info:belongTel'">
+      <van-button size="small" type="warning">查看电话</van-button>
+    </x-field>
+    
+    <x-field label="实勘人">
+      {{getNameFormated(roomRole.rescName, roomRole.rescId)}}
+    </x-field>
+    <x-field label="达成时间">
+      {{roomRole.rescTime}}
+    </x-field>
+    
+    <x-field label="钥匙人">
+      {{getNameFormated(roomRole.keyName, roomRole.keyId)}}
+    </x-field>
+
+    <x-field label="委托人">
+      {{getNameFormated(roomRole.authName, roomRole.authId)}}
+    </x-field>
+    <x-field label="委托时间">
+      {{roomRole.authTime}}
+    </x-field>
+
+    <x-field label="最后修改人">
+      {{getNameFormated(roomRole.updateName, roomRole.updateId)}}
+    </x-field>
+    <x-field label="最后修改时间">
+      {{roomRole.updateTime}}
+    </x-field>
+
+    <template v-if="roomInfo.roomStatus === '8'">
+      <x-field label="成交人">
+        {{getNameFormated(roomRole.doneName, roomRole.doneId)}}
+      </x-field>
+      <x-field label="成交时间">
+        {{roomRole.doneTime}}
+      </x-field>
+    </template>
+
+    <template v-if="roomInfo.roomStatus !== '0' && roomInfo.roomStatus !== '8'">
+      <x-field label="申请关闭人">
+        {{getNameFormated(roomRole.applyCloseName, roomRole.applyCloseId)}}
+      </x-field>
+      <x-field label="申请关闭时间">
+        {{roomRole.applyCloseTime}}
+      </x-field>
+      <x-field label="关闭操作人">
+        {{getNameFormated(roomRole.closeName, roomRole.closeId)}}
+      </x-field>
+      <x-field label="关闭操作时间">
+        {{roomRole.closeTime}}
+      </x-field>
+    </template>
+
+  </x-loading>
+</template>
+
+<script>
+import { useModel } from '@zjxpcyc/vue-tiny-store'
+import { computed, onMounted } from 'vue'
+import { Button } from 'vant'
+
+export default {
+  components: {
+    [Button.name]: Button,
+  },
+  props: {
+    roomInfo: {
+      type: Object,
+      default: () => ({})
+    },
+  },
+  setup(props) {
+    const { roomRole, getRole } = useModel("room")
+
+    const getNameFormated = (name, id) => {
+      return name + (name ? `(ID：${id})` : '')
+    }
+    
+    const firstInputUser = computed(() => {
+      const createMethod = props.roomInfo?.createMethod
+      if (createMethod === '1') {
+        return '外部录入'
+      } else {
+        return getNameFormated(roomRole.createName, roomRole.createId)
+      }
+    })
+
+    const inputUser = computed(() => {
+      const createMethod = props.roomInfo?.createMethod
+      if (createMethod === '1') {
+        return '外部录入'
+      } else {
+        return getNameFormated(roomRole.recordName, roomRole.recordId)
+      }
+    })
+
+    onMounted(() => {
+      getRole(props.roomInfo.id)
+    })
+
+    return {
+      roomRole,
+      firstInputUser,
+      inputUser,
+      getNameFormated,
+    }
+  }
+}
+</script>

src/view/secondhand/detail/index.vue

@@ -28,7 +28,7 @@
       </van-cell-group>
 
       <van-cell-group title="其他信息">
-        <van-collapse v-model="collapseItem" accordion @change="handleCollapseChange">
+        <van-collapse v-model="collapseItem" accordion>
           <van-collapse-item name="1">
             <template #title>
               <div>基础信息</div>
@@ -40,16 +40,14 @@
             <template #title>
               <div>物业信息</div>
             </template>
-            <RoomEstate :build-info="detail.buildInfo" />
+            <RoomEstate :build-info="detail.building" />
           </van-collapse-item>
 
           <van-collapse-item name="role">
             <template #title>
               <div>角色人</div>
             </template>
-            <x-loading x-id="room.role" tips="请稍等...">
-              <!-- <Contextc :options="roleInformationOptions"></Contextc> -->
-            </x-loading>
+            <RoomRole :room-info="detail.roomInfo" />
           </van-collapse-item>
           
           <van-collapse-item name="auth">
@@ -127,6 +125,7 @@ import { useModel } from "@zjxpcyc/vue-tiny-store"
 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'
@@ -156,6 +155,7 @@ export default {
     RoomMain,
     RoomBase,
     RoomEstate,
+    RoomRole,
     RoomAuth,
     RoomKey,
     RoomFollow,
@@ -174,7 +174,7 @@ export default {
     const collapseItem = ref()
     const phone = ref("")
 
-    const { detail, roomRole, getDetail, getRole } = useModel("room")
+    const { detail, getDetail } = useModel("room")
 
     onMounted(() => {
       getDetail(roomId);
@@ -238,13 +238,6 @@ export default {
       showShare.value = false;
     };
 
-    // 查看房源内容
-    const handleCollapseChange = activeName => {
-      if (activeName === 'role' && roomId != roomRole.roomId) {
-        getRole(roomId)
-      }
-    }
-
     const roomOtherData = computed(() => {
       return {
         leftSecurityNum: detail.leftSecurityNum,
@@ -264,7 +257,6 @@ export default {
       shareOptions,
       detail,
       collapseItem,
-      handleCollapseChange,
       roomId,
       roomOtherData,
     };