src/views/group/monitoring/groupTeamView/index.vue

@@ -136,11 +136,11 @@ export default {
       params.teamId = val.data.id
       params.teamName = val.data.name
       this.workOrderList.map(item => {
-        if (val.data.workOrderId === item.id) {
+        if (this.queryParams.workOrderId === item.id) {
           this.workOrderName = item.name
         }
       })
-      params.workOrderId = val.data.workOrderId
+      params.workOrderId = this.queryParams.workOrderId
       params.workOrderName = this.workOrderName
       params.roomNameDict = val.data.roomNameDict
       this.$nextTick(() => {

src/views/group/monitoring/teamProduction/components/searchArea.vue

@@ -1,97 +0,0 @@
-<template>
-  <el-form :inline="true" class="demo-form-inline">
-    <span class="blue-block"></span>
-    <el-form-item label="班次信息">
-      <el-select v-model="queryParams.classesId" placeholder="班次信息" style="width: 200px;" size="small" clearable>
-        <el-option
-          v-for="item in classesArr"
-          :key="item.id"
-          :label="(item.roomName?item.roomName:'')+'-'+item.name"
-          :value="item.id">
-          <span>{{ item.roomName }}-{{item.name}}</span>
-        </el-option>
-      </el-select>
-    </el-form-item>
-    <el-form-item label="班组信息">
-      <el-input v-model="queryParams.teamName" placeholder="班组信息" style="width: 200px;" clearable></el-input>
-    </el-form-item>
-    <el-form-item label="上班时间">
-      <el-date-picker
-        v-model="queryParams.tiemStr"
-        type="daterange"
-        format='yyyy-MM-dd'
-        value-format='yyyy-MM-dd'
-        range-separator='-'
-        style="width: 250px;"
-        size="small">
-      </el-date-picker>
-    </el-form-item>
-    <el-form-item>
-      <el-button type="primary" size="small" @click="search">查询</el-button>
-    </el-form-item>
-  </el-form>
-</template>
-<script>
-import { groupClassesListAll } from '@/api/monitoring/teamProduction'
-export default {
-  name: 'searchArea',
-  data() {
-    return {
-      // 查询参数
-      queryParams: {
-        classesId: '',
-        teamName: '',
-        tiemStr: ''
-      },
-      classesArr: [],
-    }
-  },
-  mounted() {
-    this.getGroupClass()
-  },
-  methods: {
-    getGroupClass() {
-      groupClassesListAll().then(res => {
-        this.classesArr = res.data || []
-      })
-    },
-    // 查询
-    search() {
-      console.log(this.queryParams)
-      this.$emit('submit', this.queryParams)
-    }
-  }
-}
-</script>
-<style lang="scss">
-.demo-form-inline {
-  .el-date-editor .el-range__icon {
-    font-size: 16px;
-    color: #0B58FF;
-  }
-  .el-input__prefix .el-icon-date {
-    font-size: 16px;
-    color: #0B58FF;
-  }
-}
-</style>
-<style lang="scss" scoped>
-.separateStyle {
-  display: inline-block;
-  width: 1px;
-  height: 24px;
-  background: #E8E8E8;
-  vertical-align: middle;
-}
-.demo-form-inline {
-  .blue-block {
-    display: inline-block;
-    width: 4px;
-    height: 16px;
-    background-color: #0B58FF;
-    border-radius: 1px;
-    margin-right: 8px;
-    margin-top: 10px;
-  }
-}
-</style>

src/views/group/monitoring/teamProduction/index.vue

@@ -1,12 +1,11 @@
 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-    <search-area @submit="buttonClick"/>
+    <search-bar
-    <!-- <search-bar
       :formConfigs="formConfig"
       ref="searchBarForm"
       @headBtnClick="buttonClick"
-    /> -->
+    />
     <!-- 列表 -->
     <base-table
       :page="queryParams.pageNo"
@@ -35,11 +34,10 @@
   </div>
 </template>
 <script>
-import { groupTeamSchedulingPage } from '@/api/monitoring/teamProduction'
+import { groupTeamSchedulingPage, groupClassesListAll } from '@/api/monitoring/teamProduction'
 import { parseTime } from '@/utils/ruoyi'
 import TeamProductionDetail from './components/teamProductionDetail'
 import { publicFormatter } from '@/utils/dict'
-import SearchArea from './components/searchArea'
 const tableProps = [
   {
     prop: 'roomNameDict',
@@ -141,11 +139,12 @@ export default {
       paramVisible: false
     }
   },
-  components: { TeamProductionDetail, SearchArea },
+  components: { TeamProductionDetail },
   mounted() {
     window.addEventListener('resize', () => {
       this.tableH = this.tableHeight(260)
     })
+    this.getGroupClass()
     this.getList()
   },
   methods: {
@@ -164,6 +163,11 @@ export default {
         this.total = res.data.total || 0
       })
     },
+    getGroupClass() {
+      groupClassesListAll().then(res => {
+        this.formConfig[0].selectOptions = res.data || []
+      })
+    },
     handleClick(val) {
       console.log(val)
       this.paramVisible = true

src/views/order/base/orderGroup/index.vue

@@ -236,8 +236,13 @@ export default {
               btnName: '终止',
               showTip: '终止',
               showParam: {
-                type: '&',
+                type: '|',
                 data: [
+                  {
+                    type: 'equal',
+                    name: 'status',
+                    value: 2
+                  },
                   {
                     type: 'equal',
                     name: 'status',