Commit 655ab71134eb6626b44d8d826ba9f3942b894a63
1 parent
447fa3f3
fix: bug修复
Showing
3 changed files
with
61 additions
and
24 deletions
src/views/project/approve/ProfitFieldPanel.vue
@@ -39,7 +39,7 @@ | @@ -39,7 +39,7 @@ | ||
39 | import { BasicDrawer, useDrawer } from '/@/components/Drawer'; | 39 | import { BasicDrawer, useDrawer } from '/@/components/Drawer'; |
40 | import { approveAuditApi, getApprovedListApi, getWaitListApi } from '/@/api/project/approve'; | 40 | import { approveAuditApi, getApprovedListApi, getWaitListApi } from '/@/api/project/approve'; |
41 | import { getAuditApply, getApplyList } from '/@/api/project/invoice'; | 41 | import { getAuditApply, getApplyList } from '/@/api/project/invoice'; |
42 | - import { FIELDS_BASE_INFO } from '../finance/financeProfit/ServiceProfit/ServiceProfit/tableData'; | 42 | + import { FIELDS_BASE_INFO } from './data'; |
43 | import { COLUMNS } from '../finance/financeProfit/ServiceProfit/ServiceProfit/data'; | 43 | import { COLUMNS } from '../finance/financeProfit/ServiceProfit/ServiceProfit/data'; |
44 | import { find, isEmpty } from 'lodash-es'; | 44 | import { find, isEmpty } from 'lodash-es'; |
45 | import { ROLE } from '../order//type.d'; | 45 | import { ROLE } from '../order//type.d'; |
src/views/project/approve/data.ts
@@ -70,4 +70,63 @@ export function getFormConfig(showFieldConfig: string) { | @@ -70,4 +70,63 @@ export function getFormConfig(showFieldConfig: string) { | ||
70 | : []), | 70 | : []), |
71 | ], | 71 | ], |
72 | }; | 72 | }; |
73 | -} | ||
74 | \ No newline at end of file | 73 | \ No newline at end of file |
74 | +} | ||
75 | + | ||
76 | +export const FIELDS_BASE_INFO = [ | ||
77 | + { | ||
78 | + field: 'developmentCopyRmbTotalPrice', | ||
79 | + component: 'Select', | ||
80 | + labelWidth: 150, | ||
81 | + label: '研发复制费合计¥', | ||
82 | + rules: [{ required: true }], | ||
83 | + }, | ||
84 | + { | ||
85 | + field: 'projectStartTime', | ||
86 | + component: 'Select', | ||
87 | + labelWidth: 150, | ||
88 | + label: '项目开始时间', | ||
89 | + rules: [{ required: true }], | ||
90 | + }, | ||
91 | + { | ||
92 | + field: 'projectEndTime', | ||
93 | + component: 'Select', | ||
94 | + labelWidth: 150, | ||
95 | + label: '项目结束时间', | ||
96 | + rules: [{ required: true }], | ||
97 | + }, | ||
98 | + { | ||
99 | + field: 'spainPaidRmbCommission', | ||
100 | + component: 'Select', | ||
101 | + labelWidth: 150, | ||
102 | + label: '西班牙已发提成¥', | ||
103 | + rules: [{ required: true }], | ||
104 | + }, | ||
105 | + { | ||
106 | + field: 'paidRmbCommission', | ||
107 | + component: 'Select', | ||
108 | + labelWidth: 150, | ||
109 | + label: '中国团队已发提成¥', | ||
110 | + rules: [{ required: true }], | ||
111 | + }, | ||
112 | + { | ||
113 | + field: 'actualExchangeRate', | ||
114 | + component: 'Select', | ||
115 | + labelWidth: 150, | ||
116 | + label: '实际汇率¥', | ||
117 | + rules: [{ required: true }], | ||
118 | + }, | ||
119 | + { | ||
120 | + field: 'projectInnerProfitInfoStartTime', | ||
121 | + component: 'Select', | ||
122 | + labelWidth: 150, | ||
123 | + label: '项目开始时间', | ||
124 | + rules: [{ required: true }], | ||
125 | + }, | ||
126 | + { | ||
127 | + field: 'projectInnerProfitInfoEndTime', | ||
128 | + component: 'Select', | ||
129 | + labelWidth: 150, | ||
130 | + label: '项目结束时间', | ||
131 | + rules: [{ required: true }], | ||
132 | + }, | ||
133 | +]; |
src/views/project/finance/financeProfit/ServiceProfit/ServiceProfit/tableData.tsx
@@ -55,26 +55,4 @@ export const FIELDS_BASE_INFO = [ | @@ -55,26 +55,4 @@ export const FIELDS_BASE_INFO = [ | ||
55 | label: '中国团队已发提成¥', | 55 | label: '中国团队已发提成¥', |
56 | rules: [{ required: true }], | 56 | rules: [{ required: true }], |
57 | }, | 57 | }, |
58 | - { | ||
59 | - field: 'actualExchangeRate', | ||
60 | - component: 'Select', | ||
61 | - labelWidth: 150, | ||
62 | - label: '实际汇率¥', | ||
63 | - rules: [{ required: true }], | ||
64 | - }, | ||
65 | - { | ||
66 | - field: 'projectInnerProfitInfoStartTime', | ||
67 | - component: 'Select', | ||
68 | - labelWidth: 150, | ||
69 | - label: '项目开始时间', | ||
70 | - rules: [{ required: true }], | ||
71 | - }, | ||
72 | - { | ||
73 | - field: 'projectInnerProfitInfoEndTime', | ||
74 | - component: 'Select', | ||
75 | - labelWidth: 150, | ||
76 | - label: '项目结束时间', | ||
77 | - rules: [{ required: true }], | ||
78 | - }, | ||
79 | ]; | 58 | ]; |
80 | - |