Skip to content

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

bug

parent 1cdfcce6
Show whitespace changes
Inline Side-by-side
Showing with 61 additions and 17 deletions
config/authRoutes.js
View file @ 684f9202
export default [ export default [
{ {
"path": "/welcome", "path": "/welcome",
"name": "欢迎", "name": "首页",
"icon": "smile", "icon": "smile",
"component": "./Welcome" "component": "./Welcome"
}, },
......
src/components/Addform/index.jsx
View file @ 684f9202
...@@ -110,7 +110,6 @@ const App = ({ url, actionRef, setdrawer, drawer }) => { ...@@ -110,7 +110,6 @@ const App = ({ url, actionRef, setdrawer, drawer }) => {
fields={columns} fields={columns}
defaultFormValue={drawer?.item} defaultFormValue={drawer?.item}
onValuesChange={(changedValues, allValues) => { onValuesChange={(changedValues, allValues) => {
//console.log(changedValues, allValues);
if (Object.keys(changedValues)[0] == 'faultDetailId') { if (Object.keys(changedValues)[0] == 'faultDetailId') {
doFetch({ doFetch({
url: '/repair/umFaultSettingDetail/queryById', url: '/repair/umFaultSettingDetail/queryById',
......
src/components/RepaireDetail/DesItem.jsx
View file @ 684f9202
...@@ -396,8 +396,8 @@ export default (props) => { ...@@ -396,8 +396,8 @@ export default (props) => {
1: [ 1: [
{ {
title: '追踪人员', title: '追踪人员',
dataIndex: 'trackerName', dataIndex: 'repairName',
key: 'trackerName', key: 'repairName',
}, },
{ {
title: '接单时间', title: '接单时间',
...@@ -418,8 +418,8 @@ export default (props) => { ...@@ -418,8 +418,8 @@ export default (props) => {
}, },
{ {
title: '追踪人员', title: '追踪人员',
dataIndex: 'trackerName', dataIndex: 'repairName',
key: 'trackerName', key: 'repairName',
}, },
], ],
3: [ 3: [
...@@ -435,8 +435,8 @@ export default (props) => { ...@@ -435,8 +435,8 @@ export default (props) => {
}, },
{ {
title: '追踪人员', title: '追踪人员',
dataIndex: 'trackerName', dataIndex: 'repairName',
key: 'trackerName', key: 'repairName',
}, },
], ],
4: [ 4: [
......
src/global.less
View file @ 684f9202
...@@ -527,8 +527,8 @@ ol { ...@@ -527,8 +527,8 @@ ol {
main { main {
>div:first-child { >div:first-child {
ul { .tags_container {
z-index: 99999 !important; z-index: 1001 !important;
} }
} }
} }
\ No newline at end of file
src/pages/repair/order/index.jsx
View file @ 684f9202
...@@ -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-02-01 15:23:18 * @Last Modified time: 2023-02-02 16:46:59
*/ */
import * as React from 'react'; import * as React from 'react';
...@@ -131,7 +131,29 @@ function Failure(props) { ...@@ -131,7 +131,29 @@ function Failure(props) {
<PremButton <PremButton
access="umRepairOrder_completeRepair" access="umRepairOrder_completeRepair"
btn={{ btn={{
onClick: () => { onClick: async () => {
let repairContent = '';
if (row?.faultDetailId) {
doFetch({
url: '/repair/umFaultSettingDetail/queryById',
params: {
id: row?.faultDetailId,
},
}).then((res) => {
setdrawer((s) => ({
...s,
open: true,
type: 'wcwx',
item: {
...row,
isShutdown: 1,
repairContent: res?.data?.data?.faultSolution,
},
val: 'only',
title: '完成维修',
}));
});
}
setdrawer((s) => ({ setdrawer((s) => ({
...s, ...s,
open: true, open: true,
...@@ -324,7 +346,7 @@ function Failure(props) { ...@@ -324,7 +346,7 @@ function Failure(props) {
...s, ...s,
open: true, open: true,
type: 'xgyz', type: 'xgyz',
item: row, item: { ...row, resultFlag: '1' },
val: 'only', val: 'only',
title: '效果验证', title: '效果验证',
})); }));
...@@ -372,6 +394,28 @@ function Failure(props) { ...@@ -372,6 +394,28 @@ function Failure(props) {
access="umRepairOrder_completeRepair" access="umRepairOrder_completeRepair"
btn={{ btn={{
onClick: () => { onClick: () => {
let repairContent = '';
if (row?.faultDetailId) {
doFetch({
url: '/repair/umFaultSettingDetail/queryById',
params: {
id: row?.faultDetailId,
},
}).then((res) => {
setdrawer((s) => ({
...s,
open: true,
type: 'wcwx',
item: {
...row,
isShutdown: 1,
repairContent: res?.data?.data?.faultSolution,
},
val: 'only',
title: '完成维修',
}));
});
}
setdrawer((s) => ({ setdrawer((s) => ({
...s, ...s,
open: true, open: true,
...@@ -489,7 +533,7 @@ function Failure(props) { ...@@ -489,7 +533,7 @@ function Failure(props) {
...s, ...s,
open: true, open: true,
type: 'zzsh', type: 'zzsh',
item: row, item: { ...row, resultFlag: '1' },
val: 'only', val: 'only',
title: '追踪审核', title: '追踪审核',
})); }));
...@@ -514,7 +558,7 @@ function Failure(props) { ...@@ -514,7 +558,7 @@ function Failure(props) {
...s, ...s,
open: true, open: true,
type: 'wxsh', type: 'wxsh',
item: row, item: { ...row, resultFlag: '1' },
val: 'only', val: 'only',
title: '外协审核', title: '外协审核',
})); }));
...@@ -564,7 +608,7 @@ function Failure(props) { ...@@ -564,7 +608,7 @@ function Failure(props) {
...s, ...s,
open: true, open: true,
type: 'xgyz', type: 'xgyz',
item: row, item: { ...row, resultFlag: '1' },
val: 'only', val: 'only',
title: '效果验证', title: '效果验证',
})); }));
...@@ -779,10 +823,11 @@ function Failure(props) { ...@@ -779,10 +823,11 @@ function Failure(props) {
return ( return (
<> <>
<InitForm <InitForm
formRef={formRef}
defaultFormValue={drawer?.item} defaultFormValue={drawer?.item}
fields={columns} fields={columns}
onValuesChange={(changedValues, allValues) => { onValuesChange={(changedValues, allValues) => {
//console.log(changedValues, allValues); console.log(changedValues, allValues);
if (Object.keys(changedValues)[0] == 'faultDetailId') { if (Object.keys(changedValues)[0] == 'faultDetailId') {
doFetch({ doFetch({
url: '/repair/umFaultSettingDetail/queryById', url: '/repair/umFaultSettingDetail/queryById',
......
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