diff --git a/src/views/mes/orderDay/index.vue b/src/views/mes/orderDay/index.vue
index 4562e8d48..70bc08d5a 100644
--- a/src/views/mes/orderDay/index.vue
+++ b/src/views/mes/orderDay/index.vue
@@ -340,7 +340,7 @@ const handleExport = async () => {
 }
 const stopPlan =  (id) => {
     OrderDayApi.stopPlan(id)
-   //getList()
+  
 }
 /** 导入 */
 const importFormRef = ref()
diff --git a/src/views/mes/workScheduling/components/report.vue b/src/views/mes/workScheduling/components/report.vue
index 9b387097c..136b47ac9 100644
--- a/src/views/mes/workScheduling/components/report.vue
+++ b/src/views/mes/workScheduling/components/report.vue
@@ -40,7 +40,7 @@
 
     <template #footer>
       <el-button @click="dialogVisible = false">关闭</el-button>
-      <el-button type="primary" @click="saveReport">保存</el-button>
+      <el-button type="primary"  :disabled="saveFlag" @click="saveReport">保存</el-button>
     </template> </Dialog
   >+
 </template>
@@ -69,6 +69,7 @@ const unqualified = ref()
 const reportCount = ref()
 const qualified = ref()
 const workTerm = ref()
+const saveFlag=ref(false)
 //获取工序列表
 const getProcessList=async(row)=>{
     let params={
@@ -99,9 +100,10 @@ const handleCount = () => {
     return
   }
 
-  if (checkFlag) {
+  if (checkFlag.value) {
     if (reportCount.value < qualified.value) {
       message.alert('合格数不能超出报工数！')
+      qualified.value=0
       return
     }
     if (qualified.value == undefined || qualified.value == 0) {
@@ -112,9 +114,9 @@ const handleCount = () => {
   }
 }
 //提交报工
-const saveReport = () => {
+const saveReport = async() => {
   let data = {
-    reportDate: dayjs(new Date()).format('YYYY-MM-DD HH:mm:sss'),
+    reportDate: dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'),
     schedulingCode: rowData.value.schedulingCode,
     processCode: processCodeSelected.value,
     list: [
@@ -127,8 +129,12 @@ const saveReport = () => {
       }
     ]
   }
+  saveFlag.value = true
   //console.log("report-saveReport-82",data)
-  workschedulingApi.reportWorkByProcess(data)
+  await workschedulingApi.reportWorkByProcess(data)
+  saveFlag.value = false
+  dialogVisible.value = false
+  emit('close')
 }
 // 传递给父类
 const emit = defineEmits(['success', 'close'])
diff --git a/src/views/mes/workScheduling/index.vue b/src/views/mes/workScheduling/index.vue
index d7a9a97cd..c12d7bd90 100644
--- a/src/views/mes/workScheduling/index.vue
+++ b/src/views/mes/workScheduling/index.vue
@@ -67,8 +67,8 @@
           @searchTableSuccessDetail="searchTableSuccessDetail"
           :key="count"
   />
- <Report ref="reportRef"></Report>
- <Finish ref="reportFinishRef"></Finish>
+ <Report ref="reportRef" @close="handleClose"></Report>
+ <Finish ref="reportFinishRef" @close="handleClose"></Finish>
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/mes/work-scheduling/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
@@ -169,7 +169,7 @@ const buttonBaseClick = (val, item) => {
 //     FINISHED("9", "已完成");
 // 列表-操作按钮
 const butttondata=(row) =>{ return [
-  defaultButtons.mainListEditBtn({label:"调序",hasPermi:'mes:workScheduling:update'}), // 编辑
+  defaultButtons.mainListEditBtn({label:"调序",hide: isShowMainButton(row,['-1','0','3']),hasPermi:'mes:workScheduling:update'}), // 编辑
   //defaultButtons.mainListDeleteBtn({hasPermi:'mes:workScheduling:delete'}), // 删除
   defaultButtons.mainListHandleBtn({label:"终止",name:'terminate',hide: isShowMainButton(row,['-1','0']),hasPermi:'mes:workScheduling:update'}), //
   defaultButtons.mainListHandleBtn({label:"暂停",name:'pause',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}),
@@ -292,7 +292,9 @@ const importTemplateData = reactive({
 const importSuccess = () => {
   getList()
 }
-
+const handleClose=()=>{
+  getList()
+}
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {