Skip to content

E
ems3.3
Commit a1f5b176 authored by TZW's avatar TZW
Browse files
Options

1111

parent 3e004033
Show whitespace changes
Inline Side-by-side
Showing with 474 additions and 432 deletions
src/components/InitForm/Diyrule/index.jsx
View file @ a1f5b176
...@@ -19,6 +19,7 @@ import moment from 'moment'; ...@@ -19,6 +19,7 @@ import moment from 'moment';
let Diyrule = (props) => { let Diyrule = (props) => {
let { onChange } = props; let { onChange } = props;
let defval = props?.value ?? {}; let defval = props?.value ?? {};
console.log(defval);
let value = defval?.value || [], let value = defval?.value || [],
other = useMemo(() => { other = useMemo(() => {
return ( return (
...@@ -522,7 +523,6 @@ let Diyrule = (props) => { ...@@ -522,7 +523,6 @@ let Diyrule = (props) => {
value: i + 1, value: i + 1,
}))} }))}
onChange={(val) => { onChange={(val) => {
console.log('改变的val', val);
onChange({ onChange({
value: value, value: value,
other: { other: {
......
src/pages/repair/order/index.jsx
View file @ a1f5b176
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Author: Li Hanlin * @Author: Li Hanlin
* @Date: 2022-12-02 11:41:03 * @Date: 2022-12-02 11:41:03
* @Last Modified by: Li Hanlin * @Last Modified by: Li Hanlin
* @Last Modified time: 2023-01-29 15:38:13 * @Last Modified time: 2023-01-30 10:13:54
*/ */
import * as React from 'react'; import * as React from 'react';
...@@ -126,29 +126,8 @@ function Failure(props) { ...@@ -126,29 +126,8 @@ function Failure(props) {
if (drawer?.SpecName?.businessData !== '2') { if (drawer?.SpecName?.businessData !== '2') {
// 接单模式 // 接单模式
console.log(1); console.log(1);
if (row?.status == '2') {
menulist = [ menulist = [
{
label: (
<PremButton
access="umRepairOrder_dispatchById"
btn={{
onClick: () => {
setdrawer((s) => ({
...s,
open: true,
type: 'jd',
item: row,
val: 'only',
title: '接单',
}));
},
}}
>
接单
</PremButton>
),
key: '0',
},
{ {
label: ( label: (
<PremButton <PremButton
...@@ -257,97 +236,108 @@ function Failure(props) { ...@@ -257,97 +236,108 @@ function Failure(props) {
), ),
key: '5', key: '5',
}, },
];
} else if (row?.status == '6') {
menulist = [
{ {
label: ( label: (
<PremButton <PremButton
access="umRepairOrder_completeRepairValidate" access="umRepairOrder_transferTrackingAudit"
btn={{ btn={{
onClick: () => { onClick: () => {
setdrawer((s) => ({ setdrawer((s) => ({
...s, ...s,
open: true, open: true,
type: 'xgyz', type: 'zzsh',
item: row, item: row,
val: 'only', val: 'only',
title: '效果验证', title: '追踪审核',
})); }));
}, },
}} }}
> >
效果验证 追踪审核
</PremButton> </PremButton>
), ),
key: '6', key: '7',
}, },
];
} else if (row?.status == '4') {
menulist = [
{ {
label: ( label: (
<PremButton <PremButton
access="umRepairOrder_transferTrackingAudit" access="umRepairOrder_transferAudit"
btn={{ btn={{
onClick: () => { onClick: () => {
setdrawer((s) => ({ setdrawer((s) => ({
...s, ...s,
open: true, open: true,
type: 'zzsh', type: 'wxsh',
item: row, item: row,
val: 'only', val: 'only',
title: '追踪审核', title: '外协审核',
})); }));
}, },
}} }}
> >
追踪审核 外协审核
</PremButton> </PremButton>
), ),
key: '7', key: '8',
}, },
];
} else if (row?.status == '7') {
menulist = [
{ {
label: ( label: (
<PremButton <PremButton
access="umRepairOrder_transferAudit" access="umRepairOrder_chargebackAudit"
btn={{ btn={{
onClick: () => { onClick: () => {
setdrawer((s) => ({ setdrawer((s) => ({
...s, ...s,
open: true, open: true,
type: 'wxsh', type: 'tdsh',
item: row, item: row,
val: 'only', val: 'only',
title: '外协审核', title: '退单审核',
})); }));
}, },
}} }}
> >
外协审核 退单审核
</PremButton> </PremButton>
), ),
key: '8', key: '9',
}, },
];
} else if (row?.status == '3') {
menulist = [
{ {
label: ( label: (
<PremButton <PremButton
access="umRepairOrder_chargebackAudit" access="umRepairOrder_completeRepairValidate"
btn={{ btn={{
onClick: () => { onClick: () => {
setdrawer((s) => ({ setdrawer((s) => ({
...s, ...s,
open: true, open: true,
type: 'tdsh', type: 'xgyz',
item: row, item: row,
val: 'only', val: 'only',
title: '退单审核', title: '效果验证',
})); }));
}, },
}} }}
> >
退单审核 效果验证
</PremButton> </PremButton>
), ),
key: '9', key: '6',
}, },
]; ];
} else { } else {
console.log(2);
menulist = [ menulist = [
{ {
label: ( label: (
...@@ -358,19 +348,25 @@ function Failure(props) { ...@@ -358,19 +348,25 @@ function Failure(props) {
setdrawer((s) => ({ setdrawer((s) => ({
...s, ...s,
open: true, open: true,
type: 'pd', type: 'jd',
item: row, item: row,
val: 'only', val: 'only',
title: '派单', title: '接单',
})); }));
}, },
}} }}
> >
派单 接单
</PremButton> </PremButton>
), ),
key: '0', key: '0',
}, },
];
}
} else {
console.log(2);
if (row?.status == '2') {
menulist = [
{ {
label: ( label: (
<PremButton <PremButton
...@@ -479,95 +475,133 @@ function Failure(props) { ...@@ -479,95 +475,133 @@ function Failure(props) {
), ),
key: '5', key: '5',
}, },
];
} else if (row?.status == '6') {
menulist = [
{ {
label: ( label: (
<PremButton <PremButton
access="umRepairOrder_completeRepairValidate" access="umRepairOrder_transferTrackingAudit"
btn={{ btn={{
onClick: () => { onClick: () => {
setdrawer((s) => ({ setdrawer((s) => ({
...s, ...s,
open: true, open: true,
type: 'xgyz', type: 'zzsh',
item: row, item: row,
val: 'only', val: 'only',
title: '效果验证', title: '追踪审核',
})); }));
}, },
}} }}
> >
效果验证 追踪审核
</PremButton> </PremButton>
), ),
key: '6', key: '7',
}, },
];
} else if (row?.status == '4') {
menulist = [
{ {
label: ( label: (
<PremButton <PremButton
access="umRepairOrder_transferTrackingAudit" access="umRepairOrder_transferAudit"
btn={{ btn={{
onClick: () => { onClick: () => {
setdrawer((s) => ({ setdrawer((s) => ({
...s, ...s,
open: true, open: true,
type: 'zzsh', type: 'wxsh',
item: row, item: row,
val: 'only', val: 'only',
title: '追踪审核', title: '外协审核',
})); }));
}, },
}} }}
> >
追踪审核 外协审核
</PremButton> </PremButton>
), ),
key: '7', key: '8',
}, },
];
} else if (row?.status == '7') {
menulist = [
{ {
label: ( label: (
<PremButton <PremButton
access="umRepairOrder_transferAudit" access="umRepairOrder_chargebackAudit"
btn={{ btn={{
onClick: () => { onClick: () => {
setdrawer((s) => ({ setdrawer((s) => ({
...s, ...s,
open: true, open: true,
type: 'wxsh', type: 'tdsh',
item: row, item: row,
val: 'only', val: 'only',
title: '外协审核', title: '退单审核',
})); }));
}, },
}} }}
> >
外协审核 退单审核
</PremButton> </PremButton>
), ),
key: '8', key: '9',
}, },
];
} else if (row?.status == '3') {
menulist = [
{ {
label: ( label: (
<PremButton <PremButton
access="umRepairOrder_chargebackAudit" access="umRepairOrder_completeRepairValidate"
btn={{ btn={{
onClick: () => { onClick: () => {
setdrawer((s) => ({ setdrawer((s) => ({
...s, ...s,
open: true, open: true,
type: 'tdsh', type: 'xgyz',
item: row, item: row,
val: 'only', val: 'only',
title: '退单审核', title: '效果验证',
})); }));
}, },
}} }}
> >
退单审核 效果验证
</PremButton> </PremButton>
), ),
key: '9', key: '6',
}, },
]; ];
} else {
menulist = [
{
label: (
<PremButton
access="umRepairOrder_dispatchById"
btn={{
onClick: () => {
setdrawer((s) => ({
...s,
open: true,
type: 'pd',
item: row,
val: 'only',
title: '派单',
}));
},
}}
>
派单
</PremButton>
),
key: '0',
},
];
}
} }
const menu = <Menu items={menulist} />; const menu = <Menu items={menulist} />;
......
src/pages/system/rules/index.jsx
View file @ a1f5b176
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: Li Hanlin * @Author: Li Hanlin
* @Date: 2022-11-09 14:44:44 * @Date: 2022-11-09 14:44:44
* @Last Modified by: Li Hanlin * @Last Modified by: Li Hanlin
* @Last Modified time: 2023-01-19 09:43:42 * @Last Modified time: 2023-01-30 10:30:44
*/ */
import * as React from 'react'; import * as React from 'react';
...@@ -66,6 +66,7 @@ function Rules(props) { ...@@ -66,6 +66,7 @@ function Rules(props) {
title: '编辑', title: '编辑',
val: 'edit', val: 'edit',
onFinish: async (vals) => { onFinish: async (vals) => {
console.log(vals);
vals.nrList.other = _.pick(vals.nrList.other, [ vals.nrList.other = _.pick(vals.nrList.other, [
'formatType', 'formatType',
'increaseList', 'increaseList',
...@@ -73,7 +74,14 @@ function Rules(props) { ...@@ -73,7 +74,14 @@ function Rules(props) {
'sort', 'sort',
]); ]);
vals.nrList.value = vals.nrList.value.map((it) => { vals.nrList.value = vals.nrList.value.map((it) => {
return _.pick(it, ['id', 'noContent', 'noRuleCode', 'sort', 'paramList']); return _.pick(it, [
'formatType',
'id',
'noContent',
'noRuleCode',
'sort',
'paramList',
]);
}); });
let params = { ...vals }; let params = { ...vals };
params.nrList = []; params.nrList = [];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment