更改代码

src/views/enforceflow/enforceflow.vue

@@ -498,7 +498,7 @@
             placeholder="选择日期" style="width: 350px">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="实施内容:">
+        <el-form-item label="内容:">
           <div id="editorEnforceRecord" style="text-align:left"></div>
         </el-form-item>
       </el-form>
@@ -859,14 +859,23 @@ export default {
     },
     saveUpdate(){
       let data = this.enforceForm;
+      if(data===undefined || data==null){
+        this.$message.error("该流程暂未执行，不能修改信息!")
+        return
+      }
       let id=data.id
       if(id===undefined || id==null){
         this.$message.error("该流程暂未执行，不能修改信息!")
         return
+      }else {
+        updateEnforceFlow(data).then(res => {
+          if (res.success === false) {
+            this.$message.error(res.data)
+          }else {
+            this.$message.success("操作成功!")
+          }
+        });
       }
-      updateEnforceFlow(data).then(res=>{
-        this.$message.success("操作成功!")
-      });
 
     },
     submitEnforceForm() {
@@ -1125,6 +1134,8 @@ export default {
             let dtos = data.dtos
             if (dtos.length > 0) {
               this.enforceForm = dtos[0]
+            }else{
+              this.enforceForm=null
             }
             this.$nextTick(() => {
               if (editor == null) {

src/views/meeting/meeting.vue

@@ -351,10 +351,10 @@
         </el-table-column>
       </el-table>
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="pro.status!==0 && pro.meetingConfirmStatus==='0'" type="success" size="mini" @click="confirmMeeting(pro)">会议结果确认
+        <el-button v-if="pro.status!==0 && pro.meetingConfirmStatus===0" type="success" size="mini" @click="confirmMeeting(pro)">会议结果确认
         </el-button>
-        <el-button size="mini" @click="closeProjectMeetingDailog" v-show="false">取消</el-button>
-        <el-button size="mini" v-if="pro.meetingConfirmStatus==='0'" type="primary" class="title" @click="submitMeetingOptionsForm(pro,'editForm')">保存</el-button>
+        <el-button size="mini" @click="closeProjectMeetingDailog" >取消</el-button>
+        <el-button size="mini" v-if="pro.meetingConfirmStatus===0" type="primary" class="title" @click="submitMeetingOptionsForm(pro,'editForm')">保存</el-button>
       </div>
     </el-dialog>
 
@@ -397,7 +397,6 @@
         <el-table-column label="序号" width="60" type="index"></el-table-column>
         <el-table-column label="会议内容" prop="content"></el-table-column>
       </el-table>
-
       <div slot="footer" class="dialog-footer">
         <el-button size="mini" @click="closeotherMeetingDailog">取消</el-button>
       </div>

src/views/meeting/weeklyRecords.vue

@@ -3,7 +3,7 @@
     <div style="display: flex;justify-content: space-between;margin-bottom: 8px">
       <div style="font-size: 24px">{{ m.meetingName }}</div>
       <div>
-        <el-button size="mini" @click="meetingResultConfirm" type="primary"  style="margin-right: 20px">会议结果确认</el-button>
+        <el-button size="mini" @click="meetingResultConfirm"  v-if="meetingResultConfirmVisible" type="primary"  style="margin-right: 20px">会议结果确认</el-button>
         <el-button size="mini" @click="exportPdf"  style="margin-right: 20px" v-if="workScoreVisible">导出</el-button>
       </div>
 
@@ -102,7 +102,7 @@
       </el-table-column>
       <el-table-column prop="scores" label="评分" width="150" align="center" v-if="workScoreVisible">
         <template slot-scope="scope">
-          <el-input-number size="mini" :precision="2" :step="0.1" :max="10" min="5" v-model="scope.row.score"
+          <el-input-number size="mini" :precision="2" :step="0.1" :max="10" :min="0" v-model="scope.row.score"
                            @change="workComment(scope.row)">
             {{ scope.row.score }}
           </el-input-number>
@@ -208,6 +208,7 @@ export default {
       taskFeedbackTitle: '',
       taskFeedbackVisible: false,
       taskFeedbackContent: '',
+      meetingResultConfirmVisible:false,
       title: '技术部周会',
       size: '',
       tableData: [],
@@ -264,8 +265,8 @@ export default {
           break;
         }
       }
-      console.log(JSON.stringify(permissions))
 
+      let loginUserId=this.$store.getters.userId
       let meetingId = this.meetingId
       let weeks = this.weeks
       if (meetingId != null && weeks != null) {
@@ -273,6 +274,16 @@ export default {
           this.tableData = res.data.workContent
           this.getSpanArr(this.tableData);
           this.m = res.data.meeting
+          let innerAttendess=JSON.parse(this.m.innerAttendees)
+          for(let i=0;i<innerAttendess.length;i++){
+            let user=innerAttendess[i]
+            if(Number(user.id)===Number(loginUserId)){
+              if(user.flag==='0'){
+                this.meetingResultConfirmVisible=true
+                break
+              }
+            }
+          }
 
         })
       } else {
@@ -290,6 +301,16 @@ export default {
               this.tableData = res.data.workContent
               this.getSpanArr(this.tableData);
               this.m = res.data.meeting
+              let innerAttendess=JSON.parse(this.m.innerAttendees)
+              for(let i=0;i<innerAttendess.length;i++){
+                let user=innerAttendess[i]
+                if(Number(user.id)===Number(loginUserId)){
+                  if(user.flag==='0'){
+                    this.meetingResultConfirmVisible=true
+                    break
+                  }
+                }
+              }
             })
           } else {
             this.tableData = []
@@ -341,7 +362,7 @@ export default {
       let planContent=row.planContent;
       if(planContent.includes('下周暂无工作安排')){
         let userName=row.userName;
-        let msg=userName+"下周工作计划未填写，请填写完后在评论!"
+        let msg=userName+"下周工作计划未填写，请填写完后在评论评分!"
         this.$message({
           message: msg,
           type: 'warning'