Skip to content

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

bug

parent 94019537
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 39 deletions
src/components/Addform/index.jsx
View file @ 48c141f9
......@@ -3,7 +3,7 @@ import InitForm from '@/components/InitForm';
import { message } from 'antd';
import { doFetch } from '@/utils/doFetch';
const App = ({ url, actionRef, setdrawer,drawer }) => {
const App = ({ url, actionRef, setdrawer, drawer }) => {
const columns = [
{
title: '选择设备',
......
src/components/RepaireDetail/DesItem.jsx
View file @ 48c141f9
......@@ -5,6 +5,7 @@ import { Divider, Image, Collapse } from 'antd';
const { Panel } = Collapse;
export default ({ index, title, dataSource, columns, hidden, navhidden = false, type }) => {
console.log(type);
const [flag, setflag] = useState(true);
// 0：报修 1：接单 2：派单 3：完成维修 4：转追踪 5：转外协 6：转单 7：退单 8：追踪审核 9：外协审核 10：退单审核 11：效果验证
const columns_mes = {
......@@ -104,6 +105,45 @@ export default ({ index, title, dataSource, columns, hidden, navhidden = false,
},
},
],
gzxx_nouser: [
{
title: '是否停机',
dataIndex: 'isShutdown',
key: 'isShutdown',
render: (text, row, _, action) => {
return row?.isShutdown == '1' ? '是' : '否';
},
},
{
title: '故障类型',
dataIndex: 'faultType',
key: 'faultType',
},
{
title: '故障名称',
dataIndex: 'faultDetailName',
key: 'faultDetailName',
},
{
title: '故障描述',
dataIndex: 'faultDescription',
key: 'faultDescription',
},
{
title: '故障图片',
dataIndex: 'pictureUrl',
key: 'pictureUrl',
render: (text, row, _, action) => {
if (row?.picList?.length > 0) {
return row?.picList.map((it) => (
<Image width={80} src={it?.url} style={{ padding: 8 }} />
));
} else {
return '暂无';
}
},
},
],
},
columns_wxgd = {
1: [
......@@ -539,7 +579,11 @@ export default ({ index, title, dataSource, columns, hidden, navhidden = false,
<Divider orientation="left">设备信息</Divider>
<ProDescriptions dataSource={dataSource?.equipment} columns={columns_mes.sbxx} />
<Divider orientation="left">故障信息</Divider>
<ProDescriptions dataSource={dataSource} columns={columns_mes['gzxx']} />
{type == 'wgd' ? (
<ProDescriptions dataSource={dataSource} columns={columns_mes['gzxx_nouser']} />
) : (
<ProDescriptions dataSource={dataSource} columns={columns_mes['gzxx']} />
)}
</div>
) : (
<div className="fault-detail">
......@@ -563,7 +607,11 @@ export default ({ index, title, dataSource, columns, hidden, navhidden = false,
columns={columns_mes['sbxx']}
/>
<Divider orientation="left">故障信息</Divider>
<ProDescriptions dataSource={dataSource} columns={columns_mes['gzxx']} />
{type == 'zzgd' ? (
<ProDescriptions dataSource={dataSource} columns={columns_mes['gzxx_nouser']} />
) : (
<ProDescriptions dataSource={dataSource} columns={columns_mes['gzxx']} />
)}
</div>
</div>
)
......
src/components/RepaireDetail/Detail.jsx
View file @ 48c141f9
......@@ -52,6 +52,7 @@ export default (props) => {
dataSource={request?.data?.dataList[0]}
title="基本信息"
hidden={true}
type="zzgd"
index="0"
// navhidden={false}
/>
......@@ -107,6 +108,7 @@ export default (props) => {
<DesItem
dataSource={request?.data?.dataList[0]}
title="基本信息"
type="zzgd"
hidden={true}
index="0"
// navhidden={false}
......@@ -135,6 +137,7 @@ export default (props) => {
dataSource={request?.data?.dataList[0]}
title="基本信息"
hidden={true}
type="wgd"
index="0"
navhidden={true}
/>
......
src/global.less
View file @ 48c141f9
......@@ -523,4 +523,12 @@ ol {
.runtime-keep-alive-layout aside {
z-index: 1;
}
main {
>div:first-child {
ul {
z-index: 99999 !important;
}
}
}
\ No newline at end of file
src/pages/maintain/orders/index.jsx
View file @ 48c141f9
......@@ -99,6 +99,7 @@ function Orders(props) {
const order = (text, row, _, action) => {
return (
<PremButton
access="umMaintainTask:orderReceiving"
pop={{
title: '是否接单?',
okText: '确认',
......@@ -121,6 +122,7 @@ function Orders(props) {
const close = (text, row, _, action) => {
return (
<PremButton
access="umMaintainTask:customsDeclaration"
pop={{
title: '是否关单?',
okText: '确认',
......
src/pages/maintain/plan/columns.js
View file @ 48c141f9
......@@ -563,9 +563,9 @@ function getcolumns(setdrawer) {
enabledetail: true,
add: '/maintain/umMaintainPlan/save',
edit: '/maintain/umMaintainPlan/save',
list: '/maintain/umMaintainPlan/queryList',
list: '/maintain/umMaintainPlanHis/queryList',
delete: '/maintain/umMaintainPlan/deleteById',
detail: '/maintain/umMaintainPlan/queryById',
detail: '/maintain/umMaintainPlanHis/queryById',
},
},
];
......
src/pages/maintain/plan/index.jsx
View file @ 48c141f9
......@@ -2,7 +2,7 @@
* @Author: Li Hanlin
* @Date: 2023-01-16 15:35:00
* @Last Modified by: Li Hanlin
* @Last Modified time: 2023-01-19 09:41:53
* @Last Modified time: 2023-02-01 11:00:50
*/
import * as React from 'react';
......@@ -632,11 +632,16 @@ function Plan(props) {
delete vals.maintainFrequency;
if (drawer?.from == 'tq') {
vals.isStopFlag = 1;
await runAsync({
url: '/maintain/umMaintainPlan/enableDeactivate',
params: { ...vals, id: drawer?.item?.id },
});
} else {
await runAsync({
url: '/maintain/umMaintainPlan/adjustDate',
params: { ...vals, id: drawer?.item?.id },
});
}
await runAsync({
url: '/maintain/umMaintainPlan/enableDeactivate',
params: { ...vals, id: drawer?.item?.id },
});
}}
/>
</DrawerPro>
......
src/pages/maintain/workOrder/index.jsx
View file @ 48c141f9
......@@ -2,7 +2,7 @@
* @Author: Li Hanlin
* @Date: 2023-01-19 09:53:59
* @Last Modified by: Li Hanlin
* @Last Modified time: 2023-01-30 16:18:16
* @Last Modified time: 2023-02-01 14:36:50
*/
import * as React from 'react';
......
src/pages/repair/order/index.jsx
View file @ 48c141f9
......@@ -3,7 +3,7 @@
* @Author: Li Hanlin
* @Date: 2022-12-02 11:41:03
* @Last Modified by: Li Hanlin
* @Last Modified time: 2023-01-31 17:43:42
* @Last Modified time: 2023-02-01 14:33:41
*/
import * as React from 'react';
......@@ -249,7 +249,7 @@ function Failure(props) {
...s,
open: true,
type: 'zzsh',
item: row,
item: { ...row, resultFlag: '1' },
val: 'only',
title: '追踪审核',
}));
......@@ -274,7 +274,7 @@ function Failure(props) {
...s,
open: true,
type: 'wxsh',
item: row,
item: { ...row, resultFlag: '1' },
val: 'only',
title: '外协审核',
}));
......@@ -299,7 +299,7 @@ function Failure(props) {
...s,
open: true,
type: 'tdsh',
item: row,
item: { ...row, resultFlag: '1' },
val: 'only',
title: '退单审核',
}));
......@@ -781,6 +781,21 @@ function Failure(props) {
<InitForm
defaultFormValue={drawer?.item}
fields={columns}
onValuesChange={(changedValues, allValues) => {
//console.log(changedValues, allValues);
if (Object.keys(changedValues)[0] == 'faultDetailId') {
doFetch({
url: '/repair/umFaultSettingDetail/queryById',
params: {
id: changedValues?.faultDetailId,
},
}).then((res) => {
formRef?.current?.setFieldsValue({
repairContent: res?.data?.data.faultSolution,
});
});
}
}}
onFinish={async (vals) => {
let params = {
repairComplete: {
......@@ -791,8 +806,8 @@ function Failure(props) {
isShutdown: vals.isShutdown,
repairContent: vals.repairContent,
},
id: drawer?.item.id,
repairAssistList: vals?.repairAssistList,
};
let res = await doFetch({
url: '/repair/umRepairOrder/completeRepair',
......@@ -1188,7 +1203,7 @@ function Failure(props) {
]}
onFinish={async (vals) => {
let params = {
repairProcess: { reviewerResult: vals.reviewerResult },
repairProcess: { reviewerResult: '', remark: vals?.remark },
resultFlag: vals.resultFlag,
id: drawer?.item.id,
};
......@@ -1268,7 +1283,7 @@ function Failure(props) {
]}
onFinish={async (vals) => {
let params = {
repairProcess: { reviewerResult: vals.reviewerResult },
repairProcess: { reviewerResult: '', remark: vals?.remark },
resultFlag: vals.resultFlag,
id: drawer?.item.id,
};
......@@ -1348,7 +1363,7 @@ function Failure(props) {
]}
onFinish={async (vals) => {
let params = {
repairProcess: { reviewerResult: vals.reason, remark: vals?.reason },
repairProcess: { reviewerResult: '', remark: vals?.remark },
resultFlag: vals.resultFlag,
id: drawer?.item.id,
};
......
src/pages/repair/outsourcing/index.jsx
View file @ 48c141f9
......@@ -3,7 +3,7 @@
* @Author: Li Hanlin
* @Date: 2022-12-02 11:41:03
* @Last Modified by: Li Hanlin
* @Last Modified time: 2023-02-01 09:36:58
* @Last Modified time: 2023-02-01 11:20:41
*/
import * as React from 'react';
......@@ -156,6 +156,7 @@ function Failure(props) {
return (
<>
<InitForm
defaultFormValue={drawer?.item}
fields={[
{
title: '最新外协人员',
......@@ -393,6 +394,7 @@ function Failure(props) {
title: '重新指派',
type: 'Reassig',
open: true,
val: 'only',
}));
},
}}
......
src/pages/repair/platform/index.jsx
View file @ 48c141f9
......@@ -3,7 +3,7 @@
* @Author: Li Hanlin
* @Date: 2022-12-05 10:13:42
* @Last Modified by: Li Hanlin
* @Last Modified time: 2023-01-30 11:15:44
* @Last Modified time: 2023-02-01 14:00:27
*/
import * as React from 'react';
......
src/pages/repair/track/index.jsx
View file @ 48c141f9
......@@ -3,7 +3,7 @@
* @Author: Li Hanlin
* @Date: 2022-12-02 11:41:03
* @Last Modified by: Li Hanlin
* @Last Modified time: 2023-02-01 09:34:49
* @Last Modified time: 2023-02-01 14:02:32
*/
import * as React from 'react';
......@@ -18,6 +18,8 @@ import Addform from '@/components/Addform';
import { Menu, Dropdown, Button, message } from 'antd';
import InitForm from '@/components/InitForm';
import Detail from '@/components/RepaireDetail/Detail';
import OrderHandle from '../platform/RepairOrderHandle';
function Failure(props) {
const actionRef = useRef(),
containderef = useRef(),
......@@ -102,7 +104,6 @@ function Failure(props) {
actionRef.current.reload();
}
}}
defaultFormValue={drawer?.item}
{...drawer}
/>
</>
......@@ -309,6 +310,19 @@ function Failure(props) {
);
};
// 派单
const Disp = () => {
return (
<OrderHandle
type="zzpd"
id={drawer?.item.id}
actionRef={actionRef}
url="/repair/umTrackOrder/dispatchById"
setdrawer={setdrawer}
/>
);
};
const remove = (text, row, _, action) => {
return (
<PremButton
......@@ -338,6 +352,7 @@ function Failure(props) {
{
label: (
<PremButton
access="umTrackOrder:orderReceiving"
btn={{
onClick: async () => {
let params = {
......@@ -370,23 +385,17 @@ function Failure(props) {
{
label: (
<PremButton
// access="umTrackOrder:dispatchById"
btn={{
onClick: async () => {
let params = {
id: row?.id,
};
let res = await doFetch({
url: '/repair/umTrackOrder/dispatchById',
params,
});
if (res.code === '0000') {
message.success('派单成功！');
setdrawer((s) => ({
...s,
open: false,
}));
actionRef.current.reload();
}
onClick: () => {
setdrawer((s) => ({
...s,
open: true,
type: 'pd',
item: row,
val: 'only',
title: '派单',
}));
},
}}
>
......@@ -402,6 +411,7 @@ function Failure(props) {
{
label: (
<PremButton
access="umTrackOrder:trackById"
btn={{
onClick: () => {
setdrawer((s) => ({
......@@ -433,6 +443,7 @@ function Failure(props) {
{
label: (
<PremButton
access="umTrackOrder:verification"
btn={{
onClick: () => {
setdrawer((s) => ({
......@@ -649,6 +660,8 @@ function Failure(props) {
);
case 'track':
return <TrackForm />;
case 'pd':
return <Disp />;
case 'check':
return <CheckForm />;
case 'Reassig':
......
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