FEV2 / fw-cms

Commit a4170e3e0e152908a6689aaa40daeef7314fb214

Authored by 杜志良
2 parents 2a146610 4074c583

Merge branch 'master' into d-cas

Inline Side-by-side
Showing 3 changed files with 22 additions and 10 deletions
src/common/api.ts
  View file @a4170e3
... ... @@ -213,6 +213,16 @@ export function queryShopBizType(): http.PromiseResp<CommonApi.ShopRpTypeVO[]> {
213 213 return request.get(`${OOP_HOST}/select/shopBizType`);
214 214 }
215 215  
  216 +export interface GetReimburseRpTypesReq {
  217 + businessTypes?: string
  218 +}
  219 +/**
  220 + * 报销款项列表
  221 + */
  222 +export function getReimburseRpTypes(params: GetReimburseRpTypesReq): http.PromiseResp<CommonApi.RPTypeVO[]> {
  223 + return request.get(`${FINANCE2_HOST}/common/reimburseRpTypes`, { params });
  224 +}
  225 +
216 226 /**
217 227 * 批量获取角色所在角色组信息
218 228 * @param params 角色编码，多个角色英文逗号分割
... ...
src/pages/approval/ApprovalSetting/subpages/components/DefaultFlowNewOrEdit.tsx
  View file @a4170e3
... ... @@ -85,7 +85,8 @@ export default function DefaultSettingNewOrEdit(props: Props) {
85 85 // idOrCode to idOrCode__bizType
86 86 newCondVals.forEach((n) => {
87 87 if (n.flowTriggerDto.type === TriggerType.门店) {
88   - const value = JSON.parse(n.value).map((i: FlowSetting.CondValItem) => ({
  88 + // 注意 || 和 ?? 的区别
  89 + const value = JSON.parse(n.value || '[]').map((i: FlowSetting.CondValItem) => ({
89 90 idOrCode: `${i.idOrCode}__${i.bizType}`,
90 91 name: i.name,
91 92 bizType: i.bizType,
... ... @@ -120,7 +121,7 @@ export default function DefaultSettingNewOrEdit(props: Props) {
120 121 const bizTypeSet = new Set<number>();
121 122 shopCondVals.forEach((s) => {
122 123 try {
123   - const options = JSON.parse(s.value);
  124 + const options = JSON.parse(s.value || '[]');
124 125 options.forEach((o: FlowSetting.CondValItem) => {
125 126 bizTypeSet.add(o.bizType!);
126 127 });
... ... @@ -135,7 +136,7 @@ export default function DefaultSettingNewOrEdit(props: Props) {
135 136 const bizTypeSet = new Set<number>();
136 137 shopCondVals.forEach((s) => {
137 138 try {
138   - const options = JSON.parse(s.value);
  139 + const options = JSON.parse(s.value || '[]');
139 140 options.forEach((o: FlowSetting.CondValItem) => {
140 141 bizTypeSet.add(o.bizType!);
141 142 });
... ... @@ -162,7 +163,7 @@ export default function DefaultSettingNewOrEdit(props: Props) {
162 163 // idOrCode__bizType to idOrCode
163 164 conditionVals.forEach((n) => {
164 165 if (n.flowTriggerDto.type === TriggerType.门店) {
165   - const value = JSON.parse(n.value).map((i: FlowSetting.CondValItem) => ({
  166 + const value = JSON.parse(n.value || '[]').map((i: FlowSetting.CondValItem) => ({
166 167 idOrCode: i.idOrCode.split('__')[0]!,
167 168 name: i.name,
168 169 bizType: i.bizType,
... ... @@ -347,7 +348,7 @@ export default function DefaultSettingNewOrEdit(props: Props) {
347 348 conditionVals.forEach((c) => {
348 349 const { flowTriggerDto: fd, value: v } = c;
349 350 const { type: t } = fd ?? {}; // 触发条件信息
350   - const oData = JSON.parse(v || '{}');
  351 + const oData = JSON.parse(v || '[]');
351 352 if (t === TriggerType.报销类型) {
352 353 rpTypes = oData.length > 0 ? oData.map((i: ApprovalSetting.CondValItem) => i.idOrCode) : [];
353 354 } else {
... ...
src/pages/approval/FlowSetting/subpages/ConditionSetting/components/CustomFlowNewOrEdit.tsx
  View file @a4170e3
... ... @@ -102,7 +102,8 @@ export default function CustomFlowNewOrEdit(props: Props) {
102 102 // idOrCode to idOrCode__bizType
103 103 newCondVals.forEach((n) => {
104 104 if (n.flowTriggerDto.type === TriggerType.门店) {
105   - const value = JSON.parse(n.value).map((i: FlowSetting.CondValItem) => ({
  105 + // 注意 || 和 ?? 的区别
  106 + const value = JSON.parse(n.value || '[]').map((i: FlowSetting.CondValItem) => ({
106 107 idOrCode: `${i.idOrCode}__${i.bizType}`,
107 108 name: i.name,
108 109 bizType: i.bizType,
... ... @@ -138,7 +139,7 @@ export default function CustomFlowNewOrEdit(props: Props) {
138 139 const bizTypeSet = new Set<number>();
139 140 shopCondVals.forEach((s) => {
140 141 try {
141   - const options = JSON.parse(s.value);
  142 + const options = JSON.parse(s.value || '[]');
142 143 options.forEach((o: FlowSetting.CondValItem) => {
143 144 bizTypeSet.add(o.bizType!);
144 145 });
... ... @@ -153,7 +154,7 @@ export default function CustomFlowNewOrEdit(props: Props) {
153 154 const bizTypeSet = new Set<number>();
154 155 shopCondVals.forEach((s) => {
155 156 try {
156   - const options = JSON.parse(s.value);
  157 + const options = JSON.parse(s.value || '[]');
157 158 options.forEach((o: FlowSetting.CondValItem) => {
158 159 bizTypeSet.add(o.bizType!);
159 160 });
... ... @@ -181,7 +182,7 @@ export default function CustomFlowNewOrEdit(props: Props) {
181 182 // idOrCode__bizType to idOrCode
182 183 conditionVals.forEach((n) => {
183 184 if (n.flowTriggerDto.type === TriggerType.门店) {
184   - const value = JSON.parse(n.value).map((i: FlowSetting.CondValItem) => ({
  185 + const value = JSON.parse(n.value || '[]').map((i: FlowSetting.CondValItem) => ({
185 186 idOrCode: i.idOrCode.split('__')[0]!,
186 187 name: i.name,
187 188 bizType: i.bizType,
... ... @@ -360,7 +361,7 @@ export default function CustomFlowNewOrEdit(props: Props) {
360 361 conditionVals.forEach((c) => {
361 362 const { flowTriggerDto: fd, value: v } = c;
362 363 const { type: t } = fd ?? {}; // 触发条件信息
363   - const oData = JSON.parse(v || '{}');
  364 + const oData = JSON.parse(v || '[]');
364 365 if (t === TriggerType.报销类型) {
365 366 rpTypes = oData.length > 0 ? oData.map((i: FlowSetting.CondValItem) => i.idOrCode) : [];
366 367 } else {
... ...