update: disr

src/views/salesleads/actCodeManage/attractFlowLink/info.vue

@@ -76,7 +76,7 @@
               <ul class="datebox" v-for="(lis, index) in dateLis" :key="lis.key">
                 <li :class="dateKey == index ? 'activeClass' : 'noActive'" class="dateLisBox" @click="btnChange(index)">{{ lis.value }}</li>
               </ul>
-              <el-date-picker class="w256" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions()" @change="onDateChange" value-format="yyyy-MM-dd" :clearable="false"> </el-date-picker>
+              <el-date-picker class="w256" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions()" :format="[2, 3, 4].includes(dateKey) ? 'yyyy-MM' : 'yyyy-MM-dd'" @change="onDateChange" value-format="yyyy-MM-dd" :clearable="false"> </el-date-picker>
             </div>
           </div>
           <new-add-chart :charData="charData" id="new-add-chart" style="margin-top:26px"></new-add-chart>

src/views/salesleads/actCodeManage/attractFlowLink/newAddChart.vue

@@ -51,10 +51,8 @@ export default {
       this.chart = new G2.Chart({
         container: this.id,
         autoFit: true,
-
         forceFit: true,
-
-        padding: [20, 40, 80, 80]
+        padding: [20, 40, 40, 20]
       });
       this.chart.data(this.charData);
       // 图例

src/views/salesleads/actCodeManage/components/mixin.js

@@ -79,24 +79,26 @@ export default {
       } else if (index == 2) {
         // 近三个月
         setDate = endDate => {
-          endDate.setMonth(endDate.getMonth() - 3);
+          endDate.setMonth(endDate.getMonth() - 2);
           endDate.setDate(1);
           return new Date(endDate);
         };
       } else if (index == 3) {
         // 近半年
         setDate = endDate => {
-          endDate.setMonth(endDate.getMonth() - 6);
+          endDate.setMonth(endDate.getMonth() - 5);
           endDate.setDate(1); // 以1号为开端
-          // endDate.setDate(endDate.getDate() + 1);
+
           return new Date(endDate);
         };
       } else {
         // 近一年
         setDate = endDate => {
+          console.log(endDate);
           endDate.setFullYear(endDate.getFullYear() - 1);
+          endDate.setMonth(endDate.getMonth() + 1);
           endDate.setDate(1);
-          // endDate.setDate(endDate.getDate() + 1);
+
           return new Date(endDate);
         };
       }

src/views/salesleads/actCodeManage/staffActCode/actCodeDetailStatistics.vue

@@ -39,7 +39,7 @@
           <ul class="datebox" v-for="(lis, index) in dateLis" :key="lis.key">
             <li :class="dateKey == index ? 'activeClass' : 'noActive'" class="dateLisBox" @click="btnChange(index)">{{ lis.value }}</li>
           </ul>
-          <el-date-picker class="w256" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions()" @change="onDateChange" value-format="yyyy-MM-dd" :clearable="false"> </el-date-picker>
+          <el-date-picker class="w256" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions()" @change="onDateChange" value-format="yyyy-MM-dd" :format="[2, 3, 4].includes(dateKey) ? 'yyyy-MM' : 'yyyy-MM-dd'" :clearable="false"> </el-date-picker>
         </div>
       </div>
       <new-add-chart :charData="overViewData.dateList" id="new-add-chart"></new-add-chart>

src/views/salesleads/components/dataDetail.vue

@@ -10,7 +10,7 @@
         <ul class="datebox" v-for="(lis, index) in dateLis" :key="lis.key">
           <li :class="dateKey == index ? 'activeClass' : 'noActive'" class="dateLisBox" @click="btnChange(index)">{{ lis.value }}</li>
         </ul>
-        <el-date-picker class="w256" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd" :picker-options="pickerOptions()" @change="onDateChange" :clearable="false"> </el-date-picker>
+        <el-date-picker class="w256" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd" :format="[2, 3, 4].includes(dateKey) ? 'yyyy-MM' : 'yyyy-MM-dd'" :picker-options="pickerOptions()" @change="onDateChange" :clearable="false"> </el-date-picker>
       </div>
     </el-row>
     <el-table class="mt18" :data="tableData" @sort-change="sortChange">