feats

src/router.js

@@ -122,6 +122,14 @@ const routes = [
       title: "委托书新增",
     },
   },
+  {
+    path: "/room-key",
+    name: "room.key",
+    component: () => import("./view/room-key"),
+    meta: {
+      title: "添加钥匙",
+    },
+  },
 ]
 
 const router = createRouter({

src/view/room-key/index.vue

@@ -0,0 +1,115 @@
+<template>
+  <div class="room-key">
+    <van-form @submit="handleSubmit">
+      <van-field
+        v-model="formData.keyNo"
+        name="keyNo"
+        label="钥匙编号"
+        placeholder="钥匙编号"
+      />
+
+      <van-field
+        v-model="formData.address"
+        name="address"
+        label="存放地址"
+        placeholder="存放地址"
+      />
+
+      <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:addKey'"
+        >
+          提交
+        </van-button>
+      </div>
+    </van-form>
+  </div>
+</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"
+
+export default {
+  name: "lookrecord",
+  components: {
+    [Form.name]: Form,
+    [Button.name]: Button,
+    [Field.name]: Field,
+    [Uploader.name]: Uploader,
+  },
+  setup() {
+    const route = useRoute()
+    const router = useRouter()
+    const roomId = route.query.roomId
+    const imgUrl = ref([])
+
+    const { detail, getDetail } = useModel("room")
+    const formData = reactive({
+      roomId: roomId,
+      keyNo: undefined,
+      address: undefined,
+      url: undefined, //图片
+    })
+
+    const handleSubmit = () => {
+      request({
+        url: "/room/key/save",
+        data: formData,
+        toast: "请稍候...",
+      }).then(() => {
+        alert("添加成功").then(() => {
+          router.go(-1)
+        })
+      })
+    }
+
+    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,
+      handleSubmit,
+      formData,
+      handleUpload,
+      imgUrl,
+    }
+  },
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="less" scoped>
+.room-key {
+  padding-top: 1em;
+}
+</style>

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

@@ -32,13 +32,14 @@
           <p>无委托书协议查看权限</p>
         </template>
 
-        <x-field label=" " v-if="roomAuthBox.isCreate">
-          <van-button
-            size="small"
-            type="danger"
-            @click="toggleDialog"
-            >删除委托书</van-button
-          >
+        <x-field
+          label=" "
+          v-shiro="'room:info:delAuth'"
+          v-if="roomAuthBox.isCreate && roomAuth.status === '0'"
+        >
+          <van-button block size="small" type="danger" @click="toggleDialog">
+            删除委托书
+          </van-button>
         </x-field>
 
         <x-field label="上传人">
@@ -69,7 +70,8 @@
     <van-dialog
       v-model:show="showDialog"
       title="删除委托书"
-      @confirm="handleDeleteAuth"
+      @confirm="handleDelete"
+      @cancel="toggleDialog"
     >
       <van-field
         v-model="delReason"
@@ -111,11 +113,10 @@ export default {
     const roomInfo = computed(() => detail.roomInfo)
 
     const toggleDialog = () => {
-      console.log('-----showDialog.value------>', showDialog.value)
       showDialog.value = !showDialog.value
     }
 
-    const handleDeleteAuth = () => {
+    const handleDelete = () => {
       if (!delReason.value) {
         showWarn("请填写删除原因")
         return
@@ -128,13 +129,14 @@ export default {
         reason: delReason.value,
         roomId: roomInfo.value.id,
       }
-console.log(params,'params')
+
       request({
         url: "/room/auth/delete",
         params,
         toast: "请稍候...",
       })
         .then(() => {
+          roomAuthBox.roomAuth = undefined
           showSuccess("删除成功")
         })
         .catch((e) => {
@@ -155,7 +157,7 @@ console.log(params,'params')
       roomInfo,
       delReason,
       showDialog,
-      handleDeleteAuth,
+      handleDelete,
       toggleDialog,
     }
   },

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

@@ -1,15 +1,45 @@
 <template>
   <x-loading x-id="room.key">
-    <p v-if="!roomKey">暂无钥匙信息</p>
-    <p v-else-if="roomKey.status === '1'">当前委托书正在审核中</p>
+    <div v-if="!roomKey">
+      <p>暂无钥匙信息</p>
+      <template v-if="roomInfo.status !== '7'">
+        <van-button
+          block
+          size="small"
+          type="warning"
+          v-shiro="'room:info:addKey'"
+          @click="
+            $router.push({ name: 'room.key', query: { roomId: roomInfo.id } })
+          "
+        >
+          上传钥匙委托
+        </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="roomKeyBox.isCreate">
-          <van-button size="small" type="danger">删除钥匙</van-button>
+        <x-field
+          label=" "
+          v-if="roomKeyBox.isCreate && roomKey.status === '0'"
+          v-shiro="'room:info:delKey'"
+        >
+          <van-button block size="small" type="danger" @click="toggleDialog"
+            >删除钥匙</van-button
+          >
         </x-field>
 
         <x-field label="上传人">
@@ -31,17 +61,36 @@
         <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 { Button, Image } from "vant"
 import { useModel } from "@zjxpcyc/vue-tiny-store"
-import { computed, onMounted } from "vue"
+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,
   },
@@ -52,6 +101,42 @@ export default {
     const { detail, roomKeyBox, getKey } = useModel("room")
 
     const roomKey = computed(() => roomKeyBox.roomKey)
+    const roomInfo = computed(() => detail.roomInfo)
+
+    const delReason = ref()
+    const showDialog = ref(false)
+
+    const toggleDialog = () => {
+      showDialog.value = !showDialog.value
+    }
+
+    const handleDelete = () => {
+      if (!delReason.value) {
+        showWarn("请填写删除原因")
+        return
+      }
+
+      showDialog.value = false
+
+      const params = {
+        id: roomKey.value.id,
+        reason: delReason.value,
+        roomId: roomInfo.value.id,
+      }
+
+      request({
+        url: "/room/key/delete",
+        params,
+        toast: "请稍候...",
+      })
+        .then(() => {
+          roomKeyBox.roomKey = undefined
+          showSuccess("删除成功")
+        })
+        .catch((e) => {
+          showDanger(e.message)
+        })
+    }
 
     onMounted(() => {
       if (!roomKeyBox.roomKey) {
@@ -63,6 +148,9 @@ export default {
       detail,
       roomKeyBox,
       roomKey,
+      roomInfo,
+      toggleDialog,
+      handleDelete,
     }
   },
 }

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

@@ -50,6 +50,7 @@
 
     <x-field label=" " v-shiro="'room:info:security'">
       <van-button
+        block
         v-if="!unfollowRoom"
         size="small"
         type="warning"
@@ -57,9 +58,10 @@
         >查看敏感信息（剩余 {{ otherData.leftSecurityNum }} 次）</van-button
       >
       <van-button
+        block
         v-else
         size="small"
-        type="primary"
+        type="info"
         v-shiro="'room:info:addFollow'"
         @click="goToAddFollow"
         >去跟进</van-button