From 2907ab45c004fe8e84854791bc6ece3ee4922873 Mon Sep 17 00:00:00 2001
From: zhousq <zhoushaoqiang@sina.com>
Date: Mon, 29 Apr 2024 14:20:29 +0800
Subject: [PATCH] =?UTF-8?q?2024-04-29=20=E4=BF=AE=E6=94=B9=E5=B7=A5?=
 =?UTF-8?q?=E8=89=BA=E8=B7=AF=E7=BA=BF=E9=85=8D=E7=BD=AE=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/orderDay/components/schedule.vue      | 38 +++++++++++++------
 src/views/mes/orderDay/index.vue              |  4 +-
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue
index 88127320a..3a79d518e 100644
--- a/src/views/mes/orderDay/components/schedule.vue
+++ b/src/views/mes/orderDay/components/schedule.vue
@@ -36,24 +36,25 @@
             <el-table :data="processData" ref="tableProcess" style="width: 100%; height: 80%" @cell-dblclick="userAddNode">
               <el-table-column prop="code" label="工序编码" />
               <el-table-column prop="name" label="工序名称" />
-              <el-table-column prop="opera" label="" width="60">
+              <!-- <el-table-column prop="opera" label="" width="60">
                 <template #header>
                   <span>操作</span>
                 </template>
-                <!-- <template #default="scope">
+                <template #default="scope">
                   <el-button type="danger" size="mini" text @click="deleteNode(scope.row)"
                   >移除</el-button
                   >
-                </template> -->
-              </el-table-column>
+                </template>
+              </el-table-column> -->
             </el-table>
           </el-card>
         </el-aside>
-        <el-main style="height: 320px;width: calc(100% - 980px);padding: 0px; margin:0px 20px">
+        <el-main style="height: 480px; width: calc(100% - 980px);padding: 0px; margin:0px 20px">
           <div ref="graphContainer"></div
           ></el-main>
         <el-aside width="640px">
-          <el-tabs v-model="activeName">
+          <el-tag>工序编码：{{currentNode.id}} -工序名称:{{currentNode.attrs.title.text  }}</el-tag>
+          <el-tabs v-model="activeName" >
             <el-tab-pane label="工序工位" name="workstation">
               <el-table :data="workstationData" ref="tableWorkstations" style="width: 100%; height: 80%">
                 <el-table-column prop="stationName" label="工位名称" />
@@ -76,7 +77,17 @@
                 <el-table-column prop="sourceMaterialCounts" label="需求物料数">
                   <template #default="scope">{{ getTotalcounts(scope.row.repMaterialCounts) }}</template>
                 </el-table-column>
-                <el-table-column prop="replaceFlag" label="是否替换" />
+                <el-table-column prop="replaceFlag" label="是否替换" >
+                  <template #default="scope">
+                  <el-switch
+                    v-model="scope.row.replaceFlag"
+                    active-color="#13ce66"
+                    inactive-color="#ff4949"
+                    active-text="是"
+                    inactive-text="否"
+                  />
+                  </template>
+                </el-table-column>
               </el-table>
             </el-tab-pane>
             <el-tab-pane label="工序人员" name="workers">
@@ -211,7 +222,7 @@ const graphContainer = ref<HTMLElement | null>(null)
 const graph = ref<Graph>()
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-const activeName = ref('process')
+const activeName = ref('workstation')
 const formLoading = ref(false)
 const dialogFormVisibleUser = ref(false)
 const processData = ref([])
@@ -249,6 +260,7 @@ const workstationData=ref([])
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const  graphJson =ref()
+const currentNode = ref({})
 /*班组数据*/
 const teamData = ref([])
 /*班组弹窗搜索条件*/
@@ -309,9 +321,9 @@ const open = async (type: string, row?: any, titleName?: any) => {
   queryParams.batchCode=row.batchCode
   //获取配置的
   if (titleName) {
-    dialogTitle.value = t('action.' + titleName)
+    dialogTitle.value =  titleName
   } else {
-    dialogTitle.value = t('action.' + type)
+    dialogTitle.value =  type
   }
   nextTick?.(() => {
     graph.value = createGraph(graphContainer.value as HTMLElement, true, 240, 320)
@@ -388,6 +400,7 @@ const nodeClick = (e, x, y, node, view) => {
   getConfigProcessWorker(node.id)
   getConfigProcessEquipment(node.id)
   processCode.value = node.id
+  currentNode.value=node
 }
 
 const searchTableRef = ref()
@@ -453,9 +466,10 @@ const doPublishPlan=  ()=>{
   endTime: detailData.value.endTime,
   taskMode: detailData.value.taskMode
 }
-  //console.log("-------",data)
+  
   let res = OrderDayApi.publishPlan(data)
-  if(res.code==0){
+  console.log("---doPublishPlan-- 458--",res)
+  if(res.code===0){
     message.success("计划发布成功")
   }else {
     message.error(res.msg)
diff --git a/src/views/mes/orderDay/index.vue b/src/views/mes/orderDay/index.vue
index a4b55b138..857c364a2 100644
--- a/src/views/mes/orderDay/index.vue
+++ b/src/views/mes/orderDay/index.vue
@@ -264,7 +264,7 @@ const openForm = (type: string, row?: any) => {
 const formsSuccess = async (formType,data) => {
   
   if (formType === 'create') {
-    let ret=await OrderDayApi.createOrderDay(data)
+    let ret= OrderDayApi.createOrderDay(data)
     if(ret===undefined || ret===null){
       message.error(t('common.networkError'))
     }else{
@@ -272,7 +272,7 @@ const formsSuccess = async (formType,data) => {
     }
    
   } else {
-    let ret=await OrderDayApi.updateOrderDay(data)
+    let ret= OrderDayApi.updateOrderDay(data)
     if(ret.code==0){
       message.success(t('common.updateSuccess'))
     }else{