修改bug

src/api/meeting/meeting.js

@@ -139,3 +139,14 @@ export function workComments(data){
     data: data
   })
 }
+
+/**
+ * 获取周会会议信息
+ * @returns {*}
+ */
+export function getMeetingByWeekss(){
+  return request({
+    url: '/meeting/getMeetingByWeeks',
+    method: 'get'
+  })
+}

src/views/material/receive.vue

@@ -23,6 +23,7 @@
             type="month"
             value-format="yyyy-MM"
             placeholder="选择月份"
+            @change="handleQuery"
             clearable>
           </el-date-picker>
         </div>
@@ -32,6 +33,7 @@
             type="week"
             format="yyyy 第 WW 周"
             placeholder="选择周"
+            @change="handleQuery"
             clearable>
           </el-date-picker>
         </div>
@@ -101,6 +103,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
+            v-if="showEditBtn(scope.row)"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['material:material:edit']"
           >修改
@@ -324,6 +327,22 @@ export default {
         }
       }
     },
+    showEditBtn(row) {
+      if (row.monthOrWeek === '1') {
+        if (DateUtil.getMinutes() < DateUtil.getMinutes(DateUtil.day(DateUtil.month() + '25'))) {
+          return DateUtil.unix(row.recordDate) >= DateUtil.unix(DateUtil.afterMonth())
+        } else {
+          return DateUtil.unix(row.recordDate) >= DateUtil.unix(DateUtil.afterMonth())
+        }
+      } else {
+        let split = row.recordDate.split("~");
+        let date = split[0];
+        let minutes = DateUtil.unix(date);
+        let minutes1 = DateUtil.unix(DateUtil.afterWeek());
+        return minutes >= minutes1
+      }
+    },
+
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();

src/views/meeting/meeting.vue

@@ -78,16 +78,14 @@
       <el-table-column prop="createTime" label="创建时间" width="150">
 
       </el-table-column>
-      <el-table-column label="操作" prop="op" width="150">
+      <el-table-column label="操作" prop="op" width="180">
         <template slot-scope="scope">
 
-          <el-button v-if="scope.row.status===0" size="mini" type="primary" @click="handleEdit(scope.row)">编辑
+          <el-button v-if="scope.row.status!==2" size="mini" type="primary" @click="handleEdit(scope.row)">编辑
           </el-button>
           <el-button v-if="scope.row.status===0" size="mini" type="danger" @click="deleteMeeting( scope.row)">删除
           </el-button>
-          <el-button v-if="scope.row.status===2" type="primary" size="mini" @click="confirmMeeting(scope.row)">结果确认
-          </el-button>
-          <el-button v-if="scope.row.status===1" type="primary" size="mini" @click="meetingDetail(scope.row)">会议详情
+          <el-button v-if="scope.row.status!==0 && (scope.row.meetingType===2 || scope.row.meetingType===1)" type="success" size="mini" @click="meetingDetail(scope.row)">会议详情
           </el-button>
         </template>
       </el-table-column>
@@ -147,21 +145,24 @@
           <el-input size="small" v-model="editForm.outAttendees"></el-input>
         </el-form-item>
         <el-form-item label="内部参会人员:">
-          <el-input size="small" v-model="editForm.innerAttendUsers" :disabled="true" @keyup.enter.native="openUsers()">
+          <el-input size="small" v-model="editForm.innerAttendUsers" readonly="true" @keyup.enter.native="openUsers()">
             <el-button @click="openUsers" icon="el-icon-search" slot="append"></el-button>
           </el-input>
         </el-form-item>
         <el-form-item label="主持人:">
-          <el-input size="small" v-model="editForm.emcee" :disabled="true" @keyup.enter.native="openUsers1('emcee')">
+          <el-input size="small" v-model="editForm.emcee" readonly="true" @keyup.enter.native="openUsers1('emcee')">
             <el-button @click="openUsers1('emcee')" icon="el-icon-search" slot="append"></el-button>
           </el-input>
         </el-form-item>
         <el-form-item label="记录人:">
-          <el-input size="small" v-model="editForm.recorder" :disabled="true"
+          <el-input size="small" v-model="editForm.recorder" readonly="true"
                     @keyup.enter.native="openUsers1('recorder')">
             <el-button @click="openUsers1('recorder')" icon="el-icon-search" slot="append"></el-button>
           </el-input>
         </el-form-item>
+        <el-form-item label="参会情况:">
+          <el-input size="small" v-model="editForm.remark"></el-input>
+        </el-form-item>
         <el-form-item label="会议内容:">
           <el-table
             style="width: 100%" border stripe :show-header="false" :data="editForm.meetingContents">
@@ -241,7 +242,9 @@
         <el-descriptions-item label="内部参会人员">
           {{ pro.innerAttendees }}
         </el-descriptions-item>
