Merge branch 'feature/7月迭代-会员' into test

src/components/allCustomers/components/babyinfoDialog.vue

@@ -39,6 +39,7 @@
                 value-format="yyyy-MM-dd"
                 v-model="fieldsList[activeName].form[item.systemFieldId]"
                 type="date"
+                :picker-options="pickerOptions()"
               />
               <el-select v-if="item.fieldType == 2" :placeholder="item.fieldDescription" v-model="fieldsList[activeName].form[item.systemFieldId]" style="width: 160px;">
                 <el-option v-for="(el, index) in JSON.parse(item.fieldContent.replaceAll('\'', '&quot;'))" :key="index" :label="el.name" :value="el.name" />
@@ -91,7 +92,7 @@ export default {
           },
           disabledDate(time) {
             let start = new Date();
-            start.setFullYear(start.getFullYear() - 100);
+            start.setFullYear(start.getFullYear() - 20);
             start.setDate(start.getDate() + 1);
             start = new Date(`${start.getFullYear()}-${start.getMonth() + 1}-${start.getDate()}`);
             let end = new Date();
@@ -195,7 +196,8 @@ export default {
           }
         }
         return { validator: validatePass, trigger: 'blur' }
-      } else if(item.unifiedIdentification == 'k20303') {
+      } 
+      else if(item.unifiedIdentification == 'k20303') {
         let rule = JSON.parse(item.fieldContent.replaceAll('\'', '"'));
         let time = rule.timeLong
         validatePass = (rule, value, callback) => {

src/components/allCustomers/components/baseinfoDialog.vue

 <template>
   <div>
     <el-dialog
-      title="编辑基本信息333"
+      title="编辑基本信息"
       custom-class="customer-dialog"
       :visible.sync="visible"
       :close-on-click-modal="false"

src/components/wechatmembers/enterpriseIntegralDetial.vue

@@ -51,7 +51,7 @@
           <el-option label="所有积分状态" :value=-1></el-option>
           <el-option v-for="item in frozenStatusList" :key="item.value" :label="item.label" :value="item.value"></el-option>
         </el-select>
-        <el-date-picker style="width: 256px;" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions()" value-format="yyyy-MM-dd" @change="handleSearch"> </el-date-picker>
+        <el-date-picker style="width: 256px;" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions()" value-format="yyyy-MM-dd" @change="handleSearch" :clearable="false"> </el-date-picker>
       </div>
       <el-button
         type="primary"