月报分析反馈改造

src/components/input/normalArea.vue

@@ -50,6 +50,11 @@ export default {
       default: '',
       required: false
     },
+    defaultPlaceholder: {
+      type: String,
+      default: '',
+      required: false
+    },
     height: {
       type: Number,
       default: 200,
@@ -94,6 +99,7 @@ export default {
         menubar: false, // 隐藏最上方menu
         fontsize_formats: '14px 16px 18px 20px 24px 26px 28px 30px 32px 36px', // 字体大小
         file_picker_types: 'image',
+        placeholder: this.defaultPlaceholder,
         images_upload_credentials: true,
         plugins: 'fullscreen lists table textcolor wordcount contextmenu', // 引入插件
         toolbar: 'fullscreen bold italic underline strikethrough | fontsizeselect | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent table | undo redo | removeformat formatselect',

src/store/modules/monthlyReport/baseMixin/mutations.js

@@ -100,7 +100,7 @@ export default {
     state.tabPageData = newObj
     state.domKeys = domKeys
     // console.log(peopleLists, 171)
-    state.peopleLists = peopleLists
+    state.peopleLists = peopleLists.filter(elm => elm.search(/null|\\\\/g) < 0)
   },
   // 切换页面之后数据维护
   TAB_ACTIVE_CHANGE(state, tabsActive) {
@@ -134,7 +134,7 @@ export default {
     state.tabsActive = `tab_${newTabsActive}`
     state.tabPageData = newObj
     state.domKeys = domKeys
-    state.peopleLists = peopleLists
+    state.peopleLists = peopleLists.filter(elm => elm.search(/null|\\\\/g) < 0)
     // console.log(peopleLists)
     // 页面恢复待编辑状态
     state.editKeys = []
@@ -341,7 +341,7 @@ export default {
   },
   // 设置人员数据，避免重复请求 userNames
   SET_USER_NAME(state, { key, value }) {
-    if (!state.userNames.hasOwnProperty(key) && !state.userNames[key]) {
+    if (!state.userNames.hasOwnProperty(key) && !state.userNames[key] && value && value.elm.search(/null|\\\\/g) < 0) {
       state.userNames[key] = value
     }
   },

src/store/modules/monthlyReport/utils/index.js

@@ -45,7 +45,7 @@ export function setReportData(obj, line = 6) {
   }
   if (newObj && newObj.children && newObj.children.length) {
     setDomInfo(newObj.children)
-    return { newObj, domKeys, peopleLists }
+    return { newObj, domKeys, peopleLists: peopleLists.filter(elm => elm.search(/null|\\\\/g) < 0) }
   }
   return {}
 }
@@ -188,7 +188,7 @@ export function analyticFeedbackToObj(obj) {
       // peopleLists = Array.from(new Set([...peopleLists, ...item.personInCharge]))
     })
   })
-  return { newObj, peopleLists }
+  return { newObj, peopleLists: peopleLists.filter(elm => elm.search(/null|\\\\/g) < 0) }
 }
 
 // 月报：elm组件数据转表格数据

src/views/monthlyReport/childrenPage/editReport/components/MrTable/Analysis.vue

@@ -48,14 +48,14 @@
               <el-input
                 v-model="item.problem"
                 size="small"
-                placeholder="请输入内容"
+                placeholder="该问题反馈出团队或团队同学存在什么问题？"
               />
             </el-form-item>
             <el-form-item label="原因" :label-width="formLabelWidth">
               <el-input
                 v-model="item.reason"
                 size="small"
-                placeholder="请输入内容"
+                placeholder="该问题是什么原因导致的？"
               />
             </el-form-item>
             <el-form-item label="改进项" :label-width="formLabelWidth">
@@ -143,6 +143,7 @@
         <normal-area
           :id="'item_domKey_h430sj210dajds93mscsbj'"
           :value="contentItem"
+          default-placeholder="管理者思考和当事人思考"
           :height="200"
           :full-position-style="{ top: '20px', left: '15%', right: '15%' }"
           @change="setContentItem"
