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

src/views/meeting/meeting.vue

@@ -361,6 +361,21 @@
                       :autosize="{ minRows: 4, maxRows: 10}" @input="editMeetingContents(scope.row)"></el-input>
           </template>
         </el-table-column>
+        <el-table-column label="事项优先级" prop="priority" width="180">
+          <template slot-scope="scope">
+            <el-select
+              v-model="scope.row.priority"
+              placeholder="事项优先级"  @change="editMeetingContents(scope.row)">
+              <el-option
+                v-for="dict in dict.type.task_priority"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value">
+                  {{ dict.label }}
+              </el-option>
+            </el-select>
+          </template>
+        </el-table-column>
         <el-table-column label="执行人" width="180">
           <template slot-scope="scope">
             <el-input size="mini" v-model="scope.row.executorName" :readonly="true"
@@ -439,6 +454,12 @@
       <el-table style="width: 100%;margin: 0" border stripe :data="pro.meetingContents">
         <el-table-column label="序号" width="60" type="index"></el-table-column>
         <el-table-column label="会议内容" prop="content"></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}" @input="editMeetingContents(scope.row)"></el-input>
+          </template>
+        </el-table-column>
       </el-table>
       <div slot="footer" class="dialog-footer">
         <el-button size="mini" @click="closeotherMeetingDailog">取消</el-button>
@@ -473,6 +494,7 @@ import DateUtil from "@/utils/date"
 
 export default {
   name: 'Meeting',
+  dicts: [ 'task_priority'],
   watch: {
     filterText(val) {
       this.$refs.dept.filter(val);
@@ -564,6 +586,7 @@ export default {
           executorId: null,
           beginTime: null,
           endTime: null,
+          priority:'4',
           times: []
         }],
         row: null

src/views/meeting/weekly.vue

@@ -58,6 +58,21 @@
               <el-input size="mini" v-else v-model="scope.row.planContent" @input="updateWorkPlans(scope.row)" placeholder="请填写工作计划信息" ></el-input>
             </template>
           </el-table-column>
+          <el-table-column label="优先级" prop="priority" width="180">
+            <template slot-scope="scope">
+              <el-select
+                v-model="scope.row.priority"
+                placeholder="事项优先级"  @change="updateWorkPlans(scope.row)">
+                <el-option
+                  v-for="dict in dict.type.task_priority"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value">
+                  {{ dict.label }}
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
           <el-table-column label="预计开始时间" prop="beginDate" width="180">
             <template slot-scope="scope">
               <el-date-picker
@@ -162,6 +177,7 @@ import TaskDetail from "../task/components/taskDetail"
 export default {
   name: 'weekly',
   components: {TaskDetail},
+  dicts: [ 'task_priority'],
   data() {
     return {
       meetingWeek: null,
@@ -174,7 +190,8 @@ export default {
         meetingId: null,
         completionTimes: null,
         completionTime: null,
-        projectId: null
+        projectId: null,
+        priority:'4'
       }],
       meetingStatus: null,
       weeks: null,
@@ -224,7 +241,8 @@ export default {
             completionTimes: null,
             completionTime: null,
             projectId: null,
-            beginDate:null
+            beginDate:null,
+            priority:'4'
           }]
         }
         this.weeks = response.data.weeks
@@ -359,7 +377,7 @@ export default {
         if (res.success !== true) {
           this.$message.warning(res.data)
         }else{
-          let row = {planContent: '', 'op': '', id: null, completionTimes: null,beginDate:null}
+          let row = {planContent: '', 'op': '', id: null, completionTimes: null,beginDate:null,priority:'4'}
           this.workPlans.push(row)
         }
       })
@@ -453,7 +471,8 @@ export default {
           planContent:data.planContent,
           beginDate:new Date(data.beginDate).getTime(),
           projectId:row.projectId,
-          completionTime:new Date(row.completionTimes).getTime()
+          completionTime:new Date(row.completionTimes).getTime(),
+          priority:row.priority
         }
         updateWorkPlan(datas).then(res=>{
         })

src/views/meeting/weeklyRecords.vue

@@ -101,25 +101,25 @@
           </template>
         </el-table-column>
       </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="0" v-model="scope.row.score" :value="0"
-                           @change="workComment(scope.row)">
-            {{ scope.row.score }}
-          </el-input-number>
-        </template>
-      </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="0" v-model="scope.row.score" :value="0"-->
+<!--                           @change="workComment(scope.row)">-->
+<!--            {{ scope.row.score }}-->
+<!--          </el-input-number>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column prop="remarks" label="备注">
         <template slot-scope="scope">
           <el-input v-model="scope.row.remark" type="textarea" :autosize="{ minRows: 4}" @change="workComment(scope.row)">
           </el-input>
         </template>
       </el-table-column>
-      <el-table-column prop="workComments" label="工作评论" v-if="workScoreVisible">
+<!--      <el-table-column prop="workComments" label="工作评论" v-if="workScoreVisible">
         <template slot-scope="scope">
           <el-input v-model="scope.row.workComment" type="textarea" :autosize="{ minRows: 4}" @change="workComment(scope.row)"></el-input>
         </template>
-      </el-table-column>
+      </el-table-column>-->
     </el-table>
 
     <el-dialog
@@ -143,6 +143,21 @@
             <el-input v-model="scope.row.planContent" placeholder="请输入任务名称"  size="mini"></el-input>
           </template>
         </el-table-column>
+        <el-table-column label="优先级" prop="priority" width="180">
+          <template slot-scope="scope">
+            <el-select
+              v-model="scope.row.priority"
+              placeholder="事项优先级">
+              <el-option
+                v-for="dict in dict.type.task_priority"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value">
+                {{ dict.label }}
+              </el-option>
+            </el-select>
+          </template>
+        </el-table-column>
         <el-table-column prop="projectId" label="所属项目" width="150">
           <template  slot-scope="scope">
             <el-select v-model="scope.row.projectId" placeholder="请选择" size="mini">
@@ -217,6 +232,7 @@ import { editEnforceRemind } from '@/api/meeting/enforceRemind'
 
 export default {
   name: 'weeklyRecords',
+  dicts: [ 'task_priority'],
   data() {
     return {
       taskFeedbackTitle: '',
@@ -536,7 +552,8 @@ export default {
         projectId: null,
         userId:null,
         taskId:null,
-        beginDate:null
+        beginDate:null,
+        priority:'4'
       }
       this.workPlanDatas.push(row)
     },
@@ -568,7 +585,8 @@ export default {
         meetingId:this.meetingId,
         userId:userId,
         weeks:weeks,
-        beginDate:new Date(beginDate).getTime()
+        beginDate:new Date(beginDate).getTime(),
+        priority:row.priority
       }
       addWorkPlan(data).then(res=>{
         this.$message.success("操作成功!")
@@ -604,7 +622,8 @@ export default {
         planContent:row.planContent,
         projectId:row.projectId,
         completionTime:new Date(completionTime).getTime(),
-        beginDate:new Date(beginDate).getTime()
+        beginDate:new Date(beginDate).getTime(),
+        priority:row.priority
       }
       updateWorkPlan(data).then(res=>{
         this.$message.success("操作成功!")