Merge pull request 'master' (#961) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/961

src/views/expense-management/share-detail/add.vue

@@ -396,7 +396,7 @@ const handleSubmit = (instance) => {
     if (code === 1000) {
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)
       router.push({
-        name: 'Expense/share'
+        name: 'Share'
       })
     }
   })
@@ -446,7 +446,7 @@ const handleResubmit = (instance) => {
     if (code === 1000) {
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)
       router.push({
-        name: 'Expense/share'
+        name: 'Share'
       })
     }
   })

src/views/expense-management/share-detail/index.vue

@@ -1,5 +1,7 @@
 <template>
 <!--  <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>-->
+<!--  <el-button color="#DED0B2" style="float: left;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>-->
+
   <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick" style="margin-top: 15px">
     <template #empty>
       <el-empty description="暂无数据"/>
@@ -12,6 +14,7 @@ import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 import {toThousands} from '@/utils/changePrice.js'
 import { getSubCompOpt } from '@/api/user/user.js';
 import {reactive, ref} from "vue";
+import {shareExportExcel} from "@/api/expense-manage";
 const router = useRouter()
 const route = useRoute()
 const searchConfig = reactive([
@@ -129,6 +132,17 @@ const tableConfig = reactive({
     open :false,
   }
 })
+// const exportTable = () => {
+//   shareExportExcel().then(res => {
+//     console.log(res)
+//     let fileName = `科技研发项目工时及成本分摊汇总表.xlsx`
+//     const blob = new Blob([res.data])
+//     let a = document.createElement('a')
+//     a.href = URL.createObjectURL(blob)
+//     a.download = fileName
+//     a.click()
+//   })
+// }
 const search = (val) => {
   tableConfig.params = {...val}
   tableIns.value.refresh()