소스 검색

Merge branch 'monthly_report_daily_0.0.1' of git.xiaojukeji.com:pu_qa_tool/thoth-frontend into monthly_report_daily_0.0.1

qinzhipeng_v@didiglobal.com 4 년 전
부모
커밋
f4e7eba53b

+ 16 - 0
src/api/qualityMonthlyReport/edit.js

@@ -83,6 +83,14 @@ export function sendConfirm(data) {
     data
   })
 }
+// 子月报发送确认
+export function sendSubConfirm(data) {
+  return request({
+    url: projectManagementUrl + '/monthlyReport/confirm',
+    method: 'post',
+    data
+  })
+}
 
 // 月报回退  /monthlyReport/returnReport  subReportIds
 export function returnReport(data) {
@@ -101,3 +109,11 @@ export function getSubReport(params) {
     params
   })
 }
+// 月报发布
+export function publishReport(data) {
+  return request({
+    url: projectManagementUrl + '/monthlyReport/publish',
+    method: 'post',
+    data
+  })
+}

+ 23 - 1
src/store/modules/monthlyReport/edit/index.js

@@ -7,7 +7,9 @@ import {
   getSubReport,
   getReportDependence,
   sendConfirm,
-  returnReport
+  returnReport,
+  sendSubConfirm,
+  publishReport
 } from '@/api/qualityMonthlyReport/edit'
 import { getAvaliableInfo } from '@/api/qualityMonthlyReport'
 
