修改任务待办

src/views/components/SearchForm.vue

@@ -50,6 +50,8 @@ export default {
     mounted() {
         // 通过最大显示个数控制展开/折叠
         this.minShowCtrol()
+        this.$emit('fold',this.fold)
+
     },
     watch: {
         '$store.state.app.sidebar.opened'(newVal, Val) {
@@ -76,6 +78,7 @@ export default {
         },
         shiftCollapsiable() {
             this.fold = !this.fold
+            this.$emit('fold',this.fold)
             this.minShowCtrol()
         },
         // 通过maxShow控制元素显示/折叠

src/views/system/followup/index.vue

@@ -10,7 +10,7 @@
     </el-tabs>
     <div ref="topform" class="form">
       <SearchFilter labelWidth="90px" :labelWidths="310" size="small" @search="handleQuery"
-        @reset="resetQuery" @minShowCtrol="getMaxTableHeight">
+        @reset="resetQuery" @minShowCtrol="getMaxTableHeight" @fold="fold">
         <el-form-item label="执行时间" prop="startDate">
           <el-date-picker
             v-model="intentionalTime"
@@ -190,13 +190,9 @@
             style="width: 220px"
             @keyup.enter.native="handleQuery"
           />
-        </el-form-item>
+          <span style="margin-left: 13px;" v-if="queryParams.nodeExecuteStatus == 'UNEXECUTED' &&foldshow==true">
-        <el-form-item
-          label=""
-          prop="manageRouteName"
-          v-if="queryParams.nodeExecuteStatus == 'UNEXECUTED'"
-        >
           <el-switch
+
             class="switchStyle"
             v-model="timeSignshow"
             active-color="#1890ff"
@@ -205,7 +201,24 @@
             inactive-text="待办"
             @change="changeswitch"
           />
+        </span>
         </el-form-item>
+        <!-- <el-form-item
+          label=""
+          prop="manageRouteName"
+          v-if="queryParams.nodeExecuteStatus == 'UNEXECUTED' &&foldshow==true"
+        >
+          <el-switch
+           style="width: 220px"
+            class="switchStyle"
+            v-model="timeSignshow"
+            active-color="#1890ff"
+            inactive-color="#5AC1A1"
+            active-text="全部"
+            inactive-text="待办"
+            @change="changeswitch"
+          />
+        </el-form-item> -->
       </SearchFilter>
     </div>
     <div ref="table">
@@ -421,23 +434,19 @@
         label="计划时间"
           align="center"
           prop="planTime"
-          width="80"
+          width="95"
 
         >
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.planTime, "{y}-{m}-{d}") }}</span>
           </template>
         </el-table-column>
-
-
         <el-table-column
         v-if="queryParams.nodeExecuteStatus=='EXECUTED'"
-
+        label="执行时间"
-        
-        label="执行时间'"
           align="center"
           prop="executeTime"
-          width="80"
+          width="95"
         >
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.executeTime, "{y}-{m}-{d}") }}</span>
@@ -497,6 +506,7 @@ export default {
 
   data() {
     return {
+      foldshow:null,
       maxTableHeight: undefined,
       // 随访时间
       intentionalTime: [],
@@ -1061,6 +1071,9 @@ export default {
         this.getBoxPadding(layoutDiv) -
         this.getBoxHeight(formDiv);
     },
+    fold(e){
+      this.foldshow=e
+    },
     // 屏幕resize监听
     screenChange() {
       // 屏幕resize监听事件：一旦屏幕宽高发生变化，就会执行resize