Merge branch 'mergeBranch' into allTestUrgent

src/HDrpManagement/dataanalysis/modules/clue.vue

@@ -119,9 +119,9 @@ export default {
       totalFollow:0,
       begindate:'',
       enddate:'',
-      selectAdd:'周',
-      selectUpd:'周',
-      selectFow:'周',
+      selectAdd:'月',
+      selectUpd:'月',
+      selectFow:'月',
       sort:[
         {
           reversed : 0,

src/HDrpManagement/dataanalysis/modules/customer.vue

@@ -129,9 +129,9 @@ export default {
       totalFollow:0,
       begindate:'',
       enddate:'',
-      selectAdd:'周',
-      selectUpd:'周',
-      selectFow:'周',
+      selectAdd:'月',
+      selectUpd:'月',
+      selectFow:'月',
       sort:[
         {
           reversed : 0,

src/HDrpManagement/dataanalysis/modules/documents.vue

@@ -96,8 +96,8 @@ export default {
       contractTotal:0,
       begindate:'',
       enddate:'',
-      contractSelect:'周',
-      quotationSelect:'周',
+      contractSelect:'月',
+      quotationSelect:'月',
       sort:[
         {
           reversed : 0,

src/HDrpManagement/dataanalysis/modules/project.vue

@@ -130,9 +130,9 @@ export default {
       totalFollow:0,
       begindate:'',
       enddate:'',
-      selectAdd:'周',
-      selectUpd:'周',
-      selectFow:'周',
+      selectAdd:'月',
+      selectUpd:'月',
+      selectFow:'月',
       sort:[
         {
           reversed : 0,

src/views/salesData/modules/delayedShipmentAnalysis.vue

@@ -21,7 +21,7 @@
             <span class="search__label inline-16">{{$t('分析日期')}}:</span>
             <el-date-picker
                 :append-to-body="!isFull"
-                v-model="enddate"
+                v-model="param.content.enddate"
                 type="date"
                 :clearable="false"
                 @change="changeDate"
@@ -122,7 +122,7 @@ export default {
         "content": {
           "type": 0,
           "dataid": '',
-          "enddate": "",//分析日期
+          "enddate": new Date().getFullYear() + '-' +  (new Date().getMonth() + 1) + '-' + new Date().getDate(),//分析日期
           "dateType": "",//图标联动  一周 一月 一季 一季以上 可不传 不传默认查全部
           "pageSize":20,
           "pageNumber":1,

src/views/salesData/modules/shippingTrendAnalysis.vue

@@ -8,7 +8,7 @@
             <div class="title" style="float: left">{{$t(`出货趋势分析`)}}</div>
             <el-tooltip placement="top" style="vertical-align: middle">
               <div slot="content">{{$t(`依据：月度的准交率 = 月度准交的订单行数 ÷ 月度的总订单行数 x 100%`)}};<br>
-                {{$t(`①月度准交的订单行数:回复交期在当月，且完全出货日期（物流单审核）在回复交期之后一天（不含节假日）的订单行数`)}}；<br>
+                {{$t(`①月度准交的订单行数：回复交期在当月，且在回复交期后一天(不含节假日)之前完全出货的订单行数`)}}；<br>
                 {{$t(`②月度的总订单行数: 回复交期在当月的，有审核和关闭的订单行数`)}}。<br>
               </div>
               <img style="vertical-align: middle;margin-left: 10px"  width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >

src/views/salesData/modules/unshippedExtensionAnalysis.vue

@@ -21,7 +21,7 @@
             <span class="search__label inline-16">{{$t('分析日期')}}:</span>
             <el-date-picker
                 :append-to-body="!isFull"
-                v-model="enddate"
+                v-model="param.content.enddate"
                 type="date"
                 :clearable="false"
                 @change="changeDate"
@@ -120,7 +120,7 @@ export default {
         "content": {
           "type": 0,
           "dataid": '',
-          "enddate": "",
+          "enddate": new Date().getFullYear() + '-' +  (new Date().getMonth() + 1) + '-' + new Date().getDate(),
           "dateType": "",
           "pageSize": 20,
           "pageNumber": 1,