feats

src/router.js

@@ -114,6 +114,14 @@ const routes = [
       title: "实勘上传",
     },
   },
+  {
+    path: "/room-auth",
+    name: "room.auth",
+    component: () => import("./view/room-auth"),
+    meta: {
+      title: "委托书新增",
+    },
+  },
 ]
 
 const router = createRouter({

src/view/followup/index.vue

@@ -56,7 +56,12 @@
         ]"
       />
       <div style="margin: 1em">
-        <van-button block type="warning" native-type="submit">
+        <van-button
+          block
+          type="warning"
+          native-type="submit"
+          v-shiro="'room:info:addFollow'"
+        >
           提交
         </van-button>
       </div>
@@ -71,7 +76,7 @@ import { useRouter } from "vue-router"
 import { useModel } from "@zjxpcyc/vue-tiny-store"
 import Picker from "@/components/Picker"
 import request from "@/utils/request"
-import { alert } from "../../utils"
+import { alert } from "@/utils"
 
 export default {
   name: "closehouse",
@@ -116,9 +121,7 @@ export default {
       },
     ]
 
-    const onSubmit = (values) => {
-      console.log("submit", values)
-
+    const onSubmit = () => {
       request({
         url: "/room/follow/save",
         data: formData,
@@ -127,7 +130,6 @@ export default {
         alert("添加成功").then(() => {
           router.go(-1)
         })
-        //
       })
     }
 

src/view/look/index.vue

@@ -1,81 +1,81 @@
 <template>
-  <div class="lookrecord">
-    <van-form @submit="onSubmit">
-      <van-field
-        :model-value="`${detail.roomInfo?.roomCode}${detail.roomInfo?.id}`"
-        name="id"
-        label="房源编号"
-        readonly
-        placeholder="房源编号"
-      />
-      <van-field
-        :model-value="detail.building?.buildingName"
-        name="building"
-        label="所属楼盘"
-        readonly
-        placeholder="所属楼盘"
-      />
-      <van-field
-        v-model="formData.followTime"
-        readonly
-        clickable
-        required
-        name="address"
-        label="看房时间"
-        placeholder=""
-        @click="showTimePicker = true"
-        :rules="[{ required: true, message: '请选择时间' }]"
-      />
-      <van-popup v-model:show="showTimePicker" position="bottom">
-        <van-datetime-picker
-          type="datetime"
-          @confirm="onConfirm"
-          @cancel="showTimePicker = false"
+  <x-loading x-id="room.view">
+    <div class="lookrecord">
+      <van-form @submit="handleSubmit">
+        <van-field
+          :model-value="`${detail.roomInfo?.roomCode}${detail.roomInfo?.id}`"
+          name="id"
+          label="房源编号"
+          readonly
+          placeholder="房源编号"
         />
-      </van-popup>
-      <!-- <van-field
-        v-model="state.building"
-        required
-        name="type"
-        label="关闭类型"
-        placeholder="请选择"
-        :rules="[{ required: true, message: '请填写密码' }]"
-      /> -->
-      <van-field
-        v-model="formData.followDesc"
-        required
-        name="followDesc"
-        label="跟进描述"
-        placeholder="跟进描述"
-        rows="3"
-        autosize
-        type="textarea"
-        :rules="[
-          { required: true, message: '请填写跟进描述' },
-          { pattern, message: '记录必须包含汉字' },
-        ]"
-      />
-      <!-- :before-delete="handleDelete" -->
-      <van-field name="followImg" label="上传图片">
-        <template #input>
-          <van-uploader
-            v-model="imgUrl"
-            :after-read="handleUpload"
-            :max-count="1"
+        <van-field
+          :model-value="detail.building?.buildingName"
+          name="building"
+          label="所属楼盘"
+          readonly
+          placeholder="所属楼盘"
+        />
+        <van-field
+          v-model="followTimeLook"
+          readonly
+          clickable
+          required
+          name="address"
+          label="看房时间"
+          placeholder=""
+          @click="showTimePicker = true"
+          :rules="[{ required: true, message: '请选择时间' }]"
+        />
+        <van-popup v-model:show="showTimePicker" position="bottom">
+          <van-datetime-picker
+            v-model="formData.followTime"
+            type="datetime"
+            @confirm="onConfirm"
+            @cancel="showTimePicker = false"
           />
-        </template>
-      </van-field>
-      <div style="margin: 16px">
-        <van-button block type="warning" native-type="submit">
-          提交
-        </van-button>
-      </div>
-    </van-form>
-  </div>
+        </van-popup>
+        <van-field
+          v-model="formData.followDesc"
+          required
+          name="followDesc"
+          label="跟进描述"
+          placeholder="跟进描述"
+          rows="3"
+          autosize
+          type="textarea"
+          :rules="[
+            { required: true, message: '请填写跟进描述' },
+            { pattern, message: '记录必须包含汉字' },
+          ]"
+        />
+        <!-- :before-delete="handleDelete" -->
+        <van-field name="followImg" label="上传图片">
+          <template #input>
+            <van-uploader
+              v-model="imgUrl"
+              :after-read="handleUpload"
+              :max-count="1"
+            />
+          </template>
+        </van-field>
+        <div style="margin: 1em">
+          <van-button
+            block
+            type="warning"
+            native-type="submit"
+            v-shiro="'room:info:addLook'"
+          >
+            提交
+          </van-button>
+        </div>
+      </van-form>
+    </div>
+  </x-loading>
 </template>
 
 <script>
-import { reactive, ref, onMounted } from "vue"
+import { reactive, ref, onMounted, computed } from "vue"
 import {
   Form,
   Button,
@@ -85,9 +85,11 @@ import {
   DatetimePicker,
   Uploader,
 } from "vant"
-import { useRouter } from "vue-router"
+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",
@@ -99,12 +101,11 @@ export default {
     [Picker.name]: Picker,
     [DatetimePicker.name]: DatetimePicker,
     [Uploader.name]: Uploader,
-
-    // Secondhand:secondhand,
   },
   setup() {
+    const route = useRoute()
     const router = useRouter()
-    const roomId = router.currentRoute.value.query.roomId
+    const roomId = route.query.roomId
     const showTimePicker = ref(false)
     const imgUrl = ref([])
 
@@ -116,10 +117,23 @@ export default {
       followDesc: undefined, //根进描述
       followImg: undefined, //图片
     })
+
+    const followTimeLook = computed(() => {
+      return formData.followTime.toJSON().substring(0, 19).replace(/t/i, " ")
+    })
+
     const pattern = /[\u4E00-\u9FA5\uF900-\uFA2D]/
 
-    const onSubmit = () => {
-      console.log("submit", formData)
+    const handleSubmit = () => {
+      request({
+        url: "/room/look/save",
+        data: formData,
+        toast: "请稍候...",
+      }).then(() => {
+        alert("添加成功").then(() => {
+          router.go(-1)
+        })
+      })
     }
 
     const onConfirm = (value) => {
@@ -146,12 +160,13 @@ export default {
     return {
       detail,
       onConfirm,
-      onSubmit,
+      handleSubmit,
       formData,
       pattern,
       showTimePicker,
       handleUpload,
       imgUrl,
+      followTimeLook,
     }
   },
 }

src/view/room-auth/index.vue

@@ -0,0 +1,184 @@
+<template>
+  <div class="room-auth">
+    <van-form @submit="handleSubmit">
+      <van-field
+        v-model="formData.serialNum"
+        name="serialNum"
+        label="委托书编号"
+        placeholder="委托书编号"
+      />
+
+      <van-field
+        v-model="startTimeLook"
+        readonly
+        clickable
+        required
+        name="address"
+        label="开始时间"
+        @click="showStartTime = true"
+        :rules="[{ required: true, message: '请选择时间' }]"
+      />
+      <van-popup v-model:show="showStartTime" position="bottom">
+        <van-datetime-picker
+          v-model="formData.startTime"
+          type="datetime"
+          @confirm="handleStartTime"
+          @cancel="showStartTime = false"
+        />
+      </van-popup>
+
+      <van-field
+        v-model="endTimeLook"
+        readonly
+        clickable
+        required
+        name="endTime"
+        label="结束时间"
+        @click="showEndTime = true"
+        :rules="[{ required: true, message: '请选择时间' }]"
+      />
+      <van-popup v-model:show="showEndTime" position="bottom">
+        <van-datetime-picker
+          v-model="formData.endTime"
+          type="datetime"
+          @confirm="handleEndTime"
+          @cancel="showEndTime = false"
+        />
+      </van-popup>
+
+      <!-- :before-delete="handleDelete" -->
+      <van-field name="url" label="上传图片">
+        <template #input>
+          <van-uploader
+            v-model="imgUrl"
+            :after-read="handleUpload"
+            :max-count="1"
+          />
+        </template>
+      </van-field>
+      <div style="margin: 1em">
+        <van-button
+          block
+          type="warning"
+          native-type="submit"
+          v-shiro="'room:info:addAuth'"
+        >
+          提交
+        </van-button>
+      </div>
+    </van-form>
+  </div>
+</template>
+
+<script>
+import { reactive, ref, onMounted, computed } from "vue"
+import {
+  Form,
+  Button,
+  Field,
+  Picker,
+  Popup,
+  DatetimePicker,
+  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",
+  components: {
+    [Form.name]: Form,
+    [Button.name]: Button,
+    [Field.name]: Field,
+    [Popup.name]: Popup,
+    [Picker.name]: Picker,
+    [DatetimePicker.name]: DatetimePicker,
+    [Uploader.name]: Uploader,
+  },
+  setup() {
+    const route = useRoute()
+    const router = useRouter()
+    const roomId = route.query.roomId
+    const showStartTime = ref(false)
+    const showEndTime = ref(false)
+    const imgUrl = ref([])
+
+    const { detail, getDetail } = useModel("room")
+    const formData = reactive({
+      roomId: roomId,
+      serialNum: undefined,
+      startTime: new Date(), //看房时间
+      endTime: new Date(), //根进描述
+      url: undefined, //图片
+    })
+
+    const startTimeLook = computed(() => {
+      return formData.startTime.toJSON().substring(0, 19).replace(/t/i, " ")
+    })
+    const endTimeLook = computed(() => {
+      return formData.endTime.toJSON().substring(0, 19).replace(/t/i, " ")
+    })
+
+    const handleSubmit = () => {
+      request({
+        url: "/room/auth/save",
+        data: formData,
+        toast: "请稍候...",
+      }).then(() => {
+        alert("添加成功").then(() => {
+          router.go(-1)
+        })
+      })
+    }
+
+    const handleStartTime = (val) => {
+      formData.startTime = val
+      showStartTime.value = false
+    }
+
+    const handleEndTime = (val) => {
+      formData.endTime = val
+      showEndTime.value = false
+    }
+
+    const handleUpload = (file) => {
+      if (file && file.file) {
+        uploadImage(file.file, "", 1).then((url) => {
+          formData.url = url
+          imgUrl.value = [{ url: url }]
+        })
+      }
+    }
+
+    onMounted(() => {
+      if (!detail.roomInfo) {
+        getDetail(roomId)
+      }
+    })
+
+    return {
+      detail,
+      handleStartTime,
+      handleEndTime,
+      handleSubmit,
+      formData,
+      showStartTime,
+      showEndTime,
+      handleUpload,
+      imgUrl,
+      startTimeLook,
+      endTimeLook,
+    }
+  },
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="less" scoped>
+.room-auth {
+  padding-top: 1em;
+}
+</style>

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

@@ -1,15 +1,44 @@
 <template>
   <x-loading x-id="room.auth">
-    <p v-if="!roomAuth">暂无业主委托书</p>
+    <div v-if="!roomAuth">
+      <p>暂无业主委托书</p>
+      <template v-if="roomInfo.status !== '7'">
+        <van-button
+          block
+          size="small"
+          type="warning"
+          v-shiro="'room:info:addAuth'"
+          @click="
+            $router.push({ name: 'room.auth', query: { roomId: roomInfo.id } })
+          "
+        >
+          上传业主委托书
+        </van-button>
+      </template>
+    </div>
     <p v-else-if="roomAuth.status === '1'">当前委托书正在审核中</p>
     <div v-else>
       <shiro name="room:info:auth">
         <template #callback>
-          <van-empty image="error" description="无委托书协议查看权限" />
+          <div v-if="!roomAuthBox.isCreate">
+            <x-field label="上传人">
+              {{ roomAuth.authUserName }} ({{ roomAuth.authUserPhone }})
+            </x-field>
+
+            <x-field label="上传时间">
+              {{ roomAuth.updateTime }}
+            </x-field>
+          </div>
+          <p>无委托书协议查看权限</p>
         </template>
 
         <x-field label=" " v-if="roomAuthBox.isCreate">
-          <van-button size="small" type="danger">删除委托书</van-button>
+          <van-button
+            size="small"
+            type="danger"
+            @click="toggleDialog"
+            >删除委托书</van-button
+          >
         </x-field>
 
         <x-field label="上传人">
@@ -34,24 +63,38 @@
 
         <van-image width="100" height="100" :src="roomAuth.url" />
       </shiro>
-
-      <div v-shiro="'room:info:addAuth'" v-if="!roomAuth">
-        <van-button size="small" type="warn">上传业主委托书</van-button>
-      </div>
     </div>
+
+    <!-- 删除委托书 -->
+    <van-dialog
+      v-model="showDialog"
+      title="删除委托书"
+    >
+      <!-- <van-field
+        v-model="message"
+        rows="3"
+        autosize
+        label="留言"
+        type="textarea"
+        placeholder="请输入留言"
+        required
+      /> -->
+    </van-dialog>
   </x-loading>
 </template>
 
 <script>
-import { Empty, Button, Image } from "vant"
+import { computed, onMounted, ref } from "vue"
+import { Button, Image, Field } from "vant"
 import { useModel } from "@zjxpcyc/vue-tiny-store"
-import { computed, onMounted } 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,
+    [Field.name]: Field,
   },
   props: {
     roomId: undefined,
@@ -59,7 +102,43 @@ export default {
   setup(props) {
     const { detail, roomAuthBox, getAuth } = useModel("room")
 
+    const delReason = ref()
+    const showDialog = ref(false)
+
     const roomAuth = computed(() => roomAuthBox.roomAuth)
+    const roomInfo = computed(() => detail.roomInfo)
+
+    const toggleDialog = () => {
+      console.log('-----showDialog.value------>', showDialog.value)
+      showDialog.value = !showDialog.value
+    }
+
+    const handleDeleteAuth = () => {
+      if (!delReason.value) {
+        showWarn("请填写删除原因")
+        return
+      }
+
+      showDialog.value = false
+
+      const params = {
+        id: roomAuth.value.id,
+        reason: delReason.value,
+        roomId: roomInfo.value.id,
+      }
+
+      request({
+        url: "/room/auth/delete",
+        params,
+        toast: "请稍候...",
+      })
+        .then(() => {
+          showSuccess("删除成功")
+        })
+        .catch((e) => {
+          showDanger(e.message)
+        })
+    }
 
     onMounted(() => {
       if (!roomAuthBox.roomAuth) {
@@ -71,6 +150,11 @@ export default {
       detail,
       roomAuthBox,
       roomAuth,
+      roomInfo,
+      delReason,
+      showDialog,
+      handleDeleteAuth,
+      toggleDialog,
     }
   },
 }