xlyErp / xlyUmi

You need to sign in before continuing.

Commit 8e0667876ba0c37c0f9a8c6f62e8309a73a89677

Authored by chenxt
1 parent 6de46a73

Revert "过滤项中英文" 

This reverts commit 6de46a73.
Inline Side-by-side
Showing 4 changed files with 7 additions and 9 deletions
src/components/Common/CommonListSelectAssignment.js
  View file @8e06678
... ... @@ -274,7 +274,7 @@ const CommonListComponent = Form.create({
274 274 };
275 275 const sProcessParams = commonFunc.showMessage(app.commonConst, 'sProcessParams');/* 选择工艺参数标题s */
276 276 const displayLeft = (sModelsType !== 'search/sisColor' && sModelsType !== 'search/commonPopup');
277   - const filteItem = commonFunc.showLocalMessage(props, "filteItem", "过滤项");
  277 +
278 278 // let slaveFilterCondition = [];
279 279 // if (props.slaveFilterCondition) {
280 280 // slaveFilterCondition = props.slaveFilterCondition.slice(0);
... ... @@ -297,7 +297,7 @@ const CommonListComponent = Form.create({
297 297 {displayLeft ?
298 298 <Col span={4}>
299 299 <div className="xly-tree-box">
300   - <div className="xly-tree-title">{filteItem}</div>
  300 + <div className="xly-tree-title">过滤项</div>
301 301 <StaticEditTree {...treeProps} />
302 302 </div>
303 303 </Col> : ''
... ...
src/components/Common/CommonListSelectFlex/EditTableCommonListSelectFlex/index.jsx
  View file @8e06678
... ... @@ -242,7 +242,7 @@ const CommonListComponent = Form.create({
242 242 if (props.slaveFilterKeys) {
243 243 slaveDataShow = props.slaveData.filter(i => i && i.sSqlConditionId === props.slaveFilterKeys);
244 244 }
245   -const filteItem = commonFunc.showLocalMessage(props, "filteItem", "过滤项");
  245 +
246 246 return (
247 247 <div className="modalChooseProcessContent">
248 248 <Form>
... ... @@ -259,7 +259,7 @@ const filteItem = commonFunc.showLocalMessage(props, &quot;filteItem&quot;, &quot;过滤项&quot;);
259 259 <Row gutter={[8, 0]}>
260 260 <Col span={props.treeSpan}>
261 261 <div className="xly-tree-box">
262   - <div className="xly-tree-title">{filteItem}</div>
  262 + <div className="xly-tree-title">过滤项</div>
263 263 <StaticEditTree
264 264 {...treeProps}
265 265 expandedKeys={props.filterTreeDataKey}
... ... @@ -271,7 +271,7 @@ const filteItem = commonFunc.showLocalMessage(props, &quot;filteItem&quot;, &quot;过滤项&quot;);
271 271 </Col>
272 272 <Col span={props.filterSpan}>
273 273 <div className="xly-tree-box">
274   - <div className="xly-tree-title">{filteItem}</div>
  274 + <div className="xly-tree-title">过滤项</div>
275 275 <StaticEditTree
276 276 {...treeProps}
277 277 expandedKeys={props.filterTreeDetailDataKey}
... ...
src/components/Common/CommonListSelectFlex/index.js
  View file @8e06678
... ... @@ -503,7 +503,6 @@ const CommonListComponent = Form.create({
503 503  
504 504 const BtnSure = commonFunc.showLocalMessage(props, 'BtnSure', '确定');
505 505 const BtnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '取消');
506   - const filteItem = commonFunc.showLocalMessage(props, "filteItem", "过滤项");
507 506 return (
508 507 <div className="modalChooseProcessContent">
509 508 <Form >
... ... @@ -521,7 +520,7 @@ const CommonListComponent = Form.create({
521 520 {displayLeft ?
522 521 <Col span={4}>
523 522 <div className="xly-tree-box">
524   - <div className="xly-tree-title">{filteItem}</div>
  523 + <div className="xly-tree-title">过滤项</div>
525 524 <StaticEditTree {...treeProps} />
526 525 </div>
527 526 </Col> : ''
... ...
src/components/Common/CommonListSelectTree/index.js
  View file @8e06678
... ... @@ -693,7 +693,6 @@ const CommonListComponent = Form.create({
693 693 }
694 694 }
695 695 };
696   - const filteItem = commonFunc.showLocalMessage(props, "filteItem", "过滤项");
697 696 return (
698 697 <div className="modalChooseProcessContent">
699 698 <Form >
... ... @@ -711,7 +710,7 @@ const CommonListComponent = Form.create({
711 710 {displayLeft ?
712 711 <Col span={4} style={{ height: realizeHeight > 0 ? `${500 + realizeHeight}px` : 'auto' }}>
713 712 <div className="xly-tree-box">
714   - <div className="xly-tree-title">{filteItem}</div>
  713 + <div className="xly-tree-title">过滤项</div>
715 714 <StaticEditTree {...treeProps} noVlist />
716 715 </div>
717 716 </Col> : ''
... ...