Merge pull request 'feat: 费用导入功能' (#989) from master into prod

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

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

@@ -1,5 +1,5 @@
 <template>
-  <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>
+  <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 15px"></fvSearchForm>
   <div style="float: left">
     <import-cost-excel   @success="importTheExpenseLedger"/>
   </div>
@@ -30,17 +30,39 @@ const searchConfig = ref([
       checkStrictly: true
     }
   },
-  // {
-  //   label: '子项目',
-  //   prop: 'subProjectName',
-  //   component: 'el-input',
-  //   props: {
-  //     placeholder: '请输入子项目查询',
-  //     clearable: true,
-  //     filterable: true,
-  //     checkStrictly: true
-  //   }
-  // },
+  {
+    label: '子项目',
+    prop: 'subProjectName',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入子项目查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
+  {
+    label: '会计凭证记载金额(元)',
+    prop: 'recordedAmount',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入会计凭证记载金额查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
+  {
+    label: '归集研发费用金额(元)',
+    prop: 'rdAmount',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入归集研发费用金额查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
   // {
   //   label: '项目类型',
   //   prop: 'projectType',
@@ -82,14 +104,20 @@ const tableConfig = reactive({
     //   }
     // },
     {
-      prop: 'paymentYear',
-      label: '支付年份',
+      prop: 'rdYear',
+      label: '年',
       align: 'center',
       width: 80
     },
     {
-      prop: 'paymentMonth',
-      label: '支付月份',
+      prop: 'rdMonth',
+      label: '月',
+      align: 'center',
+      width: 80
+    },
+    {
+      prop: 'rdDay',
+      label: '日',
       align: 'center',
       width: 80
     },
@@ -126,9 +154,10 @@ const tableConfig = reactive({
 
     },
     {
-      prop: 'remarks',
+      prop: 'digest',
       label: '摘要',
       align: 'center',
+      showOverflowTooltip: false,
     },
     {
       prop: 'accountCode',
@@ -141,11 +170,13 @@ const tableConfig = reactive({
       prop: 'accountName',
       label: '科目名称',
       align: 'center',
+      showOverflowTooltip: false,
     },
     {
       prop: 'auxiliaryItem',
       label: '辅助项',
       align: 'center',
+      showOverflowTooltip: false,
     },
     {
       prop: 'recordedAmount',
@@ -160,7 +191,7 @@ const tableConfig = reactive({
       width: 170
     },
   ],
-  api: '/workflow/mosr/payment/list',
+  api: '/workflow/mosr/rd/expense/list',
   params: {},
   btns: [
     {name: '模板下载', key: 'down', color: '#DED0B2'},
@@ -220,7 +251,9 @@ const importTheExpenseLedger = () => {
 }
 </script>
 <style scoped lang="scss">
-
+:deep(.el-form-item__label-wrap){
+  margin-left: 0!important;
+}
 :deep(.el-table__header) {
   .is-leaf:first-child {
     .cell {

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

@@ -27,17 +27,17 @@ const searchConfig = ref(
       checkStrictly: true
     }
   },
-  // {
-  //   label: '子项目',
-  //   prop: 'subProjectName',
-  //   component: 'el-input',
-  //   props: {
-  //     placeholder: '请输入子项目查询',
-  //     clearable: true,
-  //     filterable: true,
-  //     checkStrictly: true
-  //   }
-  // },
+  {
+    label: '子项目',
+    prop: 'subProjectName',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入子项目查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
   {
     label: '项目类型',
     prop: 'projectType',

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

@@ -88,20 +88,17 @@ const tableConfig = reactive({
       prop: 'masterProjectName',
       label: '主项目',
       align: 'center',
-      width: 120,
     },
 
     {
       prop: 'subProjectName',
       label: '子项目',
       align: 'center',
-      width: 120,
     },
     {
       prop: 'researchPersonnel',
       label: '研发人员',
       align: 'center',
-      width: 120,
       showOverflowTooltip: false,
     },
     {