-
+        <el-descriptions-item label="参会情况" >
+          {{ pro.remark }}
+        </el-descriptions-item>
       </el-descriptions>
 
       <el-table style="width: 100%;margin: 0" border stripe :data="pro.meetingContents">
@@ -281,8 +284,10 @@
         </el-table-column>
       </el-table>
       <div slot="footer" class="dialog-footer">
+        <el-button v-if="pro.status!==0" type="success" size="mini" @click="confirmMeeting(pro)">会议结果确认
+        </el-button>
         <el-button size="mini" @click="closeProjectMeetingDailog">取消</el-button>
-        <el-button size="mini" type="primary" class="title" @click="submitMeetingOptionsForm('editForm')">确定</el-button>
+        <el-button size="mini" type="primary" class="title" @click="submitMeetingOptionsForm('editForm')">保存</el-button>
       </div>
     </el-dialog>
 
@@ -336,6 +341,7 @@ export default {
         innerAttendees: '',
         innerAttendesss: null,
         innerAttendUsers: '',
+        remark:'',
         emcee: '',
         recorder: '',
         meetingContents: [
@@ -357,6 +363,8 @@ export default {
         innerAttendees: '',
         emcee: '',
         recorder: '',
+        remark:'',
+        status:null,
         meetingContents: [{
           id: null,
           meetingId: null,
@@ -406,6 +414,25 @@ export default {
         this.title = '创建会议'
         this.editFormVisible = true
       })
+      this.editForm={
+        id: null,
+        meetingName: '',
+        external: 0,
+        meetingType: '1',
+        projectId: null,
+        meetingPlace: '',
+        time: null,
+        outAttendees: '',
+        innerAttendees: '',
+        innerAttendesss: null,
+        innerAttendUsers: '',
+        remark:'',
+        emcee: '',
+        recorder: '',
+        meetingContents: [
+          {content: '会议内容', 'op': ''}
+        ]
+      }
     },
     closeDialog() {
       this.editFormVisible = false
@@ -471,6 +498,7 @@ export default {
           type: 'success'
         });
         this.getData(this.formInline);
+        this.projectMeetingDetailVisble = false
       });
 
     },
@@ -510,12 +538,17 @@ export default {
         }
         innerPeople = innerPeople.substring(0, innerPeople.length - 1);
         this.pro.innerAttendees = innerPeople
+        this.pro.remark=row.remark
+        this.pro.status=row.status
         let meetingId = row.id
+        this.pro.id=row.id
         getMeetingDetailsById(meetingId).then(res => {
           let data = res.data.meetingContents
           this.pro.meetingContents = data
         });
-
+      }
+      if(meetingType===1){
+        alert("Please select 点击了周会详情")
       }
     },
     openUsers() {

src/views/meeting/weekly.vue

@@ -101,7 +101,9 @@ export default {
     getMeetingsAndWorkPlansByWeeksData(currentWeek){
       getMeetingsAndWorkPlansByWeeks(currentWeek).then(response =>{
         this.workContents=response.data.workContent
-        this.workPlans=response.data.workPlan
+        if(response.data.workPlan!=null && response.data.workPlan.length>0){
+          this.workPlans=response.data.workPlan
+        }
         this.weeks=response.data.weeks
         const date = new Date();
         // 获取当前第几周
@@ -149,6 +151,7 @@ export default {
           message: '操作成功',
           type: 'success'
         });
+        this.getData()
 
       });
     },

src/views/meeting/weeklyRecords.vue

@@ -107,7 +107,7 @@
 </template>
 <script>
 
-import { getWeeksRecordsByWeeks, workComments } from '@/api/meeting/meeting'
+import { getMeetingByWeekss, getWeeksRecordsByWeeks, workComments } from '@/api/meeting/meeting'
 
 import {downloadPdf} from "@/api/meeting/meeting";
 
@@ -153,11 +153,22 @@ export default {
   },
   methods: {
     getData() {
-      getWeeksRecordsByWeeks(this.meetingId,this.weeks).then(res => {
-        this.tableData=res.data.workContent
-        this.getSpanArr(this.tableData);
-        this.m=res.data.meeting
+      //获取当前周会会议id与所属周数
+      getMeetingByWeekss().then(res =>{
+        let data=res.data;
+        if(data!=null){
+          this.meetingId=data.id
+          this.weeks=data.weeks
+          getWeeksRecordsByWeeks(this.meetingId,this.weeks).then(res => {
+            this.tableData=res.data.workContent
+            this.getSpanArr(this.tableData);
+            this.m=res.data.meeting
+          })
+        }else{
+          this.tableData=[]
+        }
       })
+
     },
 
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {