Merge branch 'http_mock' into http_test

src/api/reportTemplate.js

@@ -363,3 +363,11 @@ export function getReportList(data) {
   })
 }
 
+// 自动填充人员
+export function dailyReportGetReportReceiver(data) {
+  return request({
+    url: Presentation + `/dailyReport/getReportReceiver`,
+    method: 'post',
+    data
+  })
+}

src/assets/css/index.less

@@ -71,7 +71,7 @@
 
 @font-face {
   font-family: 'iconfont';  /* Project id 2402558 */
-  src: url('//at.alicdn.com/t/font_2402558_538plilwhpo.woff2?t=1620356015326') format('woff2'),
-       url('//at.alicdn.com/t/font_2402558_538plilwhpo.woff?t=1620356015326') format('woff'),
-       url('//at.alicdn.com/t/font_2402558_538plilwhpo.ttf?t=1620356015326') format('truetype');
+  src: url('//at.alicdn.com/t/font_2402558_uuubcw5e4b.woff2?t=1626146634584') format('woff2'),
+       url('//at.alicdn.com/t/font_2402558_uuubcw5e4b.woff?t=1626146634584') format('woff'),
+       url('//at.alicdn.com/t/font_2402558_uuubcw5e4b.ttf?t=1626146634584') format('truetype');
 }

src/styles/index.less

@@ -206,7 +206,7 @@ div:focus {
 }
 @font-face {
   font-family: 'iconfont';  /* Project id 2402558 */
-  src: url('//at.alicdn.com/t/font_2402558_538plilwhpo.woff2?t=1620356015326') format('woff2'),
-       url('//at.alicdn.com/t/font_2402558_538plilwhpo.woff?t=1620356015326') format('woff'),
-       url('//at.alicdn.com/t/font_2402558_538plilwhpo.ttf?t=1620356015326') format('truetype');
+  src: url('//at.alicdn.com/t/font_2402558_uuubcw5e4b.woff2?t=1626146634584') format('woff2'),
+       url('//at.alicdn.com/t/font_2402558_uuubcw5e4b.woff?t=1626146634584') format('woff'),
+       url('//at.alicdn.com/t/font_2402558_uuubcw5e4b.ttf?t=1626146634584') format('truetype');
 }

src/views/reportManagement/ReleaseReport/releaePreview.vue

@@ -5,10 +5,16 @@
     <div class="Layout_space_between bottom_mar">
       <div class="div1">收件人</div>
       <searchTeam :value.sync="form.name" :clearable="true" :multiple="true" style="width:100%" />
+      <el-tooltip class="item" effect="dark" content="自动填充任务成员" placement="top">
+        <i class="iconfont" style="margin-left: 10px; cursor: pointer;color: #666;" @click="autoGetMember('name')">&#xe61d;</i>
+      </el-tooltip>
     </div>
     <div class="Layout_space_between report-margin Above">
       <div class="div1">抄送</div>
       <searchTeam :value.sync="form.names" :clearable="true" :multiple="true" style="width:100%" />
+      <el-tooltip class="item" effect="dark" content="自动填充任务成员" placement="top">
+       <i class="iconfont" style="margin-left: 10px; cursor: pointer;color: #666;" @click="autoGetMember('names')">&#xe61d;</i>
+      </el-tooltip>
     </div>
     <span class="backStyle">关联任务</span>
     <div v-for="(item, index) in fromCreateData.taskDetailList" :key="index" class="Layout_flex_start report-taskList">
@@ -96,7 +102,7 @@ import html2canvas from 'html2canvas'
 import searchTeam from '@/components/select/searchTeam'
 import iconDisplay from '@/views/reportManagement/ReleaseReport/components/iconDisplay.vue'
 import moduleCode from '@/views/reportManagement/components/template/nodule.vue'
-import { reportreleaseGetReportById, reportreleaseSendmail } from '@/api/reportTemplate' // 模版添删改查
+import { reportreleaseGetReportById, reportreleaseSendmail, dailyReportGetReportReceiver } from '@/api/reportTemplate' // 模版添删改查
 
 export default {
   name: 'DailyNewsAdded',
@@ -142,6 +148,18 @@ export default {
       }
     },
 
