diff --git a/src/components/Common/CommonCheckBillEvent.js b/src/components/Common/CommonCheckBillEvent.js
index 070396b..967f007 100644
--- a/src/components/Common/CommonCheckBillEvent.js
+++ b/src/components/Common/CommonCheckBillEvent.js
@@ -2452,8 +2452,10 @@ export default (ChildComponent) => {
return;
}
- //
- onGetDataOk(masterConfig, slaveConfig, checkConfig);
+ const bChanged = commonBusiness.handleGetChanged(that.props) ;
+ if(bChanged) {
+ onGetDataOk(masterConfig, slaveConfig, checkConfig);
+ }
onSaveStateOk({ enabled: false });
if (commonUtils.isNotEmptyObject(copyTo)) {
const { slaveData } = copyTo;
diff --git a/src/components/Common/CommonComponentNew/index.tsx b/src/components/Common/CommonComponentNew/index.tsx
index c9fa996..fec4593 100644
--- a/src/components/Common/CommonComponentNew/index.tsx
+++ b/src/components/Common/CommonComponentNew/index.tsx
@@ -1,22 +1,61 @@
-import React, { useEffect, useState } from 'react';
-import { Form, Input, InputNumber, Select, Tooltip } from 'antd-v4';
+import React, { useEffect, useState, useRef } from 'react';
+import { Form, Input, InputNumber, Select, Tooltip } from 'antd';
import * as commonUtils from "@/utils/utils";
-import type { SelectProps } from 'antd-v4';
-import type { PropsType, FormItemTypeKey } from './type';
+import type { SelectProps } from 'antd';
+import type { PropsType, FormItemTypeKey, StateType } from './type';
const FormItemTypeEvent = (props: PropsType) => {
-
+ const addState: any = {};
const { showConfig } = props;
const { sName = "", bNotEmpty } = showConfig;
- const addState: any = {};
- addState.formItemProps = (): any => {
+ const [state, setState] = useState
({
+ searchValue: "",
+ });
+ addState.state = state;
+ const onSaveState0 = (value: StateType) => {
+ setState(pre => ({ ...pre, ...value }))
+ }
+ addState.onSaveState0 = onSaveState0;
+
+ const antdRef = useRef(null);
+ addState.antdRef = antdRef;
+
+ useEffect(() => {
+ antdRef.current?.focus();
+ }, [])
+
+ const formItemProps = (): any => {
return {
style: { margin: 0 },
name: sName,
rules: [{ required: bNotEmpty, message: 必填
}]
}
}
+ addState.formItemProps = formItemProps;
+
+ const dropDownRef = useRef(null);
+ const getDropDownData = ({ searchValue = '', pageNum = 1 } = { searchValue: '', pageNum: 1 }) => {
+ const { formId, name, record, } = props;
+ const { dropDownData: dropDownDataOld = [], totalPageCount } = state;
+ if (totalPageCount && pageNum > totalPageCount) return;
+ const tempId = commonUtils.createSid();
+ dropDownRef.current = tempId;
+ props.getSqlDropDownData(formId, name, showConfig, record, searchValue, pageNum).then((result: any = {}) => {
+ if (dropDownRef.current !== tempId) return;
+ const {
+ currentPageNo: pageNum, totalPageCount, totalCount, conditonValues, dropDownData = [],
+ } = result;
+ onSaveState0({
+ pageNum,
+ totalPageCount,
+ totalCount,
+ // conditonValues,
+ dropDownData: [...(pageNum === 1 ? [] : dropDownDataOld), ...dropDownData],
+ })
+ });
+ }
+ addState.getDropDownData = getDropDownData;
return {
...props,
@@ -52,37 +91,73 @@ const FormItemInput: React.FC = (props): React.ReactElement => {
return
-
+
}
// 下拉框
const FormItemInputSelect: React.FC = (props): React.ReactElement => {
- const { name, showConfig, record } = props;
- const { sName } = showConfig;
- const [options, setOptions] = useState([]);
+ const { name, showConfig, record, state } = props;
+ const { dropDownData = [] } = state;
+ const { sName, sDropDownType } = showConfig;
const [fieldNames, setFieldNames] = useState(null);
+ const timer = useRef(null);
// 获取下拉数据
useEffect(() => {
- const { dropDownData, showDropDown, sAssignField } = showConfig;
+ const { dropDownData, showDropDown } = showConfig;
+ if (sDropDownType === "sql") {
+ props.getDropDownData();
+ return;
+ }
const data = dropDownData || (typeof showDropDown === 'object') ? showDropDown : commonUtils.objectToArr(commonUtils.convertStrToObj(showDropDown));
if (!data?.length) return;
- setOptions(data);
+ props.onSaveState0({
+ dropDownData: data,
+ })
+
+ }, [])
- const data0 = data[0];
+ useEffect(() => {
+ if (!dropDownData.length) return;
+ const data0 = dropDownData[0];
setFieldNames({
label: Object.keys(data0)[0],
value: data0.sSlaveId ? 'sSlaveId' : 'sId',
})
- }, [])
+ }, [!!dropDownData.length])
+
+ const handlePopupScroll = (e: React.UIEvent) => {
+ // e.persist();
+ const { dropDownData } = showConfig;
+ const target = e.target as HTMLDivElement;
+ const { scrollTop, offsetHeight, scrollHeight } = target;
+ if (Math.ceil(scrollTop + offsetHeight) >= scrollHeight && sDropDownType === 'sql' && commonUtils.isEmptyArr(dropDownData)) {
+ const {
+ pageNum, searchPageNum, searchTotalPageCount, searchValue, totalPageCount,
+ } = state;
+ const nextPageNum = pageNum + 1;
+ const nextSearchPageNum = searchPageNum + 1;
+ props.getDropDownData({ searchValue, pageNum: searchValue === '' ? nextPageNum : nextSearchPageNum });
+ }
+ };
const selectProps: SelectProps = {
+ filterOption: sDropDownType !== "sql",
+ showSearch: true,
fieldNames,
- options,
+ options: dropDownData,
onChange: (value: any) => {
- props.onChange(name, sName, { [sName]: value }, record.sId, options)
- }
+ props.onChange(name, sName, { [sName]: dropDownData.find((item: any) => item[fieldNames.value] === value)[fieldNames.label] }, record.sId, dropDownData)
+ },
+ onSearch: (value: string) => {
+ if (sDropDownType !== 'sql' || showConfig.dropDownData) return;
+ clearTimeout(timer.current);
+ timer.current = setTimeout(() => {
+ props.getDropDownData({ searchValue: value, pageNum: 1 });
+ }, 500);
+ },
+ onPopupScroll: handlePopupScroll
}
return = (props): React.ReactElement =>
return
-
+
}
diff --git a/src/components/Common/CommonComponentNew/type.ts b/src/components/Common/CommonComponentNew/type.ts
index b82ffe3..5cae59b 100644
--- a/src/components/Common/CommonComponentNew/type.ts
+++ b/src/components/Common/CommonComponentNew/type.ts
@@ -1,18 +1,23 @@
-import type { RecordType, ShowConfigType } from '../CommonTableNew/type';
+import type { RecordType, ShowConfigType } from "../CommonTableNew/type";
export interface PropsType {
- ref: React.RefObject;
+ // ref: React.RefObject;
form: any;
showConfig: ShowConfigType;
onSave?: (data: RecordType) => void;
- onChange: (
- tableName: string,
- sName: string,
- returnValue: RecordType,
- sId: string,
- dropDownData: RecordType[],
- ) => void;
+ onChange: (tableName: string, sName: string, returnValue: RecordType, sId: string, dropDownData: RecordType[]) => void;
+ getDropDownData: (params?: { searchValue?: string; pageNum?: number }) => void;
[key: string]: any;
}
-export type FormItemTypeKey = 's' | 'i' | 'b' | 'd' | 't';
+export type FormItemTypeKey = "s" | "i" | "b" | "d" | "t";
+
+export interface StateType {
+ // 下拉搜索框的值
+ searchValue?: string; // 搜索条件
+ pageNum?: number; // 当前页码
+ totalPageCount?: number; // 总页数
+ totalCount?: number; // 总条数
+ dropDownData?: RecordType[]; // 下拉框数据
+ // 其他可能的字段也可以在这里添加
+}
diff --git a/src/components/Common/CommonElementEvent.js b/src/components/Common/CommonElementEvent.js
index a278786..1a0bcd2 100644
--- a/src/components/Common/CommonElementEvent.js
+++ b/src/components/Common/CommonElementEvent.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
/* eslint-disable array-callback-return,no-undef,prefer-destructuring */
import React, { Component } from 'react';
import { Modal, message } from 'antd-v4';
@@ -144,22 +145,37 @@ export default (ChildComponent) => {
...addState,
});
}
- if (commonUtils.isEmptyObject(machineOldConfig) && formData.length > 0 && sModelsType === 'element/processInfo') {
+ if (commonUtils.isEmptyObject(masterConfig) && formData.length > 0 && sModelsType === 'element/processInfo') {
const sId = currentId !== undefined ? currentId : '';
/* 数据Id */
const masterConfig = formData.filter(item => !item.bGrd)[0];
/* bGrd代表是否是表格 */
- const machineConfig = formData.filter(item => item.bGrd && item.sTbName === 'eleprocessmachine')[0];
- const machineColumn = commonFunc.getHeaderConfig(machineConfig);
- const assortConfig = formData.filter(item => item.bGrd && item.sTbName === 'eleprocessloss')[0]; /* 劲嘉 配套工序不要使用，换成 装版损设置 */
- const assortColumn = commonFunc.getHeaderConfig(assortConfig);
- const outsideConfig = formData.filter(item => item.bGrd && item.sTbName === 'eleprocessoutside')[0];
- const outsideColumn = commonFunc.getHeaderConfig(outsideConfig);
- const processstyleConfig = formData.filter(item => item.bGrd && item.sTbName === 'eleprocessstyle')[0];
- const processstyleColumn = commonFunc.getHeaderConfig(processstyleConfig);
- const processApsRuleConfig = formData.filter(item => item.bGrd && item.sTbName === 'eleprocesssApsRule')[0]; /* APS定义规则 */
- const processApsRuleColumn = commonFunc.getHeaderConfig(processApsRuleConfig);
-
+ const machineConfig = commonUtils.isNotEmptyArr(formData.filter(item => item.bGrd && item.sTbName === 'eleprocessmachine')) ? formData.filter(item => item.bGrd && item.sTbName === 'eleprocessmachine')[0] : {};
+ let machineColumn = [];
+ if (commonUtils.isNotEmptyObject(machineConfig)) {
+ machineColumn = commonFunc.getHeaderConfig(machineConfig);
+ }
+ const assortConfig = commonUtils.isNotEmptyArr(formData.filter(item => item.bGrd && item.sTbName === 'eleprocessloss')) ? formData.filter(item => item.bGrd && item.sTbName === 'eleprocessloss')[0] : {}; /* 劲嘉 配套工序不要使用，换成 装版损设置 */
+ let assortColumn = [];
+ if (commonUtils.isNotEmptyObject(assortConfig)) {
+ assortColumn = commonFunc.getHeaderConfig(assortConfig);
+ }
+ const outsideConfig = commonUtils.isNotEmptyArr(formData.filter(item => item.bGrd && item.sTbName === 'eleprocessoutside')) ? formData.filter(item => item.bGrd && item.sTbName === 'eleprocessoutside')[0] : {};
+ let outsideColumn = [];
+ if (commonUtils.isNotEmptyObject(outsideConfig)) {
+ outsideColumn = commonFunc.getHeaderConfig(outsideConfig);
+ }
+ const processstyleConfig = commonUtils.isNotEmptyArr(formData.filter(item => item.bGrd && item.sTbName === 'eleprocessoutside')) ? formData.filter(item => item.bGrd && item.sTbName === 'eleprocessstyle')[0] : {};
+ let processstyleColumn = [];
+ if (commonUtils.isNotEmptyObject(processstyleConfig)) {
+ processstyleColumn = commonFunc.getHeaderConfig(processstyleConfig);
+ }
+ console.log('22221', formData, processstyleConfig);
+ const processApsRuleConfig = commonUtils.isNotEmptyArr(formData.filter(item => item.bGrd && item.sTbName === 'eleprocesssApsRule')) ? formData.filter(item => item.bGrd && item.sTbName === 'eleprocesssApsRule')[0] : {}; /* APS定义规则 */
+ let processApsRuleColumn = [];
+ if (commonUtils.isNotEmptyObject(processApsRuleConfig)) {
+ processApsRuleColumn = commonFunc.getHeaderConfig(processApsRuleConfig);
+ }
const dynamicParamConfig = commonUtils.isNotEmptyArr(formData.filter(item => item.bGrd && item.sTbName === 'eleprocessdynamic')) ? formData.filter(item => item.bGrd && item.sTbName === 'eleprocessdynamic')[0] : {}; /* 动态参数 */
const dynamicParamColumn = commonUtils.isNotEmptyObject(dynamicParamConfig) ? commonFunc.getHeaderConfig(dynamicParamConfig) : [];
@@ -316,6 +332,9 @@ export default (ChildComponent) => {
const approveGroupConfig = formData.filter(item => item.bGrd && item.sTbName === 'sftlogininfojurisApprovalgroup')[0];
const approveGroupColumn = commonFunc.getHeaderConfig(approveGroupConfig); /* 审批组权限 */
+ const brandgroupConfig = formData.filter(item => item.bGrd && item.sTbName === 'sftlogininfobrandgroup')[0];
+ const brandgroupColumn = commonFunc.getHeaderConfig(brandgroupConfig); /* 分管公司 */
+
let addState = {};
if (sId === '') {
const config = {};
@@ -328,11 +347,12 @@ export default (ChildComponent) => {
config.drivergroupConfig = drivergroupConfig;
config.departgroupConfig = departgroupConfig;
config.approveGroupConfig = approveGroupConfig;
+ config.brandgroupConfig = brandgroupConfig;
addState = await this.handleAdd(config, nextProps.app.currentPane.copyTo, true);
} else {
const flag = undefined;
const isWait = true;
- const params = await this.handleGetSflLoginData(masterConfig, jurgroupConfig, customergroupConfig, supplygroupConfig, persongroupConfig, processgroupConfig, drivergroupConfig, departgroupConfig, flag, isWait, undefined, { approveGroupConfig });
+ const params = await this.handleGetSflLoginData(masterConfig, jurgroupConfig, customergroupConfig, supplygroupConfig, persongroupConfig, processgroupConfig, drivergroupConfig, departgroupConfig, flag, isWait, undefined, { approveGroupConfig, brandgroupConfig });
this.handleGetUserInfoData(params);
}
this.props.onSaveState({
@@ -353,6 +373,8 @@ export default (ChildComponent) => {
departgroupColumn,
approveGroupConfig,
approveGroupColumn,
+ brandgroupConfig,
+ brandgroupColumn,
sId,
pageLoading: false,
...addState,
@@ -371,6 +393,7 @@ export default (ChildComponent) => {
this.handleGetSlaveData('Set', 'param', paramConfig);
let addState = {};
+ let addStateMaster = {};
const systemFunctionData = [];
systemFunctionData.push({ value: 'Max(round(变量,0))', sName: commonFunc.showMessage(app.commonConst, 'sysMaxInteger') });
@@ -390,8 +413,13 @@ export default (ChildComponent) => {
config.customizeParamConfig = customizeParamConfig;
addState = await this.handleAdd(config, nextProps.app.currentPane.copyTo, true);
} else {
- this.handleGetSlaveData('One', undefined, masterConfig);
+ addStateMaster = await this.handleGetSlaveData('One', undefined, masterConfig);
/* 通过sId找到列表跳转行数据 */
+ let masterDataNew = {}
+ if(commonUtils.isNotEmptyObject(addStateMaster) && commonUtils.isNotEmptyObject(addStateMaster.masterData) &&
+ commonUtils.isNotEmptyObject(addStateMaster.masterData.sColTitleName)) {
+ masterDataNew = addStateMaster.masterData;
+ }
let currentRecords = [];
if (commonUtils.isNotEmptyArr(nextProps.app.currentPane.currentRecord)) {
@@ -403,7 +431,11 @@ export default (ChildComponent) => {
} else {
currentRecords = [];
}
- const currentRecordArr = commonUtils.isNotEmptyArr(currentRecords) ? currentRecords.filter(item => item.sId === sId) : [];
+ let currentRecordArr = commonUtils.isNotEmptyArr(currentRecords) ? currentRecords.filter(item => item.sId === sId) : [];
+
+ if(commonUtils.isEmptyArr(currentRecordArr) && commonUtils.isNotEmptyObject(masterDataNew)) {
+ currentRecordArr = [masterDataNew];
+ }
if (commonUtils.isNotEmptyArr(currentRecordArr) && currentRecordArr[0].sColTitleName) {
const currentRecord = currentRecordArr[0]; /* 找到列表选中行 */
/* 取自定义列名 */
@@ -1058,10 +1090,10 @@ export default (ChildComponent) => {
name: 'address', configData: addressConfig, condition: { sSqlCondition: { sParentId: sId } },
});
};
- handleGetSflLoginDataAll = async (masterConfig, jurgroupConfig, customergroupConfig, supplygroupConfig, persongroupConfig, processgroupConfig, drivergroupConfig, departgroupConfig, { approveGroupConfig }) => {
+ handleGetSflLoginDataAll = async (masterConfig, jurgroupConfig, customergroupConfig, supplygroupConfig, persongroupConfig, processgroupConfig, drivergroupConfig, departgroupConfig, { approveGroupConfig, brandgroupConfig }) => {
const flag = undefined;
const isWait = true;
- const params = await this.handleGetSflLoginData(masterConfig, jurgroupConfig, customergroupConfig, supplygroupConfig, persongroupConfig, processgroupConfig, drivergroupConfig, departgroupConfig, flag, isWait, undefined, { approveGroupConfig });
+ const params = await this.handleGetSflLoginData(masterConfig, jurgroupConfig, customergroupConfig, supplygroupConfig, persongroupConfig, processgroupConfig, drivergroupConfig, departgroupConfig, flag, isWait, undefined, { approveGroupConfig, brandgroupConfig });
this.handleGetUserInfoData(params);
};
/** 获取印件分类主表、从表 */
@@ -1183,7 +1215,7 @@ export default (ChildComponent) => {
};
/** 获取用户信息数据 */
- handleGetSflLoginData = async (masterConfig, jurgroupConfig, customergroupConfig, supplygroupConfig, persongroupConfig, processgroupConfig, drivergroupConfig, departgroupConfig, flag, isWait, bEditClick, { approveGroupConfig }) => {
+ handleGetSflLoginData = async (masterConfig, jurgroupConfig, customergroupConfig, supplygroupConfig, persongroupConfig, processgroupConfig, drivergroupConfig, departgroupConfig, flag, isWait, bEditClick, { approveGroupConfig, brandgroupConfig }) => {
const { currentId } = this.props;
/* 当前页签数据 */
const sId = currentId !== undefined ? currentId : '';
@@ -1219,8 +1251,12 @@ export default (ChildComponent) => {
name: 'approveGroup', configData: approveGroupConfig, condition: { sSqlCondition: { sParentId: sId } }, flag, isWait,
});
+ const brandgroupAddState = await this.props.handleGetDataSet({
+ name: 'brandgroup', configData: brandgroupConfig, condition: { sSqlCondition: { sParentId: sId } }, flag, isWait,
+ });
+
return {
- masterAddState, jurgroupAddState, customergroupAddState, supplygroupAddState, persongroupAddState, processgroupAddState, drivergroupAddState, departgroupAddState, approveGroupAddState,
+ masterAddState, jurgroupAddState, customergroupAddState, supplygroupAddState, persongroupAddState, processgroupAddState, drivergroupAddState, departgroupAddState, approveGroupAddState, brandgroupAddState,
};
};
@@ -1234,7 +1270,7 @@ export default (ChildComponent) => {
if (dataReturn.code === 1) {
const returnData = dataReturn.dataset.rows[0];
const {
- masterAddState = {}, jurgroupAddState, customergroupAddState, supplygroupAddState, persongroupAddState, processgroupAddState, drivergroupAddState, departgroupAddState, approveGroupAddState,
+ masterAddState = {}, jurgroupAddState, customergroupAddState, supplygroupAddState, persongroupAddState, processgroupAddState, drivergroupAddState, departgroupAddState, approveGroupAddState, brandgroupAddState,
} = params;
const { jurgroupData } = jurgroupAddState;
const { customergroupData } = customergroupAddState;
@@ -1243,6 +1279,7 @@ export default (ChildComponent) => {
const { processgroupData } = processgroupAddState;
const { drivergroupData } = drivergroupAddState;
const { approveGroupData } = approveGroupAddState;
+ const { brandgroupData } = brandgroupAddState;
let departgroupData = [];
if (commonUtils.isNotEmptyObject(departgroupAddState)) {
departgroupData = departgroupAddState.departgroupData;
@@ -1255,6 +1292,7 @@ export default (ChildComponent) => {
const drivergroupSelectedRowKeys = [];
const departgroupSelectedRowKeys = [];
const approveGroupSelectedRowKeys = [];
+ const brandgroupSelectedRowKeys = [];
const jurgroupAllData = returnData.jurgroupData;
const customergroupAllData = returnData.customergroupData;
const supplygroupAllData = returnData.supplygroupData;
@@ -1263,6 +1301,12 @@ export default (ChildComponent) => {
const drivergroupAllData = returnData.drivergroupData;
const departgroupAllData = returnData.departgroupData;
const approveGroupAllData = returnData.sApprovalprocessData;
+ const brandgroupAllData = returnData.sysbrandData.map(item => ({
+ ...item,
+ sCompanyName: item.sName,
+ ...brandgroupData.find(x => x.sCompanyId === item.sCompanyId) || { sId: commonUtils.createSid(), handleType: 'add', sParentId: masterAddState.masterData.sId },
+ }));
+
if (commonUtils.isNotEmptyArr(jurgroupAllData)) {
for (const itemAll of jurgroupAllData) {
if (commonUtils.isNotEmptyArr(jurgroupData)) {
@@ -1354,6 +1398,14 @@ export default (ChildComponent) => {
}
}
+ if (commonUtils.isNotEmptyArr(brandgroupAllData)) {
+ for (const itemAll of brandgroupAllData) {
+ if (itemAll.iCheck) {
+ brandgroupSelectedRowKeys.push(itemAll.sId);
+ }
+ }
+ }
+
this.props.onSaveState({
...masterAddState,
jurgroupData: jurgroupAllData,
@@ -1372,6 +1424,8 @@ export default (ChildComponent) => {
departgroupOldData: departgroupData,
approveGroupData: approveGroupAllData,
approveGroupOldData: approveGroupData,
+ brandgroupData: brandgroupAllData,
+ brandgroupOldData: brandgroupAllData,
jurgroupSelectedRowKeys,
customergroupSelectedRowKeys,
supplygroupSelectedRowKeys,
@@ -1380,6 +1434,7 @@ export default (ChildComponent) => {
drivergroupSelectedRowKeys,
departgroupSelectedRowKeys,
approveGroupSelectedRowKeys,
+ brandgroupSelectedRowKeys,
});
}
};
@@ -1392,21 +1447,31 @@ export default (ChildComponent) => {
this.props.handleGetDataOne({
name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick,
});
- this.props.handleGetDataSet({
- name: 'machine', configData: machineConfig, condition: { sSqlCondition: { sParentId: sId } },
- });
- this.props.handleGetDataSet({
- name: 'assort', configData: assortConfig, condition: { sSqlCondition: { sParentId: sId } },
- });
- this.props.handleGetDataSet({
- name: 'outside', configData: outsideConfig, condition: { sSqlCondition: { sParentId: sId } },
- });
- this.props.handleGetDataSet({
- name: 'processstyle', configData: processstyleConfig, condition: { sSqlCondition: { sParentId: sId } },
- });
- this.props.handleGetDataSet({
- name: 'processApsRule', configData: processApsRuleConfig, condition: { sSqlCondition: { sParentId: sId } },
- });
+ if(commonUtils.isNotEmptyObject(machineConfig)) {
+ this.props.handleGetDataSet({
+ name: 'machine', configData: machineConfig, condition: { sSqlCondition: { sParentId: sId } },
+ });
+ }
+ if(commonUtils.isNotEmptyObject(assortConfig)) {
+ this.props.handleGetDataSet({
+ name: 'assort', configData: assortConfig, condition: {sSqlCondition: {sParentId: sId}},
+ });
+ }
+ if(commonUtils.isNotEmptyObject(outsideConfig)) {
+ this.props.handleGetDataSet({
+ name: 'outside', configData: outsideConfig, condition: {sSqlCondition: {sParentId: sId}},
+ });
+ }
+ if(commonUtils.isNotEmptyObject(processstyleConfig)) {
+ this.props.handleGetDataSet({
+ name: 'processstyle', configData: processstyleConfig, condition: {sSqlCondition: {sParentId: sId}},
+ });
+ }
+ if(commonUtils.isNotEmptyObject(processApsRuleConfig)) {
+ this.props.handleGetDataSet({
+ name: 'processApsRule', configData: processApsRuleConfig, condition: {sSqlCondition: {sParentId: sId}},
+ });
+ }
this.props.handleGetDataSet({
name: 'dynamicParam', configData: dynamicParamConfig, condition: { sSqlCondition: { sParentId: sId } },
@@ -1472,14 +1537,22 @@ export default (ChildComponent) => {
}
handleGetSlaveData = async (getType, sName, currConfig, slaveConfig, iPlcNoConfig, bEditClick, addStateConfig) => {
- const { currentId } = this.props;
+ const { currentId, sModelsType } = this.props;
/* 当前页签数据 */
let addState = {};
const sId = currentId !== undefined ? currentId : '';
if (getType === 'One') {
- this.props.handleGetDataOne({
- name: 'master', configData: currConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick,
- });
+ if(sModelsType === 'system/sisformulaInfo') {
+ const addMaster = await this.props.handleGetDataOne({
+ name: 'master', configData: currConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick, isWait :true
+ });
+ this.props.onSaveState(addMaster);
+ return addMaster;
+ } else {
+ this.props.handleGetDataOne({
+ name: 'master', configData: currConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick,
+ });
+ }
if (commonUtils.isNotEmptyObject(iPlcNoConfig) && commonUtils.isNotEmptyObject(slaveConfig)) {
this.props.handleGetDataOne({
name: 'master', configData: currConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick,
@@ -1591,7 +1664,7 @@ export default (ChildComponent) => {
/* 待用数据声明 */
const {
app, currentId, masterConfig, contactConfig, addressConfig, supplyConfig, stockConfig, customerInfoConfig, eleknifemouldproductConfig, eleknifemouldfileConfig, siscommonstyleproductclassifyConfig, sModelsType, machineConfig, assortConfig, outsideConfig, picFileConfig, userConfig, sischeckphaselogininfoConfig, phaseConfig, conditionConfig, eleemployeeConfig, elemachineConfig, jurgroupConfig, customergroupConfig, supplygroupConfig, persongroupConfig, processgroupConfig, drivergroupConfig,
- eleteststandarditemConfig, processstyleConfig, processApsRuleConfig, dynamicParamConfig, bUserModel, departgroupConfig, approveGroupConfig,
+ eleteststandarditemConfig, processstyleConfig, processApsRuleConfig, dynamicParamConfig, bUserModel, departgroupConfig, approveGroupConfig, brandgroupConfig,
} = this.props;
const { userinfo } = app;
const onSendSocketMessage = this.props.handleSendSocketMessage;
@@ -1705,7 +1778,7 @@ export default (ChildComponent) => {
confirm({
title: obj.title,
onOk() {
- onGetDataOk(masterConfig, jurgroupConfig, customergroupConfig, supplygroupConfig, persongroupConfig, processgroupConfig, drivergroupConfig, departgroupConfig, { approveGroupConfig });
+ onGetDataOk(masterConfig, jurgroupConfig, customergroupConfig, supplygroupConfig, persongroupConfig, processgroupConfig, drivergroupConfig, departgroupConfig, { approveGroupConfig, brandgroupConfig });
onSaveStateOk({ enabled: false });
onSendSocketMessage('release', 'noAction', currentId, userinfo.sId, null, null);
},
@@ -1824,7 +1897,7 @@ export default (ChildComponent) => {
stockConfig, customerInfoConfig, picFileConfig, eleemployeeConfig, elemachineConfig, jurgroupConfig, customergroupConfig, supplygroupConfig,
persongroupConfig, processgroupConfig, drivergroupConfig, departgroupConfig, paramConfig, userConfig, phaseConfig, conditionConfig, sischeckphaselogininfoConfig,
sisproductclassifyProcessClassifyConfig, sysmsguserConfig, eleknifemouldproductConfig, eleknifemouldfileConfig, eleteststandarditemConfig, formData, approveGroupConfig,
- slave0Config, memoDataList,
+ brandgroupConfig, slave0Config, memoDataList,
} = this.props;
if (sModelsType === 'element/customerInfo' || sModelsType === 'element/supplyInfo') {
this.handleGetData(masterConfig, contactConfig, addressConfig, bEditClick);
@@ -1845,7 +1918,7 @@ export default (ChildComponent) => {
} else if (sModelsType === 'element/sftloginInfo') {
const flag = undefined;
const isWait = true;
- const params = await this.handleGetSflLoginData(masterConfig, jurgroupConfig, customergroupConfig, supplygroupConfig, persongroupConfig, processgroupConfig, drivergroupConfig, departgroupConfig, flag, isWait, bEditClick, { approveGroupConfig });
+ const params = await this.handleGetSflLoginData(masterConfig, jurgroupConfig, customergroupConfig, supplygroupConfig, persongroupConfig, processgroupConfig, drivergroupConfig, departgroupConfig, flag, isWait, bEditClick, { approveGroupConfig, brandgroupConfig });
this.handleGetUserInfoData(params);
} else if (sModelsType === 'element/machineInfo') {
const addStateConfig = {
@@ -1893,7 +1966,7 @@ export default (ChildComponent) => {
// tableName: masterConfig.sTbName,
// sId: [sId],
// };
- this.props.onSaveState({ pageLoading: true });
+ // this.props.onSaveState({ pageLoading: true });
const { masterData, bUserModel, dispatch } = this.props;
let timValue = 0;
if (this.props.app.webSocket === null || this.props.app.webSocket.readyState !== WebSocket.OPEN) {
@@ -1931,13 +2004,13 @@ export default (ChildComponent) => {
this.props.onSaveState({
enabled: true,
bUserModel,
- isEnabledPlcNo: (masterData.iPlcNo === undefined || masterData.iPlcNo === 0),
+ isEnabledPlcNo: (masterData?.iPlcNo === undefined || masterData?.iPlcNo === 0),
loading: false,
});
} else if (this.props.app.webSocket.homeAction) {
this.props.app.webSocket.homeAction(msg);
}
- this.props.onSaveState({ pageLoading: false });
+ // this.props.onSaveState({ pageLoading: false });
};
this.props.handleSendSocketMessage('update', 'showMsg', this.props.currentId, this.props.app.userinfo.sId, null, null);
}, timValue);
@@ -1970,7 +2043,7 @@ export default (ChildComponent) => {
/* 数据参数 */
const {
currentId, token, sModelsId, masterConfig, contactConfig, addressConfig, supplyConfig, stockConfig, customerInfoConfig, eleknifemouldproductConfig, eleknifemouldfileConfig, eleteststandarditemConfig, siscommonstyleproductclassifyConfig, machineConfig, assortConfig, outsideConfig, picFileConfig, eleemployeeConfig, elemachineConfig, jurgroupConfig, customergroupConfig, supplygroupConfig, persongroupConfig, processgroupConfig, drivergroupConfig, userConfig, sischeckphaselogininfoConfig, phaseConfig, conditionConfig, sModelsType, sisproductclassifyProcessClassifyConfig,
- approveGroupConfig,
+ approveGroupConfig, brandgroupConfig,
} = props;
/* 当前页签数据 */
const sId = currentId !== undefined ? currentId : '';
@@ -2131,6 +2204,9 @@ export default (ChildComponent) => {
}, {
tableName: approveGroupConfig.sTbName,
relationName: 'sParentId',
+ }, {
+ tableName: brandgroupConfig.sTbName,
+ relationName: 'sParentId',
}],
},
};
@@ -2278,7 +2354,7 @@ export default (ChildComponent) => {
processgroupOldData, processgroupOldDelData, jurgroupOldData, jurgroupOldDelData, persongroupOldData, persongroupOldDelData, drivergroupOldData, drivergroupOldDelData,
eleknifemouldproductData, eleknifemouldproductDelData, eleknifemouldfileData, eleknifemouldfileDelData, eleteststandarditemData, eleteststandarditemDelData,
customizeParamConfig, customizeParamData, customizeParamDelData, dynamicParamData, dynamicParamDelData, departgroupOldData, departgroupOldDelData, customizeParamName,
- approveGroupConfig, approveGroupData, approveGroupOldData, approveGroupOldDelData, slaveInfoList,
+ approveGroupConfig, approveGroupData, approveGroupOldData, approveGroupOldDelData, brandgroupConfig, brandgroupData, brandgroupOldData = [], slaveInfoList,
} = this.props;
/* app, const { webSocket, currentPane } = app;
const { key } = currentPane; */
@@ -2638,7 +2714,7 @@ export default (ChildComponent) => {
data.push(commonBusiness.mergeData('elemachine', elemachineConfig.sTbName, elemachineData, elemachineDelData));
} else if (sModelsType === 'element/sftloginInfo') {
if (!commonBusiness.validateTable(jurgroupConfig, jurgroupData, this.props, '2') || !commonBusiness.validateTable(customergroupConfig, customergroupData, this.props, '3') || !commonBusiness.validateTable(supplygroupConfig, supplygroupData, this.props, '4') || !commonBusiness.validateTable(persongroupConfig, persongroupData, this.props, '5') || !commonBusiness.validateTable(processgroupConfig, processgroupData, this.props, '6') || !commonBusiness.validateTable(drivergroupConfig, drivergroupData, this.props, '7')
- || !commonBusiness.validateTable(drivergroupConfig, departgroupData, this.props, '8') || !commonBusiness.validateTable(approveGroupConfig, approveGroupData, this.props, '9')) {
+ || !commonBusiness.validateTable(drivergroupConfig, departgroupData, this.props, '8') || !commonBusiness.validateTable(approveGroupConfig, approveGroupData, this.props, '9') || !commonBusiness.validateTable(brandgroupConfig, brandgroupData, this.props, '10')) {
return;
}
data.push(commonBusiness.mergeData('jurgroup', jurgroupConfig.sTbName, jurgroupOldData, jurgroupOldDelData));
@@ -2649,6 +2725,7 @@ export default (ChildComponent) => {
data.push(commonBusiness.mergeData('drivergroup', drivergroupConfig.sTbName, drivergroupOldData, drivergroupOldDelData));
data.push(commonBusiness.mergeData('departgroup', departgroupConfig.sTbName, departgroupOldData, departgroupOldDelData));
data.push(commonBusiness.mergeData('approveGroup', approveGroupConfig.sTbName, approveGroupOldData, approveGroupOldDelData));
+ data.push(commonBusiness.mergeData('brandgroup', brandgroupConfig.sTbName, brandgroupOldData.filter(item => item.iCheck), brandgroupOldData.filter(item => !item.iCheck).map(item => ({ ...item, handleType: 'del' }))));
} else if (sModelsType === 'element/checkModelInfo') {
if (!commonBusiness.validateTable(userConfig, userData, this.props, '2') || !commonBusiness.validateTable(phaseConfig, phaseData, this.props, '3') || !commonBusiness.validateTable(conditionConfig, conditionData, this.props, '4')) {
return;
@@ -3707,6 +3784,21 @@ export default (ChildComponent) => {
tableDataRow.sMaterialsUnit = masterData.sMaterialsUnit;
tableDataRow.sComputeId = masterData.sComputeId;
tableDataRow = await this.handleMaterialsChange(tableDataRow, sModelsId, masterData, changeValue, sFieldName, app, token, models);
+ } else if (name === 'brandgroup') {
+ let { brandgroupOldData = [] } = this.props;
+ const iIndex = brandgroupOldData.findIndex(item => item.sId === sId);
+ if (iIndex !== -1) {
+ brandgroupOldData[iIndex] = { ...brandgroupOldData[iIndex], ...tableDataRow };
+ if (brandgroupOldData[iIndex].bDefault) {
+ brandgroupOldData = brandgroupOldData.map((item, index) => {
+ item.bDefault = index === iIndex;
+ item.handleType = item.handleType || 'update';
+ return item;
+ });
+ }
+ }
+ this.props.onSaveState({ brandgroupOldData, brandgroupData: brandgroupOldData });
+ return;
} else if (commonUtils.isNotEmptyStr(masterData.handleType)) {
masterData.handleType = masterData.handleType === 'add' ? 'add' : 'update';
}
@@ -3832,6 +3924,7 @@ export default (ChildComponent) => {
if (commonUtils.isNotEmptyStr(customizeParamConfig.panelName)) {
addState.customizePanelName = customizeParamConfig.panelName;
}
+ addState.customizeParamConfig = customizeParamConfigNew;
addState.customizeParamColumn = commonFunc.getHeaderConfig(customizeParamConfigNew);
addState.tableKey = commonUtils.createSid();
addState.customizeParamName = [];
@@ -4259,7 +4352,7 @@ export default (ChildComponent) => {
},
});
};
- handleTableSelectRowChange = (name, selectedRowKeys) => {
+ handleTableSelectRowChange = (name, selectedRowKeys, bCheckBoxClick) => {
const {
sModelsType, [`${name}OldData`]: oldData, masterData, enabled,
} = this.props;
@@ -4268,6 +4361,17 @@ export default (ChildComponent) => {
message.warn('请先点击修改！');
return;
}
+ if (name === 'brandgroup') {
+ if (!bCheckBoxClick) return;
+ let { brandgroupOldData = [] } = this.props;
+ brandgroupOldData = brandgroupOldData.map((item) => {
+ item.iCheck = selectedRowKeys.includes(item.sId);
+ item.handleType = item.handleType || 'update';
+ return item;
+ });
+ this.props.onSaveState({ brandgroupOldData, brandgroupData: brandgroupOldData, brandgroupSelectedRowKeys: selectedRowKeys });
+ return;
+ }
const addState = this.props.onTableSelectRowChange(name, selectedRowKeys, true);
const { [`${name}SelectedRowKeys`]: rowKeys } = addState;
if (oldData.length > 0) {
@@ -4302,6 +4406,7 @@ export default (ChildComponent) => {
if (name === 'approveGroup') {
index = addkeys.indexOf(item.sJurisdictionClassifyId);
}
+
if (index === -1) {
delKeys.push(item.sId);
} else if (index > -1) {
diff --git a/src/components/Common/CommonExamInfo/index.js b/src/components/Common/CommonExamInfo/index.js
index ac1fae8..5dc5d26 100644
--- a/src/components/Common/CommonExamInfo/index.js
+++ b/src/components/Common/CommonExamInfo/index.js
@@ -35,20 +35,45 @@ class CommonExamInfo extends Component {
}
}
const historyList = sFlowObj?.historyList; /* 审批流程 */
+ const dataList = sFlowObj?.dataList; /* 数据集 */
const sBrandsId = userinfo?.sBrandsId;
const sSubsidiaryId = userinfo?.sSubsidiaryId;
const sUserId = userinfo?.sUserName;
const taskId = sFlowObj?.taskId;
const sTaskId = sFlowObj?.taskId;
- const commentObj = document.getElementById('comment');
- const comment = commentObj?.value ; /* 驳回理由 */
- if(btnName ==='reject' && commonUtils.isEmptyObject(comment)){
- message.error("请输入驳回理由!")
+ // const commentObj = document.getElementById('comment');
+ // const comment = commentObj?.value ; /* 驳回理由 */
+ if(btnName ==='reject' && commonUtils.isEmptyObject(textareaValue)){
+ message.warn("请输入驳回理由!")
return;
}
const bizFlowVo = sFlowObj.bizFlowVo;
const sTableParamsValue= sFlowObj.bizFlowVo?.sTableParamsValue;
const sFormData= commonUtils.isNotEmptyObject(sTableParamsValue) ? JSON.parse(sTableParamsValue) : {};
+ /* 可输入文本 */
+ const dataDynamicList = commonUtils.isNotEmptyArr(dataList) ? dataList.filter(item => item.name !=='sEmployeeName') : [];
+ if(commonUtils.isNotEmptyArr(dataDynamicList)) {
+ for (const child of dataDynamicList) {
+ const name = child.name;
+ const bEdit = !child.bEdit; /* 是否编辑 */
+ const type= child.type; /* 文本类型 */
+ const obj = {};
+ if( bEdit ) { /* 可编辑的都传入 */
+ const sRealName = name +'_sRealName';
+ const sValue = this.state[name];
+ if (btnName === 'agree' && commonUtils.isEmptyObject(sValue)) {
+ message.warn(`${child.title} 为必填项！`);
+ return;
+ }
+ sFormData[name]= sValue;
+ if(child.bSelect) { /* 下拉需要传sRealName */
+ sFormData[sRealName]= this.state[sRealName];
+ }
+
+ }
+ }
+ }
+
const prefix = commonConfig.server_host + "currencyFlow";
let url = prefix + "/complete/" + taskId+"/"+sBrandsId+"/"+sSubsidiaryId+"/"+sUserId;
// const data = $('#form-leave-edit').serialize();
@@ -67,8 +92,9 @@ class CommonExamInfo extends Component {
data.sUserName = sUserId;
data.messagesTitle = bizFlowVo?.title;
data.selectMap = {};
- data.comment = this.state.textareaValue;
+ data.comment = textareaValue;
const { token }= this.props;
+ console.log('data传参', data);
const sReturn = (await commonServices.postValueService(token, data, url)).data;
if(commonUtils.isNotEmptyObject(sReturn)) {
if (sReturn.code > 0 || sReturn.code === 0) {
@@ -107,7 +133,7 @@ class CommonExamInfo extends Component {
this.props.getServiceError(sReturn);
}
}else {
- message.error('操作异常！')
+ message.warn('操作异常！')
}
}
@@ -139,11 +165,11 @@ class CommonExamInfo extends Component {
const taskId = sFlowObj?.taskId;
const data =[];
if(commonUtils.isEmptyObject(delegateToUser)) {
- message.error('请选择转办人！')
+ message.warn('请选择转办人！')
return;
}
if(delegateToUser === sUserId){
- message.error('请选择非自己的待办人');
+ message.warn('请选择非自己的待办人');
return;
}
this.setState({flowLoaing:true});
@@ -181,7 +207,7 @@ class CommonExamInfo extends Component {
this.props.getServiceError(sReturn);
}
} else {
- message.error('操作异常！')
+ message.warn('操作异常！')
}
this.setState({ bTransferUserVisible:false })
}
@@ -190,7 +216,6 @@ class CommonExamInfo extends Component {
}
/* 设置textareaValue */
handleTextareaChange = (e) => {
- console.log('驳回', e);
this.setState({
textareaValue: e.target.value,
});
@@ -201,11 +226,19 @@ class CommonExamInfo extends Component {
delegateToUser: value
});
};
+ handleInputChange = (e, name) => {
+ const inputValue = e.target.value;
+ this.setState({
+ [name]: inputValue
+ });
+ };
- handleOptionChange = (value) => {
+ handleOptionChange = (value, option, name) => {
+ const sFieldName = name;
+ const sKey = option?.id;
this.setState({
- delegateToUserId: value,
- delegateToUser:'sEmployeeName'
+ [sFieldName + "_sRealName"]:value,
+ [sFieldName]: sKey
});
};
@@ -223,8 +256,12 @@ class CommonExamInfo extends Component {
// sFlowObj = sFlowArr[0];
// }
}
- console.log('sFlowObj:', sFlowObj);
+ const isHandle = sFlowObj?.isHandle;
+ // console.log('sFlowObj:', sFlowObj);
// const bHandleShow = sFlowObj?.bHandleShow; /* 是否展示按钮及审批意见区域 */
+ if(bHandleShow) {
+ bHandleShow = !sFlowObj.isHandle;
+ }
let sFlowTitle = sFlowObj?.title; /* 审批标题 */
const dataList = sFlowObj?.dataList; /* 审批数据源 */
let historyList = sFlowObj?.historyList; /* 审批流程 */
@@ -302,27 +339,48 @@ class CommonExamInfo extends Component {
const name = child.name;
const title = child.title;
const value = child.value;
- const bEdit = !child.bEdit; /* 是否编辑 */
+ let bEdit = !child.bEdit; /* 是否编辑 */
+ /* 如果 isHandle 为 true,代表只能查看， 就不允许编辑 */
+ if(bEdit) {
+ bEdit = !isHandle;
+ }
const type= child.type; /* 文本类型 */
const bSelect = child.bSelect; /* 是否下拉 */
+ const selectList = child.selectList;
const selectConfig = bSelect && commonUtils.isNotEmptyObject(masterConfig) ? masterConfig.gdsconfigformslave.filter(item => item.sName === name) : [];
- const showDropDown = commonUtils.isNotEmptyArr(selectConfig) ? selectConfig[0].showDropDown : []; /* 可编辑的下拉 */
+ const showDropDownStr = commonUtils.isNotEmptyArr(selectConfig) && commonUtils.isNotEmptyObject(selectConfig[0].showDropDown) ?
+ selectConfig[0].showDropDown : []; /* 可编辑的下拉 */
+ const showDropDown = commonUtils.isNotEmptyObject(showDropDownStr) && commonUtils.isJSON(showDropDownStr) ? [JSON.parse(showDropDownStr)] : [];
return (
{title}
{
- bEdit && type === 's' ?
-
:
+ bEdit && type === 's' && !bSelect ?
+
this.handleInputChange(e, name)} />
:
bEdit && type === 's' && bSelect ?
-
:
+ bEdit && type === 'm' && !bSelect ?
+