Skip to content

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

bug

parent 53a951d3
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 97 deletions
src/pages/device/account/index.jsx
View file @ 27dd3144
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: Li Hanlin * @Author: Li Hanlin
* @Date: 2022-11-10 09:39:56 * @Date: 2022-11-10 09:39:56
* @Last Modified by: Li Hanlin * @Last Modified by: Li Hanlin
* @Last Modified time: 2023-01-19 09:42:58 * @Last Modified time: 2023-01-31 09:34:55
*/ */
import * as React from 'react'; import * as React from 'react';
...@@ -544,7 +544,11 @@ function Model(props) { ...@@ -544,7 +544,11 @@ function Model(props) {
{ {
label: ( label: (
<a <a
onClick={() => { onClick={async () => {
let res = await doFetch({
url: '/asset/equipmentLog/checkResumeType',
params: {},
});
setDrawer((s) => ({ setDrawer((s) => ({
...s, ...s,
visible: true, visible: true,
...@@ -709,7 +713,6 @@ function Model(props) { ...@@ -709,7 +713,6 @@ function Model(props) {
const [request, setrequest] = useState(); const [request, setrequest] = useState();
useEffect(() => { useEffect(() => {
const fn = async () => { const fn = async () => {
let res = await doFetch({ let res = await doFetch({
url: '/base/paFormField/queryList', url: '/base/paFormField/queryList',
params: { params: {
......
src/pages/repair/order/index.jsx
View file @ 27dd3144
...@@ -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-31 09:19:09 * @Last Modified time: 2023-01-31 11:18:25
*/ */
import * as React from 'react'; import * as React from 'react';
...@@ -1030,8 +1030,8 @@ function Failure(props) { ...@@ -1030,8 +1030,8 @@ function Failure(props) {
{ {
valueType: 'textarea', valueType: 'textarea',
title: '故障原因', title: '故障原因',
dataIndex: 'faultDescription', dataIndex: 'faultCause',
key: 'faultDescription', key: 'faultCause',
fieldProps: { fieldProps: {
disabled: true, disabled: true,
}, },
...@@ -1047,8 +1047,8 @@ function Failure(props) { ...@@ -1047,8 +1047,8 @@ function Failure(props) {
{ {
valueType: 'textarea', valueType: 'textarea',
title: '维修内容', title: '维修内容',
dataIndex: 'faultDescription', dataIndex: 'repairContent',
key: 'faultDescription', key: 'repairContent',
fieldProps: { fieldProps: {
disabled: true, disabled: true,
}, },
...@@ -1205,7 +1205,7 @@ function Failure(props) { ...@@ -1205,7 +1205,7 @@ function Failure(props) {
{ {
title: '申请外协原因', title: '申请外协原因',
dataIndex: 'reason', dataIndex: 'reason',
key: 'reson', key: 'reason',
fieldProps: { fieldProps: {
disabled: true, disabled: true,
}, },
...@@ -1284,7 +1284,7 @@ function Failure(props) { ...@@ -1284,7 +1284,7 @@ function Failure(props) {
{ {
title: '退单原因', title: '退单原因',
dataIndex: 'reason', dataIndex: 'reason',
key: 'reson', key: 'reason',
fieldProps: { fieldProps: {
disabled: true, disabled: true,
}, },
......
src/pages/repair/outsourcing/columns.js
View file @ 27dd3144
...@@ -10,10 +10,6 @@ function getcolumns(setdrawer, bus) { ...@@ -10,10 +10,6 @@ function getcolumns(setdrawer, bus) {
label: '外协中', label: '外协中',
value: '3', value: '3',
}, },
{
label: '已完成',
value: '4',
},
]; ];
} else { } else {
listOptions = [ listOptions = [
...@@ -25,10 +21,6 @@ function getcolumns(setdrawer, bus) { ...@@ -25,10 +21,6 @@ function getcolumns(setdrawer, bus) {
label: '外协中', label: '外协中',
value: '3', value: '3',
}, },
{
label: '已完成',
value: '4',
},
]; ];
} }
return [ return [
...@@ -319,7 +311,7 @@ function getcolumns(setdrawer, bus) { ...@@ -319,7 +311,7 @@ function getcolumns(setdrawer, bus) {
{ {
title: '最新外协人员', title: '最新外协人员',
dataIndex: 'newRepairUserName', dataIndex: 'newRepairUserName',
key: 'newRepairUserName', key: 'newRepairUserId',
valueType: 'select', valueType: 'select',
fieldProps: { fieldProps: {
showSearch: true, showSearch: true,
...@@ -337,8 +329,8 @@ function getcolumns(setdrawer, bus) { ...@@ -337,8 +329,8 @@ function getcolumns(setdrawer, bus) {
title: '工单状态', title: '工单状态',
dataIndex: 'statusName', dataIndex: 'statusName',
key: 'status', key: 'status',
valueType: 'select',
options: listOptions, options: listOptions,
search: false,
fieldProps: { fieldProps: {
dropdownMatchSelectWidth: 150, dropdownMatchSelectWidth: 150,
}, },
......
src/pages/repair/outsourcing/index.jsx
View file @ 27dd3144
...@@ -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 16:49:15 * @Last Modified time: 2023-01-31 10:54:47
*/ */
import * as React from 'react'; import * as React from 'react';
...@@ -258,82 +258,91 @@ function Failure(props) { ...@@ -258,82 +258,91 @@ function Failure(props) {
// 更多 // 更多
const more = (text, row, _, action) => { const more = (text, row, _, action) => {
const menu = ( let menulist = [];
<Menu if (row?.status == '1') {
items={[ menulist = [
{ {
label: label: (
row?.status == 0 || row?.status == 1 ? ( <PremButton
<PremButton btn={{
btn={{ onClick: async () => {
onClick: async () => { let params = {
let params = { id: row?.id,
id: row?.id, };
}; let res = await doFetch({
let res = await doFetch({ url: '/repair/umOtherUnitsOrder/orderReceiving',
url: '/repair/umOtherUnitsOrder/orderReceiving', params,
params, });
}); if (res.code === '0000') {
if (res.code === '0000') { message.success('接单成功！');
message.success('接单成功！');
setdrawer((s) => ({
...s,
open: false,
}));
actionRef.current.reload();
}
},
}}
>
接单
</PremButton>
) : (
<PremButton
btn={{
onClick: async () => {
setdrawer((s) => ({
...s,
open: true,
type: 'wxpd',
item: row,
val: 'only',
title: '派单',
}));
},
}}
>
派单
</PremButton>
),
key: '0',
// disabled: true,
},
{
label: (
<PremButton
btn={{
onClick: () => {
setdrawer((s) => ({ setdrawer((s) => ({
...s, ...s,
open: true, open: false,
type: 'comouts',
item: {
id: row.id,
},
val: 'only',
title: '完成外协',
})); }));
}, actionRef.current.reload();
}} }
> },
完成外协 }}
</PremButton> >
), 接单
key: '1', </PremButton>
}, ),
]} key: '0',
/> },
); ];
} else if (row?.status == '3') {
menulist = [
{
label: (
<PremButton
btn={{
onClick: () => {
setdrawer((s) => ({
...s,
open: true,
type: 'comouts',
item: {
id: row.id,
},
val: 'only',
title: '完成外协',
}));
},
}}
>
完成外协
</PremButton>
),
key: '1',
},
];
} else if (row?.status == '2') {
menulist = [
{
label: (
<PremButton
btn={{
onClick: async () => {
setdrawer((s) => ({
...s,
open: true,
type: 'wxpd',
item: row,
val: 'only',
title: '派单',
}));
},
}}
>
派单
</PremButton>
),
key: '0',
},
];
}
const menu = <Menu items={menulist} />;
return ( return (
<Dropdown <Dropdown
overlay={menu} overlay={menu}
......
src/pages/repair/platform/RepairOrderHandle.jsx
View file @ 27dd3144
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: Li Hanlin * @Author: Li Hanlin
* @Date: 2022-12-05 11:13:26 * @Date: 2022-12-05 11:13:26
* @Last Modified by: Li Hanlin * @Last Modified by: Li Hanlin
* @Last Modified time: 2023-01-30 17:00:18 * @Last Modified time: 2023-01-31 10:58:26
*/ */
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
...@@ -19,7 +19,7 @@ const App = ({ type, id, actionRef, url, setdrawer }) => { ...@@ -19,7 +19,7 @@ const App = ({ type, id, actionRef, url, setdrawer }) => {
valueType: 'select', valueType: 'select',
options: { options: {
path: '/repair/umRepairOrder/selection', path: '/repair/umRepairOrder/selection',
params: { id, permission: 'umRepairOrder:orderReceiving' }, params: { id, permission: 'RECEIVING_TO_VERIFY' },
}, },
fieldProps: { fieldProps: {
placeholder: '请选择', placeholder: '请选择',
...@@ -44,7 +44,7 @@ const App = ({ type, id, actionRef, url, setdrawer }) => { ...@@ -44,7 +44,7 @@ const App = ({ type, id, actionRef, url, setdrawer }) => {
valueType: 'select', valueType: 'select',
options: { options: {
path: '/repair/umRepairOrder/selection', path: '/repair/umRepairOrder/selection',
params: { id, permission: 'umRepairOrder:dispatchById' }, params: { id, permission: 'RECEIVING_TO_VERIFY' },
}, },
fieldProps: { fieldProps: {
placeholder: '请选择', placeholder: '请选择',
......
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