Skip to content

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

qweqwe

parent c64cfb4d
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 58 deletions
src/pages/device/account/index.jsx
View file @ 2cd55116
......@@ -2,7 +2,7 @@
* @Author: Li Hanlin
* @Date: 2022-11-10 09:39:56
* @Last Modified by: Li Hanlin
* @Last Modified time: 2022-12-16 15:40:58
* @Last Modified time: 2022-12-16 21:23:19
*/
import * as React from 'react';
......@@ -255,68 +255,35 @@ function Model(props) {
},
{
title: '借用公司',
dataIndex: 'organizationName',
key: 'toOrganizationId',
valueType: 'select',
options: { path: '/auth/sysDepartment/query/organization/selectbox', params: {} },
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
dataIndex: 'toOrganizationName',
key: 'toOrganizationName',
},
{
title: '借用部门',
valueType: 'treeSelect',
dataIndex: 'departmentName',
key: 'toDepartmentId',
options: {
path: '/auth/sysDepartment/query/children/tree',
linkParams: {
toOrganizationId: 'parentId',
},
},
dataIndex: 'toDepartmentName',
key: 'toDepartmentName',
},
{
title: '借用工厂',
dataIndex: 'factoryName',
key: 'toFactoryId',
valueType: 'select',
options: { path: '/auth/sysFactory/getAllFactorySelection', params: {} },
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
dataIndex: 'toFactoryName',
key: 'toFactoryName',
},
{
title: '借用车间',
dataIndex: 'shopName',
dataIndex: 'toShopName',
valueType: 'select',
options: {
path: '/auth/sysShop/getShopSelectionByFactory',
linkParams: {
toFactoryId: 'factoryId',
},
},
key: 'toShopId',
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
key: 'toShopName',
},
{
title: '借用工段',
dataIndex: 'sectionName',
key: 'toSectionId',
valueType: 'select',
options: {
path: '/auth/sysSection/getAllSectionSelectionByShop',
linkParams: {
toShopId: 'shopId',
},
},
dataIndex: 'toSectionName',
key: 'toSectionName',
},
{
title: '借用产线',
dataIndex: 'productionLines',
valueType: 'select',
key: 'toProductLineId',
options: {
path: '/auth/sysProductionLine/getAllProductLineSelectionByShop',
linkParams: {
toShopId: 'shopId',
},
},
dataIndex: 'toProductLineName',
key: 'toProductLineName',
},
{
title: '借用位置号',
......@@ -359,8 +326,8 @@ function Model(props) {
},
{
title: '接收公司',
dataIndex: 'returnOrganizationId',
key: 'returnOrganizationId',
dataIndex: 'returnOrganizationName',
key: 'returnOrganizationName',
valueType: 'select',
options: { path: '/auth/sysDepartment/query/organization/selectbox', params: {} },
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
......@@ -368,8 +335,8 @@ function Model(props) {
{
title: '接收部门',
valueType: 'treeSelect',
dataIndex: 'returnDepartmentId',
key: 'returnDepartmentId',
dataIndex: 'returnDepartmentName',
key: 'returnDepartmentName',
options: {
path: '/auth/sysDepartment/query/children/tree',
linkParams: {
......@@ -379,15 +346,15 @@ function Model(props) {
},
{
title: '接收工厂',
dataIndex: 'returnFactoryId',
key: 'returnFactoryId',
dataIndex: 'returnFactoryName',
key: 'returnFactoryName',
valueType: 'select',
options: { path: '/auth/sysFactory/getAllFactorySelection', params: {} },
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
},
{
title: '接收车间',
dataIndex: 'returnShopId',
dataIndex: 'returnShopName',
valueType: 'select',
options: {
path: '/auth/sysShop/getShopSelectionByFactory',
......@@ -400,7 +367,7 @@ function Model(props) {
},
{
title: '接收工段',
dataIndex: 'returnSectionId',
dataIndex: 'returnSectionName',
key: 'returnSectionId',
valueType: 'select',
options: {
......@@ -412,7 +379,7 @@ function Model(props) {
},
{
title: '接收产线',
dataIndex: 'returnProductLineId',
dataIndex: 'returnProductLineName',
valueType: 'select',
key: 'returnProductLineId',
options: {
......@@ -567,6 +534,9 @@ function Model(props) {
id: row.id,
reformDate: formatDate(new Date()),
scrapDate: formatDate(new Date()),
transferDate: formatDate(new Date()),
borrowDate: formatDate(new Date()),
realReturnDate: formatDate(new Date()),
},
val: 'only',
title: '履历登记',
......@@ -1073,6 +1043,7 @@ function Model(props) {
dataIndex: 'createTime',
key: 'createTime',
width: 120,
searchValueType: 'timeRange',
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
},
{
......@@ -1764,7 +1735,7 @@ function Model(props) {
dataIndex: 'remark',
key: 'remark',
valueType: 'textarea',
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
formItemProps: { rules: [{ required: false, message: '此项为必填项' }] },
},
],
};
......@@ -1905,6 +1876,7 @@ function Model(props) {
children: activeTab == 3 && (
<InitForm
fields={fields[activeTab]}
defaultFormValue={drawer?.item}
onFinish={async (vals) => {
//console.log(vals);
let res = await doFetch({
......@@ -1929,6 +1901,7 @@ function Model(props) {
key: 4,
children: activeTab == 4 && (
<InitForm
defaultFormValue={drawer?.item}
fields={fields[activeTab]}
onFinish={async (vals) => {
//console.log(vals);
......@@ -1955,6 +1928,7 @@ function Model(props) {
children: activeTab == 5 && (
<InitForm
fields={fields[activeTab]}
defaultFormValue={drawer?.item}
onFinish={async (vals) => {
//console.log(vals);
let res = await doFetch({
......
src/pages/setting/users/index.jsx
View file @ 2cd55116
......@@ -2,7 +2,7 @@
* @Author: Li Hanlin
* @Date: 2022-11-09 14:44:44
* @Last Modified by: Li Hanlin
* @Last Modified time: 2022-12-16 20:20:17
* @Last Modified time: 2022-12-16 20:51:25
*/
import * as React from 'react';
......@@ -160,7 +160,7 @@ function User(props) {
setDrawer={setDrawer}
drawer={drawer}
formRef={formRef}
columns={columns}
columns={getcolumns(false, formRef)}
formId={'1'}
// urlParams={urlParams}
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