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

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

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

@@ -11,95 +11,60 @@
 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 {useRoute, useRouter} from "vue-router";
 const router = useRouter()
 const route = useRoute()
 const searchConfig = ref([
-  {
-    label: '公司名称',
-    prop: 'affiliatedCompanyIds',
-    component: 'el-tree-select',
-    props: {
-      placeholder: '请输入公司名称查询',
-      clearable: true,
-      data: [],
-      filterable: true,
-      checkStrictly: true,
-      remote: true
-    }
-  },
-  {
-    label: '项目名称',
-    prop: 'projectName',
-    component: 'el-input',
-    props: {
-      placeholder: '请输入项目名称查询',
-      clearable: true,
-      filterable: true,
-      checkStrictly: true
-    }
-  },
 
   {
-    label: '项目费用',
+    label: '主项目',
-    prop: 'projectCost',
+    prop: 'masterProjectName',
-    component: shallowRef(fvSelect),
-    props: {
-      placeholder: '请选择项目费用查询',
-      clearable: true,
-      filterable: true,
-      cacheKey: 'project_cost',
-      remote: true
-    }
-  },
-  {
-    label: '研发阶段',
-    prop: 'researchStage',
-    component: shallowRef(fvSelect),
-    props: {
-      placeholder: '请选择研发阶段查询',
-      clearable: true,
-      filterable: true,
-      checkStrictly: true,
-      cacheKey: 'fee_stage',
-      remote: true
-    }
-  },
-
-  {
-    label: '时间',
-    prop: 'time',
-    component: 'el-date-picker',
-    props: {
-      placeholder: '请选择时间',
-      clearable: true,
-      type:'month',
-      format: 'YYYY-MM',
-      valueFormat:'YYYY-MM',
-    },
-    colProps: {}
-  },
-  {
-    label: '税后余额',
-    prop: 'afterTax',
     component: 'el-input',
     props: {
-      placeholder: '请输入税后余额查询',
+      placeholder: '请输入主项目查询',
       clearable: true,
       filterable: true,
       checkStrictly: true
     }
   },
   {
-    label: '摘要',
+    label: '子项目',
-    prop: 'digest',
+    prop: 'subProjectName',
     component: 'el-input',
     props: {
-      placeholder: '请输入摘要查询',
+      placeholder: '请输入子项目查询',
       clearable: true,
       filterable: true,
       checkStrictly: true
     }
   },
+  // {
+  //   label: '项目类型',
+  //   prop: 'projectType',
+  //   component: shallowRef(fvSelect),
+  //   props: {
+  //     placeholder: '请选择项目类型',
+  //     cacheKey: 'project_type',
+  //     clearable: true,
+  //     filterable: true,
+  //     remote: true
+  //   },
+  //   colProps: {}
+  // },
+  // {
+  //   label: '归档时间',
+  //   prop: 'filingTime',
+  //   component: 'el-date-picker',
+  //   props: {
+  //     placeholder: '请选择归档时间',
+  //     clearable: true,
+  //     type:'date',
+  //     format: 'YYYY-MM-DD HH:mm',
+  //     valueFormat:'YYYY-MM-DD HH:mm',
+  //   },
+  //   colProps: {}
+  // },
 ])
 const tableIns = ref()
 const tableConfig = reactive({
@@ -117,12 +82,14 @@ const tableConfig = reactive({
     {
       prop: 'affiliatedCompany',
       label: '支出年份',
-      align: 'center'
+      align: 'center',
+      width: 80
     },
     {
       prop: 'projectName',
       label: '月份',
-      align: 'center'
+      align: 'center',
+      width: 80
     },
 
     {
@@ -173,6 +140,11 @@ const tableConfig = reactive({
         return <span>{toThousands(row.afterTax)}</span>
       }
     },
+    {
+      prop: 'digest',
+      label: '摘要',
+      align: 'center',
+    },
     {
       prop: 'digest',
       label: '科目编码',
@@ -200,11 +172,13 @@ const tableConfig = reactive({
       prop: 'digest',
       label: '会计凭证记载金额(元)',
       align: 'center',
+      width: 170
     },
     {
       prop: 'digest',
       label: '归集研发费用金额(元)',
       align: 'center',
+      width: 170
     },
   ],
   api: '',

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

@@ -1,6 +1,6 @@
 <template>
-<!--  <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>-->
+  <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>
-  <fvTable ref="tableIns" :tableConfig="tableConfig" style="margin-top: 15px">
+  <fvTable ref="tableIns" :tableConfig="tableConfig" >
     <template #empty>
       <el-empty description="暂无数据"/>
     </template>
@@ -13,93 +13,57 @@ import {toThousands} from '@/utils/changePrice.js'
 import { getSubCompOpt } from '@/api/user/user.js';
 const router = useRouter()
 const route = useRoute()
-const searchConfig = ref([
+const searchConfig = ref(
+    [
+
   {
-    label: '公司名称',
+    label: '主项目',
-    prop: 'affiliatedCompanyIds',
+    prop: 'masterProjectName',
-    component: 'el-tree-select',
-    props: {
-      placeholder: '请输入公司名称查询',
-      clearable: true,
-      data: [],
-      filterable: true,
-      checkStrictly: true,
-      remote: true
-    }
-  },
-  {
-    label: '项目名称',
-    prop: 'projectName',
     component: 'el-input',
     props: {
-      placeholder: '请输入项目名称查询',
+      placeholder: '请输入主项目查询',
       clearable: true,
       filterable: true,
       checkStrictly: true
     }
   },
-
   {
-    label: '项目费用',
+    label: '子项目',
-    prop: 'projectCost',
+    prop: 'subProjectName',
-    component: shallowRef(fvSelect),
+    component: 'el-input',
     props: {
-      placeholder: '请选择项目费用查询',
+      placeholder: '请输入子项目查询',
       clearable: true,
       filterable: true,
-      cacheKey: 'project_cost',
+      checkStrictly: true
-      remote: true
     }
   },
   {
-    label: '研发阶段',
+    label: '项目类型',
-    prop: 'researchStage',
+    prop: 'projectType',
     component: shallowRef(fvSelect),
     props: {
-      placeholder: '请选择研发阶段查询',
+      placeholder: '请选择项目类型',
+      cacheKey: 'project_type',
       clearable: true,
       filterable: true,
-      checkStrictly: true,
-      cacheKey: 'fee_stage',
       remote: true
-    }
-  },
-
-  {
-    label: '时间',
-    prop: 'time',
-    component: 'el-date-picker',
-    props: {
-      placeholder: '请选择时间',
-      clearable: true,
-      type:'month',
-      format: 'YYYY-MM',
-      valueFormat:'YYYY-MM',
     },
     colProps: {}
   },
-  {
+  // {
-    label: '税后余额',
+  //   label: '归档时间',
-    prop: 'afterTax',
+  //   prop: 'filingTime',
-    component: 'el-input',
+  //   component: 'el-date-picker',
-    props: {
+  //   props: {
-      placeholder: '请输入税后余额查询',
+  //     placeholder: '请选择归档时间',
-      clearable: true,
+  //     clearable: true,
-      filterable: true,
+  //     type:'date',
-      checkStrictly: true
+  //     format: 'YYYY-MM-DD HH:mm',
-    }
+  //     valueFormat:'YYYY-MM-DD HH:mm',
-  },
+  //   },
-  {
+  //   colProps: {}
-    label: '摘要',
+  // },
-    prop: 'digest',
-    component: 'el-input',
-    props: {
-      placeholder: '请输入摘要查询',
-      clearable: true,
-      filterable: true,
-      checkStrictly: true
-    }
-  },
 ])
 const tableIns = ref()
 const tableConfig = reactive({
@@ -116,12 +80,12 @@ const tableConfig = reactive({
     // },
     {
       prop: 'paymentYear',
-      label: '支出年份',
+      label: '支付年份',
       align: 'center'
     },
     {
       prop: 'paymentMonth',
-      label: '月份',
+      label: '支付月份',
       align: 'center'
     },
 
@@ -154,13 +118,21 @@ const tableConfig = reactive({
     },
     {
       prop: 'rdType',
-      label: 'RAD统计类型',
+      label: 'R&D统计类型',
-      align: 'center'
+      align: 'center',
+      width: 200
+    },
+    {
+      prop: 'rdSub',
+      label: 'R&D统计子项',
+      align: 'center',
+      width: 150
     },
     {
       prop: 'paymentProcessType',
       label: '付款流程类型',
       align: 'center',
+      width: 150
     },
     {
       prop: 'processState',
@@ -171,11 +143,13 @@ const tableConfig = reactive({
       prop: 'filingTime',
       label: '归档时间',
       align: 'center',
+      width: 180
     },
     {
       prop: 'paymentProcessNum',
       label: '付款流程编号',
       align: 'center',
+      width: 150
     },
     {
       prop: 'paymentAmount',
@@ -186,6 +160,7 @@ const tableConfig = reactive({
       prop: 'paymentSubject',
       label: '付款/请款事由',
       align: 'center',
+      width: 130
     },
 
     {
@@ -200,7 +175,19 @@ const tableConfig = reactive({
     },
     {
       prop: 'contractSumAmount',
-      label: '合同金额(元)',
+      label: '合同总额(元)',
+      align: 'center',
+      width: 130
+    },
+    {
+      prop: 'recipientName',
+      label: '收款方名称',
+      align: 'center',
+      width: 130
+    },
+    {
+      prop: 'remarks',
+      label: '备注说明',
       align: 'center',
     },
   ],

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

@@ -11,95 +11,44 @@
 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";
 const router = useRouter()
 const route = useRoute()
-const searchConfig = ref([
+const searchConfig = reactive([
   {
-    label: '公司名称',
+    label: '分摊名称',
-    prop: 'affiliatedCompanyIds',
+    prop: 'shareName',
-    component: 'el-tree-select',
-    props: {
-      placeholder: '请输入公司名称查询',
-      clearable: true,
-      data: [],
-      filterable: true,
-      checkStrictly: true,
-      remote: true
-    }
-  },
-  {
-    label: '项目名称',
-    prop: 'projectName',
     component: 'el-input',
     props: {
-      placeholder: '请输入项目名称查询',
+      placeholder: '请输入分摊名称查询',
       clearable: true,
       filterable: true,
       checkStrictly: true
     }
   },
-
   {
-    label: '项目费用',
+    label: '分摊月份',
-    prop: 'projectCost',
+    prop: 'apportionmentMonth',
-    component: shallowRef(fvSelect),
-    props: {
-      placeholder: '请选择项目费用查询',
-      clearable: true,
-      filterable: true,
-      cacheKey: 'project_cost',
-      remote: true
-    }
-  },
-  {
-    label: '研发阶段',
-    prop: 'researchStage',
-    component: shallowRef(fvSelect),
-    props: {
-      placeholder: '请选择研发阶段查询',
-      clearable: true,
-      filterable: true,
-      checkStrictly: true,
-      cacheKey: 'fee_stage',
-      remote: true
-    }
-  },
-
-  {
-    label: '时间',
-    prop: 'time',
     component: 'el-date-picker',
     props: {
-      placeholder: '请选择时间',
+      placeholder: '请选择分摊月份',
       clearable: true,
       type:'month',
       format: 'YYYY-MM',
-      valueFormat:'YYYY-MM',
+      valueFormat:"YYYY-MM"
     },
     colProps: {}
   },
-  {
+  // {
-    label: '税后余额',
+  //   label: '状态',
-    prop: 'afterTax',
+  //   prop: 'state',
-    component: 'el-input',
+  //   component: shallowRef(fvSelect),
-    props: {
+  //   props: {
-      placeholder: '请输入税后余额查询',
+  //     placeholder: '请选择状态',
-      clearable: true,
+  //     clearable: true,
-      filterable: true,
+  //     cacheKey: 'special_fund'
-      checkStrictly: true
+  //   }
-    }
+  // },
-  },
-  {
-    label: '摘要',
-    prop: 'digest',
-    component: 'el-input',
-    props: {
-      placeholder: '请输入摘要查询',
-      clearable: true,
-      filterable: true,
-      checkStrictly: true
-    }
-  },
 ])
 const tableIns = ref()
 const tableConfig = reactive({