From 5deaa0bc1e744bd1c78180fa3a173267e553187d Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Thu, 29 Feb 2024 16:46:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/monitoring/groupTeamView/index.vue  |   4 +-
 .../teamProduction/components/searchArea.vue  | 103 ++++++++++++++++++
 .../group/monitoring/teamProduction/index.vue |  16 +--
 src/views/order/base/orderGroup/index.vue     |   7 +-
 4 files changed, 112 insertions(+), 18 deletions(-)
 create mode 100644 src/views/group/monitoring/teamProduction/components/searchArea.vue

diff --git a/src/views/group/monitoring/groupTeamView/index.vue b/src/views/group/monitoring/groupTeamView/index.vue
index 71f95eda..1719b7b7 100644
--- a/src/views/group/monitoring/groupTeamView/index.vue
+++ b/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 (this.queryParams.workOrderId === item.id) {
+        if (val.data.workOrderId === item.id) {
           this.workOrderName = item.name
         }
       })
-      params.workOrderId = this.queryParams.workOrderId
+      params.workOrderId = val.data.workOrderId
       params.workOrderName = this.workOrderName
       params.roomNameDict = val.data.roomNameDict
       this.$nextTick(() => {
diff --git a/src/views/group/monitoring/teamProduction/components/searchArea.vue b/src/views/group/monitoring/teamProduction/components/searchArea.vue
new file mode 100644
index 00000000..739d19e8
--- /dev/null
+++ b/src/views/group/monitoring/teamProduction/components/searchArea.vue
@@ -0,0 +1,103 @@
+<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.roomNameDictName+'-'+item.name"
+          :value="item.id">
+          <span>{{ item.roomNameDictName }}-{{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 => {
+        let arr = res.data || []
+        if (arr.length > 0) {
+          for (let i = 0; i < arr.length; i++) {
+            arr[i].roomNameDictName = this.getDictDataLabel('workshop',arr[i].roomNameDict) || ''
+          }
+        }
+        this.classesArr = arr
+      })
+    },
+    // 查询
+    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>
\ No newline at end of file
diff --git a/src/views/group/monitoring/teamProduction/index.vue b/src/views/group/monitoring/teamProduction/index.vue
index 45cbb569..be06f52d 100644
--- a/src/views/group/monitoring/teamProduction/index.vue
+++ b/src/views/group/monitoring/teamProduction/index.vue
@@ -1,11 +1,12 @@
 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-    <search-bar
+    <search-area @submit="buttonClick"/>
+    <!-- <search-bar
       :formConfigs="formConfig"
       ref="searchBarForm"
       @headBtnClick="buttonClick"
-    />
+    /> -->
     <!-- 列表 -->
     <base-table
       :page="queryParams.pageNo"
@@ -34,10 +35,11 @@
   </div>
 </template>
 <script>
-import { groupTeamSchedulingPage, groupClassesListAll } from '@/api/monitoring/teamProduction'
+import { groupTeamSchedulingPage } 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',
@@ -139,12 +141,11 @@ export default {
       paramVisible: false
     }
   },
-  components: { TeamProductionDetail },
+  components: { TeamProductionDetail, SearchArea },
   mounted() {
     window.addEventListener('resize', () => {
       this.tableH = this.tableHeight(260)
     })
-    this.getGroupClass()
     this.getList()
   },
   methods: {
@@ -163,11 +164,6 @@ 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
diff --git a/src/views/order/base/orderGroup/index.vue b/src/views/order/base/orderGroup/index.vue
index 79316f63..d71b9638 100644
--- a/src/views/order/base/orderGroup/index.vue
+++ b/src/views/order/base/orderGroup/index.vue
@@ -236,13 +236,8 @@ export default {
               btnName: '终止',
               showTip: '终止',
               showParam: {
-                type: '|',
+                type: '&',
                 data: [
-                  {
-                    type: 'equal',
-                    name: 'status',
-                    value: 2
-                  },
                   {
                     type: 'equal',
                     name: 'status',
-- 
2.45.2


From afe28d103e57d3a4e731627d031cc374c1eccce1 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Thu, 29 Feb 2024 16:52:30 +0800
Subject: [PATCH 2/2] 1

---
 .../teamProduction/components/searchArea.vue         | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/views/group/monitoring/teamProduction/components/searchArea.vue b/src/views/group/monitoring/teamProduction/components/searchArea.vue
index 739d19e8..fff8c211 100644
--- a/src/views/group/monitoring/teamProduction/components/searchArea.vue
+++ b/src/views/group/monitoring/teamProduction/components/searchArea.vue
@@ -6,9 +6,9 @@
         <el-option
           v-for="item in classesArr"
           :key="item.id"
-          :label="item.roomNameDictName+'-'+item.name"
+          :label="(item.roomName?item.roomName:'')+'-'+item.name"
           :value="item.id">
-          <span>{{ item.roomNameDictName }}-{{item.name}}</span>
+          <span>{{ item.roomName }}-{{item.name}}</span>
         </el-option>
       </el-select>
     </el-form-item>
@@ -52,13 +52,7 @@ export default {
   methods: {
     getGroupClass() {
       groupClassesListAll().then(res => {
-        let arr = res.data || []
-        if (arr.length > 0) {
-          for (let i = 0; i < arr.length; i++) {
-            arr[i].roomNameDictName = this.getDictDataLabel('workshop',arr[i].roomNameDict) || ''
-          }
-        }
-        this.classesArr = arr
+        this.classesArr = res.data || []
       })
     },
     // 查询
-- 
2.45.2