feats

src/router.js

@@ -86,9 +86,9 @@ const routes = [
         }
     },
     {
-        path: '/lookRecord',
-        name: 'lookRecord',
-        component: () => import('./view/lookRecord'),
+        path: '/look',
+        name: 'look',
+        component: () => import('./view/look'),
         meta: {
             title: '添加空看'
         }

src/utils/dateFormat.js

@@ -0,0 +1,20 @@
+
+export default (fmt, date) => {
+    let ret;
+    const opt = {
+        "Y+": date.getFullYear().toString(),        // 年
+        "m+": (date.getMonth() + 1).toString(),     // 月
+        "d+": date.getDate().toString(),            // 日
+        "H+": date.getHours().toString(),           // 时
+        "M+": date.getMinutes().toString(),         // 分
+        "S+": date.getSeconds().toString()          // 秒
+        // 有其他格式化字符需求可以继续添加，必须转化成字符串
+    };
+    for (let k in opt) {
+        ret = new RegExp("(" + k + ")").exec(fmt);
+        if (ret) {
+            fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+        };
+    };
+    return fmt;
+}

src/utils/uploadImage.js

@@ -1,11 +1,11 @@
 import { showDanger } from './index'
 import request from './request'
 
-export default (file, imgType) => {
+export default (file, imgType,index) => {
   const formData = new FormData()
   formData.append('resourceImg', file)
   formData.append('imgType', imgType)
-
+  index&&formData.append('index', index)
   return request({
     url: '/upload-img',
     data: formData,

src/view/followup/index.vue

@@ -17,6 +17,7 @@
       />
 
       <van-field
+        :model-value="formData.followType"
         required
         :rules="[{ required: true, message: '请选择跟进类型' }]"
         label="跟进类型"
@@ -29,30 +30,14 @@
           />
         </template>
       </van-field>
-      <!-- <van-field
-        v-model="pickerState.value"
-        readonly
-        clickable
-        required
-        name="followType"
-        label="跟进类型"
-        placeholder="跟进类型"
-        @click="pickerState.showPicker = true"
-        :rules="[{ required: true, message: '请选择跟进类型' }]"
-      />
-      <van-popup v-model:show="pickerState.showPicker" position="bottom">
-        <van-picker
-          :columns="followTypeOptions"
-          @confirm="onConfirm"
-          @cancel="pickerState.showPicker = false"
-        />
-      </van-popup> -->
 
       <van-field
-        v-show="formData.followType == 4"
+        v-if="formData.followType == 4"
         v-model="formData.newRoomPrice"
         label="价格调整为"
         type="number"
+        required
+        :rules="[{ required: true, message: '请填写金额' }]"
       >
         <template #extra>
           元/月
@@ -67,7 +52,10 @@
         rows="3"
         autosize
         type="textarea"
-        :rules="[{ required: true, message: '请填写跟进描述' }]"
+        :rules="[
+          { required: true, message: '请填写跟进描述' },
+          { pattern, message: '记录必须包含汉字' },
+        ]"
       />
       <div style="margin: 16px;">
         <van-button round block type="primary" native-type="submit">
@@ -85,6 +73,8 @@ 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";
+
 export default {
   name: "closehouse",
   components: {
@@ -99,15 +89,17 @@ export default {
     return {};
   },
   setup() {
-     const roomId = router.currentRoute.value.query.roomId;
+    const router = useRouter();
+    const roomId = router.currentRoute.value.query.roomId;
     const formData = reactive({
       roomId: roomId,
       followType: undefined, //根据类型
       newRoomPrice: undefined, //新价格
       followDesc: undefined, //根进描述
     });
-    const router = useRouter();
-   
+    const pattern = /[\u4E00-\u9FA5\uF900-\uFA2D]/;
+    // var reg = ;
+    //  const pattern = /\d{6}/;
     const { detail, getDetail } = useModel("room");
 
     const followTypeOptions = [
@@ -134,9 +126,13 @@ export default {
 
       request({
         url: "/room/follow/save",
-        params: formData,
+        data: formData,
       }).then(() => {
-        // list.value = res.result;
+  
+        alert("添加成功").then(() => {
+          router.go(-1);
+        });
+        //
       });
     };
 
@@ -147,10 +143,8 @@ export default {
     });
 
     return {
-   
-
       formData,
-
+      pattern,
       onSubmit,
       detail,
       followTypeOptions,

src/view/look/index.vue

@@ -0,0 +1,207 @@
+<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"
+        />
+      </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"
+          />
+        </template>
+      </van-field>
+      <div style="margin: 16px;">
+        <van-button round block type="primary" native-type="submit">
+          提交
+        </van-button>
+      </div>
+    </van-form>
+  </div>
+</template>
+
+<script>
+import { reactive, ref, onMounted } from "vue";
+import {
+  Form,
+  Button,
+  Field,
+  Picker,
+  Popup,
+  DatetimePicker,
+  Uploader,
+} from "vant";
+import { useRouter } from "vue-router";
+import { useModel } from "@zjxpcyc/vue-tiny-store";
+import uploadImage from '@/utils/uploadImage'
+
+
+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,
+
+    // Secondhand:secondhand,
+  },
+  data() {
+    return {};
+  },
+  setup() {
+    const router = useRouter();
+    const roomId = router.currentRoute.value.query.roomId;
+    const showTimePicker = ref(false);
+    const imgUrl = ref([]);
+    
+    const { detail, getDetail } = useModel("room");
+    const formData = reactive({
+      roomId: roomId,
+      followType: 0, //根据类型
+      followTime: new Date(), //看房时间
+      followDesc: undefined, //根进描述
+      followImg: undefined, //图片
+    });
+    const pattern = /[\u4E00-\u9FA5\uF900-\uFA2D]/;
+
+    const onSubmit = () => {
+      console.log("submit", formData);
+    };
+
+    const onConfirm = (value) => {
+      console.log(value, "value");
+      formData.followTime = value;
+      showTimePicker.value = false;
+    };
+
+    const handleUpload = file => {
+      if (file && file.file) {
+       console.log(file, )
+uploadImage(file.file, '', 1).then((url) => {
+        // const img = {
+        //   roomId,
+        //   url,
+        //   imgType: type,
+        //   sort,
+        // };
+        
+    
+        console.log(url,'url')
+        formData.followImg=url
+        imgUrl.value=[{url:url}]
+        // willSave.value.push(img);
+        // initData.value = {
+        //   ...initData.value,
+        //   rescList: {
+        //     ...(initData.value.rescList || {}),
+        //     [type]: (initData.value.rescList[type] || []).concat(img),
+        //   },
+        // };
+      });
+
+
+      }
+      // const sort =
+      //   (initData.value.rescList[type] || []).length +
+      //   willSave.value.filter((x) => x.imgType === type).length;
+
+      // uploadImage(file, "1").then((url) => {
+      //   // const img = {
+      //   //   roomId,
+      //   //   url,
+      //   //   imgType: type,
+      //   //   sort,
+      //   // };
+      //   url;
+      //   type;
+      //   // willSave.value.push(img);
+      //   // initData.value = {
+      //   //   ...initData.value,
+      //   //   rescList: {
+      //   //     ...(initData.value.rescList || {}),
+      //   //     [type]: (initData.value.rescList[type] || []).concat(img),
+      //   //   },
+      //   // };
+      // });
+    };
+
+    onMounted(() => {
+      if (!detail.roomInfo) {
+        getDetail(roomId);
+      }
+    });
+
+    return {
+      detail,
+      onConfirm,
+      onSubmit,
+      formData,
+      pattern,
+      showTimePicker,
+      handleUpload,
+      imgUrl,
+    };
+  },
+};
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="less" scoped></style>

src/view/lookRecord/index.vue

@@ -1,127 +0,0 @@
-<template>
-  <div class="lookrecord">
-    <van-form @submit="onSubmit">
-      <van-field
-        v-model="state.id"
-        name="id"
-        label="房源编号"
-        readonly
-        placeholder="房源编号"
-      />
-      <van-field
-        v-model="state.building"
-        name="building"
-        label="所属楼盘"
-        readonly
-        placeholder="所属楼盘"
-      />
-      <van-field
-        v-model="pickerState.value"
-        readonly
-        clickable
-        required
-        name="address"
-        label="看房时间"
-        placeholder=""
-        @click="pickerState.showPicker = true"
-        :rules="[{ required: true, message: '请选择' }]"
-      />
-      <van-popup v-model:show="pickerState.showPicker" position="bottom">
-        <van-datetime-picker
-          type="datetime"
-          @confirm="onConfirm"
-          @cancel="state.showPicker = false"
-        />
-      </van-popup>
-      <!-- <van-field
-        v-model="state.building"
-        required
-        name="type"
-        label="关闭类型"
-        placeholder="请选择"
-        :rules="[{ required: true, message: '请填写密码' }]"
-      /> -->
-      <van-field
-        v-model="state.explain"
-        required
-        name="explain"
-        label="看房记录"
-        placeholder="看房记录"
-        rows="3"
-        autosize
-        type="textarea"
-        :rules="[{ required: true, message: '请填写跟进描述' }]"
-      />
-
-      <van-field name="uploader" label="文件上传">
-  <template #input>
-    <van-uploader v-model="state.image" />
-  </template>
-</van-field>
-      <div style="margin: 16px;">
-        <van-button round block type="primary" native-type="submit">
-          提交
-        </van-button>
-      </div>
-    </van-form>
-  </div>
-</template>
-
-<script>
-import { reactive, ref } from "vue";
-import { Form, Button, Field, Picker, Popup, DatetimePicker,Uploader } from "vant";
-
-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,
-    
-    // Secondhand:secondhand,
-  },
-  data() {
-    return {};
-  },
-  setup() {
-    const state = reactive({
-      id: "",
-      building: "",
-      image:[],
-    });
-
-    const currentDate = ref(null);
-    const onSubmit = (values) => {
-      console.log("submit", values);
-    };
-
-    const pickerState = reactive({
-      value: "",
-      showPicker: false,
-    });
-    const columns = ["杭州", "宁波", "温州", "嘉兴", "湖州"];
-
-    const onConfirm = (value) => {
-      console.log(value,'value')
-      pickerState.value = value;
-      pickerState.showPicker = false;
-    };
-
-    return {
-      currentDate,
-      state,
-      pickerState,
-      columns,
-      onConfirm,
-      onSubmit,
-    };
-  },
-};
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style lang="less" scoped></style>

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

@@ -16,18 +16,17 @@
     <van-button
       size="small"
       type="primary"
-     
+      v-shiro="'room:info:addFollow'"
       @click="goToAddFollow"
       >添加跟进</van-button
     >
-     <!-- v-shiro="'room:info:addFollow'" -->
   </x-loading>
 </template>
 
 <script>
 import { onMounted, ref } from "vue";
-import { List, Step, Steps, Image,Button } from "vant";
-import { useRouter } from 'vue-router'
+import { List, Step, Steps, Image, Button } from "vant";
+import { useRouter } from "vue-router";
 import request from "@/utils/request";
 
 export default {
@@ -37,14 +36,13 @@ export default {
     [Step.name]: Step,
     [Image.name]: Image,
     [Button.name]: Button,
-    
   },
   props: {
     roomId: undefined,
   },
   setup(props) {
     const list = ref([]);
-    const router = useRouter()
+    const router = useRouter();
 
     const handleLoad = () => {
       request({

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

@@ -15,26 +15,35 @@
         </p>          
       </van-step>
     </van-steps>
+        <van-button
+      size="small"
+      type="primary"
+      v-shiro="'room:info:addFollow'"
+      @click="goToAddLook"
+      >添加空看</van-button
+    >
   </x-loading>
 </template>
 
 <script>
 import { onMounted, ref } from 'vue'
-import { List, Step, Steps, Image } from 'vant'
+import { List, Step, Steps, Image,Button } from 'vant'
 import request from '@/utils/request'
-
+import {useRouter} from 'vue-router'
 export default {
   components: {
     [List.name]: List,
     [Steps.name]: Steps,
     [Step.name]: Step,
     [Image.name]: Image,
+    [Button.name]: Button,
   },
   props: {
     roomId: undefined,
   },
   setup(props) {
     const list = ref([])
+    const router = useRouter()
 
     const handleLoad = () => {
       request({
@@ -49,6 +58,13 @@ export default {
         list.value = res.result
       })
     }
+    
+
+        const goToAddLook = () =>
+      router.push({
+        name: "look",
+        query: { roomId: props.roomId },
+      });
 
     onMounted(() => {
       handleLoad()
@@ -57,6 +73,7 @@ export default {
     return {
       list,
       handleLoad,
+      goToAddLook,
     }
   }
 }