Commit 2afcb6da4deb2b7ad1344763b94151c131f628b3

Authored by chenhang4442024
1 parent d7d6ffea

fix: 修复审核界面角色权限问题

- 审核界面对不同角色设置不同的可见功能。
src/views/project/approve/index.vue
... ... @@ -4,10 +4,10 @@
4 4 <a-tab-pane key="1" tab="字段待审核" v-if="role !== ROLE.FINANCE">
5 5 <FieldPanel />
6 6 </a-tab-pane>
7   - <a-tab-pane key="3" tab="利润分析待审核" v-if="role !== ROLE.FINANCE">
  7 + <a-tab-pane key="3" tab="利润分析待审核" v-if="role==ROLE.ADMIN || role==ROLE.BUSINESS" >
8 8 <ProfitPanel />
9 9 </a-tab-pane>
10   - <a-tab-pane key="5" tab="项目报告书待审核" v-if="role !== ROLE.FINANCE">
  10 + <a-tab-pane key="5" tab="项目报告书待审核" v-if="role==ROLE.ADMIN || role==ROLE.BUSINESS">
11 11 <ReportPanel />
12 12 </a-tab-pane>
13 13 <a-tab-pane
... ... @@ -15,9 +15,10 @@
15 15 tab="应收款待审核"
16 16 v-if="
17 17 role == ROLE.FINANCE ||
18   - role == ROLE.ADMIN ||
19   - role == ROLE.BUSINESS ||
20   - role == ROLE.TRACKER
  18 + role == ROLE.ADMIN
  19 + // ||
  20 + // role == ROLE.BUSINESS ||
  21 + // role == ROLE.TRACKER
21 22 "
22 23 >
23 24 <ReceivePanel />
... ... @@ -47,10 +48,10 @@
47 48 <a-tab-pane key="2" tab="字段已审核" v-if="role !== ROLE.FINANCE">
48 49 <FieldPanel isApproved />
49 50 </a-tab-pane>
50   - <a-tab-pane key="4" tab="利润分析已审核" v-if="role !== ROLE.FINANCE">
  51 + <a-tab-pane key="4" tab="利润分析已审核" v-if="role==ROLE.ADMIN || role==ROLE.BUSINESS">
51 52 <ProfitPanel isApproved />
52 53 </a-tab-pane>
53   - <a-tab-pane key="6" tab="项目报告书已审核" v-if="role !== ROLE.FINANCE">
  54 + <a-tab-pane key="6" tab="项目报告书已审核" v-if="role==ROLE.ADMIN || role==ROLE.BUSINESS">
54 55 <ReportPanel isApproved />
55 56 </a-tab-pane>
56 57 <a-tab-pane
... ... @@ -58,9 +59,10 @@
58 59 tab="应收款已审核"
59 60 v-if="
60 61 role == ROLE.FINANCE ||
61   - role == ROLE.ADMIN ||
62   - role == ROLE.BUSINESS ||
63   - role == ROLE.TRACKER
  62 + role == ROLE.ADMIN
  63 + // ||
  64 + // role == ROLE.BUSINESS ||
  65 + // role == ROLE.TRACKER
64 66 "
65 67 >
66 68 <ReceivePanel isApproved />
... ...
src/views/project/config/CreateModal.vue
... ... @@ -90,7 +90,7 @@
90 90 },
91 91 {
92 92 field: 'relationValue',
93   - component: 'InputNumber',
  93 + component: props.column === 10 ? 'Input' :'InputNumber',
94 94 label:
95 95 props.column === 1
96 96 ? '利润率'
... ... @@ -100,6 +100,8 @@
100 100 ? '最后回款日期'
101 101 : props.column === 7
102 102 ? '销售额'
  103 + : props.column === 10
  104 + ? '客户公司名称'
103 105 : '生产科回款日期',
104 106 rules: [{ required: true }],
105 107 colProps: {
... ... @@ -147,6 +149,8 @@
147 149 ? 'orderHodTime'
148 150 : props.column === 7
149 151 ? 'salesAmount'
  152 + : props.column === 10
  153 + ? 'companyConfiguration'
150 154 : 'produHodTime',
151 155 relationName: '包装费用',
152 156 relationValue: values.relationValue,
... ...
src/views/project/config/data.tsx
... ... @@ -157,6 +157,20 @@ export const COLUMNS = {
157 157 },
158 158 },
159 159 ],
  160 + 10: [
  161 + {
  162 + title: '客户编码',
  163 + dataIndex: 'settingValue',
  164 + width: 150,
  165 + },
  166 + {
  167 + title: '公司名称',
  168 + dataIndex: 'relationValue',
  169 + width: 150,
  170 + editComponent: 'Input',
  171 + editRow: true,
  172 + },
  173 + ]
160 174 };
161 175  
162 176 export const columns: BasicColumn[] = [
... ...
src/views/project/config/index.vue
... ... @@ -33,6 +33,9 @@
33 33 <Tabs.TabPane key="9" tab="生产科固定成本">
34 34 <TablePanel :searchInfo="{ relationCode: 'ProduceSettingItem' }" :column="9" />
35 35 </Tabs.TabPane>
  36 + <Tabs.TabPane key="10" tab="客户公司" v-if="role !== ROLE.FINANCE">
  37 + <TablePanel :searchInfo="{ relationCode: 'companyConfiguration' }" :column="10" />
  38 + </Tabs.TabPane>
36 39 </Tabs>
37 40 </div>
38 41 </PageWrapper>
... ...