优化

src/views/kpi/assessment/goals/index.vue

@@ -415,14 +415,7 @@ export default {
           }
         }
       }
-      const obj = { status: 1, menuName: '制定了' }
+
-      const params = Object.assign({}, { resultRecordId: this.$route.query.id || '' }, obj)
-      let res = await apiSaveapproval(params)
-      if (res.code !== 200) {
-        this.$message.error(res.msg || '出错了 ')
-        return
-      }
-      this.obj.commentId = res.commentId
       this.obj.recortModelDtos.map(i => {
         i.detailDtos.map(j => {
           const result = this.handleFilter(j.taskDtos).reduce((result, item) => {
@@ -438,6 +431,15 @@ export default {
         this.$message.error(res1.msg)
         return
       }
+      const obj = { status: 1, menuName: '制定了' }
+      const params = Object.assign({}, { resultRecordId: this.$route.query.id || '' }, obj)
+      params.commentId = res1.commentId || ''
+
+      let res = await apiSaveapproval(params)
+      if (res.code !== 200) {
+        this.$message.error(res.msg || '出错了 ')
+        return
+      }
       this.$message({
         message: res.msg,
         type: 'success'

src/views/kpi/assessment/performance/components/UseButton/index.vue

@@ -368,19 +368,19 @@ export default {
         }
       }
 
-      const obj = { status: 1, menuName: '同意了', comment: this.form.comment }
-      const params = Object.assign({}, { resultRecordId: this.obj.id || '' }, obj)
-      let res = await apiSaveapproval(params)
-      if (res.code !== 200) {
-        this.$message.error(res.msg || '出错了 ')
-        return
-      }
-      this.obj.commentId = res.commentId
       let res1 = await apiSaveDetail(this.obj)
       if (res1.code !== 200) {
         this.$message.error(res1.msg)
         return
       }
+      const obj = { status: 1, menuName: '同意了', comment: this.form.comment }
+      const params = Object.assign({}, { resultRecordId: this.obj.id || '' }, obj)
+      params.commentId = res1.commentId || ''
+      let res = await apiSaveapproval(params)
+      if (res.code !== 200) {
+        this.$message.error(res.msg || '出错了 ')
+        return
+      }
       this.$message({
         message: res.msg,
         type: 'success'

src/views/kpi/assessment/performance/components/table.vue

@@ -381,17 +381,18 @@ export default {
           })
         }
       }
-      let res = await apiSaveapproval(params)
+
-      this.loadingTi = false
-      if (res.code !== 200) {
-        this.$message.error(res.msg)
-      }
-      this.obj.commentId = res.commentId
       let res1 = await apiSaveDetail(Object.assign({}, this.obj, this.score))
       if (res1.code !== 200) {
         this.$message.error(res1.msg)
         this.loadingTi = false
       }
+      params.commentId = res1.commentId || ''
+      let res = await apiSaveapproval(params)
+      this.loadingTi = false
+      if (res.code !== 200) {
+        return this.$message.error(res.msg)
+      }
       this.$message({
         message: res.msg,
         type: 'success'