Skip to content

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

1214bug

parent 344a9802
Show whitespace changes
Inline Side-by-side
Showing with 133 additions and 251 deletions
src/components/DetailPro/index.jsx
View file @ 2271b5e2
......@@ -23,7 +23,7 @@ function DetailPro(props) {
if (props?.extendField) {
let obj = {};
res?.data?.data[props.extendField]?.forEach((it) => {
obj[it?.fieldId] = it?.fieldRealValueList;
obj[it?.fieldId] = it?.fieldRealValue;
});
//console.log('extendField:', obj);
setcuritem({
......
src/components/InitForm/index.jsx
View file @ 2271b5e2
......@@ -118,16 +118,11 @@ function InitForm({
request={async (params) => {
if (detailpath) {
let res = await doFetch({ url: detailpath, params });
// console.log({
// ...(res?.data?.data ?? {}),
// ...defaultFormValue,
// });
if (extendField) {
let obj = {};
res?.data?.data[extendField]?.forEach((it) => {
obj[it?.fieldId] = it?.fieldRealValueList;
obj[it?.fieldId] = it?.fieldRealValue;
});
//console.log('extendField:', obj);
return {
...(res?.data?.data ?? {}),
...obj,
......@@ -139,9 +134,9 @@ function InitForm({
...defaultFormValue,
};
} else {
// console.log({
// ...defaultFormValue,
// });
console.log({
...defaultFormValue,
});
return {
...defaultFormValue,
};
......
src/components/SiderMenu/index.less
View file @ 2271b5e2
......@@ -26,6 +26,7 @@
border-radius: 0px !important;
outline: none !important;
box-shadow: none !important;
&:focus {
box-shadow: none !important;
}
......@@ -100,7 +101,7 @@
margin-bottom: 12px;
break-inside: avoid;
> h2 {
>h2 {
margin-bottom: 0px;
padding: 4px 6px;
color: #000;
......@@ -121,7 +122,7 @@
.section {
padding: 12px 0px;
> h2 {
>h2 {
margin-bottom: 0px;
padding: 4px 6px;
color: #000;
......@@ -147,12 +148,12 @@
transition: all 0.02s;
}
> .tocollect {
>.tocollect {
display: none;
color: @primary-color;
}
> .collected {
>.collected {
color: @primary-color;
}
......@@ -164,7 +165,7 @@
}
}
&:hover > .tocollect {
&:hover>.tocollect {
display: block;
}
}
......@@ -204,6 +205,7 @@
background-color: #f0f0f0;
transform: translate(0);
transform-origin: left center;
* {
opacity: 1;
}
......@@ -221,6 +223,7 @@
background-color: #f0f0f0;
transform: translate(-100vw);
transform-origin: left center;
* {
opacity: 0.4;
}
......@@ -238,6 +241,7 @@
line-height: 48px !important;
background: #002140;
transition: all 0.1s !important;
img {
display: inline-block;
height: 32px;
......@@ -261,11 +265,13 @@
min-width: 48px !important;
max-width: 48px !important;
}
.sider {
position: relative;
z-index: 10;
min-height: 100vh;
box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35);
&.fixSiderBar {
position: fixed;
top: 0;
......@@ -274,7 +280,7 @@
:global {
.ant-menu-root {
height: ~'calc(100vh - @{nav-header-height})';
height:~'calc(100vh - @{nav-header-height})';
overflow-y: auto;
}
......@@ -306,25 +312,22 @@
}
.ant-menu-inline-collapsed {
& > .ant-menu-item .sider-menu-item-img + span,
&
> .ant-menu-item-group
> .ant-menu-item-group-list
> .ant-menu-item
.sider-menu-item-img
+ span,
& > .ant-menu-submenu > .ant-menu-submenu-title .sider-menu-item-img + span {
&>.ant-menu-item .sider-menu-item-img+span,
&>.ant-menu-item-group>.ant-menu-item-group-list>.ant-menu-item .sider-menu-item-img+span,
&>.ant-menu-submenu>.ant-menu-submenu-title .sider-menu-item-img+span {
display: inline-block;
max-width: 0;
opacity: 0;
}
}
.ant-menu-item .sider-menu-item-img + span,
.ant-menu-submenu-title .sider-menu-item-img + span {
.ant-menu-item .sider-menu-item-img+span,
.ant-menu-submenu-title .sider-menu-item-img+span {
opacity: 1;
transition: opacity 0.3s @ease-in-out, width 0.3s @ease-in-out;
}
.ant-menu-title-content {
display: flex;
align-items: center;
......@@ -335,13 +338,22 @@
padding: 0;
}
}
.ant-layout-has-sider,
.ant-card-bordered {
min-height: 100%;
height: unset !important
}
}
.firstag {
height: 35px !important;
margin-top: 0px !important;
background-color: #000000;
box-shadow: 0 2px 14px #000000 !important;
user-select: none;
&:hover {
color: #ffffff !important;
background-color: #000000 !important;
......
src/global.less
View file @ 2271b5e2
......@@ -387,7 +387,7 @@ ol {
.container,
.diycard {
height: 100% !important;
height: unset
}
.runtime-keep-alive-layout {
......
src/pages/device/account/columns.js
View file @ 2271b5e2
......@@ -18,7 +18,14 @@ function getcolumns(setdrawer) {
key: 'equipmentName',
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
},
{ title: '位置号', width: 120, align: 'center', dataIndex: 'positionNo', key: 'positionNo' },
{
title: '位置号',
width: 120,
align: 'center',
dataIndex: 'positionNo',
search: false,
key: 'positionNo',
},
{
width: 120,
title: '设备类型',
......@@ -53,11 +60,11 @@ function getcolumns(setdrawer) {
title: '部门名称',
width: 120,
align: 'center',
valueType: 'select',
valueType: 'treeSelect',
dataIndex: 'departmentName',
key: 'departmentId',
options: {
path: '/auth/sysDepartment/query/depart/selectbox',
path: '/auth/sysDepartment/query/children/tree',
linkParams: {
organizationId: 'parentId',
},
......@@ -107,7 +114,7 @@ function getcolumns(setdrawer) {
width: 120,
dataIndex: 'productLineName',
valueType: 'select',
key: 'productLineName',
key: 'productLineId',
align: 'center',
options: {
path: '/auth/sysProductionLine/getAllProductLineSelectionByShop',
......@@ -123,6 +130,7 @@ function getcolumns(setdrawer) {
dataIndex: 'supplierName',
align: 'center',
hideInTable: true,
search: false,
key: 'supplierId',
options: {
path: '/asset/equipmentSupplier/query/selection',
......@@ -131,6 +139,7 @@ function getcolumns(setdrawer) {
},
{
title: '设备原值（万元）',
search: false,
hideInTable: true,
align: 'center',
dataIndex: 'equipmentWorth',
......@@ -139,6 +148,7 @@ function getcolumns(setdrawer) {
{
title: '安装投产日期',
hideInTable: true,
search: false,
align: 'center',
dataIndex: 'productDate',
key: 'productDate',
......@@ -149,6 +159,7 @@ function getcolumns(setdrawer) {
width: 120,
dataIndex: 'pictureUrl',
search: false,
search: false,
key: 'picList',
align: 'center',
valueType: 'uploadImage',
......@@ -175,6 +186,7 @@ function getcolumns(setdrawer) {
title: '二维码',
width: 120,
align: 'center',
search: false,
align: 'center',
dataIndex: 'qrCodeUrl',
key: 'qrCodeUrl',
......@@ -192,6 +204,7 @@ function getcolumns(setdrawer) {
{
title: '状态名称',
align: 'center',
search: false,
hideInTable: true,
dataIndex: 'statusName',
key: 'statusName',
......@@ -204,6 +217,21 @@ function getcolumns(setdrawer) {
align: 'center',
hideInForm: true,
fixed: 'right',
valueType: 'select',
options: [
{
label: '在用',
value: 1,
},
{
label: '借用中',
value: 2,
},
{
label: '报废',
value: 3,
},
],
key: 'status',
render: (text, row) => {
switch (row.status) {
......
src/pages/device/account/index.jsx
View file @ 2271b5e2
......@@ -2,7 +2,7 @@
* @Author: Li Hanlin
* @Date: 2022-11-10 09:39:56
* @Last Modified by: Li Hanlin
* @Last Modified time: 2022-12-12 14:29:17
* @Last Modified time: 2022-12-14 11:40:45
*/
import * as React from 'react';
......@@ -75,7 +75,7 @@ function Model(props) {
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
},
{
title: '上传文件（上限为5个）',
title: '上传文件',
key: 'urlIds ',
valueType: 'uploadDragger',
// colProps: { span: 24 },
......@@ -123,14 +123,14 @@ function Model(props) {
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
},
{
title: '上传文件',
title: '',
key: 'urlIds ',
valueType: 'uploadDragger',
// colProps: { span: 24 },
formItemProps: {
rules: [
{
required: true,
required: false,
message: '此项为必填项',
},
],
......@@ -158,7 +158,7 @@ function Model(props) {
},
{
title: '调入公司',
dataIndex: 'organizationName',
dataIndex: 'toOrganizationName',
key: 'toOrganizationId',
valueType: 'select',
options: { path: '/auth/sysDepartment/query/organization/selectbox', params: {} },
......@@ -166,11 +166,11 @@ function Model(props) {
},
{
title: '调入部门',
valueType: 'select',
dataIndex: 'departmentName',
valueType: 'treeSelect',
dataIndex: 'toDepartmentName',
key: 'toDepartmentId',
options: {
path: '/auth/sysDepartment/query/depart/selectbox',
path: '/auth/sysDepartment/query/children/tree',
linkParams: {
toOrganizationId: 'parentId',
},
......@@ -178,7 +178,7 @@ function Model(props) {
},
{
title: '调入工厂',
dataIndex: 'factoryName',
dataIndex: 'toFactoryName',
key: 'toFactoryId',
valueType: 'select',
options: { path: '/auth/sysFactory/getAllFactorySelection', params: {} },
......@@ -186,7 +186,7 @@ function Model(props) {
},
{
title: '调入车间',
dataIndex: 'shopName',
dataIndex: 'toShopName',
valueType: 'select',
options: {
path: '/auth/sysShop/getShopSelectionByFactory',
......@@ -199,7 +199,7 @@ function Model(props) {
},
{
title: '调入工段',
dataIndex: 'sectionName',
dataIndex: 'toSectionName',
key: 'toSectionId',
valueType: 'select',
options: {
......@@ -211,7 +211,7 @@ function Model(props) {
},
{
title: '调入产线',
dataIndex: 'productionLines',
dataIndex: 'toProductLineName',
valueType: 'select',
key: 'toProductLineId',
options: {
......@@ -263,11 +263,11 @@ function Model(props) {
},
{
title: '借用部门',
valueType: 'select',
valueType: 'treeSelect',
dataIndex: 'departmentName',
key: 'toDepartmentId',
options: {
path: '/auth/sysDepartment/query/depart/selectbox',
path: '/auth/sysDepartment/query/children/tree',
linkParams: {
toOrganizationId: 'parentId',
},
......@@ -367,11 +367,11 @@ function Model(props) {
},
{
title: '接收部门',
valueType: 'select',
valueType: 'treeSelect',
dataIndex: 'returnDepartmentId',
key: 'returnDepartmentId',
options: {
path: '/auth/sysDepartment/query/depart/selectbox',
path: '/auth/sysDepartment/query/children/tree',
linkParams: {
returnOrganizationId: 'parentId',
},
......@@ -465,6 +465,20 @@ function Model(props) {
fsb: '/asset/equipment/detail/parent/page',
};
function formatDate(date) {
var myyear = date.getFullYear();
var mymonth = date.getMonth() + 1;
var myweekday = date.getDate();
if (mymonth < 10) {
mymonth = '0' + mymonth;
}
if (myweekday < 10) {
myweekday = '0' + myweekday;
}
return myyear + '-' + mymonth + '-' + myweekday; //想要什么格式都可以随便自己拼
}
const edit = (text, row, _, action) => {
return (
<PremButton
......@@ -566,25 +580,6 @@ function Model(props) {
},
val: 'only',
title: '编辑子设备',
// onFinish: async (vals) => {
// //console.log(1);
// let params = {
// ...vals,
// id: row.id,
// };
// let res = await doFetch({
// url: urlParams.save,
// params,
// });
// if (res.code === '0000') {
// message.success('新增成功！');
// setDrawer((s) => ({
// ...s,
// visible: false,
// }));
// actionRef.current.reload();
// }
// },
}));
}}
>
......@@ -603,28 +598,11 @@ function Model(props) {
type: 'resume',
item: {
id: row.id,
reformDate: formatDate(new Date()),
scrapDate: formatDate(new Date()),
},
val: 'only',
title: '履历登记',
// onFinish: async (vals) => {
// //console.log(1);
// let params = {
// ...vals,
// id: row.id,
// };
// let res = await doFetch({
// url: urlParams.save,
// params,
// });
// if (res.code === '0000') {
// message.success('新增成功！');
// setDrawer((s) => ({
// ...s,
// visible: false,
// }));
// actionRef.current.reload();
// }
// },
}));
}}
>
......@@ -802,7 +780,7 @@ function Model(props) {
//console.log(res?.data?.data);
let obj = {};
res?.data?.data['equipmentCharList']?.forEach((it) => {
obj[it?.fieldId] = it?.fieldRealValueList;
obj[it?.fieldId] = it?.fieldRealValue;
});
console.log('drawerpro:', {
...(res?.data?.data ?? {}),
......@@ -866,11 +844,11 @@ function Model(props) {
title: '部门名称',
width: 120,
align: 'center',
valueType: 'select',
valueType: 'treeSelect',
dataIndex: 'departmentName',
key: 'departmentId',
options: {
path: '/auth/sysDepartment/query/depart/selectbox',
path: '/auth/sysDepartment/query/children/tree',
linkParams: {
organizationId: 'parentId',
},
......@@ -968,11 +946,11 @@ function Model(props) {
title: '部门名称',
width: 120,
align: 'center',
valueType: 'select',
valueType: 'treeSelect',
dataIndex: 'departmentName',
key: 'departmentId',
options: {
path: '/auth/sysDepartment/query/depart/selectbox',
path: '/auth/sysDepartment/query/children/tree',
linkParams: {
organizationId: 'parentId',
},
......@@ -1229,11 +1207,11 @@ function Model(props) {
title: '部门名称',
width: 120,
align: 'center',
valueType: 'select',
valueType: 'treeSelect',
dataIndex: 'departmentName',
key: 'departmentId',
options: {
path: '/auth/sysDepartment/query/depart/selectbox',
path: '/auth/sysDepartment/query/children/tree',
linkParams: {
organizationId: 'parentId',
},
......@@ -1497,7 +1475,7 @@ function Model(props) {
formItemProps: {
rules: [
{
required: true,
required: false,
message: '此项为必填项',
},
],
......@@ -1520,14 +1498,13 @@ function Model(props) {
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
},
{
title: '上传文件',
title: '上传文件（上限为5个）',
key: 'urlIds ',
valueType: 'uploadDragger',
// colProps: { span: 24 },
formItemProps: {
rules: [
{
required: true,
required: false,
message: '此项为必填项',
},
],
......@@ -1548,11 +1525,11 @@ function Model(props) {
},
{
title: '调入部门',
valueType: 'select',
valueType: 'treeSelect',
dataIndex: 'departmentName',
key: 'toDepartmentId',
options: {
path: '/auth/sysDepartment/query/depart/selectbox',
path: '/auth/sysDepartment/query/children/tree',
linkParams: {
toOrganizationId: 'parentId',
},
......@@ -1635,11 +1612,11 @@ function Model(props) {
},
{
title: '借用部门',
valueType: 'select',
valueType: 'treeSelect',
dataIndex: 'departmentName',
key: 'toDepartmentId',
options: {
path: '/auth/sysDepartment/query/depart/selectbox',
path: '/auth/sysDepartment/query/children/tree',
linkParams: {
toOrganizationId: 'parentId',
},
......@@ -1729,11 +1706,11 @@ function Model(props) {
},
{
title: '接收部门',
valueType: 'select',
valueType: 'treeSelect',
dataIndex: 'returnDepartmentId',
key: 'returnDepartmentId',
options: {
path: '/auth/sysDepartment/query/depart/selectbox',
path: '/auth/sysDepartment/query/children/tree',
linkParams: {
returnOrganizationId: 'parentId',
},
......@@ -1890,6 +1867,7 @@ function Model(props) {
children: activeTab == 1 && (
<InitForm
fields={fields[activeTab]}
defaultFormValue={drawer?.item}
onFinish={async (vals) => {
//console.log(vals);
let res = await doFetch({
......@@ -1915,8 +1893,8 @@ function Model(props) {
children: activeTab == 2 && (
<InitForm
fields={fields[activeTab]}
defaultFormValue={drawer?.item}
onFinish={async (vals) => {
//console.log(vals);
let res = await doFetch({
url: urlParams_resume.save,
params: { ...vals, type: '2', equipmentId: drawer?.item?.id },
......@@ -2079,7 +2057,7 @@ function Model(props) {
if (!isNaN(Number(i))) {
equipmentCharReqList.push({
fieldId: i,
fieldRealValueList: vals[i],
fieldRealValue: vals[i],
});
delete vals[i];
}
......@@ -2124,7 +2102,7 @@ function Model(props) {
if (!isNaN(Number(i))) {
equipmentCharReqList.push({
fieldId: i,
fieldRealValueList: vals[i],
fieldRealValue: vals[i],
});
delete vals[i];
}
......@@ -2231,9 +2209,6 @@ function Model(props) {
setDrawer((s) => ({
...s,
visible: false,
item: null,
detailpath: null,
params: null,
}));
}}
{...drawer}
......
src/pages/device/supplier/index.jsx
View file @ 2271b5e2
......@@ -2,7 +2,7 @@
* @Author: Li Hanlin
* @Date: 2022-11-09 14:44:44
* @Last Modified by: Li Hanlin
* @Last Modified time: 2022-12-13 17:09:31
* @Last Modified time: 2022-12-14 09:15:07
*/
import * as React from 'react';
......@@ -217,7 +217,7 @@ function Supplier(props) {
//console.log(res?.data?.data);
let obj = {};
res?.data?.data['equipmentSupplierCharReqList']?.forEach((it) => {
obj[it?.fieldId] = it?.fieldRealValueList;
obj[it?.fieldId] = it?.fieldRealValue;
});
// console.log('drawerpro:', {
// ...(res?.data?.data ?? {}),
......@@ -339,7 +339,7 @@ function Supplier(props) {
if (!isNaN(Number(i))) {
equipmentSupplierCharReqList.push({
fieldId: i,
fieldRealValueList: vals[i],
fieldRealValue: vals[i],
});
delete vals[i];
}
......@@ -385,7 +385,7 @@ function Supplier(props) {
if (!isNaN(Number(i))) {
equipmentSupplierCharReqList.push({
fieldId: i,
fieldRealValueList: vals[i],
fieldRealValue: vals[i],
});
delete vals[i];
}
......
src/pages/setting/organization/columns.js
View file @ 2271b5e2
......@@ -8,7 +8,7 @@ function getcolumns(setdrawer) {
formItemProps: {
rules: [
{
required: false,
required: true,
message: '此项为必填项',
},
],
......
src/pages/setting/role/index.jsx
View file @ 2271b5e2
......@@ -2,7 +2,7 @@
* @Author: Li Hanlin
* @Date: 2022-11-09 14:44:44
* @Last Modified by: Li Hanlin
* @Last Modified time: 2022-11-24 15:39:28
* @Last Modified time: 2022-12-14 09:56:26
*/
import * as React from 'react';
......@@ -195,10 +195,10 @@ function Role(props) {
{
title: '部门名称',
dataIndex: 'departmentName',
valueType: 'select',
valueType: 'treeSelect',
key: 'departmentId',
options: {
path: '/auth/sysDepartment/query/depart/selectbox',
path: '/auth/sysDepartment/query/children/tree',
linkParams: {
organizationId: 'parentId',
},
......
src/pages/setting/users/columns.js
View file @ 2271b5e2
......@@ -20,134 +20,6 @@ function getcolumns(setdrawer) {
render: (text, row) => {
return (
<a
// onClick={async () => {
// let newfieldscolumns = [];
// const fieldscolumns = [
// {
// title: '用户名',
// dataIndex: 'username',
// key: 'username',
// },
// {
// title: '姓名',
// dataIndex: 'fullName',
// key: 'fullName',
// },
// { title: '手机号', dataIndex: 'telephone', key: 'telephone' },
// {
// title: '邮箱',
// dataIndex: 'mailNo',
// key: 'mailNo',
// },
// {
// title: '公司名称',
// dataIndex: 'organizationName',
// key: 'organizationId',
// },
// {
// title: '部门名称',
// dataIndex: 'departmentName',
// key: 'departmentId',
// },
// {
// title: '负责工厂',
// dataIndex: 'factoryNames',
// key: 'factoryNames',
// },
// {
// title: '负责车间',
// dataIndex: 'shopNames',
// key: 'shopNames',
// },
// {
// title: '负责工段',
// dataIndex: 'sectionName',
// key: 'sectionIdList',
// },
// {
// title: '负责产线',
// dataIndex: 'productionLines',
// key: 'productionLineIdList',
// },
// {
// title: '角色配置',
// dataIndex: 'roleNames',
// key: 'roleIdList',
// },
// {
// title: '直属领导',
// dataIndex: 'parentName',
// key: 'parentId',
// },
// {
// title: '状态',
// dataIndex: 'statusName',
// key: 'status',
// },
// ];
// const selectValueType = (type, options) => {
// switch (type) {
// case 1:
// return {
// valueType: 'input',
// };
// case 2:
// return {
// valueType: 'select',
// options,
// };
// case 3:
// return {
// valueType: 'radio',
// options,
// };
// case 4:
// return {
// valueType: 'select',
// options,
// };
// default:
// break;
// }
// };
// let res = await doFetch({
// url: '/base/paFormField/queryList',
// params: {
// formId: '1',
// },
// });
// if (res?.data?.dataList) {
// let column = [
// {
// title: '扩展字段',
// valueType: 'split',
// },
// ];
// res?.data?.dataList?.forEach((el) => {
// column.push({
// ...selectValueType(el.fieldChar, el.valueList),
// title: el.fieldName,
// dataIndex: el.id,
// key: el.id,
// });
// });
// newfieldscolumns = fieldscolumns.concat(column);
// //console.log('fieldscolumns', newfieldscolumns);
// }
// setdrawer((s) => ({
// ...s,
// visible: true,
// item: row,
// title: '详情',
// fields: newfieldscolumns,
// extendField: 'userCharList',
// detailpath: '/auth/sysUser/detail',
// params: { id: row.id },
// val: 'detail',
// title: row.fullName + '的详细信息',
// }));
// }}
onClick={() => {
fieldsDetail(
[
......@@ -189,7 +61,7 @@ function getcolumns(setdrawer) {
},
{
title: '负责工段',
dataIndex: 'sectionName',
dataIndex: 'sectionNames',
key: 'sectionIdList',
},
{
......@@ -247,11 +119,11 @@ function getcolumns(setdrawer) {
title: '部门名称',
width: 120,
align: 'center',
valueType: 'select',
valueType: 'treeSelect',
dataIndex: 'departmentName',
key: 'departmentId',
options: {
path: '/auth/sysDepartment/query/depart/selectbox',
path: '/auth/sysDepartment/query/children/tree',
linkParams: {
organizationId: 'parentId',
},
......
src/pages/setting/users/index.jsx
View file @ 2271b5e2
......@@ -2,7 +2,7 @@
* @Author: Li Hanlin
* @Date: 2022-11-09 14:44:44
* @Last Modified by: Li Hanlin
* @Last Modified time: 2022-12-13 17:09:41
* @Last Modified time: 2022-12-14 09:15:23
*/
import * as React from 'react';
......@@ -163,7 +163,7 @@ function User(props) {
if (!isNaN(Number(i))) {
userCharReqList.push({
fieldId: i,
fieldRealValueList: vals[i],
fieldRealValue: vals[i],
});
delete vals[i];
}
......@@ -211,7 +211,7 @@ function User(props) {
if (!isNaN(Number(i))) {
userCharReqList.push({
fieldId: i,
fieldRealValueList: vals[i],
fieldRealValue: vals[i],
});
delete vals[i];
}
......
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