Browse Source

2024-04-30 增加日期校验、修改错误提示

master_hella_20240701
zhousq 5 months ago
parent
commit
b351f4705c
  1. 4
      src/views/mes/orderDay/components/BasicFormV2.vue
  2. 2
      src/views/mes/orderDay/components/orderDetail.vue
  3. 13
      src/views/mes/orderDay/components/schedule.vue
  4. 2
      src/views/mes/orderDay/index.vue

4
src/views/mes/orderDay/components/BasicFormV2.vue

@ -324,6 +324,10 @@ const submitForm = async () => {
if (!elForm) return if (!elForm) return
const valid = await elForm.validate() const valid = await elForm.validate()
if (!valid) return if (!valid) return
if(formRef.value.formModel.startTime>formRef.value.formModel.endTime){
message.warning('开始时间不能大于结束时间!')
return
}
// //
if (props.isBusiness) { if (props.isBusiness) {
formLoading.value = true formLoading.value = true

2
src/views/mes/orderDay/components/orderDetail.vue

@ -102,7 +102,7 @@ const route = useRoute() // 路由信息
const routeName = ref() const routeName = ref()
routeName.value = route.name routeName.value = route.name
routeName.value = routeName.value.substring(0, routeName.value.length - 4) + 'Detail' routeName.value = routeName.value.substring(0, routeName.value.length - 4) + 'Detail'
const activeName = ref('processRouteInfo') const activeName = ref('processInfo')
const props = defineProps({ const props = defineProps({
allSchemas: { allSchemas: {
type: Object, type: Object,

13
src/views/mes/orderDay/components/schedule.vue

@ -190,6 +190,7 @@
</el-dialog> </el-dialog>
</ContentWrap> </ContentWrap>
<template #footer> <template #footer>
<el-button @click="dialogVisible=false" >关闭</el-button>
<el-button @click="publishPlan" >发布计划</el-button> <el-button @click="publishPlan" >发布计划</el-button>
</template> </template>
<SearchTable ref="searchTableRef" @search-table-success="searchTableSuccess" /> <SearchTable ref="searchTableRef" @search-table-success="searchTableSuccess" />
@ -480,12 +481,14 @@ const doPublishPlan= ()=>{
} }
let res = OrderDayApi.publishPlan(data) let res = OrderDayApi.publishPlan(data)
console.log("---doPublishPlan-- 458--",res)
if(res.code===0){ res.then(()=>{
message.success("计划发布成功") message.success("计划发布成功")
}else { }).catch((err)=>{
message.error(res.msg) //console.log("---doPublishPlan-- 458--",res.msg)
} message.error("计划发布失败!")
})
} }
// //

2
src/views/mes/orderDay/index.vue

@ -214,7 +214,7 @@ const isShowMainButton = (row,val) => {
const butttondata = (row) => { const butttondata = (row) => {
//console.log('row2',row) //console.log('row2',row)
return [ 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.mainListDeleteBtn({ hide: isShowMainButton(row,['1']),hasPermi:'mes:orderDay:delete'}), //
defaultButtons.mainListHandleBtn({label: '排产', defaultButtons.mainListHandleBtn({label: '排产',
name: 'publish', name: 'publish',

Loading…
Cancel
Save