Skip to content

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

1219bug

parent e159e4e6
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 13 deletions
src/components/InitForm/FormItems.jsx
View file @ c20c1f9f
...@@ -1418,7 +1418,7 @@ function FormList({ item, colProps, formRef }) { ...@@ -1418,7 +1418,7 @@ function FormList({ item, colProps, formRef }) {
<ProFormList <ProFormList
name={item.key ?? item.dataIndex} name={item.key ?? item.dataIndex}
label={item.title} label={item.title}
min={item.min ?? 1} min={item.min ?? 0}
max={item.max ?? 100} max={item.max ?? 100}
itemContainerRender={(doms) => { itemContainerRender={(doms) => {
return <ProForm.Group>{doms}</ProForm.Group>; return <ProForm.Group>{doms}</ProForm.Group>;
......
src/pages/device/account/columns.js
View file @ c20c1f9f
...@@ -34,6 +34,10 @@ function getcolumns(setdrawer) { ...@@ -34,6 +34,10 @@ function getcolumns(setdrawer) {
dataIndex: 'equipmentTypeName', dataIndex: 'equipmentTypeName',
key: 'equipmentTypeId', key: 'equipmentTypeId',
valueType: 'treeSelect', valueType: 'treeSelect',
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
options: { path: '/asset/equipmentType/queryTreeList', params: {} }, options: { path: '/asset/equipmentType/queryTreeList', params: {} },
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] }, formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
}, },
...@@ -44,6 +48,10 @@ function getcolumns(setdrawer) { ...@@ -44,6 +48,10 @@ function getcolumns(setdrawer) {
align: 'center', align: 'center',
key: 'equipmentModelId', key: 'equipmentModelId',
valueType: 'select', valueType: 'select',
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
options: { path: '/asset/equipmentModel/query/selection', params: {} }, options: { path: '/asset/equipmentModel/query/selection', params: {} },
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] }, formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
}, },
...@@ -53,6 +61,10 @@ function getcolumns(setdrawer) { ...@@ -53,6 +61,10 @@ function getcolumns(setdrawer) {
dataIndex: 'organizationName', dataIndex: 'organizationName',
width: 120, width: 120,
key: 'organizationId', key: 'organizationId',
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
valueType: 'select', valueType: 'select',
options: { path: '/auth/sysDepartment/query/organization/selectbox', params: {} }, options: { path: '/auth/sysDepartment/query/organization/selectbox', params: {} },
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] }, formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
...@@ -63,6 +75,10 @@ function getcolumns(setdrawer) { ...@@ -63,6 +75,10 @@ function getcolumns(setdrawer) {
align: 'center', align: 'center',
valueType: 'treeSelect', valueType: 'treeSelect',
dataIndex: 'departmentName', dataIndex: 'departmentName',
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
key: 'departmentId', key: 'departmentId',
options: { options: {
path: '/auth/sysDepartment/query/children/tree', path: '/auth/sysDepartment/query/children/tree',
...@@ -76,6 +92,10 @@ function getcolumns(setdrawer) { ...@@ -76,6 +92,10 @@ function getcolumns(setdrawer) {
dataIndex: 'factoryName', dataIndex: 'factoryName',
key: 'factoryId', key: 'factoryId',
width: 120, width: 120,
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
align: 'center', align: 'center',
valueType: 'select', valueType: 'select',
options: { path: '/auth/sysFactory/getAllFactorySelection', params: {} }, options: { path: '/auth/sysFactory/getAllFactorySelection', params: {} },
...@@ -87,6 +107,10 @@ function getcolumns(setdrawer) { ...@@ -87,6 +107,10 @@ function getcolumns(setdrawer) {
align: 'center', align: 'center',
width: 120, width: 120,
valueType: 'select', valueType: 'select',
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
options: { options: {
path: '/auth/sysShop/getShopSelectionByFactory', path: '/auth/sysShop/getShopSelectionByFactory',
linkParams: { linkParams: {
...@@ -102,6 +126,10 @@ function getcolumns(setdrawer) { ...@@ -102,6 +126,10 @@ function getcolumns(setdrawer) {
dataIndex: 'sectionName', dataIndex: 'sectionName',
align: 'center', align: 'center',
key: 'sectionId', key: 'sectionId',
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
valueType: 'select', valueType: 'select',
options: { options: {
path: '/auth/sysSection/getAllSectionSelectionByShop', path: '/auth/sysSection/getAllSectionSelectionByShop',
...@@ -115,6 +143,10 @@ function getcolumns(setdrawer) { ...@@ -115,6 +143,10 @@ function getcolumns(setdrawer) {
width: 120, width: 120,
dataIndex: 'productLineName', dataIndex: 'productLineName',
valueType: 'select', valueType: 'select',
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
key: 'productLineId', key: 'productLineId',
align: 'center', align: 'center',
options: { options: {
......
src/pages/device/account/index.jsx
View file @ c20c1f9f
...@@ -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: 2022-12-19 09:21:53 * @Last Modified time: 2022-12-19 10:45:52
*/ */
import * as React from 'react'; import * as React from 'react';
...@@ -1041,9 +1041,9 @@ function Model(props) { ...@@ -1041,9 +1041,9 @@ function Model(props) {
{ {
title: '操作时间', title: '操作时间',
dataIndex: 'createTime', dataIndex: 'createTime',
key: 'createTime', key: 'operateTimeList',
width: 120, width: 120,
searchValueType: 'timeRange', searchValueType: 'dateRange',
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] }, formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
}, },
{ {
...@@ -1051,6 +1051,29 @@ function Model(props) { ...@@ -1051,6 +1051,29 @@ function Model(props) {
dataIndex: 'logTypeName', dataIndex: 'logTypeName',
width: 120, width: 120,
key: 'logType', key: 'logType',
valueType: 'select',
options: [
{
label: '改造',
value: '1',
},
{
label: '报废',
value: '2',
},
{
label: '调拨',
value: '3',
},
{
label: '借用',
value: '4',
},
{
label: '归还',
value: '5',
},
],
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] }, formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
}, },
{ {
...@@ -1134,7 +1157,7 @@ function Model(props) { ...@@ -1134,7 +1157,7 @@ function Model(props) {
title: '设备编号', title: '设备编号',
dataIndex: 'equipmentNo', dataIndex: 'equipmentNo',
key: 'equipmentNo', key: 'equipmentNo',
searchfalse, search: false,
align: 'center', align: 'center',
width: 120, width: 120,
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] }, formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
...@@ -1153,6 +1176,10 @@ function Model(props) { ...@@ -1153,6 +1176,10 @@ function Model(props) {
dataIndex: 'organizationName', dataIndex: 'organizationName',
width: 120, width: 120,
key: 'organizationId', key: 'organizationId',
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
valueType: 'select', valueType: 'select',
options: { path: '/auth/sysDepartment/query/organization/selectbox', params: {} }, options: { path: '/auth/sysDepartment/query/organization/selectbox', params: {} },
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] }, formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
...@@ -1163,6 +1190,10 @@ function Model(props) { ...@@ -1163,6 +1190,10 @@ function Model(props) {
align: 'center', align: 'center',
valueType: 'treeSelect', valueType: 'treeSelect',
dataIndex: 'departmentName', dataIndex: 'departmentName',
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
key: 'departmentId', key: 'departmentId',
options: { options: {
path: '/auth/sysDepartment/query/children/tree', path: '/auth/sysDepartment/query/children/tree',
...@@ -1177,6 +1208,10 @@ function Model(props) { ...@@ -1177,6 +1208,10 @@ function Model(props) {
key: 'factoryId', key: 'factoryId',
width: 120, width: 120,
align: 'center', align: 'center',
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
valueType: 'select', valueType: 'select',
options: { path: '/auth/sysFactory/getAllFactorySelection', params: {} }, options: { path: '/auth/sysFactory/getAllFactorySelection', params: {} },
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] }, formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
...@@ -1186,6 +1221,10 @@ function Model(props) { ...@@ -1186,6 +1221,10 @@ function Model(props) {
dataIndex: 'shopName', dataIndex: 'shopName',
align: 'center', align: 'center',
width: 120, width: 120,
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
valueType: 'select', valueType: 'select',
options: { options: {
path: '/auth/sysShop/getShopSelectionByFactory', path: '/auth/sysShop/getShopSelectionByFactory',
...@@ -1202,6 +1241,10 @@ function Model(props) { ...@@ -1202,6 +1241,10 @@ function Model(props) {
dataIndex: 'sectionName', dataIndex: 'sectionName',
align: 'center', align: 'center',
key: 'sectionId', key: 'sectionId',
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
valueType: 'select', valueType: 'select',
options: { options: {
path: '/auth/sysSection/getAllSectionSelectionByShop', path: '/auth/sysSection/getAllSectionSelectionByShop',
...@@ -1216,6 +1259,10 @@ function Model(props) { ...@@ -1216,6 +1259,10 @@ function Model(props) {
dataIndex: 'productLineName', dataIndex: 'productLineName',
valueType: 'select', valueType: 'select',
key: 'productLineName', key: 'productLineName',
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
align: 'center', align: 'center',
options: { options: {
path: '/auth/sysProductionLine/getAllProductLineSelectionByShop', path: '/auth/sysProductionLine/getAllProductLineSelectionByShop',
......
src/pages/device/supplier/columns.js
View file @ c20c1f9f
...@@ -208,6 +208,15 @@ function getcolumns(setdrawer) { ...@@ -208,6 +208,15 @@ function getcolumns(setdrawer) {
colProps: { colProps: {
sm: 6, sm: 6,
}, },
formItemProps: {
rules: [
{
required: false,
message: '此项为必填项',
},
{ pattern: new RegExp(/^1[3456789]\d{9}$/, 'g'), message: '' },
],
},
}, },
{ {
title: '邮箱', title: '邮箱',
...@@ -222,7 +231,7 @@ function getcolumns(setdrawer) { ...@@ -222,7 +231,7 @@ function getcolumns(setdrawer) {
dataIndex: 'title', dataIndex: 'title',
key: 'title', key: 'title',
fieldProps: { fieldProps: {
placeholder: '请选择', placeholder: '请输入',
}, },
formItemProps: { formItemProps: {
rules: [ rules: [
......
src/pages/device/supplier/index.jsx
View file @ c20c1f9f
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: Li Hanlin * @Author: Li Hanlin
* @Date: 2022-11-09 14:44:44 * @Date: 2022-11-09 14:44:44
* @Last Modified by: Li Hanlin * @Last Modified by: Li Hanlin
* @Last Modified time: 2022-12-14 14:33:30 * @Last Modified time: 2022-12-19 11:14:04
*/ */
import * as React from 'react'; import * as React from 'react';
...@@ -146,7 +146,7 @@ function Supplier(props) { ...@@ -146,7 +146,7 @@ function Supplier(props) {
}, },
{ {
title: '状态', title: '状态',
dataIndex: 'status', dataIndex: 'statusName',
key: 'status', key: 'status',
}, },
{ {
......
src/pages/setting/users/columns.js
View file @ c20c1f9f
...@@ -2,7 +2,7 @@ import { doFetch } from '@/utils/doFetch'; ...@@ -2,7 +2,7 @@ import { doFetch } from '@/utils/doFetch';
import { Image } from 'antd'; import { Image } from 'antd';
import fieldsDetail from '@/utils/fieldsDetail'; import fieldsDetail from '@/utils/fieldsDetail';
import { useState, useEffect } from 'react'; import { useState, useEffect } from 'react';
function getcolumns(ifs, formRef) { function getcolumns(setDrawer, ifs, formRef) {
// const options = usermsg?.map((it) => ({ // const options = usermsg?.map((it) => ({
// label: `${it?.username}-${it?.fullName}`, // label: `${it?.username}-${it?.fullName}`,
// value: it?.id, // value: it?.id,
......
src/pages/setting/users/index.jsx
View file @ c20c1f9f
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: Li Hanlin * @Author: Li Hanlin
* @Date: 2022-11-09 14:44:44 * @Date: 2022-11-09 14:44:44
* @Last Modified by: Li Hanlin * @Last Modified by: Li Hanlin
* @Last Modified time: 2022-12-16 20:51:25 * @Last Modified time: 2022-12-19 10:32:30
*/ */
import * as React from 'react'; import * as React from 'react';
...@@ -143,7 +143,7 @@ function User(props) { ...@@ -143,7 +143,7 @@ function User(props) {
}; };
const columns = useMemo(() => { const columns = useMemo(() => {
let defcolumn = getcolumns(setDrawer, formRef); let defcolumn = getcolumns(setDrawer, false, formRef);
return defcolumn.concat({ return defcolumn.concat({
title: '操作', title: '操作',
valueType: 'option', valueType: 'option',
...@@ -160,7 +160,7 @@ function User(props) { ...@@ -160,7 +160,7 @@ function User(props) {
setDrawer={setDrawer} setDrawer={setDrawer}
drawer={drawer} drawer={drawer}
formRef={formRef} formRef={formRef}
columns={getcolumns(false, formRef)} columns={getcolumns(setDrawer, false, formRef)}
formId={'1'} formId={'1'}
// urlParams={urlParams} // urlParams={urlParams}
onFinish={async (vals) => { onFinish={async (vals) => {
...@@ -215,7 +215,7 @@ function User(props) { ...@@ -215,7 +215,7 @@ function User(props) {
setDrawer={setDrawer} setDrawer={setDrawer}
drawer={drawer} drawer={drawer}
actionRef={actionRef} actionRef={actionRef}
columns={getcolumns(true, formRef)} columns={getcolumns(setDrawer, true, formRef)}
formId={'1'} formId={'1'}
urlParams={urlParams} urlParams={urlParams}
onFinish={async (vals) => { onFinish={async (vals) => {
......
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