Merge branch 'crm_16.7' into debug

src/views/dataReport_manage/components/DataSummary.vue

@@ -39,6 +39,10 @@ export default {
       type: Array,
       default: [],
     },
+    timeSelection: {
+      type: Array,
+      default: [],
+    },
     dataItem: {
       type: Object,
       default: {},
@@ -101,6 +105,8 @@ export default {
         CurrentIndex: this.page_no,
         PageSize: this.pageSize,
         PopupType: this.title,
+        StartDate: this.timeSelection && this.timeSelection.length ? this.timeSelection[0] : "",
+        EndDate: this.timeSelection && this.timeSelection.length ? this.timeSelection[1] : "",
       });
       if (res.Ret === 200) {
         this.tableData = res.Data.List;

src/views/dataReport_manage/equityDataSummary.vue

@@ -8,6 +8,18 @@
           </span>
         </div>
         <date-picker v-model="timeRange" type="year" range value-type="format" placeholder="开始至结束" :editable="false" @change="dateChange" :disabled-date="disabledDate" @pick="onPick" clearable />
+        <el-date-picker
+          style="margin-left: 20px"
+          v-model="timeSelection"
+          type="daterange"
+          range-separator="至"
+          @change="salesChangeHandedl"
+          @clear="salesChangeHandedl"
+          start-placeholder="开始日期"
+          value-format="yyyy-MM-dd"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
       </div>
     </el-card>
     <div class="dataReport-main">
@@ -67,7 +79,7 @@
         </el-table-column>
       </el-table>
     </div>
-    <DataSummary :visible.sync="showDlg" :title="titleDlg" :columns="columnsDlg" :dataItem.sync="dataItem" />
+    <DataSummary :visible.sync="showDlg" :title="titleDlg" :columns="columnsDlg" :dataItem.sync="dataItem" :timeSelection="timeSelection" />
   </div>
 </template>
 
@@ -115,6 +127,7 @@ export default {
       pathfinderSwitch: false, //开拓者开关
       serviceGroupSwitch: false, //服务组开关
       dataItem: {}, //数据项
+      timeSelection: [], //时间选择器的值
     };
   },
   methods: {
@@ -149,6 +162,8 @@ export default {
         ServiceAdminId,
         DevelopButton: this.pathfinderSwitch,
         ServerButton: this.serviceGroupSwitch,
+        StartDate: this.timeSelection && this.timeSelection.length ? this.timeSelection[0] : "",
+        EndDate: this.timeSelection && this.timeSelection.length ? this.timeSelection[1] : "",
       };
       const res = await dataMainInterface.getRaiDataSummary(params);
       this.tableData = res.Data.List;