Эх сурвалжийг харах

月报设置:发布修改

洪海涛 4 жил өмнө
parent
commit
7262ea37e6

+ 2 - 2
src/store/modules/monthlyReport/edit/index.js

@@ -603,9 +603,9 @@ export default {
       }
     },
     // 月报发布
-    async publishAllReport({ commit, state, context }, { cb }) {
+    async publishAllReport({ commit, state, context }, { id, cb }) {
       const res = await publishReport({
-        id: state.pageDate.id
+        id
       })
       if (res.code === 200) {
         message.success('发布成功!')

+ 60 - 14
src/views/monthlyReport/childrenPage/editReport/index.vue

@@ -1,5 +1,9 @@
 <template>
-  <div ref="pageWrapper" class="page-wrapper" @click.stop="$store.commit('monthlyReportEdit/INIT_EDIT_KEYS')">
+  <div
+    ref="pageWrapper"
+    class="page-wrapper"
+    @click.stop="$store.commit('monthlyReportEdit/INIT_EDIT_KEYS')"
+  >
     <headerCom
       title="月报"
       :sub-title="subTitle"
@@ -7,28 +11,45 @@
     >
       <template slot="content">
         <el-button
-          v-if="pageDate && pageDate.status < 20 && (roleCode === 100 || roleCode === 50 || roleCode === 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 === 10 && (roleCode === 100 || roleCode === 50 || roleCode === 0)"
+          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)"
+          v-if="
+            pageDate &&
+              pageDate.status < 10 &&
+              (roleCode === 100 || roleCode === 0)
+          "
           plain
           size="small"
           @click="dialogOpen('dialogSend')"
           >发送确认
         </el-button>
         <el-button
-          v-if="$route.query.type === 'create' && pageDate && pageDate.status < 20 && (roleCode === 100 || roleCode === 0)"
+          v-if="
+            $route.query.type === 'create' &&
+              pageDate &&
+              pageDate.status < 20 &&
+              (roleCode === 100 || roleCode === 0)
+          "
           slot="reference"
           plain
           size="small"
@@ -36,14 +57,28 @@
           >取消
         </el-button>
         <el-button
-          v-if="pageType.search(/All/) > -1 && pageDate && pageDate.status === 20 && (roleCode === 100 || roleCode === 0)"
+          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="pageType.search(/All/) > -1 && pageDate && pageDate.status === 30 && (roleCode === 100 || roleCode === 0)" trigger="click" @command="returnReport">
+        <el-dropdown
+          v-if="
+            pageType.search(/All/) > -1 &&
+              pageDate &&
+              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>
@@ -58,7 +93,13 @@
           </el-dropdown-menu>
         </el-dropdown>
         <el-button
-          v-if="pageType.search(/All/) > -1 && (!$route.query.type || $route.query.type !== 'create') && (pageDate && pageDate.status < 20) && (roleCode === 100 || roleCode === 0)"
+          v-if="
+            pageType.search(/All/) > -1 &&
+              (!$route.query.type || $route.query.type !== 'create') &&
+              pageDate &&
+              pageDate.status < 20 &&
+              (roleCode === 100 || roleCode === 0)
+          "
           slot="reference"
           type="danger"
           size="small"
@@ -367,8 +408,11 @@ export default {
       }
     },
     publishAllReport(key) {
-      this.$store.dispatch('monthlyReportEdit/publishAllReport', () => {
-        this.$router.push({ path: '/monthlyReport/index' })
+      this.$store.dispatch('monthlyReportEdit/publishAllReport', {
+        id: this.$route.query.reportId,
+        cb: () => {
+          this.$router.push({ path: '/monthlyReport/index' })
+        }
       })
     },
     tabClick(tab, event) {
@@ -444,12 +488,14 @@ export default {
     }
   }
 }
+
 /*特殊字体*/
-/deep/hhtem {
+/deep/ hhtem {
   color: #333;
   font-weight: 600;
 }
-/deep/hhtsubtitle {
+
+/deep/ hhtsubtitle {
   color: #333;
 }
 </style>