Skip to content

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

1222

parent 36c434a1
Hide whitespace changes
Inline Side-by-side
Showing with 206 additions and 35 deletions
src/components/Addform/index.jsx
View file @ cb0aceb6
......@@ -3,7 +3,7 @@ import InitForm from '@/components/InitForm';
import { message } from 'antd';
import { doFetch } from '@/utils/doFetch';
const App = ({ url, actionRef, setdrawer }) => {
const App = ({ url, actionRef, setdrawer,drawer }) => {
const columns = [
{
title: '选择设备',
......@@ -108,6 +108,7 @@ const App = ({ url, actionRef, setdrawer }) => {
<InitForm
formRef={formRef}
fields={columns}
defaultFormValue={drawer?.item}
onValuesChange={(changedValues, allValues) => {
//console.log(changedValues, allValues);
if (Object.keys(changedValues)[0] == 'faultDetailId') {
......
src/components/RepaireDetail/DesItem.jsx
View file @ cb0aceb6
......@@ -6,7 +6,7 @@ const { Panel } = Collapse;
export default ({ index, title, dataSource, columns, hidden, navhidden = false, type }) => {
const [flag, setflag] = useState(true);
console.log(dataSource);
console.log(index, dataSource);
// 0：报修 1：接单 2：派单 3：完成维修 4：转追踪 5：转外协 6：转单 7：退单 8：追踪审核 9：外协审核 10：退单审核 11：效果验证
const columns_mes = {
......@@ -96,8 +96,10 @@ export default ({ index, title, dataSource, columns, hidden, navhidden = false,
dataIndex: 'pictureUrl',
key: 'pictureUrl',
render: (text, row, _, action) => {
if (row?.pictureUrl) {
return <Image width={70} src={row.pictureUrl} />;
if (row?.picList?.length > 0) {
return row?.picList.map((it) => (
<Image width={80} src={it?.url} style={{ padding: 8 }} />
));
} else {
return '暂无';
}
......@@ -575,7 +577,6 @@ export default ({ index, title, dataSource, columns, hidden, navhidden = false,
dataSource={dataSource}
columns={columns_wxgd[dataSource?.operationType]}
/>
<ProDescriptions dataSource={dataSource} columns={columns_mes['gzxx']} />
</div>
</div>
</div>
......@@ -625,7 +626,7 @@ export default ({ index, title, dataSource, columns, hidden, navhidden = false,
<h2 className="page-title">{title}</h2>
</div>
<Divider orientation="left">设备信息</Divider>
<ProDescriptions dataSource={dataSource?.equipment} columns={columns_mes['sbxx']} />
<ProDescriptions dataSource={dataSource?.equipment} columns={columns_mes.sbxx} />
<Divider orientation="left">故障信息</Divider>
<ProDescriptions dataSource={dataSource} columns={columns_mes['gzxx']} />
</div>
......@@ -647,14 +648,11 @@ export default ({ index, title, dataSource, columns, hidden, navhidden = false,
</div>
<Divider orientation="left">设备信息</Divider>
<ProDescriptions
dataSource={dataSource?.umTrackOrder}
dataSource={dataSource?.equipment}
columns={columns_mes['sbxx']}
/>
<Divider orientation="left">故障信息</Divider>
<ProDescriptions
dataSource={dataSource?.umTrackOrder?.equipment}
columns={columns_mes['gzxx']}
/>
<ProDescriptions dataSource={dataSource} columns={columns_mes['gzxx']} />
</div>
</div>
)
......
src/pages/repair/failure/index.jsx
View file @ cb0aceb6
......@@ -2,7 +2,7 @@
* @Author: Li Hanlin
* @Date: 2022-12-02 11:41:03
* @Last Modified by: Li Hanlin
* @Last Modified time: 2022-12-13 16:07:17
* @Last Modified time: 2022-12-22 15:18:07
*/
import * as React from 'react';
......@@ -162,7 +162,12 @@ function Failure(props) {
switch (type) {
case 'add':
return (
<Addform url="/repair/umFailureRepair/save" actionRef={actionRef} setdrawer={setdrawer} />
<Addform
url="/repair/umFailureRepair/save"
actionRef={actionRef}
setdrawer={setdrawer}
drawer={drawer}
/>
);
case 'detail':
return (
......@@ -198,7 +203,7 @@ function Failure(props) {
setdrawer((s) => ({
...s,
open: true,
item: null,
item: { isShutdown: 1 },
title: '新增',
val: 'only',
type: 'add',
......
src/pages/repair/order/index.jsx
View file @ cb0aceb6
......@@ -2,7 +2,7 @@
* @Author: Li Hanlin
* @Date: 2022-12-02 11:41:03
* @Last Modified by: Li Hanlin
* @Last Modified time: 2022-12-12 20:07:04
* @Last Modified time: 2022-12-22 15:54:06
*/
import * as React from 'react';
......
src/pages/repair/platform/columns.js
View file @ cb0aceb6
......@@ -8,6 +8,25 @@ function getcolumns(setdrawer) {
title: '维修单号',
dataIndex: 'repairOrderNo',
key: 'repairOrderNo',
render: (text, row, _, action) => {
return (
<a
onClick={() => {
setdrawer((s) => ({
...s,
open: true,
title: '详情',
val: 'only',
type: 'detail_wxgd',
title: '详细信息',
item: row,
}));
}}
>
{row?.repairOrderNo}
</a>
);
},
},
{
title: '设备编号',
......@@ -66,6 +85,25 @@ function getcolumns(setdrawer) {
title: '追踪单号',
dataIndex: 'taskOrderNo',
key: 'taskOrderNo',
render: (text, row, _, action) => {
return (
<a
onClick={() => {
setdrawer((s) => ({
...s,
open: true,
title: '详情',
val: 'only',
type: 'detail_zzgd',
title: '详细信息',
item: row,
}));
}}
>
{row?.taskOrderNo}
</a>
);
},
},
{
title: '设备编号',
......@@ -120,9 +158,28 @@ function getcolumns(setdrawer) {
key: '3',
columns: [
{
title: '维修单号',
dataIndex: 'repairOrderNo',
key: 'repairOrderNo',
title: '外协单号',
dataIndex: 'otherUnitsOrderNo',
key: 'otherUnitsOrderNo',
render: (text, row, _, action) => {
return (
<a
onClick={() => {
setdrawer((s) => ({
...s,
open: true,
title: '详情',
val: 'only',
type: 'detail_wgd',
title: '详细信息',
item: row,
}));
}}
>
{row?.otherUnitsOrderNo}
</a>
);
},
},
{
title: '设备编号',
......@@ -140,20 +197,20 @@ function getcolumns(setdrawer) {
key: 'faultDescription',
},
{
title: '报修人员',
dataIndex: 'repairUserName',
key: 'repairUserName',
title: '创建时间',
dataIndex: 'createTime',
key: 'createTimeList',
valueType: 'dateTimeRange',
},
{
title: '报修时间',
dataIndex: 'repairTime',
key: 'repairTimeList',
valueType: 'dateTimeRange',
title: '创建人员',
dataIndex: 'createUserName',
key: 'createUserName',
},
{
title: '报修单号',
dataIndex: 'repairNo',
key: 'repairNo',
title: '来源单号',
dataIndex: 'dataSourcesNo',
key: 'dataSourcesNo',
},
{
title: '工单状态',
......
src/pages/repair/platform/index.jsx
View file @ cb0aceb6
......@@ -2,7 +2,7 @@
* @Author: Li Hanlin
* @Date: 2022-12-05 10:13:42
* @Last Modified by: Li Hanlin
* @Last Modified time: 2022-12-08 13:47:55
* @Last Modified time: 2022-12-22 17:16:38
*/
import * as React from 'react';
......@@ -15,7 +15,7 @@ import { useRequest } from 'ahooks';
import { doFetch } from '@/utils/doFetch';
import OrderHandle from './RepairOrderHandle';
import { message } from 'antd';
import Detail from '@/components/RepaireDetail/Detail';
function Platform(props) {
const actionRef = useRef(),
formRef = useRef();
......@@ -278,6 +278,104 @@ function Platform(props) {
url={'/repair/umOtherUnitsOrder/dispatchById'}
/>
);
case 'detail_wxgd':
return (
<Detail
title="维修单号"
titleno={drawer?.item?.repairNo}
detailpath="/repair/umRepairOperation/queryOperationList"
params={{ repairOrderId: drawer?.item?.id }}
baseRow={drawer?.item}
basecolumns={[
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
},
{
title: '工单状态',
dataIndex: 'statusName',
key: 'statusName',
},
{
title: '报修单号',
dataIndex: 'repairNo',
key: 'repairNo',
},
{
title: '最新维修人员',
dataIndex: 'newRepairUserName',
key: 'newRepairUserName',
},
{
title: '关单时间',
dataIndex: 'repairCloseTime',
key: 'repairCloseTime',
},
]}
type="wxgd"
/>
);
case 'detail_wgd':
return (
<Detail
title="外协单号"
titleno={drawer?.item.otherUnitsOrderNo}
detailpath="/repair/umOtherUnitsOperation/queryOperationList"
params={{ otherUnitsOrderId: drawer?.item.id }}
baseRow={drawer?.item}
basecolumns={[
{
title: '创建人',
dataIndex: 'createUserName',
key: 'createUserName',
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
},
{
title: '工单状态',
dataIndex: 'statusName',
key: 'statusName',
},
{
title: '来源工单',
dataIndex: 'dataSourcesNo',
key: 'dataSourcesNo',
},
{
title: '来源类型',
dataIndex: 'dataSourcesName',
key: 'dataSourcesName',
},
{
title: '最新外协人员',
dataIndex: 'newRepairUserName',
key: 'newRepairUserName',
},
{
title: '关单时间',
dataIndex: 'repairCloseTime',
key: 'repairCloseTime',
},
]}
type="wgd"
/>
);
case 'detail_zzgd':
return (
<Detail
title="追踪单号"
titleno={drawer?.item?.taskOrderNo}
detailpath="/repair/umTrackOperation/queryOperationList"
params={{ trackOrderId: drawer?.item?.id }}
baseRow={drawer?.item}
basecolumns={basecolumns}
type="zzgd"
/>
);
default:
break;
}
......
src/pages/repair/track/index.jsx
View file @ cb0aceb6
......@@ -2,7 +2,7 @@
* @Author: Li Hanlin
* @Date: 2022-12-02 11:41:03
* @Last Modified by: Li Hanlin
* @Last Modified time: 2022-12-13 11:37:55
* @Last Modified time: 2022-12-22 17:34:32
*/
import * as React from 'react';
......@@ -261,7 +261,7 @@ function Failure(props) {
title: '备注',
dataIndex: 'remark',
valueType: 'textarea',
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
formItemProps: { rules: [{ required: false, message: '此项为必填项' }] },
key: 'remark',
},
]}
......
src/pages/system/pushsetting/columns.js
View file @ cb0aceb6
......@@ -65,9 +65,16 @@ function getcolumns(setdrawer) {
dataIndex: 'fieldName',
key: 'fieldId',
},
{
title: '推送标题',
dataIndex: 'sendTitle',
key: 'sendTitle',
search: false,
},
{
title: '推送内容',
dataIndex: 'sendContent',
search: false,
key: 'sendContent',
valueType: 'textarea',
},
......
src/pages/system/pushsetting/index.jsx
View file @ cb0aceb6
......@@ -17,7 +17,7 @@ function Pushsetting(props) {
open: false,
});
const [checkVariableDraw, setCheckVariableDraw] = useState(false);
const [variablePath, setVariablePath] = useState(null);
const pathconfig = useMemo(() => {
let pathconf = getcolumns(setdrawer)?.pathconfig ?? {};
return pathconf;
......@@ -137,8 +137,9 @@ function Pushsetting(props) {
return (
<AutoTable
columns={columns}
resizeable={false}
path="/base/paBusinessMsgSceneVariable/queryPageBySceneId"
pagination={false}
params={variablePath}
/>
);
};
......@@ -175,7 +176,7 @@ function Pushsetting(props) {
actionRef={actionRef}
path={pathconfig?.list || '/ngic-auth/sysUser/query/page'}
pageextra={pathconfig?.enableadd ? 'add' : null}
resizeable={true}
resizeable={false}
addconfig={{
// access: 'sysDepartment_save',
btn: {
......@@ -208,6 +209,10 @@ function Pushsetting(props) {
console.log(a, b);
const res = doFetch({ url: selectValueType[a?.fitField] });
console.log(formRef);
} else if (a?.businessMsgSceneId) {
setVariablePath({
businessMsgSceneId: a?.businessMsgSceneId,
});
}
}}
onClose={() => {
......
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