bug修改

src/utils/common.js

@@ -246,16 +246,15 @@ export function getMonthDate(date) {
   let d = new Date(date);
   let year = d.getFullYear();
   let month = d.getMonth() + 1;
+  let days = new Date(year, month, 0).getDate();
+
   let today = new Date();
-  let startDate = new Date(year, d.getMonth(), 1);
-  let endData = new Date(year, d.getMonth() + 1, 1);
-  let days = (endData - startDate) / (1000 * 60 * 60 * 24);
   let list = []
   let weeks = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
   for (let i = 1; i <= days; i++) {
     const day = i < 10 ? '0' + i : i + '';
-    let weekIndex = new Date(month + '/' + i + '/' + year).getDay();
-    let week = weeks[weekIndex];
+    d.setDate(i);
+    let week = weeks[d.getDay()]
     if (today.getFullYear() === year && today.getMonth() + 1 === month && today.getDate() === i) {
       week = '今日'
     }

src/views/meeting/meeting.vue

@@ -101,7 +101,7 @@
                :close-on-click-modal="false">
       <el-form label-width="120px" ref="form" size="mini" :model="editForm">
         <el-form-item label="会议主题:" prop="meetingName" :rules="[{required:true,message: '请输入会议主题', trigger: 'blur'}]">
-          <el-input v-model="editForm.meetingName" ></el-input>
+          <el-input v-model="editForm.meetingName"></el-input>
         </el-form-item>
         <el-form-item label="会议类别:">
           <el-radio-group v-model="editForm.external">
@@ -111,7 +111,8 @@
         </el-form-item>
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="会议类型:" prop="meetingType" :rules="[{required:true,message: '请选择会议类型', trigger: 'blur'}]">
+            <el-form-item label="会议类型:" prop="meetingType"
+                          :rules="[{required:true,message: '请选择会议类型', trigger: 'blur'}]">
               <el-select v-model="editForm.meetingType" placeholder="会议类型" clearable>
                 <el-option label="周例会" :value="1" key="周例会">周例会</el-option>
                 <el-option label="项目会议" :value="2" key="项目会议">项目会议</el-option>
@@ -121,7 +122,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="关联项目" v-if="editForm.meetingType===2" prop="projectId" :rules="[{required:true,message: '请选择项目', trigger: 'change'}]">
+            <el-form-item label="关联项目" v-if="editForm.meetingType===2" prop="projectId"
+                          :rules="[{required:true,message: '请选择项目', trigger: 'change'}]">
               <el-select
                 v-model="editForm.projectId"
                 clearable
@@ -148,7 +150,8 @@
         <el-form-item label="外部参会人员:">
           <el-input size="mini" v-model="editForm.outAttendees"></el-input>
         </el-form-item>
-        <el-form-item label="内部参会人员:" prop="innerAttendUsers" :rules="[{required:true,message: '请选择参会人员', trigger: 'change'}]">
+        <el-form-item label="内部参会人员:" prop="innerAttendUsers"
+                      :rules="[{required:true,message: '请选择参会人员', trigger: 'change'}]">
           <el-input size="mini" v-model="editForm.innerAttendUsers" readonly="true" @keyup.enter.native="openUsers()">
             <el-button @click="openUsers" icon="el-icon-search" slot="append"></el-button>
           </el-input>
@@ -164,10 +167,10 @@
             <el-button @click="openUsers1('recorder')" icon="el-icon-search" slot="append"></el-button>
           </el-input>
         </el-form-item>
-        <el-form-item label="参会情况:" prop="remark" :rules="[{required:true,message: '请输入参会情况', trigger: 'blur'}]">
+        <el-form-item label="参会情况:" prop="remark" v-if="editForm.status>0">
           <el-input size="mini" v-model="editForm.remark"></el-input>
         </el-form-item>
-        <el-form-item label="会议内容:" >
+        <el-form-item label="会议内容:">
           <el-table
             style="width: 100%" border stripe :show-header="false" :data="editForm.meetingContents">
             <el-table-column type="index" label="序号" width="40">
@@ -259,12 +262,14 @@
         <el-table-column label="会议内容" prop="content"></el-table-column>
         <el-table-column label="会议问题" prop="question">
           <template slot-scope="scope">
-            <el-input size="mini" v-model="scope.row.question" type="textarea" :autosize="{ minRows: 4, maxRows: 10}"></el-input>
+            <el-input size="mini" v-model="scope.row.question" type="textarea"
+                      :autosize="{ minRows: 4, maxRows: 10}"></el-input>
           </template>
         </el-table-column>
         <el-table-column label="会议方案" prop="optionss">
           <template slot-scope="scope">
-            <el-input size="mini" v-model="scope.row.optionss" type="textarea" :autosize="{ minRows: 4, maxRows: 10}"></el-input>
+            <el-input size="mini" v-model="scope.row.optionss" type="textarea"
+                      :autosize="{ minRows: 4, maxRows: 10}"></el-input>
           </template>
 
         </el-table-column>
@@ -501,7 +506,7 @@ export default {
         return;
       }
       this.editForm.meetingContents.splice(index, 1)
-      if(row.id!==undefined){
+      if (row.id !== undefined) {
         deleteMeetingContentById(row.id).then(res => {
         });
       }
@@ -743,7 +748,7 @@ export default {
       let data = this.pro.meetingContents;
       for (let i = 0; i < data.length; i++) {
         let t = data[i];
-        if(t.question==='' || t.optionss==='' || t.executorName==='' || t.times===''){
+        if (t.question === '' || t.optionss === '' || t.executorName === '' || t.times === '') {
           this.$message({
             message: '请将信息填写完整!',
             type: 'warning'

src/views/task/view.vue

@@ -258,9 +258,9 @@ export default {
     },
 
     cellClick(row, column, cell, event) {
-      if (!row[column.property].color || row[column.property].color === '1') {
-        return
-      }
+      // if (!row[column.property].color || row[column.property].color === '1') {
+      //   return
+      // }
       if (!row[column.property].value || row[column.property].value === '') {
         return;
       }
@@ -273,9 +273,9 @@ export default {
       })
     },
     cellDbClick(row, column, cell, event) {
-      if (!row[column.property].color || row[column.property].color === '1') {
-        return
-      }
+      // if (!row[column.property].color || row[column.property].color === '1') {
+      //   return
+      // }
       let feedbackDate = this.queryParams.month + '-' + column.property
       if (DateUtil.unix(feedbackDate) > DateUtil.unix()) {
         this.$message.warning("反馈时间不能超过:" + DateUtil.day())