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

src/components/detailCompents/swiper/index.vue

@@ -4,7 +4,6 @@
       <van-swipe-item v-for="(image, index) in images" :key="index" >
         <van-image
           height="300"
-          fit="contain"
           :src="image.image"
           @click="onPerView(index)"
         />
@@ -24,9 +23,7 @@
           v-for="(image, index) in images"
           :key="index"
           :title="image.text"
-          
         >
-          <!-- {{ image.text }} -->
         </van-tab>
       </van-tabs>
     </div>
@@ -53,31 +50,16 @@ export default {
     [Tabs.name]: Tabs,
     [Tab.name]: Tab,
   },
-
-  //   images = [
-  //       'https://img.yzcdn.cn/vant/apple-1.jpg',
-  //       'https://img.yzcdn.cn/vant/apple-2.jpg',
-  //     ];
-
   props: {
     images: {
       type: Array,
-      default: () => [
-        {
-          image: "https://img.yzcdn.cn/vant/apple-1.jpg",
-          text: "户型",
-        },
-        {
-          image: "https://img.yzcdn.cn/vant/apple-2.jpg",
-          text: "客厅",
-        },
-      ],
+      default: () => [],
     },
   },
 
   setup(props,) {
     const current = ref(0);
-const swipe = ref();
+    const swipe = ref();
     
     const onChange = (index) => {
       current.value = index;
@@ -91,8 +73,8 @@ const swipe = ref();
     };
     const onClickTab = (index) => {
       current.value=index
-    swipe.value.swipeTo(index)
-swipe.value.resize()
+      swipe.value.swipeTo(index)
+      swipe.value.resize()
     
       console.log(index,  "ongchawng");
     };
@@ -100,7 +82,7 @@ swipe.value.resize()
     // refs.checkbox.toggle();
     onPerView;
     return {
-        swipe,
+      swipe,
       current,
       onChange,
       onPerView,

src/store/models/room.js

@@ -178,6 +178,27 @@ export default () => {
     })
   }
 
+  // 保存
+  const saveResc = (data, roomId) => {
+    return request({
+      url: '/room/resc/save',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      params: { roomId },
+      data,
+      toast: '请稍候...',
+    })
+  }
+
+  // 删除
+  const deleteResc = ({roomId, rescId, rescType}) => {
+    return request({
+      url: '/room/resc/delete',
+      params: { roomId, rescId, rescType },
+      toast: '请稍候...',
+    })
+  }
 
   return {
     list,
@@ -199,5 +220,7 @@ export default () => {
     houseEdit,
     getRescList,
     setRescCover,
+    saveResc,
+    deleteResc,
   }
 }

src/view/resc/components/Items.vue