@@ -238,8 +239,8 @@ export default {
       if (this.options.filter(elm => elm === username).length && this.isCommittedUser.indexOf(username) < 0) {
         this.feedbackCharge = username
       } else {
-        // console.log(this.userNamesList)
-        this.feedbackCharge = this.userNamesList.filter(elm => this.isCommittedUser.indexOf(elm.value) < 0)[0].value || ''
+        const committedUserList = this.userNamesList.filter(elm => this.isCommittedUser.indexOf(elm.value) < 0)
+        this.feedbackCharge = committedUserList.length ? committedUserList[0].value : ''
       }
     },
     // 设置富文本内容

src/views/monthlyReport/childrenPage/editReport/components/MrTable/TableExpandRowList.vue

@@ -120,8 +120,8 @@
           </div>
           <div v-else style="padding-bottom: 0px;padding-left: 0;font-size: 14px">暂无分析反馈数据!</div>
         </div>
-      <!-- <div v-else style="padding-bottom: 20px;padding-top: 10px;padding-left: 0;font-size: 14px">暂无分析反馈数据!</div>-->
       </div>
+<!--      <div v-if="!analyticFeedbackList" style="padding-bottom: 20px;padding-top: 10px;padding-left: 0;font-size: 14px">暂无分析反馈数据!</div>-->
       <Hold ref="Hold" @upData="upHold" />
     </div>
   </div>

src/views/monthlyReport/childrenPage/editReport/components/MrTable/index.vue

@@ -759,7 +759,7 @@ export default {
         return false
       }
       // 新版分析反馈控制显示隐藏
-      if (row.analyticFeedbackList && this.title === '重点问题') {
+      if (row.analyticFeedbackList) {
         let peopleKey = ''
         // let peoples = ''
         // 找到 责任人 的 headerKey

src/views/monthlyReport/index.vue

@@ -23,13 +23,13 @@
       <div class="content-reportName">
         {{ reportName }}
         <div class="content-reportName-btn-wrapper">
-          <span v-if="tagData.status === 20" type="text" @click="jump('report_home_Publication', '/monthlyReport/edit', { pageType: 'readAll', reportId: reportStatus.id })">月报发布</span>
+          <span v-if="tagData.status === 20" type="text" @click="jump('report_home_Publication', '/monthlyReport/edit', { pageType: 'readAll', reportId: reportStatus.id })"><i class="el-icon-document" />&nbsp;&nbsp;月报发布</span>
           <span v-if="tagData.status === 30" type="text" @click="jump('report_home_viewReport', '/monthlyReport/edit', { pageType: 'readAll', reportId: reportStatus.id })"><i class="el-icon-document" />&nbsp;&nbsp;查看完整报告</span>
           <!--    @click="downloadMonthlyReportFn"    -->
           <!-- <a target="blank" :href="`${projectManagementUrl}/monthlyReport/downloadMonthlyReport?id=${reportValue}&refrash=true`" :download="`${reportName}.pdf`" style="margin-left: 10px;display: inline-block"><svg-icon icon-class="monthlyReport下载" class="icon" /></a> -->
-          <span v-show="isShowPdfPushDow() && tagData.status === 20" style="margin-left: 10px;display: inline-block" @click="downloadFile(true)"><svg-icon icon-class="monthlyReport下载" class="icon" />&nbsp;&nbsp;下载报告</span>
+          <span v-show="isShowPdfPushDow() && tagData.status === 20" style="margin-left: 10px;display: inline-block" @click="downloadFile(true)"><i class="el-icon-download" />下载报告</span>
 <!--          <a v-show="isShowPdfPushDow() && tagData.status === 20" style="margin-left: 10px;display: inline-block" @click="downloadFile(true)"><svg-icon icon-class="monthlyReport下载" class="icon" /></a>-->
-          <span v-show="isShowPdfDow()" style="margin-left: 10px;display: inline-block" @click="downloadFile(true)"><svg-icon icon-class="monthlyReport下载" class="icon" />&nbsp;&nbsp;下载报告</span>
+          <span v-show="isShowPdfDow()" style="margin-left: 10px;display: inline-block" @click="downloadFile(true)"><i class="el-icon-download" />下载报告</span>
 <!--          <a v-show="isShowPdfDow()" target="blank" style="margin-left: 10px;display: inline-block" @click="downloadFile"><svg-icon icon-class="monthlyReport下载" class="icon" /></a>-->
           <span v-if="tagData.status === 0" type="text" @click="sendConfirm(reportData)">发送确认</span>
         </div>