Browse Source

feature_20250722_金牌店档案收集

zhujindu 4 tháng trước cách đây
mục cha
commit
0a443ec766

+ 15 - 5
src/views/deviceWithin/addStoreVisit.vue

@@ -235,7 +235,7 @@
               v-model="item.answerValue"
               :placeholder="item.text"
               readonly
-              @click="getNyr(item)"></van-field>
+              @click="getNyr(item, item.answerValue)"></van-field>
             <p
               style="color: red; font-size: 14px; margin: 0; padding: 10px 0; text-align: right"
               v-if="item.collectionOptionList[0].collectionOption">
@@ -2835,10 +2835,11 @@
     <!-- 时间选择 -->
     <van-popup v-model="datetimeShowPicker" position="bottom">
       <van-datetime-picker
+        v-model="currentDate"
         type="date"
         title="选择年月日"
-        :min-date="new Date(1945, 0, 1)"
-        :max-date="new Date()"
+        :min-date="minDate"
+        :max-date="maxDate"
         @confirm="datetimeOnConfirm"
         @cancel="datetimeShowPicker = false" />
     </van-popup>
@@ -2985,6 +2986,9 @@ export default {
       verificationPassedPhoneNum: '', //验证通过的手机号
       verifyMobile: false, //手机号是否验证透通过
       verifyMobileFlag: false, //手机号是否改变
+      minDate: new Date(1945, 0, 1),
+      maxDate: new Date(),
+      currentDate: new Date(1945, 0, 1),
     };
   },
   beforeRouteLeave(to, from, next) {
@@ -5134,8 +5138,14 @@ export default {
         }
       });
     },
-    getNyr(item) {
-      this.activatNyrItem = item;
+    getNyr(val, date) {
+      this.activatNyrItem = val;
+      if (date && date != '') {
+        let time = date.split('-');
+        this.currentDate = new Date(time[0], Number(time[1]) - 1, time[2]);
+      } else {
+        this.currentDate = new Date(1945, 0, 1);
+      }
       this.datetimeShowPicker = true;
     },
     datetimeOnConfirm(time) {

+ 4 - 5
src/views/home/bottomBtn.vue

@@ -91,12 +91,10 @@
       >
     </div>
     <!-- <p class="updataTime" v-if="type != 4 && tabVal != '-1'">更新时间:{{ updataTime }}</p> -->
-    <div class="ownerBirthdayReminds" v-if="ownerBirthdayBoxFlag">
+    <div class="ownerBirthdayReminds" v-if="ownerBirthdayBoxFlag && ownerBirthdayReminds">
       <div class="ownerBirthdayBox">
         <div class="title"><img :src="require('@/assets/hua.png')" />金牌店生日提醒</div>
-        <div class="content">
-          {{ this.reportInfoData.ownerBirthdayReminds }}将在3日后生日,请及时送上生日祝福!
-        </div>
+        <div class="content">{{ this.ownerBirthdayReminds }},将在3日后生日,请及时送上生日祝福!</div>
         <img class="dangao" :src="require('@/assets/dangao.png')" />
       </div>
       <div class="close" @click="ownerBirthdayBoxFlag = false">
@@ -128,6 +126,7 @@ export default {
       updataTime: '',
       type: '-1',
       ownerBirthdayBoxFlag: false,
+      ownerBirthdayReminds: null,
     };
   },
   activated() {
@@ -167,7 +166,7 @@ export default {
           // 金牌店老板生日提醒
           if (res.data.ownerBirthdayReminds && res.data.ownerBirthdayReminds.length) {
             this.ownerBirthdayBoxFlag = true;
-            this.reportInfoData.ownerBirthdayReminds = res.data.ownerBirthdayReminds.join(',');
+            this.ownerBirthdayReminds = res.data.ownerBirthdayReminds.join(',');
           }
         } else {
           this.$toast(res.msg);

+ 15 - 5
src/views/storeManagement/JPattributeEditor.vue

@@ -30,7 +30,7 @@
           v-model="detail.ownerBirthday"
           label="主经营者出生日期"
           placeholder="请输入主经营者出生日期"
-          @click="getNyr('ownerBirthday')" />
+          @click="getNyr('ownerBirthday', detail.ownerBirthday)" />
         <van-field autosize type="textarea" label="主营/擅长经营品类">
           <template #input>
             <van-checkbox-group v-model="detail.mainProductCategorys" direction="horizontal">
@@ -56,7 +56,7 @@
         <van-field
           v-model="detail.emergencyContactBirthday"
           label="紧急联系人出生日期"
-          @click="getNyr('emergencyContactBirthday')" />
+          @click="getNyr('emergencyContactBirthday', detail.emergencyContactBirthday)" />
         <van-field v-model="detail.emergencyContactMobile" type="number" label="紧急联系人电话" />
         <van-field label="紧急联系人身份">
           <template #input>
@@ -82,10 +82,11 @@
     <!-- 时间选择 -->
     <van-popup v-model="datetimeShowPicker" position="bottom">
       <van-datetime-picker
+        v-model="currentDate"
         type="date"
         title="选择年月日"
-        :min-date="new Date(1945, 0, 1)"
-        :max-date="new Date()"
+        :min-date="minDate"
+        :max-date="maxDate"
         @confirm="datetimeOnConfirm"
         @cancel="datetimeShowPicker = false" />
     </van-popup>
@@ -109,6 +110,9 @@ export default {
       mainProductCategorys: [],
       emergencyContactRelation: [],
       verificationPassedPhoneNum: '', //验证通过手机号
+      minDate: new Date(1945, 0, 1),
+      maxDate: new Date(),
+      currentDate: new Date(1945, 0, 1),
     };
   },
   activated() {
@@ -200,8 +204,14 @@ export default {
         }
       );
     },
-    getNyr(val) {
+    getNyr(val, date) {
       this.activatNyrItem = val;
+      if (date && date != '') {
+        let time = date.split('-');
+        this.currentDate = new Date(time[0], Number(time[1]) - 1, time[2]);
+      } else {
+        this.currentDate = new Date(1945, 0, 1);
+      }
       this.datetimeShowPicker = true;
     },
     datetimeOnConfirm(time) {