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

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

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

@@ -145,7 +145,15 @@
 <script setup lang="jsx">
 import {ElNotification} from "element-plus";
 import {useTagsView} from '@/stores/tagsview.js'
-import {addAllocation, getAllocationDetail, getAllocationProcess, getResearchUser,getProjectOption,editAllocation, getAllocationDetailList} from "@/api/expense-manage";
+import {
+  addAllocation,
+  getAllocationDetail,
+  getAllocationProcess,
+  getResearchUser,
+  getProjectOption,
+  editAllocation,
+  getAllocationDetailList
+} from "@/api/expense-manage";
 import {useProcessStore} from '@/stores/processStore.js';
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
 
@@ -386,3 +394,14 @@ onMounted(async () => {
   }
 })
 </script>
+<style scoped lang="scss">
+:deep(.el-table--enable-row-transition) {
+  .el-table__body td.el-table__cell {
+    .cell {
+      .el-form-item {
+        margin-top: 20px;
+      }
+    }
+  }
+}
+</style>

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

@@ -13,6 +13,35 @@ import { ElNotification} from "element-plus";
 import {deleteAllocation} from "@/api/expense-manage";
 
 const router = useRouter();
+const shortcuts = [
+  {
+    text: '上周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '上月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+      return [start, end]
+    },
+  },
+  {
+    text: '三月前',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+      return [start, end]
+    },
+  },
+]
 const searchConfig = reactive([
   {
     label: '分摊名称',
@@ -32,18 +61,23 @@ const searchConfig = reactive([
       placeholder: '请选择分摊月份',
       clearable: true,
       type:'month',
-      valueFormat:"YYYY-MM-DD HH:mm:ss"
+      format: 'YYYY-MM',
+      valueFormat:"YYYY-MM"
     },
     colProps: {}
   },
   {
     label: '生成时间',
-    prop: 'generationTime',
+    prop: 'dateValue',
     component: 'el-date-picker',
     props: {
-      placeholder: '请选择生成时间',
       clearable: true,
+      type: 'daterange',
+      startPlaceholder: '开始日期',
+      endPlaceholder: '结束日期',
+      format: 'YYYY-MM-DD',
       valueFormat: 'YYYY-MM-DD',
+      shortcuts: shortcuts
     },
     colProps: {}
   },
@@ -147,7 +181,13 @@ const tableConfig = reactive({
 })
 
 const search = (val) => {
-  tableConfig.params = {...val}
+  let obj = {...val}
+  if (obj.dateValue) {
+    obj.startGenerationTime = obj.dateValue[0]
+    obj.endGenerationTime = obj.dateValue[1]
+    delete obj.dateValue
+  }
+  tableConfig.params = obj
   tableIns.value.refresh()
 }
 const handleAdd = () => {