From f41fd24902b4f69315ae4598368db600eb8e7171 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Wed, 17 Jul 2024 12:04:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E4=B8=8B=E6=8B=89=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=20=E5=8F=8A=20=E5=B7=A5=E5=BA=8F=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/biz/assignTasks/index.vue       | 23 ++++++++++++++++++-
 .../src/views/biz/plan/planSchedule.vue       | 20 ++++++++++++----
 .../src/views/biz/procedure/index.vue         |  2 +-
 .../src/views/biz/taskreport/index.vue        | 22 ++++++++++++++++--
 4 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/assignTasks/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/assignTasks/index.vue
index f49cc3b5..77bb2c2a 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/assignTasks/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/assignTasks/index.vue
@@ -57,12 +57,17 @@
           />
         </el-form-item>
         <el-form-item label="派工工序" prop="procedureName">
-          <el-input
+          <!-- <el-input
             v-model="queryParams.procedureName"
             placeholder="请输入派工工序"
             clearable
             @keyup.enter="handleQuery"
             class="!w-240px"
+          /> -->
+          <ProcedureSelect
+            v-model="queryParams.procedureId"
+            @update:newValue="handleSelectedProcedure"
+            class="!w-240px"
           />
         </el-form-item>
         <el-form-item label="负责人" prop="ownerName">
@@ -73,6 +78,8 @@
             @keyup.enter="handleQuery"
             class="!w-240px"
           />
+          <!-- <UserSelect v-model="queryParams.ownerId"  class="!w-240px"
+            @update:newValue="handleSelectedUser" /> -->
         </el-form-item>
         <el-form-item label="完成状态" prop="procedureStatus">
           <el-select
@@ -221,6 +228,8 @@ import download from '@/utils/download'
 import * as TaskReportApi from '@/api/biz/taskreport'
 import AssignForm from './assignForm.vue'
 import WorkshopSelect from '@/views/biz/hlvuestyle/workshopSelect.vue'
+// import UserSelect from '@/views/biz/hlvuestyle/userSelect.vue'
+import ProcedureSelect from '@/views/biz/hlvuestyle/procedureSelect.vue'
 
 defineOptions({ name: 'TaskReport' })
 
