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 @@
-
+
-
+
+ -->
-
+
-
+ 工序编码:{{currentNode.id}} -工序名称:{{currentNode.attrs.title.text }}
+
@@ -76,7 +77,17 @@
{{ getTotalcounts(scope.row.repMaterialCounts) }}
-
+
+
+
+
+
@@ -211,7 +222,7 @@ const graphContainer = ref(null)
const graph = ref()
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{