1.主页增加iJsOrder排序

2.工艺流程去掉部分按钮

1.主页增加iJsOrder排序
2.工艺流程去掉部分按钮
Min
1 parent 3d4ce1ac
Showing 2 changed files with 12 additions and 8 deletions
src/components/Common/Flows/CommonFlow.js
src/components/IndexCenter/IndexCenter.js
@@ -36,7 +36,7 @@ const OverviewFlow = (props) =&gt; {
     if (commonutils.isNotEmptyArr(initialEdges)) {
       initialEdges.forEach((item) => {
         if (commonutils.isNotEmptyStr(item.markerEnd)) {
-          const markerObj = { 
+          const markerObj = {
             type: MarkerType.ArrowClosed,
           }
           item.markerEnd = markerObj
@@ -123,11 +123,11 @@ const OverviewFlow = (props) =&gt; {
         <Button onClick={onAdd} id='AddSole'>单一部件</Button>
         <Button onClick={onAdd} id='AddPortalBundle'>合版部件</Button>
         <Button onClick={onAdd} id='AddClaim'>组装部件</Button>
-        <Button onClick={onMadl}>选择工序</Button>
-        <Button onClick={onMadl}>选择材料</Button>
-        <Button onClick={onDel}>删除</Button>
-        <Button onClick={onSave}>保存</Button>
-        <Button id='Generate' onClick={onMadl}>反向生成工单</Button>
+        {/*<Button onClick={onMadl}>选择工序</Button>*/}
+        {/*<Button onClick={onMadl}>选择材料</Button>*/}
+        {/*<Button onClick={onDel}>删除</Button>*/}
+        {/*<Button onClick={onSave}>保存</Button>*/}
+        {/*<Button id='Generate' onClick={onMadl}>反向生成工单</Button>*/}
         <Button id='Err' onClick={onMadl}>开单逻辑错误</Button>
         <Modal title="添加部件名称" visible={isModalVisible} onOk={handleOk} onCancel={handleCancel}><Input placeholder="Basic usage" onChange={e => handleChangeValue(e)} value={value} /></Modal>
       </div>
@@ -204,12 +204,16 @@ class IndexCenter extends Component {
       //   this.tableTree.scrollTop = 0;
       // }
       const addState = {};
-      Object.keys(model).forEach((child, index) => {
+      Object.keys(model).sort((a, b) => {
+        const firstA = model[a][0]?.iJsOrder || 0;
+        const firstB = model[b][0]?.iJsOrder || 0;
+        return firstA - firstB;
+      }).forEach((child, index) => {
         const name = child.split('_')[0];
         // const num = child.split('_')[1];
         let num = 0;
         // const key = name;
-        const data = model[child];
+        const data = model[child].sort((a, b) => a.iJsOrder - b.iJsOrder);
         data.forEach((item, index) => {
           let { dToDayNum } = item;
           dToDayNum = Number(dToDayNum);