修改 技术监督 现场问题

src/views/pqs/supervise/harmonicSurvey/components/planTest.vue

@@ -273,14 +273,14 @@ const audit = (filePath: any) => {
     if (title.value == '计划测试填报') {
         addSurvey({ ...form.value, filePath: filePath }).then((res: any) => {
             ElMessage.success('新增成功!')
-            cancelFn()
             emit('onsubmit')
+            cancelFn()
         })
     } else if (title.value == '重新发起计划') {
         auditSurvey({ ...form.value, filePath: filePath }).then((res: any) => {
             ElMessage.success('重新发起计划成功!')
-            cancelFn()
             emit('onsubmit')
+            cancelFn()
         })
     }
 }

src/views/pqs/supervise/harmonicSurvey/components/testManage.vue

@@ -192,7 +192,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
+                        return row.deptId != adminInfo.$state.deptId || !(row.status == 3 || row.status == 4)
                     },
                     click: row => {
                         planTestRef.value.open('重新发起计划测试', row.id, false)
@@ -205,7 +205,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status != 1
+                        return row.deptId != adminInfo.$state.deptId || row.status != 1
                     },
                     click: row => {
                         cancelLeave(row)