diff --git a/src/views/mes/orderDay/components/BasicFormV2.vue b/src/views/mes/orderDay/components/BasicFormV2.vue
index 8715c9abb..a6863b0ad 100644
--- a/src/views/mes/orderDay/components/BasicFormV2.vue
+++ b/src/views/mes/orderDay/components/BasicFormV2.vue
@@ -324,6 +324,10 @@ const submitForm = async () => {
if (!elForm) return
const valid = await elForm.validate()
if (!valid) return
+ if(formRef.value.formModel.startTime>formRef.value.formModel.endTime){
+ message.warning('开始时间不能大于结束时间!')
+ return
+ }
// 针对主子表 明细校验
if (props.isBusiness) {
formLoading.value = true
diff --git a/src/views/mes/orderDay/components/orderDetail.vue b/src/views/mes/orderDay/components/orderDetail.vue
index 486efad04..3e7b0e7ad 100644
--- a/src/views/mes/orderDay/components/orderDetail.vue
+++ b/src/views/mes/orderDay/components/orderDetail.vue
@@ -102,7 +102,7 @@ const route = useRoute() // 路由信息
const routeName = ref()
routeName.value = route.name
routeName.value = routeName.value.substring(0, routeName.value.length - 4) + 'Detail'
-const activeName = ref('processRouteInfo')
+const activeName = ref('processInfo')
const props = defineProps({
allSchemas: {
type: Object,
diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue
index ad4eb54f2..f9d48a015 100644
--- a/src/views/mes/orderDay/components/schedule.vue
+++ b/src/views/mes/orderDay/components/schedule.vue
@@ -190,6 +190,7 @@
+ 关闭
发布计划
@@ -480,12 +481,14 @@ const doPublishPlan= ()=>{
}
let res = OrderDayApi.publishPlan(data)
- console.log("---doPublishPlan-- 458--",res)
- if(res.code===0){
+
+ res.then(()=>{
message.success("计划发布成功")
- }else {
- message.error(res.msg)
- }
+ }).catch((err)=>{
+ //console.log("---doPublishPlan-- 458--",res.msg)
+ message.error("计划发布失败!")
+ })
+
}
// 弹层确定返回所选数据
diff --git a/src/views/mes/orderDay/index.vue b/src/views/mes/orderDay/index.vue
index 857c364a2..fc421c5e3 100644
--- a/src/views/mes/orderDay/index.vue
+++ b/src/views/mes/orderDay/index.vue
@@ -214,7 +214,7 @@ const isShowMainButton = (row,val) => {
const butttondata = (row) => {
//console.log('row2',row)
return [
- defaultButtons.mainListEditBtn({ hide: isShowMainButton(row,['1']),hasPermi:'mes:orderDay:update'}), // 编辑
+ //defaultButtons.mainListEditBtn({ hide: isShowMainButton(row,['1']),hasPermi:'mes:orderDay:update'}), // 编辑
defaultButtons.mainListDeleteBtn({ hide: isShowMainButton(row,['1']),hasPermi:'mes:orderDay:delete'}), // 删除
defaultButtons.mainListHandleBtn({label: '排产',
name: 'publish',