@@ -67,7 +67,14 @@ export default {
 
     // 看不到图
     const notAllowed = computed(() => {
-      return props.rescType === '0' && !permissions['room:info:viewNum'] && !permissions['room:info:delResc']
+      // 只控制门牌
+      const isDoor = props.rescType === '0'
+      // 是否新数据
+      const nwData = !!props.rescList[0]?.id
+      // 是否有对应的权限
+      const hasRight = permissions['room:info:viewNum'] || permissions['room:info:delResc']
+
+      return nwData && isDoor && !hasRight
     })
 
     // 是否允许删除图片
@@ -79,7 +86,7 @@ export default {
 
     // 是否允许上传图片
     const canUpload = computed(() => {
-      const inProtected = props.limitFlag !== 'rescLimit' && props.roomInfo?.rescStatus === '9'
+      const inProtected = props.limitFlag === 'rescLimit' && props.roomInfo?.rescStatus === '9'
       const validating = props.roomInfo?.rescStatus === '1'
 
       return !inProtected && !validating

src/view/resc/index.vue

@@ -1,17 +1,16 @@
 <template>
   <x-loading x-id="room.resc.list">
-    <div class="resc-mgtp" v-if="initData.limitFlag === 'rescLimit' && detail.roomInfo?.rescStatus === '9'">
-      <p>房源录入后4小时内仅允许房源录入人上传图片，目前尚无权限上传实勘图</p>
-    </div>
-    <div class="resc-mgtp" v-if="detail.roomInfo?.rescStatus === '1'">
-      <p>当前实勘图正在审核中</p>
-    </div>
-    <div class="resc-mgtp" v-if="detail.roomInfo?.rescStatus === '0'">
-      <x-field label="实勘人">{{initData.rescUser}}</x-field>
-      <x-field label="达成时间">{{initData.rescTime}}</x-field>
-    </div>
-
     <div class="resc">
+      <div class="resc-tip" v-if="initData.limitFlag === 'rescLimit' && detail.roomInfo?.rescStatus === '9'">
+        <p>房源录入后4小时内仅允许房源录入人上传图片，目前尚无权限上传实勘图</p>
+      </div>
+      <div class="resc-tip" v-if="detail.roomInfo?.rescStatus === '1'">
+        <p>当前实勘图正在审核中</p>
+      </div>
+      <div class="resc-tip" v-if="detail.roomInfo?.rescStatus === '0'">
+        <x-field label="实勘人">{{initData.rescUser}}</x-field>
+        <x-field label="达成时间">{{initData.rescTime}}</x-field>
+      </div>
       <van-row>
         <van-col span="12">
           <g-section title="门牌">
@@ -92,8 +91,8 @@
         />
       </g-section>
 
-      <div style="margin-top: 2em">
-        <van-button block type="warning" v-shiro="'room:info:addResc'">
+      <div style="margin-top: 2em" v-if="canSubmit">
+        <van-button block type="warning" v-shiro="'room:info:addResc'" @click="handleSubmit">
           保存审核并提交
         </van-button>
       </div>
@@ -102,8 +101,8 @@
 </template>
 
 <script>
-import { onMounted, ref } from "vue";
-import { useRoute } from 'vue-router'
+import { computed, onMounted, ref } from "vue";
+import { useRoute, useRouter } from 'vue-router'
 import { useModel } from '@zjxpcyc/vue-tiny-store'
 //
 import {
@@ -113,7 +112,7 @@ import {
   Button,
 } from "vant"
 import RescItems from './components/Items'
-import { showDanger, showSuccess } from '@/utils'
+import { showDanger, showSuccess, alert } from '@/utils'
 import uploadImage from '@/utils/uploadImage'
 
 export default {
@@ -128,12 +127,26 @@ export default {
   setup() {
     const initData = ref({})
     const route = useRoute()
+    const router = useRouter()
     const willSave = ref([])
 
-    const { detail, getRescList, getDetail, setRescCover } = useModel('room')
+    const { detail, getRescList, getDetail, setRescCover, saveResc, deleteResc } = useModel('room')
 
     const roomId = route.query.roomId - 0
 
+    const canSubmit = computed(() => {
+      // 报单锁定
+      const isLocked = detail.roomInfo?.status === '7'
+      // 已实勘
+      const rescDone = detail.roomInfo?.rescStatus === '0'
+      // 非保护期
+      const notProteced = detail.roomInfo?.rescStatus === '9' && initData.value.limitFlag != 'rescLimit'
+      // 存在未保存的数据
+      const hasNoSaved = willSave.value.length > 0
+
+      return !isLocked && (rescDone || notProteced) && hasNoSaved
+    })
+
     // 设置封面
     const handleCover = resc => {
       setRescCover(resc.id).then(() => {
@@ -151,7 +164,9 @@ export default {
 
     // 上传图片
     const handleUpload = ({file, type}) => {
-      const sort = (initData.value.rescList[type] || []).length + willSave.value.filter(x => x.imgType === type).length
+      const rescListData = initData.value.rescList || {}
+      const list = rescListData[type] || []
+      const sort = list.length + willSave.value.filter(x => x.imgType === type).length
 
       uploadImage(file, '1').then(url => {
         const img = {
@@ -165,8 +180,8 @@ export default {
         initData.value = {
           ...initData.value,
           rescList: {
-            ...initData.value.rescList || {},
-            [type]: (initData.value.rescList[type] || []).concat(img)
+            ...rescListData,
+            [type]: list.concat(img)
           }
         }
       })
@@ -174,9 +189,9 @@ export default {
 
     // 删除图片
     const handleDelete = ({resc, index, rescType}) => {
-      // 尚未保存
-      if (!resc.id) {
-        const list = initData.value.rescList[rescType] || []        
+      const del = () => {
+        const rescListData = initData.value.rescList || {}
+        const list = rescListData[rescType] || []
         list.splice(index, 1)
 
         initData.value = {
@@ -186,10 +201,38 @@ export default {
             [rescType]: list
           }
         }
+
+        if (willSave.value.length) {
+          willSave.value = willSave.value.filter(x => x.url !== resc.url && x.imgType !== rescType)
+        }
+      }
+
+      if (resc.id) {
+        deleteResc({
+          roomId,
+          rescId: resc.id,
+          rescType
+        }).then(() => {
+          del()
+          showSuccess('删除成功')
+        })
       } else {
-        // 
+        // 没有 id 的说明未提交, 可以直接删除
+        del()
       }
     }
+
+    // 保存
+    const handleSubmit = () => {
+      saveResc(willSave.value, roomId).then(() => {
+        alert('成功提交实勘审核').then(() => {
+          router.go(-1)
+        })
+      }).catch(e => {
+        console.error(e)
+        showDanger(e.message)
+      })
+    }
     
     onMounted(() => {
       getDetail(roomId)
@@ -203,9 +246,11 @@ export default {
     return {
       initData,
       detail,
+      canSubmit,
       handleCover,
       handleUpload,
       handleDelete,
+      handleSubmit,
     };
   },
 };
@@ -215,10 +260,11 @@ export default {
 <style lang="less" scoped>
 .resc {
   padding: 1em;
-}
 
-.resc-mgtp {
-  margin-top: 1em;
+  .resc-tip {
+    font-weight: 500;
+    color: rgba(0,0,0, .8)
+  }
 }
 
 </style>

src/view/secondhand/detail/index.vue

@@ -3,7 +3,7 @@
     <!-- xId='room.view' -->
     <x-loading x-id="room.view" tip="正在加载详情">
       <div>
-        <Swiper></Swiper>
+        <Swiper :images="imageList"></Swiper>
       </div>
 
       <div class="title">
@@ -92,7 +92,7 @@
 <script>
 import { ref, onMounted, computed } from "vue";
 import { useRouter } from "vue-router";
-import { Swiper } from "../../../components/detailCompents";
+import { Swiper } from "@/components/detailCompents";
 import {
   Icon,
   Popover,
@@ -170,55 +170,22 @@ export default {
       getDetail,
     } = useModel("room")
 
+    const { dicts, getDict } = useModel('dicts')
+
+    const getRescType = val => {
+      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').map(x => ({image: x.url, text: getRescType(x.imgType)}))
+    })
+
     onMounted(() => {
       getDetail(roomId);
+      getDict('roomResc_type')
     });
 
-    // 通过 actions 属性来定义菜单选项
-    const actions = [
-      { text: "设置房源保护", value: "1" },
-      { text: "新增业主电话", value: "2" },
-      { text: "下架房源", value: "3" },
-      { text: "修改房源", value: "4" },
-      { text: "分享房源", value: "5" },
-      { text: "房源实勘", value: "6" },
-    ];
-    // 设为房源保护后，只有录入人、同部门的上级以及上级部门的上级可以看到房源敏感信息。
-    const onSelect = (action) => {
-      console.log(action);
-      if (action.value == 1) {
-        // 设置房源保护
-        Dialog.confirm({
-          title: "提示",
-          message:
-            "设为房源保护后，只有录入人、同部门的上级以及上级部门的上级可以看到房源敏感信息。",
-          theme: "round-button",
-        })
-          .then(() => {
-            // on close
-          })
-          .catch(() => {
-            // on cancel
-          });
-      } else if (action.value == 2) {
-        // 新增业主电话
-        phoneShow.value = true;
-      } else if (action.value == 3) {
-        // 下架房源
-
-        router.push("/closehouse");
-      } else if (action.value == 4) {
-        // 修改房源
-        router.push("/editsecondhandhouse");
-      } else if (action.value == 5) {
-        // 分享房源
-        showShare.value = true;
-      } else if (action.value == 6) {
-        // 房源实勘
-        router.push("/resc");
-      }
-    };
-        
     const shareOptions = [
       { name: "微信", icon: "wechat" },
       { name: "微博", icon: "weibo" },
@@ -243,8 +210,7 @@ export default {
 
     return {
       phone,
-      actions,
-      onSelect,
+      imageList,
       showPopover,
       showShare,
       phoneShow,

vue.config.js

@@ -11,8 +11,8 @@ module.exports = {
     disableHostCheck: true,
     proxy: {
       '/mp': {
-        target: 'http://10.161.7.66:8080/',
-        // target: 'http://localhost:8080/',
+        // target: 'http://10.161.7.66:8080/',
+        target: 'http://localhost:8080/',
         ws: true,
         changeOrigin: true,
         // pathRewrite: {'^/mp': ''}