Merge remote-tracking branch 'origin/master'

src/modules/print/view/CourseStatistic.vue

@@ -8,6 +8,7 @@
           :inline="true"
           label-position="right"
           label-width="100px"
+          style="border-bottom: 1px solid rgb(221, 221, 221);margin-bottom: 10px"
         >
           <el-form-item label="学校">
             <el-select

src/modules/print/view/ExamStructure.vue

@@ -8,6 +8,7 @@
           :inline="true"
           label-position="right"
           label-width="100px"
+          style="border-bottom: 1px solid rgb(221, 221, 221);margin-bottom: 10px"
         >
           <el-form-item label="学校">
             <el-select

src/modules/print/view/Project.vue

@@ -8,6 +8,7 @@
           :inline="true"
           label-position="right"
           label-width="100px"
+          style="border-bottom: 1px solid rgb(221, 221, 221);margin-bottom: 10px"
         >
           <el-form-item label="学校">
             <el-select
@@ -82,6 +83,7 @@
           <el-form-item style="padding-left: 60px">
             <el-button
               size="small"
+              v-show="false"
               icon="el-icon-refresh"
               @click="resetSearchForm"
             >
@@ -235,9 +237,9 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="准备时间" prop="prepareTime">
+          <el-form-item label="准备时间" prop="prepareTimeRange">
             <el-date-picker
-              v-model="prepareTime"
+              v-model="prepareTimeRange"
               type="datetimerange"
               range-separator="至"
               start-placeholder="开始时间"
@@ -248,9 +250,9 @@
             </el-date-picker>
           </el-form-item>
 
-          <el-form-item label="印刷时间" prop="printTime">
+          <el-form-item label="印刷时间" prop="printTimeRange">
             <el-date-picker
-              v-model="printTime"
+              v-model="printTimeRange"
               type="datetimerange"
               range-separator="至"
               start-placeholder="开始时间"
@@ -261,9 +263,9 @@
             </el-date-picker>
           </el-form-item>
 
-          <el-form-item label="邮寄时间" prop="mailTime">
+          <el-form-item label="邮寄时间" prop="mailTimeRange">
             <el-date-picker
-              v-model="mailTime"
+              v-model="mailTimeRange"
               type="datetimerange"
               range-separator="至"
               start-placeholder="开始时间"