@@ -238,8 +247,10 @@ const queryParams = reactive({
   materialNameOrCode: undefined,
   spec: undefined,
   workshopId: undefined,
+  procedureId:undefined,
   procedureName: undefined,
   ownerName: undefined,
+  ownerId: undefined,
   procedureStatus: undefined
 })
 const statuslist = ref([
@@ -377,4 +388,14 @@ const handleSelectedWorkshop = (newValue: any) => {
 onMounted(() => {
   getList()
 })
+//接收工序传递的数据
+const handleSelectedProcedure = (newValue: any) => {
+  // console.log('接收工序对应的数据:', newValue)
+  queryParams.procedureId = newValue?.id
+}
+// //接收职工传递的数据
+// const handleSelectedUser = (newValue: any) => {
+//   // console.log('接收职工对应的数据:', newValue)
+//   queryParams.ownerId = newValue?.id
+// }
 </script>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/plan/planSchedule.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/plan/planSchedule.vue
index de3c6a0b..dd4db95f 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/plan/planSchedule.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/plan/planSchedule.vue
@@ -60,7 +60,7 @@
         <el-form-item label="生产车间" prop="workshopId">
           <WorkshopSelect
             v-model="queryParams.workshopId"
-            class="!w-240px"
+            class="!w-250px"
             @update:newValue="handleSelectedWorkshop"
             @keyup.enter="handleQuery"
           />
@@ -71,16 +71,21 @@
             placeholder="请输入报工人"
             clearable
             @keyup.enter="handleQuery"
-            class="!w-240px"
+            class="!w-250px"
           />
         </el-form-item>
         <el-form-item label="工序名称" prop="procedureName">
-          <el-input
+          <!-- <el-input
             v-model="queryParams.procedureName"
             placeholder="请输入工序名称"
             clearable
             @keyup.enter="handleQuery"
             class="!w-250px"
+          /> -->
+          <ProcedureSelect
+            v-model="queryParams.procedureId"
+            @update:newValue="handleSelectedProcedure"
+            class="!w-250px"
           />
         </el-form-item>
         <el-form-item style="margin-left: 15px">
@@ -204,6 +209,7 @@
 <script setup lang="ts">
 import { getIntDictOptions, getStrDictOptions, DICT_TYPE } from '@/utils/dict'
 import WorkshopSelect from '@/views/biz/hlvuestyle/workshopSelect.vue'
+import ProcedureSelect from '@/views/biz/hlvuestyle/procedureSelect.vue'
 
 import { formatDate } from '@/utils/formatTime'
 import * as PlanApi from '@/api/biz/plan'
@@ -227,7 +233,8 @@ const queryParams = reactive({
   owner: undefined,
   workshopId: undefined,
   reportUserName: undefined,
-  procedureName: undefined
+  procedureName: undefined,
+  procedureId:undefined,
 })
 const queryFormRef = ref() // 搜索的表单
 
@@ -264,6 +271,11 @@ onMounted(async () => {
 const handleSelectedWorkshop = (newValue: any) => {
   queryParams.workshopId = newValue?.id
 }
+//接收工序传递的数据
+const handleSelectedProcedure = (newValue: any) => {
+  // console.log('接收工序对应的数据:', newValue)
+  queryParams.procedureId = newValue?.id
+}
 </script>
 <style scoped>
 .el-dropdown-link {
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/procedure/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/procedure/index.vue
index bcaf176f..129b1976 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/procedure/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/procedure/index.vue
@@ -46,7 +46,7 @@
       <!-- <el-table-column label="自增字段，唯一" align="center" prop="id" /> -->
       <el-table-column type="index" width="70" label="序号" align="center" />
       <el-table-column label="工序编码" align="center" prop="code" min-width="110"/>
-      <el-table-column label="工序名称" align="center" prop="name" min-width="120"/>
+      <el-table-column label="工序名称" align="center" prop="name" min-width="180"/>
       <!-- <el-table-column label="工序类型" align="center" prop="procedureType" >
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.BIZ_PROCEDURE_TYPE" :value="scope.row.procedureType" />
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/taskreport/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/taskreport/index.vue
index 77ff44fb..d7792a12 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/taskreport/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/taskreport/index.vue
@@ -29,7 +29,12 @@
           <el-input v-model="queryParams.projectSubName" placeholder="请输入所属车间" clearable @keyup.enter="handleQuery" class="!w-240px" />
         </el-form-item> -->
         <el-form-item label="工序名称" prop="procedureName">
-          <el-input v-model="queryParams.procedureName" placeholder="请输入工序名称" clearable @keyup.enter="handleQuery" class="!w-240px" />
+          <!-- <el-input v-model="queryParams.procedureName" placeholder="请输入工序名称" clearable @keyup.enter="handleQuery" class="!w-240px" /> -->
+          <ProcedureSelect
+            v-model="queryParams.procedureId"
+            @update:newValue="handleSelectedProcedure"
+            class="!w-240px"
+          />
         </el-form-item>
         <el-form-item style="margin-left: 20px">
           <el-button @click="handleQuery" type="primary">
@@ -106,7 +111,8 @@ import { dateFormatter, formatDate } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as TaskReportApi from '@/api/biz/taskreport'
 import TaskReportForm from './TaskReportForm.vue'
-
+import UserSelect from '@/views/biz/hlvuestyle/userSelect.vue'
+import ProcedureSelect from '@/views/biz/hlvuestyle/procedureSelect.vue'
 defineOptions({ name: 'TaskReport' })
 
 const message = useMessage() // 消息弹窗
@@ -118,8 +124,15 @@ const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
+  projectCode:undefined,
+  planCode:undefined,
+  dispatchCode:undefined,
+  projectSubName:undefined,
   dispatchDetailId: undefined,
   owner: undefined,
+  ownerName:undefined,
+  procedureName:undefined,
+  procedureId:undefined,
   amount: undefined,
   startTime: [],
   endTime: [],
@@ -193,4 +206,9 @@ const handleExport = async () => {
 onMounted(() => {
   getList()
 })
+//接收工序传递的数据
+const handleSelectedProcedure = (newValue: any) => {
+  // console.log('接收工序对应的数据:', newValue)
+  queryParams.procedureId = newValue?.id
+}
 </script>