Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/api/meeting/meeting.js
#	src/views/meeting/weeklyRecords.vue

src/api/material/material.js

@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import exportExcel from '@/utils/export'
+import download from '@/utils/download'
 
 // 查询物料计划列表
 export function listMaterial(query) {
@@ -47,7 +47,7 @@ export function delMaterial(materialId) {
 
 //导出数据
 export function exportMaterial(data) {
-  return exportExcel({
+  return download({
     url: '/material/material/export',
     method: 'get',
     responseType: 'blob',

src/api/meeting/meeting.js

@@ -105,6 +105,14 @@ export function getTodoMeetings(){
   })
 }
 
+export function downloadPdf(){
+  return download({
+    url: '/meeting/download',
+    method: 'get',
+    responseType: 'blob',
+  })
+}
+
 /**
  * 通过所属周 查询周报记录信息
  * @param meetingId

src/views/meeting/weeklyRecords.vue

@@ -1,4 +1,5 @@
 <template>
+<<<<<<< HEAD
   <div class="app-container" >
     <h3>{{m.meetingName}}</h3>
     <el-descriptions  title="" :column="2" :size="size" border>
@@ -83,16 +84,101 @@
       <el-table-column prop="remark" label="备注" >
       </el-table-column>
     </el-table>
+  <div class="app-container">
+    <div style="display: flex;justify-content: space-between">
+      <div style="font-size: 24px">{{ title }}</div>
+      <el-button size="mini" @click="exportPdf" icon="el-icon-download" style="margin-right: 20px">导出</el-button>
+    </div>
+
+    <div id="pdfDom" ref="pdfDom" style="padding: 20px">
+      <el-descriptions title="" :column="2" :size="size" border>
+        <el-descriptions-item>
+          <template slot="label">
+            <i class="el-icon-user"></i>
+            会议时间
+          </template>
+          2022-12-12 12:00:00至2022-12-12 12:00:00
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            <i class="el-icon-mobile-phone"></i>
+            会议主持人
+          </template>
+          张三
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            <i class="el-icon-location-outline"></i>
+            会议地点
+          </template>
+          重庆柏玮熠办公室
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            <i class="el-icon-tickets"></i>
+            会议记录人
+          </template>
+          <el-tag size="small">李四</el-tag>
+        </el-descriptions-item>
+        <el-descriptions-item :span="2">
+          <template slot="label">
+            <i class="el-icon-office-building"></i>
+            参会人员
+          </template>
+          王五、张三、小七
+        </el-descriptions-item>
+        <el-descriptions-item :span="2">
+          <template slot="label">
+            <i class="el-icon-office-building"></i>
+            参会情况
+          </template>
+          应到15人，实到12人
+        </el-descriptions-item>
+      </el-descriptions>
+      <el-table
+        style="width: 100%" border stripe>
+        <el-table-column
+          prop="date"
+          label="姓名" align="center"
+          width="120">
+        </el-table-column>
+        <el-table-column prop="workzongjie" label="本周工作总结" align="center" min-width="450">
+          <el-table-column label="工作内容" align="center">
+          </el-table-column>
+          <el-table-column label="是否上周遗留" align="center" width="120">
+          </el-table-column>
+          <el-table-column label="完成情况说明" align="center">
+          </el-table-column>
+        </el-table-column>
+        <el-table-column prop="workplan" label="下周工作计划" align="center">
+          <el-table-column label="工作内容" align="center">
+          </el-table-column>
+          <el-table-column label="计划时间" align="center" width="150">
+          </el-table-column>
+        </el-table-column>
+        <el-table-column prop="pingfen" label="评分" align="center" width="85">
+        </el-table-column>
+        <el-table-column prop="remark" label="备注" align="center">
+        </el-table-column>
+      </el-table>
+    </div>
+
+
+  </div>
   </div>
-</template>
 
 <script>
+
 import { getWeeksRecordsByWeeks } from '@/api/meeting/meeting'
 
+import {downloadPdf} from "@/api/meeting/meeting";
+
+
 export default {
   name: 'weeklyRecords',
-  data()  {
+  data() {
     return {
+
       title : '技术部周会',
       size: '',
       tableData:[],
@@ -253,11 +339,14 @@ export default {
           this.indexNum[index] = num += 1
         }
       })
+
+
+    },
+    downloadPdf(){
     }
   }
+
 }
 </script>
 
-<style scoped>
-
-</style>
+</template>

src/views/task/view.vue

@@ -60,13 +60,14 @@
       <el-table-column align="center" v-for="(item,index) in tableHeaders" :key="index" :prop="item.day" width="50">
         <template slot="header" slot-scope="scope">
           <div style="width: 20px">{{ item.day }}</div>
-          <div v-if="item.week=='周六'" style="width: 24px;color: #1c84c6">{{ item.week }}</div>
-          <div v-else-if="item.week=='周日'" style="width: 24px;color: #1c84c6">{{ item.week }}</div>
-          <div v-else-if="item.week=='今日'" style="width: 24px;color: #008000">{{ item.week }}</div>
-          <div v-else style="width: 24px">{{ item.week }}</div>
+          <div v-if="item.week=='周六'" style="width: 24px;font-size: 12px;color: #1c84c6">{{ item.week }}</div>
+          <div v-else-if="item.week=='周日'" style="width: 24px;font-size: 12px;color: #1c84c6">{{ item.week }}</div>
+          <div v-else-if="item.week=='今日'" style="width: 24px;font-size: 12px;color: #008000">{{ item.week }}</div>
+          <div v-else style="width: 24px;font-size: 12px">{{ item.week }}</div>
         </template>
         <template slot-scope="scope">
           <el-popover
+            v-if="scope.row[item.day].value!=''"
             placement="top"
             width="680"
             trigger="click">
@@ -88,10 +89,10 @@
                   <div>
                     <div>{{ scope.row.description }}</div>
                     <span v-for="(file,index) in scope.row.fileList">
-                      <a :href="file.url" style="color: darkgreen">
-                        <span v-html="file.fileName"></span>
-                      </a>
-                    </span>
+                                <a :href="file.url" style="color: darkgreen">
+                                  <span v-html="file.fileName"></span>
+                                </a>
+                              </span>
                   </div>
                 </template>
               </el-table-column>
@@ -186,7 +187,6 @@ export default {
       open: false,
       form: {},
       feedbacks: [],
-      visible: false,
       rules: {
         feedbackType: [
           {required: true, message: "反馈类型不能为空", trigger: "change"}
@@ -207,7 +207,7 @@ export default {
         '3': '#f56c6c',
         '4': '#67c23a',
         '5': '#e6a23c',
-      },
+      }
     }
   },
   created() {
@@ -223,8 +223,8 @@ export default {
     },
     getList() {
       listView(this.queryParams).then(res => {
-        this.tableData = res.data
         this.tableHeaders = this.getMonthDate(this.queryParams.month);
+        this.tableData = res.data
       })
     },
     cellStyle({row, column, rowIndex, columnIndex}) {
@@ -242,19 +242,24 @@ export default {
     },
 
     cellClick(row, column, cell, event) {
-      if (!row[column.property].color || row[column.property].color === 'white') {
+      if (!row[column.property].color || row[column.property].color === '1') {
         return
       }
+      if (!row[column.property].value || row[column.property].value === '') {
+        return;
+      }
       let date = this.queryParams.month + '-' + column.property
+      if (DateUtil.unix(date) > DateUtil.unix()) {
+        return;
+      }
       getFeedbackList(row.id, date).then(res => {
         this.feedbacks = res.data
       })
     },
     cellDbClick(row, column, cell, event) {
-      if (!row[column.property].color || row[column.property].color === 'white') {
+      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())