Commit 16fa8c44b129a219c018f66ed9af447f4b49df65

Authored by Min
1 parent a3ed3db8

1.完善提交

src/components/Common/CommonNewBill.js
... ... @@ -2349,9 +2349,10 @@ const BillComponent = Form.create({
2349 2349 }
2350 2350  
2351 2351 /* 悬浮Tip */
2352   - const mainContentChinese = commonUtils.isNotEmptyArr(masterConfig?.gdsconfigformslave?.filter(item => item.sControlName === "MainContent"))
  2352 + let mainContentChinese = commonUtils.isNotEmptyArr(masterConfig?.gdsconfigformslave?.filter(item => item.sControlName === "MainContent"))
2353 2353 ? masterConfig.gdsconfigformslave.filter(item => item.sControlName === "MainContent")[0].sChinese
2354 2354 : commonFunc.showChineseMessage(app.commonConst, "MainContent"); /* 从表信息 */
  2355 + mainContentChinese = commonUtils.isNotEmptyObject(mainContentChinese)? mainContentChinese : '主体内容';
2355 2356 const materialsInfoChinese = commonUtils.isNotEmptyArr(masterConfig?.gdsconfigformslave?.filter(item => item.sControlName === "zMaterials"))
2356 2357 ? masterConfig.gdsconfigformslave.filter(item => item.sControlName === "zMaterials")[0].sChinese
2357 2358 : commonFunc.showChineseMessage(app.commonConst, "zMaterials"); /* 表一 */
... ...
src/components/Common/PersonCenter/PersonCenter.js
... ... @@ -111,7 +111,7 @@ class PersonCenter extends Component {
111 111 target = e.target;
112 112 }
113 113  
114   - console.log('target', target);
  114 +
115 115  
116 116 if (!target) return null;
117 117 if (target.title) {
... ... @@ -120,7 +120,7 @@ class PersonCenter extends Component {
120 120  
121 121 const content = target.children.length ? target.children[0].innerText : target.innerText;
122 122 const tip = target.children.length ? target.children[0].getAttribute('data-tip') : target.getAttribute('data-tip');
123   - console.log(2222, tip);
  123 +
124 124 this.showTooltipAtMouse(e, content, tip);
125 125 } catch (error) {
126 126 // eslint-disable-next-line no-empty
... ... @@ -327,7 +327,7 @@ class PersonCenter extends Component {
327 327  
328 328 const shownNotices = localStorage.getItem('shownNotices') || '';
329 329  
330   - console.log('shownNotices', shownNotices, noticeKey);
  330 +
331 331  
332 332 // 如果已经显示过,直接返回,不调用接口
333 333 if (shownNotices.includes(noticeKey)) {
... ... @@ -349,7 +349,7 @@ class PersonCenter extends Component {
349 349  
350 350 // 3. 再次确认是否已显示(防止并发请求)
351 351 const currentShownNotices = localStorage.getItem('shownNotices') || '';
352   - console.log('currentShownNotices11', currentShownNotices);
  352 +
353 353 if (!currentShownNotices.includes(noticeKey)) {
354 354 this.setState({
355 355 noticeVisible: true,
... ... @@ -384,7 +384,7 @@ class PersonCenter extends Component {
384 384 // 在用户确认阅读后,才将公告记录存储到shownNotices中
385 385 const noticeKey = `${sMsgId}_${sMsgSlaveId}`;
386 386 const currentShownNotices = localStorage.getItem('shownNotices') || '';
387   - console.log('noticeKe11111y', noticeKey);
  387 +
388 388 localStorage.setItem('shownNotices', JSON.stringify(noticeKey));
389 389 } else {
390 390 message.error(configReturn?.msg);
... ...