Merge remote-tracking branch 'origin/develop' into develop

src/pages/processCenter/pages/creatProcess/bzjd/step3.vue

@@ -175,7 +175,7 @@
                         show-overflow-tooltip
                         align="center">
                     <template slot-scope="scope">
-                        {{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }}
+                        {{ scope.row.complianceRequir === '1' ? '符合' : (scope.row.complianceRequir === '2' ? '不符合' : '') }}
                     </template>
                 </el-table-column>
                 <el-table-column

src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue

@@ -39,6 +39,7 @@
                   <el-date-picker
                     v-model="form.endTime"
                     type="date"
+                    :picker-options="pickerOptions"
                     placeholder="请选择结束日期">
                   </el-date-picker>
                 </el-form-item>
@@ -365,6 +366,11 @@ export default {
   name: "bzzqyjStep1-1",
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
+        }
+      },
       drawerTitle2: '',
       type2: '',
       activeNames: '1',