Commit 51f36d8a23aee1fb863873e7b0985f9112506d68

Authored by chenxt
1 parent 71a442dd

上下班后刷新数据

src/mes/common/commonOperationBarComponent/MesToolbar.js
@@ -1073,7 +1073,8 @@ const handleScanFace = (props) => { @@ -1073,7 +1073,8 @@ const handleScanFace = (props) => {
1073 }); 1073 });
1074 1074
1075 props.onSaveState({ 1075 props.onSaveState({
1076 - [`${addData}Data`]: tableData 1076 + [`${addData}Data`]: tableData,
  1077 + mesRefresh: true
1077 }); 1078 });
1078 }, 1079 },
1079 onConfirm: () => { }, 1080 onConfirm: () => { },
src/mes/indexMes/index.js
@@ -696,7 +696,6 @@ const SiderComponent = () => { @@ -696,7 +696,6 @@ const SiderComponent = () => {
696 ]; 696 ];
697 697
698 let [hoverState, setHoverState] = useState(null); 698 let [hoverState, setHoverState] = useState(null);
699 -  
700 return ( 699 return (
701 <div className="sider"> 700 <div className="sider">
702 {filteredMenuList.map(item => ( 701 {filteredMenuList.map(item => (
src/mes/teamInfo/index.js
@@ -33,7 +33,7 @@ const teamInfoSid = &quot;17086669370007136849817837261000&quot;; @@ -33,7 +33,7 @@ const teamInfoSid = &quot;17086669370007136849817837261000&quot;;
33 let loginInfo = {}; 33 let loginInfo = {};
34 // 业务层 34 // 业务层
35 const useTeamInfoEvent = props => { 35 const useTeamInfoEvent = props => {
36 - const { formData } = props; 36 + const { formData, mesRefresh } = props;
37 useEffect( 37 useEffect(
38 async () => { 38 async () => {
39 if (commonUtils.isNotEmptyArr(formData)) { 39 if (commonUtils.isNotEmptyArr(formData)) {
@@ -44,10 +44,10 @@ const useTeamInfoEvent = props =&gt; { @@ -44,10 +44,10 @@ const useTeamInfoEvent = props =&gt; {
44 ...result, 44 ...result,
45 bFinish: true 45 bFinish: true
46 }; 46 };
47 - props.onSaveState({ ...addState, loadings: false }); 47 + props.onSaveState({ ...addState, loadings: false ,mesRefresh:false});
48 } 48 }
49 }, 49 },
50 - [formData] 50 + [formData,mesRefresh]
51 ); 51 );
52 52
53 // 监听人员表第一条数据的实际上班人员 53 // 监听人员表第一条数据的实际上班人员
@@ -299,6 +299,7 @@ const useTeamInfoEvent = props =&gt; { @@ -299,6 +299,7 @@ const useTeamInfoEvent = props =&gt; {
299 } 299 }
300 300
301 const result = dataset.rows[0]; 301 const result = dataset.rows[0];
  302 +
302 resolve(result); 303 resolve(result);
303 }); 304 });
304 } 305 }
@@ -342,7 +343,7 @@ const useTeamInfoEvent = props =&gt; { @@ -342,7 +343,7 @@ const useTeamInfoEvent = props =&gt; {
342 tableData: [record], 343 tableData: [record],
343 faceData: { sEmployeeNo: faceResult.sEmployeeNo }, 344 faceData: { sEmployeeNo: faceResult.sEmployeeNo },
344 onSuccess: () => { 345 onSuccess: () => {
345 - handleRefreshDataByTableName(name); 346 + handleRefreshDataByTableName(name, props);
346 }, 347 },
347 onConfirm: () => {}, 348 onConfirm: () => {},
348 onError: () => {} 349 onError: () => {}
@@ -354,9 +355,10 @@ const useTeamInfoEvent = props =&gt; { @@ -354,9 +355,10 @@ const useTeamInfoEvent = props =&gt; {
354 }; 355 };
355 356
356 // 通过表名刷新数据 357 // 通过表名刷新数据
357 - const handleRefreshDataByTableName = tableName => { 358 + const handleRefreshDataByTableName = (tableName, props) => {
358 const { [`${tableName}Config`]: config } = props; 359 const { [`${tableName}Config`]: config } = props;
359 handleGetData([{ ...config, specifyTableName: tableName }]); 360 handleGetData([{ ...config, specifyTableName: tableName }]);
  361 + props.onSaveState({mesRefresh:true})
360 }; 362 };
361 363
362 // props.setLoading(false) 364 // props.setLoading(false)