+    async autoGetMember(e) {
+      const res = await dailyReportGetReportReceiver({ reportId: this.fromCreateData.id, type: 4 })
+      if (res.code === 200) {
+        if (this.form[e] !== undefined) {
+          const list = [...this.form[e], ...res.data]
+          this.form[e] = [...new Set(list)]
+        } else {
+          this.$set(this.form, e, [...res.data])
+        }
+      }
+    },
+
     sendReport() {
       if (this.form.name !== undefined) {
         setTimeout(() => {

src/views/reportManagement/Testing/TestingPreview.vue

@@ -5,10 +5,16 @@
     <div class="Layout_space_between" style="margin-bottom: 10px;">
       <div class="div1">收件人</div>
       <searchTeam :value.sync="form.name" :clearable="true" :multiple="true" style="width:100%" />
+      <el-tooltip class="item" effect="dark" content="自动填充任务成员" placement="top">
+        <i class="iconfont" style="margin-left: 10px; cursor: pointer;color: #666;" @click="autoGetMember('name')">&#xe61d;</i>
+      </el-tooltip>
     </div>
     <div class="Layout_space_between">
       <div class="div1">抄送</div>
       <searchTeam :value.sync="form.names" :clearable="true" :multiple="true" style="width:100%" />
+      <el-tooltip class="item" effect="dark" content="自动填充任务成员" placement="top">
+       <i class="iconfont" style="margin-left: 10px; cursor: pointer;color: #666;" @click="autoGetMember('names')">&#xe61d;</i>
+      </el-tooltip>
     </div>
     <span class="backStyle"> 关联任务</span>
     <div v-for="(item, index) in fromCreateData.taskDetailList" :key="index" class="Layout_flex_start report-taskList">
@@ -106,7 +112,7 @@ import { mapGetters } from 'vuex'
 import html2canvas from 'html2canvas'
 import searchTeam from '@/components/select/searchTeam'
 import moduleCode from '@/views/reportManagement/components/template/nodule.vue'
-import { reportdelivertestGetReportById, reportdelivertestSendmail, reportdelivertestGetRequiresByTaskIds } from '@/api/reportTemplate' // 模版添删改查
+import { reportdelivertestGetReportById, reportdelivertestSendmail, reportdelivertestGetRequiresByTaskIds, dailyReportGetReportReceiver } from '@/api/reportTemplate' // 模版添删改查
 
 export default {
   name: 'DailyNewsAdded',
@@ -157,6 +163,18 @@ export default {
       }
     },
 
+    async autoGetMember(e) {
+      const res = await dailyReportGetReportReceiver({ reportId: this.fromCreateData.id, type: 1 })
+      if (res.code === 200) {
+        if (this.form[e] !== undefined) {
+          const list = [...this.form[e], ...res.data]
+          this.form[e] = [...new Set(list)]
+        } else {
+          this.$set(this.form, e, [...res.data])
+        }
+      }
+    },
+
     async reportdelivertestGetRequiresByTaskIds(val) {
       const res2 = await reportdelivertestGetRequiresByTaskIds({ taskIds: val })
       if (res2.code === 200) {

src/views/reportManagement/daily/dailyPreview.vue

@@ -5,10 +5,16 @@
     <div class="Layout_space_between report-div">
       <div class="div1">收件人</div>
       <searchTeam :value.sync="form.name" :clearable="true" :multiple="true" style="width:100%" />
+      <el-tooltip class="item" effect="dark" content="自动填充任务成员" placement="top">
+        <i class="iconfont" style="margin-left: 10px; cursor: pointer;color: #666;" @click="autoGetMember('name')">&#xe61d;</i>
+      </el-tooltip>
     </div>
     <div class="Layout_space_between report-div" style="margin-bottom: 30px;">
       <div class="div1">抄送</div>
       <searchTeam :value.sync="form.names" :clearable="true" :multiple="true" style="width:100%" />
+      <el-tooltip class="item" effect="dark" content="自动填充任务成员" placement="top">
+        <i class="iconfont" style="margin-left: 10px; cursor: pointer;color: #666;" @click="autoGetMember('names')">&#xe61d;</i>
+      </el-tooltip>
     </div>
 
     <span class="backStyle">关联任务</span>
@@ -44,7 +50,7 @@ import { dailyReportSendmail } from '@/api/ResultPage'
 import searchTeam from '@/components/select/searchTeam'
 import iconDisplay from '@/views/reportManagement/daily/components/iconDisplay.vue'
 import moduleCode from '@/views/reportManagement/components/template/nodule.vue'
-import { dailyReportGetV2 } from '@/api/reportTemplate' // 模版添删改查
+import { dailyReportGetV2, dailyReportGetReportReceiver } from '@/api/reportTemplate' // 模版添删改查
 
 export default {
   name: 'DailyNewsAdded',
@@ -95,6 +101,18 @@ export default {
       }
     },
 
+    async autoGetMember(e) {
+      const res = await dailyReportGetReportReceiver({ reportId: this.fromCreateData.id, type: 3 })
+      if (res.code === 200) {
+        if (this.form[e] !== undefined) {
+          const list = [...this.form[e], ...res.data]
+          this.form[e] = [...new Set(list)]
+        } else {
+          this.$set(this.form, e, [...res.data])
+        }
+      }
+    },
+
     sendReport() {
       if (this.form.name !== undefined) {
         setTimeout(() => {