@@ -299,24 +301,27 @@ import {
 
 export default {
   data() {
-    let validatePrepareTime = (rule, value, callback) => {
-      if (!checkArray(this.prepareTime)) {
+    let validatePrepareTimeRange = (rule, value, callback) => {
+      if (
+        !checkArray(this.prepareTimeRange) ||
+        this.prepareTimeRange.length == 0
+      ) {
         callback(new Error("请选择准备时间！"));
       } else {
         callback();
       }
     };
 
-    let validatePrintTime = (rule, value, callback) => {
-      if (!checkArray(this.printTime)) {
+    let validatePrintTimeRange = (rule, value, callback) => {
+      if (!checkArray(this.printTimeRange) || this.printTimeRange.length == 0) {
         callback(new Error("请选择印刷时间！"));
       } else {
         callback();
       }
     };
 
-    let validateMailTime = (rule, value, callback) => {
-      if (!checkArray(this.mailTime)) {
+    let validateMailTimeRange = (rule, value, callback) => {
+      if (!checkArray(this.mailTimeRange) || this.mailTimeRange.length == 0) {
         callback(new Error("请选择邮寄时间！"));
       } else {
         callback();
@@ -357,9 +362,9 @@ export default {
         mailStartTime: "",
         mailEndTime: ""
       },
-      prepareTime: [],
-      printTime: [],
-      mailTime: [],
+      prepareTimeRange: [],
+      printTimeRange: [],
+      mailTimeRange: [],
       rules: {
         orgId: [
           {
@@ -391,24 +396,24 @@ export default {
             trigger: "change"
           }
         ],
-        prepareTime: [
+        prepareTimeRange: [
           {
             required: true,
-            validator: validatePrepareTime,
+            validator: validatePrepareTimeRange,
             trigger: "change"
           }
         ],
-        printTime: [
+        printTimeRange: [
           {
             required: true,
-            validator: validatePrintTime,
+            validator: validatePrintTimeRange,
             trigger: "change"
           }
         ],
-        mailTime: [
+        mailTimeRange: [
           {
             required: true,
-            validator: validateMailTime,
+            validator: validateMailTimeRange,
             trigger: "change"
           }
         ]
@@ -590,12 +595,12 @@ export default {
         this.selectPmName(this.settingForm.pmId);
         this.selectSupplierName(this.settingForm.supplierId);
 
-        this.settingForm.prepareStartTime = formatGMT(this.prepareTime[0]);
-        this.settingForm.prepareEndTime = formatGMT(this.prepareTime[1]);
-        this.settingForm.printStartTime = formatGMT(this.printTime[0]);
-        this.settingForm.printEndTime = formatGMT(this.printTime[1]);
-        this.settingForm.mailStartTime = formatGMT(this.mailTime[0]);
-        this.settingForm.mailEndTime = formatGMT(this.mailTime[1]);
+        this.settingForm.prepareStartTime = formatGMT(this.prepareTimeRange[0]);
+        this.settingForm.prepareEndTime = formatGMT(this.prepareTimeRange[1]);
+        this.settingForm.printStartTime = formatGMT(this.printTimeRange[0]);
+        this.settingForm.printEndTime = formatGMT(this.printTimeRange[1]);
+        this.settingForm.mailStartTime = formatGMT(this.mailTimeRange[0]);
+        this.settingForm.mailEndTime = formatGMT(this.mailTimeRange[1]);
 
         let curLoading = this.$loading({
           lock: true,
@@ -637,28 +642,28 @@ export default {
       this.settingForm.supplierId = row.supplierId;
       this.settingForm.supplierName = row.supplierName;
 
-      this.prepareTime = [
-        this.settingDate(row.prepareStartTime),
-        this.settingDate(row.prepareEndTime)
-      ];
-      this.printTime = [
-        this.settingDate(row.printStartTime),
-        this.settingDate(row.printEndTime)
-      ];
-      this.mailTime = [
-        this.settingDate(row.mailStartTime),
-        this.settingDate(row.mailEndTime)
-      ];
+      this.prepareTimeRange = this.settingDateRange(
+        row.prepareStartTime,
+        row.prepareEndTime
+      );
+      this.printTimeRange = this.settingDateRange(
+        row.printStartTime,
+        row.printEndTime
+      );
+      this.mailTimeRange = this.settingDateRange(
+        row.mailStartTime,
+        row.mailEndTime
+      );
     },
     closeProjectSettingDialog() {
       /* 关闭项目设置弹窗 */
       this.projectSettingDialog = false;
     },
-    settingDate(dateStr) {
-      if (dateStr) {
-        return new Date(dateStr);
+    settingDateRange(startDate, endDate) {
+      if (!checkEmptyStr(startDate) && !checkEmptyStr(endDate)) {
+        return [startDate, endDate];
       }
-      return "";
+      return [];
     }
   },
   computed: {

src/modules/print/view/ProjectStatistic.vue

@@ -8,6 +8,7 @@
           :inline="true"
           label-position="right"
           label-width="100px"
+          style="border-bottom: 1px solid rgb(221, 221, 221);margin-bottom: 10px"
         >
           <el-form-item label="学校">
             <el-select

src/modules/print/view/ProjectTemplate.vue

@@ -8,6 +8,7 @@
           :inline="true"
           label-position="right"
           label-width="100px"
+          style="border-bottom: 1px solid rgb(221, 221, 221);margin-bottom: 10px"
         >
           <el-form-item label="学校">
             <el-select