浏览代码

2022-12-1

codeMan 2 年之前
父节点
当前提交
22c3e1c4be

+ 1 - 1
src/SManagement/submitedit_details/components/SubmiteditItemInfo.vue

@@ -97,7 +97,7 @@ export default {
   height: 100%;
 }
 .normal-card {
-  min-height: calc(100vh - 310px);
+  min-height: calc(100vh - 190px);
   position: relative;
 }
 /deep/.el-drawer__header {

+ 1 - 2
src/SManagement/submitedit_details/index.vue

@@ -98,8 +98,7 @@ export default {
       this.detailData.submitedit.forEach( async element => {
         if(element.status == '未提报') {
           let param = {
-              "classname": "saletool.submitedit.submitedit",
-              "method": "delete_submitdetailed",
+              "id":20221102095202,
               "content": {
                   "sat_submiteditid":element.sat_submiteditid
               }

+ 42 - 9
src/SManagement/submitedit_more/index.vue

@@ -1,16 +1,33 @@
 <template>
-<normalLayout class="normal-card" @onRefresh="getSubmitEditAction">
-  <div slot="content" class="container">
-    <time-select @timeChange="timeChange" @clearSelect="clearSelect" v-if="tool.checkAuth($route.name,'read')"></time-select>
-    <list :list="oneData" type="more" v-if="tool.checkAuth($route.name,'read')"></list>
-    <!--分页-->
-    <pagination :total="total" :pageSize="param.content.pageSize" :currentPage="param.content.pageNumber" @pageChange="pageChange">
-    </pagination>
-  </div>
-</normalLayout>
+<div>
+  <el-drawer
+      title="我是标题"
+      :visible.sync="drawer"
+      :with-header="false"
+      direction="rtl"
+      size="90%"
+      append-to-body
+      @close="closeDrawer">
+      <div>
+        <router-view/>
+      </div>
+    </el-drawer>
+    <normalLayout class="normal-card" @onRefresh="getSubmitEditAction">
+    <div slot="content" class="container">
+      <time-select @timeChange="timeChange" @clearSelect="clearSelect" v-if="tool.checkAuth($route.name,'read')"></time-select>
+      <list :list="oneData" type="more" v-if="tool.checkAuth($route.name,'read')"></list>
+      <!--分页-->
+      <pagination :total="total" :pageSize="param.content.pageSize" :currentPage="param.content.pageNumber" @pageChange="pageChange">
+      </pagination>
+    </div>
+  </normalLayout>
+</div>
+
 </template>
 
 <script>
+import {mapGetters} from 'vuex'
+
 import Pagination from '@/components/pagination/Pagination'
 import SelectPanl from '@/SManagement/submitedit_one/components/SelectPanl'
 import TimeSelect from '@/SManagement/submitedit_one/components/TimeSelect'
@@ -35,6 +52,7 @@ export default {
       },
       oneData:[],
       total: 0,
+      drawer:false
     }
   },
   components: {
@@ -44,13 +62,28 @@ export default {
     TimeSelect
   },
   computed: {
+    ...mapGetters({
+      DrawerShow:'DrawerShow'
+    })
   },
   watch: {
+    $route (val) {
+      if (val.path == '/submitedit_more') {
+        this.getSubmitEditAction()
+      }
+    },
+    DrawerShow (val) {
+      val ? this.drawer = true : this.drawer = false
+    }
   },
   created () {
     this.getSubmitEditAction()
   },
   methods: {
+    closeDrawer () {
+      this.$store.dispatch('DrawerShowChange',false)
+      this.$router.back()
+    },
     //获取所有一事一报
     async getSubmitEditAction () {
       let res = await this.$api.requested(this.param)

+ 2 - 1
src/SManagement/submitedit_one/components/list.vue

@@ -46,8 +46,9 @@ export default {
     itemClick (id, history) {
       window.sessionStorage.setItem('currentPath', this.$route.path)
       window.sessionStorage.setItem('history', history)
+      this.$store.dispatch('DrawerShowChange',true)
       this.$router.push({
-        path: '/submiteditmag_detail',
+        path: this.type == 'more' ? '/submiteditmag_detail' : 'submiteditmag_detail_one',
         query: {
           id: id,
           type: this.type

+ 42 - 9
src/SManagement/submitedit_one/index.vue

@@ -1,16 +1,33 @@
 <template>
-<normalLayout class="normal-card" @onRefresh="getSubmitEditAction">
-  <div class="container" slot="content">
-    <time-select @timeChange="timeChange" @clearSelect="clearSelect" v-if="tool.checkAuth($route.name,'read')"></time-select>
-    <list :list="oneData" v-if="tool.checkAuth($route.name,'read')"></list>
-    <!--分页-->
-    <pagination :total="total" :pageSize="param.content.pageSize" :currentPage="param.content.pageNumber" @pageChange="pageChange">
-    </pagination>
-  </div>
-</normalLayout>
+<div>
+  <normalLayout class="normal-card" @onRefresh="getSubmitEditAction">
+    <div class="container" slot="content">
+      <time-select @timeChange="timeChange" @clearSelect="clearSelect" v-if="tool.checkAuth($route.name,'read')"></time-select>
+      <list :list="oneData" v-if="tool.checkAuth($route.name,'read')"></list>
+      <!--分页-->
+      <pagination :total="total" :pageSize="param.content.pageSize" :currentPage="param.content.pageNumber" @pageChange="pageChange">
+      </pagination>
+    </div>
+  </normalLayout>
+  <el-drawer
+      title="我是标题"
+      :visible.sync="drawer"
+      :with-header="false"
+      direction="rtl"
+      size="90%"
+      append-to-body
+      @close="closeDrawer">
+      <div>
+        <router-view/>
+      </div>
+    </el-drawer>
+</div>
+
 </template>
 
 <script>
+import {mapGetters} from 'vuex'
+
 import Pagination from '@/components/pagination/Pagination'
 import SelectPanl from '@/SManagement/submitedit_one/components/SelectPanl'
 import TimeSelect from '@/SManagement/submitedit_one/components/TimeSelect'
@@ -36,6 +53,7 @@ export default {
       },
       oneData:[],
       total: 0,
+      drawer:false
     }
   },
   components: {
@@ -45,13 +63,28 @@ export default {
     TimeSelect
   },
   computed: {
+    ...mapGetters({
+      DrawerShow:'DrawerShow'
+    })
   },
   watch: {
+    $route (val) {
+      if (val.path == '/submitedit_one') {
+        this.getSubmitEditAction()
+      }
+    },
+    DrawerShow (val) {
+      val ? this.drawer = true : this.drawer = false
+    }
   },
   created () {
     this.getSubmitEditAction()
   },
   methods: {
+    closeDrawer () {
+      this.$store.dispatch('DrawerShowChange',false)
+      this.$router.back()
+    },
     //获取所有一事一报
     async getSubmitEditAction () {
       let res = await this.$api.requested(this.param)

+ 26 - 11
src/router/SManagement.js

@@ -79,7 +79,19 @@ const SManagement = [{
     title: '提报',
     ast_nav: true
   },
-  component: () => import(/* webpackChunkName: "about" */ '@/SManagement/submitedit_one/index')
+  component: () => import(/* webpackChunkName: "about" */ '@/SManagement/submitedit_one/index'),
+  children: [
+    {
+      path: '/submiteditmag_detail_one',
+      name: 'submiteditmag',
+      meta: {
+        title: '提报详情',
+        ast_nav: true,
+        keeproute: true
+      },
+      component: () => import(/* webpackChunkName: "about" */ '@/SManagement/submitedit_details/index')
+    }
+  ]
 }, {
   path: '/submitedit_more',
   name: 'submiteditmag',
@@ -87,16 +99,19 @@ const SManagement = [{
     title: '提报',
     ast_nav: true
   },
-  component: () => import(/* webpackChunkName: "about" */ '@/SManagement/submitedit_more/index')
-}, {
-  path: '/submiteditmag_detail',
-  name: 'submiteditmag',
-  meta: {
-    title: '提报详情',
-    ast_nav: true,
-    keeproute: true
-  },
-  component: () => import(/* webpackChunkName: "about" */ '@/SManagement/submitedit_details/index')
+  component: () => import(/* webpackChunkName: "about" */ '@/SManagement/submitedit_more/index'),
+  children: [
+    {
+      path: '/submiteditmag_detail',
+      name: 'submiteditmag',
+      meta: {
+        title: '提报详情',
+        ast_nav: true,
+        keeproute: true
+      },
+      component: () => import(/* webpackChunkName: "about" */ '@/SManagement/submitedit_details/index')
+    }
+  ]
 }, {
   path: '/refresh',
   name: 'refresh',