@@ -45,6 +47,7 @@ export default {
     subTitle: '新建月报',
     offsetList: [],
     /**
+     * 用户身份权限编号
      * 100        月报发起人
      * 50         确认人
      * 30         用户
@@ -562,6 +565,25 @@ export default {
         cb()
       }
     },
+    // 月报发布
+    async publishAllReport({ commit, state, context }, { cb }) {
+      const res = await publishReport({
+        id: state.pageDate.id
+      })
+      if (res.code === 200) {
+        message.success('发布成功!')
+        cb()
+      }
+    },
+    // 月报确认
+    async confirmReport({ state }, cb) {
+      const res = await sendSubConfirm({
+        subReportId: state.pageDate.id
+      })
+      if (res.code === 200) {
+        cb()
+      }
+    },
     // 月报回退
     async returnReport({ commit, state, context }, { data, cb }) {
       const res = await returnReport(data)

+ 57 - 58
src/store/modules/monthlyReport/edit/utils.js

@@ -8,24 +8,24 @@ export function setReportData(obj, line = 6) {
   const newObj = { ...obj }
   const setDomInfo = (arr) => {
     arr &&
-      arr.length &&
-      arr.forEach((elm) => {
-        elm.domKey = uuid10(4)
-        domKeys.indexOf(elm.domKey) < 0 && domKeys.push(elm.domKey)
-        if (elm.hasOwnProperty('content') && elm.content.length) {
-          elm.content.forEach((item) => {
-            item.domKey = uuid10(4)
-            domKeys.indexOf(item.domKey) < 0 && domKeys.push(elm.domKey)
-            if (item.type.search(/Table|TableAndRichText/) > -1) {
-              setTableHeader(item.tableHeaders)
-              item.tableRows = arrToObj(item.tableRows, item.tableHeaders)
-            }
-          })
-        }
-        if (elm.hasOwnProperty('children') && elm.children.length) {
-          setDomInfo(elm.children)
-        }
-      })
+    arr.length &&
+    arr.forEach((elm) => {
+      elm.domKey = uuid10(4)
+      domKeys.indexOf(elm.domKey) < 0 && domKeys.push(elm.domKey)
+      if (elm.hasOwnProperty('content') && elm.content.length) {
+        elm.content.forEach((item) => {
+          item.domKey = uuid10(4)
+          domKeys.indexOf(item.domKey) < 0 && domKeys.push(elm.domKey)
+          if (item.type.search(/Table|TableAndRichText/) > -1) {
+            setTableHeader(item.tableHeaders)
+            item.tableRows = arrToObj(item.tableRows, item.tableHeaders)
+          }
+        })
+      }
+      if (elm.hasOwnProperty('children') && elm.children.length) {
+        setDomInfo(elm.children)
+      }
+    })
   }
   if (newObj && newObj.children && newObj.children.length) {
     setDomInfo(newObj.children)
@@ -42,20 +42,20 @@ export function reportDataBack(obj) {
   const newObj = { ...obj }
   const setOldData = (arr) => {
     arr &&
-      arr.length &&
-      arr.forEach((elm) => {
-        const { content, children } = elm
-        if (content && content.length) {
-          content.forEach((item) => {
-            if (item.type.search(/Table|TableAndRichText/) > -1) {
-              item.tableRows = objToArr(item.tableRows, item.tableHeaders)
-            }
-          })
-        }
-        if (children && children.length) {
-          setOldData(children)
-        }
-      })
+    arr.length &&
+    arr.forEach((elm) => {
+      const { content, children } = elm
+      if (content && content.length) {
+        content.forEach((item) => {
+          if (item.type.search(/Table|TableAndRichText/) > -1) {
+            item.tableRows = objToArr(item.tableRows, item.tableHeaders)
+          }
+        })
+      }
+      if (children && children.length) {
+        setOldData(children)
+      }
+    })
   }
   if (newObj && newObj.children && newObj.children.length) {
     setOldData(newObj.children)
@@ -111,16 +111,14 @@ export function arrToObj(arr, headerList) {
 export function analyticFeedbackToObj(obj) {
   const newObj = _.cloneDeep(obj)
   newObj &&
-    newObj.analyticContents &&
-    _.isArray(newObj.analyticContents) &&
-    newObj.analyticContents.forEach((elm) => {
-      _.isArray(elm.improvementItems) &&
-        elm.improvementItems.forEach((item) => {
-          item.personInCharge = item.personInCharge
-            .replace(/\[|\]|'/g, '')
-            .split(',')
-        })
+  newObj.analyticContents &&
+  _.isArray(newObj.analyticContents) &&
+  newObj.analyticContents.forEach((elm) => {
+    _.isArray(elm.improvementItems) &&
+    elm.improvementItems.forEach((item) => {
+      item.personInCharge = item.personInCharge ? strToArr(item.personInCharge) : []
     })
+  })
   return newObj
 }
 
@@ -164,14 +162,14 @@ export function objToArr(obj, tableHeaders) {
 export function analyticFeedbackToArr(obj) {
   const newObj = _.cloneDeep(obj)
   newObj &&
-    newObj.analyticContents &&
-    _.isArray(newObj.analyticContents) &&
-    newObj.analyticContents.forEach((elm) => {
-      _.isArray(elm.improvementItems) &&
-        elm.improvementItems.forEach((item) => {
-          item.personInCharge = `[${item.personInCharge.toString()}]`
-        })
+  newObj.analyticContents &&
+  _.isArray(newObj.analyticContents) &&
+  newObj.analyticContents.forEach((elm) => {
+    _.isArray(elm.improvementItems) &&
+    elm.improvementItems.forEach((item) => {
+      item.personInCharge = JSON.stringify(item.personInCharge)
     })
+  })
   return newObj
 }
 // 对字符串进行处理,支持正则
@@ -198,21 +196,22 @@ export function ret(arr) {
 }
 
 // 根据操作对象唯一标识,查询该对象数据
-export function findDomKey(obj, domKey) {}
+export function findDomKey(obj, domKey) {
+}
 
 // 设置部门数据
 export function setDeptArch(data) {
   const run = (arr) => {
     arr &&
-      arr.length &&
-      arr.forEach((elm) => {
-        if (elm.children.length) {
-          run(elm.children)
-        }
-        if (!elm.children.length) {
-          elm.children = null
-        }
-      })
+    arr.length &&
+    arr.forEach((elm) => {
+      if (elm.children.length) {
+        run(elm.children)
+      }
+      if (!elm.children.length) {
+        elm.children = null
+      }
+    })
   }
   run(data)
 }

+ 21 - 19
src/views/monthlyReport/childrenPage/editReport/components/MrTable.vue

@@ -42,7 +42,6 @@
             <div v-if="tabsActive.search(/本月重点问题/) > -1">
               <el-button
                 v-if="isShowButton(scope.row, item)"
-                size="mini"
                 type="text"
                 @click="btnFun({ value: '分析反馈' }, scope)"
               >分析反馈
@@ -56,7 +55,6 @@
               <el-button
                 v-if="isShowButton(scope.row, item)"
                 style="margin-right: 10px;"
-                size="mini"
                 type="text"
                 @click="btnFun(btnItem, scope)"
               >{{ btnItem.value }}</el-button
@@ -68,7 +66,7 @@
             v-else
             class="edit-wrapper"
             :style="{
-              cursor: pageDate.status === 0 ? 'pointer' : 'auto'
+              cursor: pageDate.status < 20 ? 'pointer' : 'auto'
             }"
           >
             <!--  <div v-if="editKeys.indexOf(`${scope.row.rowKey}_${index}`) > -1">  -->
@@ -207,7 +205,7 @@
       </el-table-column>
     </el-table>
     <div class="plus-table-data" :style="{ marginBottom: plusTableDataBottom }">
-      <el-button v-if="pageDate.status === 0" type="text" @click="addTableData">
+      <el-button v-if="pageDate.status < 20" type="text" @click="addTableData">
         <svg-icon icon-class="data-plus" class="icon" />
         新增
       </el-button>
@@ -326,7 +324,7 @@ export default {
     editLine(row, index) {
       // console.log(this.pageDate.status, this.domKey, this.editKeys)
       console.log(typeof this.pageDate.status)
-      if (this.pageDate.status === 0) {
+      if (this.pageDate.status < 20) {
         this.$store.commit('monthlyReportEdit/ADD_EDIT_KEYS', this.domKey)
       }
       this.$forceUpdate()
@@ -381,7 +379,7 @@ export default {
     setColumns(columns) {
       let newColumns = _.cloneDeep(columns)
       if (
-        this.pageDate.status &&
+        this.pageDate.status > 10 &&
         this.tabsActive.indexOf('本月重点问题') > -1
       ) {
         newColumns = [
@@ -405,7 +403,7 @@ export default {
           elm.align = 'center'
         }
       })
-      if (this.pageDate.status && this.tabsActive.indexOf('本月重点问题') < 0) {
+      if (this.pageDate.status > 10&& this.tabsActive.indexOf('本月重点问题') < 0) {
         newColumns.splice(newColumns.length - 1, 1)
       }
       return newColumns
@@ -446,16 +444,18 @@ export default {
         run(tabPageData.children)
         console.log(obj)
         // 提交数据
-        updateAnalyticFeedback({
-          reportId: this.$route.query.reportId,
-          reportCatalog: obj
-        }).then((res) => {
-          if (res.code === 200) {
-            console.log(res.data)
-          }
-        })
-        // console.log(this.domKey)
-        // console.log(this.title)
+        if (obj) {
+          updateAnalyticFeedback({
+            reportId: this.$route.query.reportId,
+            reportCatalog: obj
+          }).then((res) => {
+            if (res.code === 200) {
+              console.log(res.data)
+            }
+          })
+          // console.log(this.domKey)
+          // console.log(this.title)
+        }
       }
     },
     /**
@@ -470,7 +470,7 @@ export default {
      * @returns {boolean}
      */
     isShowButton(row) {
-      if (this.pageType.search(/edit/) > -1 && this.pageDate.status === 0) {
+      if (this.pageType.search(/edit/) > -1 && this.pageDate.status < 20) {
         return true
       }
       if (row.analyticFeedback && row.analyticFeedback.isCommitted) {
@@ -536,7 +536,9 @@ export default {
     }
   }
 }
-
+/deep/.el-button{
+  font-weight: 400;
+}
 .red {
   color: red;
 }

+ 2 - 2
src/views/monthlyReport/childrenPage/editReport/components/RichText.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div v-if="pageDate.status" v-html="item.value || '暂无数据!'" />
+    <div v-if="pageDate.status > 10" v-html="item.value || '暂无数据!'" />
     <normal-area
       v-else-if="editKeys.indexOf(item.domKey) > -1"
       :id="item.domKey"
@@ -41,7 +41,7 @@ export default {
   },
   methods: {
     editDom() {
-      if (this.pageDate.status === 0) {
+      if (this.pageDate.status < 20) {
         this.$store.commit(
           'monthlyReportEdit/ADD_EDIT_KEYS',
           // `${row.rowKey}_${index}`

+ 1 - 1
src/views/monthlyReport/childrenPage/editReport/components/VarText.vue

@@ -8,7 +8,7 @@
       <div class="title">{{ name }}:</div>
       <div class="value">
         <el-input
-          v-if="pageDate.status === 0"
+          v-if="pageDate.status < 20"
           v-model="textValue"
           type="textarea"
           placeholder="请输入"

+ 3 - 1
src/views/monthlyReport/childrenPage/editReport/components/anchor.vue

@@ -41,9 +41,11 @@
           effect="dark"
           :enterable="true"
           :disabled="tooltip[`anchor_${index}`] && tooltip[`anchor_${index}`].isTooltip"
-          :content="item.headerTitle || item.title"
           placement="top-start"
         >
+          <template slot="content">
+            <span v-html="item.headerTitle || item.title" />
+          </template>
           <div
             :ref="`anchor_${index}`"
             class="mi"

+ 16 - 9
src/views/monthlyReport/childrenPage/editReport/components/core.vue

@@ -1,17 +1,21 @@
 <template>
   <div v-if="baseData.isVisible">
     <div v-if="baseData.type === 'Head1'" :id="baseData.domKey">
-      <headTitle :title="baseData.title" style="margin-top: 37px;" />
+      <headTitle :title="baseData.title" style="padding-top: 37px;" />
     </div>
     <div
       v-if="baseData.type.search(/Head2|Head3/) > -1"
       :id="baseData.domKey"
-      :style="{marginTop: baseData.type === 'head3' ? '0':'10.2px'}"
+      :style="{ marginTop: baseData.type === 'head3' ? '0' : '10.2px' }"
     >
-      {{ headerIndex }}<SubTitle v-if="headerTitle.indexOf('线下缺陷') > -1" :sub-title="baseData.subTitles" /> <span v-else>{{ headerTitle }}</span>
+      <span v-html="headerIndex" />
+      <SubTitle
+        v-if="headerTitle.indexOf('线下缺陷') > -1"
+        :sub-title="baseData.subTitles"
+      />
+      <span v-else :style="{color: baseData.depth === 3? '#333' : '#666'}" v-html="headerTitle" />
       <el-button
-        v-if="headerTitle.indexOf('线下缺陷') > -1 && pageDate.status === 0"
-        size="mini"
+        v-if="headerTitle.indexOf('线下缺陷') > -1 && pageDate.status < 20"
         type="text"
         style="margin-left: 5px"
         @click="marking"
@@ -87,7 +91,7 @@ export default {
   computed: {
     headerIndex() {
       if (this.baseData.depth === 3) {
-        return `${toChinesNum(this.domIndex + 1)}、`
+        return `<hhtsubtitle>${toChinesNum(this.domIndex + 1)}、</hhtsubtitle>`
       }
       return `${this.domIndex + 1}、`
     },
@@ -133,7 +137,7 @@ export default {
       // this.$store.commit('monthlyReportEdit/SUB_TABS_ACTIVE', this.baseData.children[0].domKey, this.activeName)
     },
     setHeader() {
-      const title = `${this.baseData.title}`
+      let title = `${this.baseData.title}`
       if (title.search(/\{param\}/) > -1) {
         this.headerTitle = this.generalDelayTitle(title)
         this.$store.commit('monthlyReportEdit/SET_HEADER_TITLE', {
@@ -142,6 +146,9 @@ export default {
         })
         return
       }
+      title = title.replace(/([0-9][0-9][0-9])/g, '<hhtem>$1</hhtem>')
+      title = title.replace(/([0-9][0-9])/g, '<hhtem>$1</hhtem>')
+      title = title.replace(/([0-9])/g, '<hhtem>$1</hhtem>')
       this.headerTitle = title
     },
     // 延期 - 项目延期提测{test}次,延期发布{release}次
@@ -161,8 +168,8 @@ export default {
             test2++
           }
         })
-      newTitle = newTitle.replace('{param}', test1)
-      newTitle = newTitle.replace('{param}', test2)
+      newTitle = newTitle.replace('{param}', `<hhtem>${test1}</hhtem>`)
+      newTitle = newTitle.replace('{param}', `<hhtem>${test2}</hhtem>`)
       return newTitle
     },
     // 标记为重点问题

+ 26 - 35
src/views/monthlyReport/childrenPage/editReport/components/createdItem.vue

@@ -1,47 +1,37 @@
 <template>
-  <div v-clickoutside="()=> modalShow = false">
-    <modal
-      :visible="modalShow"
-      :bg="false"
-      :title="titleName"
-      :box-styles="{
-        width:'50%',
-        margin: '0 auto',
-        left: '25%',
-    }"
-      @close="modalClose">
-      <el-form label-width="50px">
-        <el-form-item label="标题">
-          <el-input v-model="normalAreaName" autocomplete="off" placeholder="请输入项目名称" />
-        </el-form-item>
-        <el-form-item label="内容">
-          <normal-area
-            :id="uuid10(10)"
-            :value.sync="normalAreaValue"
-            :height="520"
-            :full-position-style="{ top:'20px',left:'15%', right: '15%' }"
-          />
-        </el-form-item>
-      </el-form>
-      <div slot="footer">
-        <el-button @click="modalShow = false">取 消</el-button>
-        <el-button type="primary" @click="addItem">确 定</el-button>
-      </div>
-    </modal>
-  </div>
+  <normal-dialog
+    ref="normalDialog"
+    :show-dialog="false"
+    is-succes
+    title="分析反馈"
+    width="80%"
+    @succes="addItem"
+  >
+    <el-form label-width="50px">
+      <el-form-item label="标题">
+        <el-input v-model="normalAreaName" autocomplete="off" placeholder="请输入项目名称" />
+      </el-form-item>
+      <el-form-item label="内容">
+        <normal-area
+          :id="uuid10(10)"
+          :value.sync="normalAreaValue"
+          :height="520"
+          :full-position-style="{ top:'20px',left:'15%', right: '15%' }"
+        />
+      </el-form-item>
+    </el-form>
+  </normal-dialog>
 </template>
 <script>
-import modal from '@/components/modal'
+import normalDialog from '@/components/dialog/normalDialog'
 import normalArea from '@/components/input/normalArea'
 import { uuid10 } from '@/utils'
-import Clickoutside from 'element-ui/src/utils/clickoutside'
 export default {
   name: 'CreatedItem',
   components: {
     normalArea,
-    modal
+    normalDialog
   },
-  directives: { Clickoutside },
   data() {
     return {
       modalShow: false,
@@ -54,9 +44,9 @@ export default {
   methods: {
     uuid10,
     openModal(title, menuData) {
+      this.$refs.normalDialog.visible = true
       this.titleName = title
       this.menuData = menuData
-      this.modalShow = true
     },
     addItem() {
       const params = {
@@ -97,6 +87,7 @@ export default {
         })
       }
       this.modalClose()
+      this.$refs.normalDialog.visible = false
     },
     modalClose() {
       this.normalAreaName = ''

+ 6 - 1
src/views/monthlyReport/childrenPage/editReport/components/markingIssues.vue

@@ -9,7 +9,7 @@
       width="40%"
       @succes="updateModule"
     >
-      <el-form label-width="100px" style="padding-right: 30px">
+      <el-form label-width="100px" style="padding-right: 20px">
         <el-form-item label="问题">
           <el-input
             v-model="normalAreaName"
@@ -115,3 +115,8 @@ export default {
   }
 }
 </script>
+<style scoped lang="less">
+/deep/ .el-form-item__label {
+  text-align: left!important;
+}
+</style>

+ 5 - 3
src/views/monthlyReport/childrenPage/editReport/components/menu.vue

@@ -7,7 +7,7 @@
       :style="menuStyle"
       :class="{ hide: show }"
     >
-      <el-dropdown-item v-if="pageDate.status === 0">
+      <el-dropdown-item v-if="pageDate.status < 20">
         <div @click.stop="hideDom">
           <!--
           menuData.item.isVisible === true
@@ -26,10 +26,10 @@
           }}
         </div>
       </el-dropdown-item>
-      <el-dropdown-item v-if="pageDate.status === 0">
+      <el-dropdown-item v-if="pageDate.status < 20">
         <div @click="addItem('添加同级子项')">添加同级子项</div>
       </el-dropdown-item>
-      <el-dropdown-item v-if="menuData.item.depth < 4 && pageDate.status === 0">
+      <el-dropdown-item v-if="menuData.item.depth < 4 && pageDate.status < 20">
         <div @click="addItem('添加子项')">添加下级子项</div>
       </el-dropdown-item>
     </div>
@@ -99,6 +99,7 @@ export default {
     },
     // 控制左侧dom的显示隐藏
     hideDom() {
+      this.$store.commit('monthlyReportEdit/INIT_EDIT_KEYS')
       setTimeout(() => {
         this.show = true
       }, 300)
@@ -132,6 +133,7 @@ export default {
     },
     // 添加同级子项
     addItem(title) {
+      this.$store.commit('monthlyReportEdit/INIT_EDIT_KEYS')
       this.$refs.createdItem.openModal(title, this.menuData.item)
     },
     // 添加下级子项

+ 43 - 7
src/views/monthlyReport/childrenPage/editReport/index.vue

@@ -5,30 +5,45 @@
       :sub-title="subTitle"
       address="/monthlyReport/index"
     >
-      <template v-if="pageDate && pageDate.status === 0" slot="content">
+      <template slot="content">
         <el-button
-          v-if="pageDate && pageDate.status === 0"
+          v-if="pageDate && pageDate.status < 20 && (roleCode === 100 || roleCode === 50 || roleCode === 0)"
           type="primary"
           size="small"
           @click="upDateReport"
           >保存
         </el-button>
         <el-button
-          v-if="pageDate && pageDate.status < 20"
+          v-if="pageDate && pageDate.status === 10 && (roleCode === 100 || roleCode === 50 || roleCode === 0)"
+          type="primary"
+          size="small"
+          @click="confirmReport"
+        >确认
+        </el-button>
+        <el-button
+          v-if="pageDate && pageDate.status < 10 && (roleCode === 100 || roleCode === 0)"
           plain
           size="small"
           @click="dialogOpen('dialogSend')"
           >发送确认
         </el-button>
         <el-button
-          v-if="pageDate && pageDate.status === 0"
+          v-if="pageDate && pageDate.status < 20 && (roleCode === 100 || roleCode === 0)"
           slot="reference"
           plain
           size="small"
           @click="$router.push({ path: '/monthlyReport/index' })"
           >取消
         </el-button>
-        <el-dropdown v-if="pageDate.status === 10" trigger="click" @command="returnReport">
+        <el-button
+          v-if="pageType.search(/All/) > -1 && pageDate && pageDate.status === 20 && (roleCode === 100 || roleCode === 0)"
+          slot="reference"
+          plain
+          size="small"
+          @click="publishAllReport"
+        >发布
+        </el-button>
+        <el-dropdown v-if="pageDate.status === 30 && (roleCode === 100 || roleCode === 0)" trigger="click" @command="returnReport">
           <span class="el-dropdown-link">
             回退<i class="el-icon-arrow-down el-icon--right" />
           </span>
@@ -43,7 +58,7 @@
           </el-dropdown-menu>
         </el-dropdown>
         <el-button
-          v-if="pageDate && pageDate.status > 0 && pageDate.status < 30"
+          v-if="roleCode === 100 || roleCode === 0"
           slot="reference"
           plain
           size="small"
@@ -332,6 +347,12 @@ export default {
         this.$router.push({ path: '/monthlyReport/index' })
       })
     },
+    // 月报确认
+    confirmReport() {
+      this.$store.dispatch('monthlyReportEdit/confirmReport', () => {
+        this.$router.push({ path: '/monthlyReport/index' })
+      })
+    },
     deleteReport(key) {
       this.$refs['dialogDelete'].visible = false
       if (key === '删除') {
@@ -345,6 +366,11 @@ export default {
         // this.$message('删除操作已取消!')
       }
     },
+    publishAllReport(key) {
+      this.$store.dispatch('monthlyReportEdit/publishAllReport', () => {
+        this.$router.push({ path: '/monthlyReport/index' })
+      })
+    },
     tabClick(tab, event) {
       this.$store.dispatch('monthlyReportEdit/tabActiveChange', {
         ...this.$route.query,
@@ -378,7 +404,9 @@ export default {
         list.push(Number.parseInt(command.replace('tab_', '')))
       }
       this.$store.dispatch('monthlyReportEdit/returnReport', {
-        data: list,
+        data: {
+          subReportIds: list
+        },
         cb: () => {
           this.$message.success('退回成功!')
           this.$router.push({ path: '/monthlyReport/index' })
@@ -415,4 +443,12 @@ export default {
     }
   }
 }
+/*特殊字体*/
+/deep/hhtem {
+  color: #333;
+  font-weight: 600;
+}
+/deep/hhtsubtitle {
+  color: #333;
+}
 </style>

+ 1 - 1
src/views/monthlyReport/components/header.vue

@@ -62,7 +62,7 @@ export default {
 
       >* {
         display: inline-block !important;
-        margin-left: 20px;
+        margin-left: 10px;
       }
     }
   }

+ 3 - 0
src/views/monthlyReport/style.less

@@ -33,3 +33,6 @@
 .report-create-margin {
   padding: 0 30px;
 }
+/deep/label{
+  font-weight: 400;
+}