Merge branch 'stage' into test

src/components/PeriodDatePicker.vue

@@ -50,6 +50,7 @@ export default {
           if (this.endTime != null && this.endTime != "" && time) {
             return time.getTime() > new Date(this.endTime).valueOf();
           }
+        
         },
       },
       pickerOptions2: {
@@ -57,6 +58,7 @@ export default {
           if (this.startTime != null && this.startTime != "" && time) {
             return time.getTime() < new Date(this.startTime).valueOf();
           }
+          
         },
       },
     };
@@ -87,7 +89,10 @@ export default {
         } else if (this.type + "" === "2" && !this.setType(90)) {
           this.showMessage("时间跨度不能超过90天！");
           return;
-        } else if (
+        } else if (this.type + "" === "3" && !this.setType(30)) {
+          this.showMessage("时间跨度不能超过30天！");
+          return;
+        }else if (
           new Date(this.endTime).valueOf() < new Date(this.startTime).valueOf()
         ) {
           this.showMessage("结束时间不大于开始时间！");

src/views/search/standBook/addEdit.vue

@@ -44,7 +44,7 @@
               <period-date-picker
                 :start="ruleForm.start"
                 :end="ruleForm.end"
-                :type="1"
+                :type="type"
                 :width="'199px'"
                 :size="searchSize"
                 @timeReturned="timeReturned($event)"
@@ -56,7 +56,7 @@
           <el-alert
             style="width: 230px"
             :closable="false"
-            :title="type==='1'?'报表会在提交后开始执行！':'报表会在明天01:00开始生成'"
+            :title="type==='2'?'报表会在提交后开始执行！':'报表会在明天01:00开始生成'"
             type="warning"
           >
           </el-alert>

src/views/search/standBook/pre-export.vue

@@ -82,6 +82,7 @@
       :sitem="sitem"
       :show-model="showModel"
       @refresh="searchList"
+      :type="'1'"
       @cancel="showModel = false"
     />
   </div>

src/views/search/standBook/real-time-export-new.vue

@@ -81,7 +81,7 @@
     <add-edit
       :sitem="sitem"
       :show-model="showModel"
-      :type="'1'"
+      :type="'2'"
       @refresh="searchList"
       @cancel="showModel = false"
     />

src/views/search/standBook/real-time-export.vue

@@ -8,7 +8,7 @@
             <period-date-picker
               :start="item.start"
               :end="item.end"
-              :type="0"
+              :type="3"
               :width="'135px'"
               :size="searchSize"
               @timeReturned="timeReturned($event, item.value)"
@@ -136,7 +136,7 @@ export default {
         // },
         {
           value: "16",
-          label: "何杨经分表",
+          label: "经营分析报表",
           start: "",
           end: "",
           url: "Admin/getjingfen",