Merge remote-tracking branch 'origin/master' into master

src/api/meeting/work.js

@@ -37,3 +37,14 @@ export function deleteWorkPlanById(id){
     method: "GET"
   })
 }
+
+/**
+ * 获取项目列表
+ * @returns {*}
+ */
+export function getProjects(){
+  return request({
+    url: "/workPlan/getProjects",
+    method: "GET"
+  })
+}

src/views/meeting/components/meetingDetail.vue

@@ -154,7 +154,7 @@ export default {
       let meetingType = this.detailForm.meetingType
 
       if (meetingType !== 1) {
-        if (this.detailForm.meetingType == 2) {
+        if (this.detailForm.meetingType === 2) {
           this.projectMeetingDetailVisble = true
         } else {
           this.otherMeetingDetailVisble = true

src/views/meeting/meeting.vue

@@ -39,7 +39,7 @@
       style="width: 100%">
       <el-table-column type="index" label="序号" width="60" fixed>
       </el-table-column>
-      <el-table-column label="会议主题" prop="meetingName" fixed>
+      <el-table-column label="会议主题" prop="meetingName" >
       </el-table-column>
 
       <el-table-column label="会议地点" prop="meetingPlace" width="120">
@@ -76,12 +76,12 @@
           <div v-else>已结束</div>
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" label="创建时间" width="130">
+<!--      <el-table-column prop="createTime" label="创建时间" width="130" :v-show="false">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
-      </el-table-column>
-      <el-table-column label="操作" prop="op" width="180">
+      </el-table-column>-->
+      <el-table-column label="操作" prop="op" width="200">
         <template slot-scope="scope">
 
           <el-button v-if="scope.row.status!==2" size="mini" type="primary" @click="handleEdit(scope.row)">编辑
@@ -168,7 +168,7 @@
           </el-input>
         </el-form-item>
         <el-form-item label="参会情况:" prop="remark" v-if="editForm.status>0">
-          <el-input size="mini" v-model="editForm.remark"></el-input>
+          <el-input  type="textarea" :rows="2" size="mini" v-model="editForm.remark"></el-input>
         </el-form-item>
         <el-form-item label="会议内容:">
           <el-table
@@ -191,7 +191,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="mini" @click="closeDialog">取消</el-button>
-        <el-button size="mini" type="primary" :loading="loading" class="title" @click="submitForm('editForm')">保存
+        <el-button size="mini" type="primary"  class="title" @click="submitForm('editForm')">保存
         </el-button>
       </div>
     </el-dialog>
@@ -560,15 +560,30 @@ export default {
     },
     confirmMeeting(row) {
       let id = row.id;
-      confirmMeetings(id).then(res => {
-        this.$message({
-          message: '操作成功!',
-          type: 'success'
+      //点击会议确认时候判断信息是否完整
+      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===null ||  t.times.length ===0  ) {
+          this.$message({
+            message: '请将信息填写完整!',
+            type: 'warning'
+          });
+          return
+        }
+      }
+      saveMeetingOptionss(data).then(res => {
+        confirmMeetings(id).then(res => {
+          this.$message({
+            message: '操作成功!',
+            type: 'success'
+          });
+          this.getData(this.formInline);
+          this.projectMeetingDetailVisble = false
         });
-        this.getData(this.formInline);
-        this.projectMeetingDetailVisble = false
       });
 
+
     },
     meetingDetail(row) {
       let meetingType = row.meetingType
@@ -749,7 +764,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===null ||  t.times.length ===0) {
           this.$message({
             message: '请将信息填写完整!',
             type: 'warning'

src/views/meeting/weekly.vue

@@ -56,6 +56,18 @@
               </el-date-picker>
             </template>
           </el-table-column>
+          <el-table-column label="所属项目" prop="projectId">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.projectId" placeholder="请选择" size="mini">
+                <el-option
+                  v-for="item in projects"
+                  :key="item.id"
+                  :label="item.projectName"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
           <el-table-column label="操作" prop="op" width="150" v-if="currentWeek===weeks">
             <template slot-scope="scope">
               <el-button size="mini" type="primary" @click="addRow()">添加</el-button>
@@ -82,7 +94,7 @@
 <script>
 
 import {list} from '@/api/meeting/meeting'
-import {deleteWorkPlanById, getMeetingsAndWorkPlansByWeeks, saveWorkPlans} from '@/api/meeting/work'
+import { deleteWorkPlanById, getMeetingsAndWorkPlansByWeeks, getProjects, saveWorkPlans } from '@/api/meeting/work'
 import {getTask} from "@/api/task/task";
 import TaskDetail from "../task/components/taskDetail"
 
@@ -95,12 +107,14 @@ export default {
       meetingWeek: null,
       meetingData: [],
       workContents: [],
+      projects:[],
       workPlans: [{
         planContent: '请填写工作计划信息',
         id: null,
         meetingId: null,
         completionTimes: null,
-        completionTime: null
+        completionTime: null,
+        projectId: null
       }],
       meetingStatus: null,
       weeks: null,
@@ -126,6 +140,9 @@ export default {
         this.meetingWeek = currentWeek
         this.getMeetingsAndWorkPlansByWeeksData(currentWeek)
       })
+      getProjects().then(res=>{
+        this.projects=res.data
+      });
     },
     getMeetingsAndWorkPlansByWeeksData(currentWeek) {
       let weekss = currentWeek