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

src/store/models/renting.js

   const list = ref([])
   const page = reactive({})
   const detail = reactive({})
-
+  const rentRole = reactive({})
+  const rentKeyBox = reactive({})
   const getList = data => {
     loading.value = true
     request({
     })
   }
 
-  
+    // 角色人信息
+  const getRole = data => {
+    request({
+      loadingId: 'rent.role.view',
+      url: '/rent/role/view',
+      params: {
+        roomId:data,
+      }
+    }).then(res => {
+      Object.assign(rentRole, res)
+    }).catch(e => {
+      console.error(e)
+      showDanger('获取角色人失败')
+    })
+  }
+
+ // 钥匙信息
+  const getKey = data => {
+    request({
+      loadingId: 'rent.key.view',
+      url: '/rent/key/view',
+      params: {
+        roomId: data,
+      }
+    }).then(res => {
+      Object.assign(rentKeyBox, res)
+    }).catch(e => {
+      console.error(e)
+      showDanger('获取钥匙失败')
+    })
+  }
+
 
 
 
     getList,
     detail,
     getDetail,
-    loading
+    loading,
+    getRole,
+    rentRole,
+    getKey,
+    rentKeyBox,
   }
 }

src/view/followup/index.vue

   <div class="closehouse">
     <van-form @submit="onSubmit">
       <van-field
-        v-model="state.id"
+        :model-value="`${detail.roomInfo?.roomCode}${detail.roomInfo?.id}`"
         name="id"
         label="房源编号"
         readonly
         placeholder="房源编号"
       />
       <van-field
-        v-model="state.building"
+        :model-value="detail.building?.buildingName"
         name="building"
         label="所属楼盘"
         readonly
         placeholder="所属楼盘"
-       
       />
+
       <van-field
+        required
+        :rules="[{ required: true, message: '请选择跟进类型' }]"
+        label="跟进类型"
+      >
+        <template #input>
+          <Picker
+            placeholder="请选择跟进类型"
+            :options="followTypeOptions"
+            v-model="formData.followType"
+          />
+        </template>
+      </van-field>
+      <!-- <van-field
         v-model="pickerState.value"
         readonly
         clickable
         required
-        name="address"
+        name="followType"
         label="跟进类型"
         placeholder="跟进类型"
         @click="pickerState.showPicker = true"
       />
       <van-popup v-model:show="pickerState.showPicker" position="bottom">
         <van-picker
-          :columns="columns"
+          :columns="followTypeOptions"
           @confirm="onConfirm"
           @cancel="pickerState.showPicker = false"
         />
-      </van-popup>
-      <!-- <van-field
-        v-model="state.building"
-        required
-        name="type"
-        label="关闭类型"
-        placeholder="请选择"
-        :rules="[{ required: true, message: '请填写密码' }]"
-      /> -->
+      </van-popup> -->
+
+      <van-field
+        v-show="formData.followType == 4"
+        v-model="formData.newRoomPrice"
+        label="价格调整为"
+        type="number"
+      >
+        <template #extra>
+          元/月
+        </template>
+      </van-field>
       <van-field
-        v-model="state.explain"
+        v-model="formData.followDesc"
         required
-        name="explain"
+        name="followDesc"
         label="跟进描述"
         placeholder="跟进描述"
         rows="3"
 </template>
 
 <script>
-import { reactive } from "vue";
-import { Form, Button, Field, Picker, Popup } from "vant";
-
+import { reactive, onMounted } from "vue";
+import { Form, Button, Field, Popup } from "vant";
+import { useRouter } from "vue-router";
+import { useModel } from "@zjxpcyc/vue-tiny-store";
+import Picker from "@/components/Picker";
+import request from "@/utils/request";
 export default {
   name: "closehouse",
   components: {
     [Button.name]: Button,
     [Field.name]: Field,
     [Popup.name]: Popup,
-    [Picker.name]: Picker,
+    Picker: Picker,
     // Secondhand:secondhand,
   },
   data() {
     return {};
   },
   setup() {
-    const state = reactive({
-      id: "",
-      building: "",
+     const roomId = router.currentRoute.value.query.roomId;
+    const formData = reactive({
+      roomId: roomId,
+      followType: undefined, //根据类型
+      newRoomPrice: undefined, //新价格
+      followDesc: undefined, //根进描述
     });
+    const router = useRouter();
+   
+    const { detail, getDetail } = useModel("room");
+
+    const followTypeOptions = [
+      {
+        text: "日常跟进",
+        value: "2",
+      },
+      {
+        text: "带看",
+        value: "1",
+      },
+      {
+        text: "查看敏感信息",
+        value: "3",
+      },
+      {
+        text: "价格调整",
+        value: "4",
+      },
+    ];
+
     const onSubmit = (values) => {
       console.log("submit", values);
+
+      request({
+        url: "/room/follow/save",
+        params: formData,
+      }).then(() => {
+        // list.value = res.result;
+      });
     };
 
-    const pickerState = reactive({
-      value: "",
-      showPicker: false,
+    onMounted(() => {
+      if (!detail.roomInfo) {
+        getDetail(roomId);
+      }
     });
-    const columns = ["杭州", "宁波", "温州", "嘉兴", "湖州"];
-
-    const onConfirm = (value) => {
-      pickerState.value = value;
-      pickerState.showPicker = false;
-    };
 
     return {
-      state,
-      pickerState,
-      columns,
-      onConfirm,
+   
+
+      formData,
+
       onSubmit,
+      detail,
+      followTypeOptions,
     };
   },
 };

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

 <template>
-  <x-loading x-id="room.follow.list">
+  <x-loading x-id="rent.follow.list">
     <p v-if="!list.length">暂无跟进记录</p>
     <van-steps direction="vertical" :active="0" v-else>
       <van-step v-for="(item, index) in list" :key="index">
+        <p>{{ item.followUserName }} {{ item.createTime }}</p>
         <p>
-          {{item.followUserName}} {{item.createTime}}
-        </p>
-        <p>
-          {{item.followType === '0' ? '看房, ': ''}}
-          {{item.followDesc}}
+          {{ item.followType === "0" ? "看房, " : "" }}
+          {{ item.followDesc }}
         </p>
         <p v-if="item.followImg">
           <van-image width="100" height="100" :src="item.followImg" />
-        </p>          
+        </p>
       </van-step>
     </van-steps>
+
+    <!-- <x-field label=" " v-shiro="'room:info:security'"> -->
+
+    <van-button
+      size="small"
+      type="primary"
+      v-shiro="'room:renting:follow'"
+      @click="goToAddFollow"
+      >添加跟进</van-button
+    >
+    <!-- </x-field> -->
   </x-loading>
 </template>
 
 <script>
-import { onMounted, ref } from 'vue'
-import { List, Step, Steps, Image } from 'vant'
-import request from '@/utils/request'
+import { onMounted, ref } from "vue";
+import { List, Step, Steps, Image, Button } from "vant";
+import { useRouter } from "vue-router";
+import request from "@/utils/request";
 
 export default {
   components: {
     [Steps.name]: Steps,
     [Step.name]: Step,
     [Image.name]: Image,
+    [Button.name]: Button,
   },
   props: {
     roomId: undefined,
   },
   setup(props) {
-    const list = ref([])
-
+    const list = ref([]);
+    const router = useRouter();
     const handleLoad = () => {
       request({
-        loadingId: 'room.follow.list',
-        url: '/room/follow/list',
+        loadingId: "rent.follow.list",
+        url: "/rent/follow/list",
         params: {
           roomId: props.roomId,
           pageNo: 1,
           pageSize: 100,
-        }
-      }).then(res => {
-        list.value = res.result
-      })
-    }
+        },
+      }).then((res) => {
+        list.value = res.result;
+      });
+    };
+
+    const goToAddFollow = () =>
+      router.push({
+        name: "secondhand.detail",
+        query: { roomId: props.roomId },
+      });
 
     onMounted(() => {
-      handleLoad()
-    })
+      handleLoad();
+    });
 
     return {
       list,
       handleLoad,
-    }
-  }
-}
+      goToAddFollow,
+    };
+  },
+};
 </script>

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

 <template>
-  <x-loading x-id="room.key">
-    <p v-if="!roomKey">暂无钥匙信息</p>
-    <p v-else-if="roomKey.status === '1'">当前委托书正在审核中</p>
+  <x-loading x-id="rent.key.view">
+    <p v-if="!rentKey">暂无钥匙信息</p>
+    <p v-else-if="rentKey.status === '1'">当前委托书正在审核中</p>
     <div v-else>
       <shiro name="room:info:key">
         <template #callback>
           <van-empty image="error" description="无钥匙协议查看权限" />
         </template>
 
-        <x-field label=" " v-if="roomKeyBox.isCreate">
+        <x-field label=" " v-if="rentKeyBox.isCreate">
           <van-button size="small" type="danger">删除钥匙</van-button>
         </x-field>
 
         <x-field label="上传人">
-          {{roomKey.keyUserName}} ({{roomKey.keyUserPhone}})
+          {{rentKey.keyUserName}} ({{rentKey.keyUserPhone}})
         </x-field>
 
         <x-field label="上传时间">
-          {{roomKey.updateTime}}
+          {{rentKey.updateTime}}
         </x-field>
 
         <x-field label="钥匙编号">
-          {{roomKey.keyNo}}
+          {{rentKey.keyNo}}
         </x-field>
 
         <x-field label="存储位置">
-          {{roomKey.address}}
+          {{rentKey.address}}
         </x-field>
 
-        <van-image width="100" height="100" :src="roomKey.url" />
+        <van-image width="100" height="100" :src="rentKey.url" />
 
       </shiro>
     </div>
     roomId: undefined
   },
   setup(props) {
-    const { detail, roomKeyBox, getKey } = useModel("room")
+    const { detail, rentKeyBox, getKey } = useModel("renting")
 
-    const roomKey = computed(() => roomKeyBox.roomKey)
+    const rentKey = computed(() => rentKeyBox.roomKey)
 
     onMounted(() => {
-      if (!roomKeyBox.roomKey) {
+      if (!rentKeyBox.roomKey) {
         getKey(props.roomId)
       }
     })
 
     return {
       detail,
-      roomKeyBox,
-      roomKey,
+      rentKeyBox,
+      rentKey,
     }
   }
 }

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

 <template>
-  <x-loading x-id="room.look.list">
+  <x-loading x-id="rent.look.list">
     <p v-if="!list.length">暂无空看记录</p>
     <van-steps direction="vertical" :active="0" v-else>
       <van-step v-for="(item, index) in list" :key="index">
 
     const handleLoad = () => {
       request({
-        loadingId: 'room.look.list',
-        url: '/room/look/list',
+        loadingId: 'rent.look.list',
+        url: '/rent/look/list',
         params: {
           roomId: props.roomId,
           pageNo: 1,

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

     <x-field label="房源ID"> {{ roomInfo.roomCode }}{{ roomInfo.id }} </x-field>
 
     <x-field label="所属楼盘">
-      {{ roomInfo.buildingName }}
+      {{ building.buildingName }}
     </x-field>
 
     <x-field label="面积"> {{ roomInfo.acreage }} ㎡ </x-field>
       }}
     </x-field>
 
-
-
     <x-field label="创建方式">
       {{ roomInfo.createMethod === "1" ? "外部录入" : "荟居录入" }}
     </x-field>
         size="small"
         type="warning"
         @click="handleSecurityClick"
-        >查看敏感信息（剩余 {{ otherData.leftSecurityNum }} 次）</van-button
+        >查看敏感信息（剩余 {{ otherData?.leftSecurityNum }} 次）</van-button
       >
       <van-button
         v-else
       type: Object,
       default: () => ({}),
     },
+    building: {
+      type: Object,
+      default: () => ({}),
+    },
+
     otherData: Object,
   },
   setup(props) {

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

 <template>
-  <x-loading x-id="room.role">
+  <x-loading x-id="rent.role.view">
     <x-field label="首次录入人">
       {{firstInputUser}}
     </x-field>
     <x-field label="首次录入时间">
-      {{roomRole.createTime}}
+      {{rentRole.createTime}}
     </x-field>
     
     <x-field label="录入人">
       {{inputUser}}
     </x-field>
     <x-field label="录入时间">
-      {{roomRole.recordTime}}
+      {{rentRole.recordTime}}
     </x-field>
     
     <x-field label="维护人">
-      {{getNameFormated(roomRole.belongName, roomRole.belongId)}}
+      {{getNameFormated(rentRole.belongName, rentRole.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)}}
+      {{getNameFormated(rentRole.rescName, rentRole.rescId)}}
     </x-field>
     <x-field label="达成时间">
-      {{roomRole.rescTime}}
+      {{rentRole.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}}
+      {{getNameFormated(rentRole.keyName, rentRole.keyId)}}
     </x-field>
 
     <x-field label="最后修改人">
-      {{getNameFormated(roomRole.updateName, roomRole.updateId)}}
+      {{getNameFormated(rentRole.updateName, rentRole.updateId)}}
     </x-field>
     <x-field label="最后修改时间">
-      {{roomRole.updateTime}}
+      {{rentRole.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>
     },
   },
   setup(props) {
-    const { roomRole, getRole } = useModel("room")
+    const { rentRole, getRole } = useModel("renting")
 
     const getNameFormated = (name, id) => {
       return name + (name ? `(ID：${id})` : '')
       if (createMethod === '1') {
         return '外部录入'
       } else {
-        return getNameFormated(roomRole.createName, roomRole.createId)
+        return getNameFormated(rentRole.createName, rentRole.createId)
       }
     })
 
       if (createMethod === '1') {
         return '外部录入'
       } else {
-        return getNameFormated(roomRole.recordName, roomRole.recordId)
+        return getNameFormated(rentRole.recordName, rentRole.recordId)
       }
     })
 
     })
 
     return {
-      roomRole,
+      rentRole,
       firstInputUser,
       inputUser,
       getNameFormated,

src/view/renting/detail/index.vue

 <template>
   <div class="secondhanddetail">
     <!-- xId='room.view' -->
-    <x-loading x-id="room.view" tip="正在加载详情">
+    <x-loading x-id="rent.key.view" tip="正在加载详情">
       <div>
         <Swiper></Swiper>
       </div>
       </div>
 
       <van-cell-group title="房源信息">
-        <RoomMain :room-info="detail.roomInfo" :other-data="roomOtherData" />
+        <RoomMain :room-info="detail.roomInfo" :building="detail.building"  :other-data="roomOtherData" />
       </van-cell-group>
 
       <van-cell-group title="其他信息">
             <RoomBase :room-info="detail.roomInfo" :building="detail.building" />
           </van-collapse-item>
 
-          <van-collapse-item name="2">
+          <!-- <van-collapse-item name="2">
             <template #title>
               <div>物业信息</div>
             </template>
             <RoomEstate :build-info="detail.building" />
-          </van-collapse-item>
+          </van-collapse-item> -->
 
           <van-collapse-item name="role">
             <template #title>
             <RoomRole :room-info="detail.roomInfo" />
           </van-collapse-item>
           
-          <van-collapse-item name="auth">
+          <!-- <van-collapse-item name="auth">
             <template #title>
               <div>委托书</div>
             </template>
             <RoomAuth :room-id="roomId" />
-          </van-collapse-item>
+          </van-collapse-item> -->
           
           <van-collapse-item name="key">
             <template #title>
 import { useModel } from "@zjxpcyc/vue-tiny-store"
 import RoomMain from './components/Main'
 import RoomBase from './components/Base'
-import RoomEstate from './components/Estate'
+// import RoomEstate from './components/Estate'
 import RoomRole from './components/Role'
-import RoomAuth from './components/Auth'
+// import RoomAuth from './components/Auth'
 import RoomKey from './components/Key'
 import RoomFollow from './components/Follow'
 import RoomLook from './components/Look'
     Swiper: Swiper,
     RoomMain,
     RoomBase,
-    RoomEstate,
+    // RoomEstate,
     RoomRole,
-    RoomAuth,
+    // RoomAuth,
     RoomKey,
     RoomFollow,
     RoomLook,

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

     <p v-if="!list.length">暂无跟进记录</p>
     <van-steps direction="vertical" :active="0" v-else>
       <van-step v-for="(item, index) in list" :key="index">
+        <p>{{ item.followUserName }} {{ item.createTime }}</p>
         <p>
-          {{item.followUserName}} {{item.createTime}}
-        </p>
-        <p>
-          {{item.followType === '0' ? '看房, ': ''}}
-          {{item.followDesc}}
+          {{ item.followType === "0" ? "看房, " : "" }}
+          {{ item.followDesc }}
         </p>
         <p v-if="item.followImg">
           <van-image width="100" height="100" :src="item.followImg" />
-        </p>          
+        </p>
       </van-step>
     </van-steps>
+    <van-button
+      size="small"
+      type="primary"
+     
+      @click="goToAddFollow"
+      >添加跟进</van-button
+    >
+     <!-- v-shiro="'room:info:addFollow'" -->
   </x-loading>
 </template>
 
 <script>
-import { onMounted, ref } from 'vue'
-import { List, Step, Steps, Image } from 'vant'
-import request from '@/utils/request'
+import { onMounted, ref } from "vue";
+import { List, Step, Steps, Image,Button } from "vant";
+import { useRouter } from 'vue-router'
+import request from "@/utils/request";
 
 export default {
   components: {
     [Steps.name]: Steps,
     [Step.name]: Step,
     [Image.name]: Image,
+    [Button.name]: Button,
+    
   },
   props: {
     roomId: undefined,
   },
   setup(props) {
-    const list = ref([])
+    const list = ref([]);
+    const router = useRouter()
 
     const handleLoad = () => {
       request({
-        loadingId: 'room.follow.list',
-        url: '/room/follow/list',
+        loadingId: "room.follow.list",
+        url: "/room/follow/list",
         params: {
           roomId: props.roomId,
           pageNo: 1,
           pageSize: 100,
-        }
-      }).then(res => {
-        list.value = res.result
-      })
-    }
+        },
+      }).then((res) => {
+        list.value = res.result;
+      });
+    };
+    const goToAddFollow = () =>
+      router.push({
+        name: "followup",
+        query: { roomId: props.roomId },
+      });
 
     onMounted(() => {
-      handleLoad()
-    })
+      handleLoad();
+    });
 
     return {
       list,
       handleLoad,
-    }
-  }
-}
+      goToAddFollow,
+    };
+  },
+};
 </script>