From cbab1934ab812f387daa794c7bcf484f66436101 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Mon, 29 Apr 2024 17:23:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=B9=E6=AC=A1=E5=8F=B7?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E7=8F=AD=E7=BB=84=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=20=E7=A6=BB=E7=BA=BF?=
 =?UTF-8?q?=E7=99=BB=E8=AE=B0=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/orderDay/index.ts                 |  3 +-
 .../mes/orderDay/components/schedule.vue      | 32 +++++++++++++------
 .../mes/productOffline/productOffline.data.ts |  4 +--
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/api/mes/orderDay/index.ts b/src/api/mes/orderDay/index.ts
index 0ccc0f3ee..89fafea88 100644
--- a/src/api/mes/orderDay/index.ts
+++ b/src/api/mes/orderDay/index.ts
@@ -18,6 +18,7 @@ export interface OrderDayVO {
   startTime: Date
   endTime: Date
   taskMode: string
+  batchCode:string
 }
 
 // 查询生产日计划列表
@@ -104,4 +105,4 @@ export const publishPlan = async (data: OrderDayVO)  => {
 //终止计划
 export const stopPlan = async (id)  => {
   return await request.post({ url: `/mes/orderday/stopPlan/`+id })
-}
\ No newline at end of file
+}
diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue
index 3a79d518e..ad4eb54f2 100644
--- a/src/views/mes/orderDay/components/schedule.vue
+++ b/src/views/mes/orderDay/components/schedule.vue
@@ -70,7 +70,7 @@
 
             </el-tab-pane>
             <el-tab-pane label="工序物料" name="materials">
-              <el-table :data="materialsData" ref="tableMaterials" style="width: 100%; height: 80%">
+                <el-table :data="materialsData" ref="tableMaterials" style="width: 100%; height: 80%">
                 <el-table-column prop="repMaterialCode" label="物料编码" />
                 <el-table-column prop="repMaterialCounts" label="物料数量" />
                 <el-table-column prop="repMaterialModel" label="物料单位" />
@@ -260,7 +260,14 @@ const workstationData=ref([])
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const  graphJson =ref()
-const currentNode = ref({})
+const currentNode = ref({
+  attrs:{
+    title:{
+      text:''
+    }
+  },
+  id:''
+})
 /*班组数据*/
 const teamData = ref([])
 /*班组弹窗搜索条件*/
@@ -283,6 +290,8 @@ const closeTeamUser = () =>{
 const workerData=ref([])
 /*查询班组接口参数*/
 const teamParams = ref({
+  workshopCode:'',
+  productionLineCode:'',
   teamGroup: '',
   name: '',
   pageNo:1,
@@ -304,6 +313,8 @@ const searchTeamList = () => {
 }
 /** 打开弹窗 */
 const open = async (type: string, row?: any, titleName?: any) => {
+  currentNode.value.attrs.title.text=''
+  currentNode.value.id=''
   //首次打开页面，将数据清空
   workerData.value = []
   equipmentData.value = []
@@ -424,7 +435,7 @@ const opensearchTable = (
     false,
     //true
   )
-  
+
 }
 const publishPlan=()=>{
      message.confirm("确认发布当前计划？","question").then(async () => {
@@ -441,11 +452,11 @@ const publishPlan=()=>{
      }).catch(() => {
       message.info("已取消发布")
      })
-     
-    
+
+
 }
 const doPublishPlan=  ()=>{
-  
+
   let data ={
   updateId: detailData.value.id,
   status: detailData.value.status,
@@ -464,9 +475,10 @@ const doPublishPlan=  ()=>{
   planDate: detailData.value.planDate,
   startTime: detailData.value.planDate,
   endTime: detailData.value.endTime,
-  taskMode: detailData.value.taskMode
-}
-  
+  taskMode: detailData.value.taskMode,
+  batchCode:detailData.value.batchCode,
+  }
+
   let res = OrderDayApi.publishPlan(data)
   console.log("---doPublishPlan-- 458--",res)
   if(res.code===0){
@@ -567,6 +579,8 @@ const opensearchTableUser = async  (
   teamParams.value.teamGroup = ''
   teamParams.value.name = ''
   teamParams.value.pageNo = 1
+  teamParams.value.workshopCode = detailData.value.workroomCode
+  teamParams.value.productionLineCode = detailData.value.lineCode
   var teamList = await getTeamList(teamParams.value)
   teamData.value =  teamList.list
   totalTeam.value = teamList.total
diff --git a/src/views/mes/productOffline/productOffline.data.ts b/src/views/mes/productOffline/productOffline.data.ts
index 95a1784df..1cc932791 100644
--- a/src/views/mes/productOffline/productOffline.data.ts
+++ b/src/views/mes/productOffline/productOffline.data.ts
@@ -48,8 +48,8 @@ export const ProductOffline = useCrudSchemas(reactive<CrudSchema[]>([
         searchAllSchemas: workscheduling.allSchemas, // 查询弹窗所需类
         searchPage: ProductOfflineApi.getworkSchedulingPage, // 查询弹窗所需分页方法
         searchCondition: [{
-          key: 'flagDo',
-          value: '3',
+          key: 'status',
+          value: '1',
           action: '==',
           isSearch: true,
           isMainValue: false