Commit 2afcb6da4deb2b7ad1344763b94151c131f628b3

Authored by chenhang4442024
1 parent d7d6ffea

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

- 审核界面对不同角色设置不同的可见功能。
src/views/project/approve/index.vue
@@ -4,10 +4,10 @@ @@ -4,10 +4,10 @@
4 <a-tab-pane key="1" tab="字段待审核" v-if="role !== ROLE.FINANCE"> 4 <a-tab-pane key="1" tab="字段待审核" v-if="role !== ROLE.FINANCE">
5 <FieldPanel /> 5 <FieldPanel />
6 </a-tab-pane> 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 <ProfitPanel /> 8 <ProfitPanel />
9 </a-tab-pane> 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 <ReportPanel /> 11 <ReportPanel />
12 </a-tab-pane> 12 </a-tab-pane>
13 <a-tab-pane 13 <a-tab-pane
@@ -15,9 +15,10 @@ @@ -15,9 +15,10 @@
15 tab="应收款待审核" 15 tab="应收款待审核"
16 v-if=" 16 v-if="
17 role == ROLE.FINANCE || 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 <ReceivePanel /> 24 <ReceivePanel />
@@ -47,10 +48,10 @@ @@ -47,10 +48,10 @@
47 <a-tab-pane key="2" tab="字段已审核" v-if="role !== ROLE.FINANCE"> 48 <a-tab-pane key="2" tab="字段已审核" v-if="role !== ROLE.FINANCE">
48 <FieldPanel isApproved /> 49 <FieldPanel isApproved />
49 </a-tab-pane> 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 <ProfitPanel isApproved /> 52 <ProfitPanel isApproved />
52 </a-tab-pane> 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 <ReportPanel isApproved /> 55 <ReportPanel isApproved />
55 </a-tab-pane> 56 </a-tab-pane>
56 <a-tab-pane 57 <a-tab-pane
@@ -58,9 +59,10 @@ @@ -58,9 +59,10 @@
58 tab="应收款已审核" 59 tab="应收款已审核"
59 v-if=" 60 v-if="
60 role == ROLE.FINANCE || 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 <ReceivePanel isApproved /> 68 <ReceivePanel isApproved />
src/views/project/config/CreateModal.vue
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 }, 90 },
91 { 91 {
92 field: 'relationValue', 92 field: 'relationValue',
93 - component: 'InputNumber', 93 + component: props.column === 10 ? 'Input' :'InputNumber',
94 label: 94 label:
95 props.column === 1 95 props.column === 1
96 ? '利润率' 96 ? '利润率'
@@ -100,6 +100,8 @@ @@ -100,6 +100,8 @@
100 ? '最后回款日期' 100 ? '最后回款日期'
101 : props.column === 7 101 : props.column === 7
102 ? '销售额' 102 ? '销售额'
  103 + : props.column === 10
  104 + ? '客户公司名称'
103 : '生产科回款日期', 105 : '生产科回款日期',
104 rules: [{ required: true }], 106 rules: [{ required: true }],
105 colProps: { 107 colProps: {
@@ -147,6 +149,8 @@ @@ -147,6 +149,8 @@
147 ? 'orderHodTime' 149 ? 'orderHodTime'
148 : props.column === 7 150 : props.column === 7
149 ? 'salesAmount' 151 ? 'salesAmount'
  152 + : props.column === 10
  153 + ? 'companyConfiguration'
150 : 'produHodTime', 154 : 'produHodTime',
151 relationName: '包装费用', 155 relationName: '包装费用',
152 relationValue: values.relationValue, 156 relationValue: values.relationValue,
src/views/project/config/data.tsx
@@ -157,6 +157,20 @@ export const COLUMNS = { @@ -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 export const columns: BasicColumn[] = [ 176 export const columns: BasicColumn[] = [
src/views/project/config/index.vue
@@ -33,6 +33,9 @@ @@ -33,6 +33,9 @@
33 <Tabs.TabPane key="9" tab="生产科固定成本"> 33 <Tabs.TabPane key="9" tab="生产科固定成本">
34 <TablePanel :searchInfo="{ relationCode: 'ProduceSettingItem' }" :column="9" /> 34 <TablePanel :searchInfo="{ relationCode: 'ProduceSettingItem' }" :column="9" />
35 </Tabs.TabPane> 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 </Tabs> 39 </Tabs>
37 </div> 40 </div>
38 </PageWrapper> 41 </PageWrapper>