Эх сурвалжийг харах

Squashed commit of the following:
merge
commit 4958d8b32176363b868850bec33d27584cee8884
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 18:08:42 2022 +0800

修改显示

commit be1b8de22e9fd2cdf65c951ad2fb82fccebac5a2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 16:00:30 2022 +0800

Squashed commit of the following:
merge
commit f5add5c6a7c64414a36e11a71ec58735bb6bd325
Merge: 616012a ea19888
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 15:58:37 2022 +0800

Merge branch 'develop_0715' into develop
merge
# Conflicts:
# src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js
# src/pages/PurchaseAdmin/PurchaseList/Detail/HistoryDrawer.js
# src/pages/PurchaseAdmin/PurchaseList/Detail/Index.js
# src/pages/PurchaseAdmin/PurchaseList/Detail/TimeNode.js

commit 616012a58ec3688f03eeec30dab89d12655a5454
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:05:31 2022 +0800

Squashed commit of the following:
merge
commit 9c3cb6985ba730337971e8a8537730a4e5119ef2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:04:01 2022 +0800

查询节点版本接口添加node_type字段

commit 307abe6678a74bfa0a0b44a861e1ca024aa22fb2
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 18:08:24 2022 +0800

修改bom最新需求

commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

# Conflicts:
# src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js

commit 87ec2751172f4ab98a2a92772cf01fb832573ed8
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:14:47 2022 +0800

Squashed commit of the following:
merge
commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 3db0c23a140a307d70f902b122b25b431f78cfe5
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:46:20 2022 +0800

项目列表审核列表 流程缺失 修复

commit 70e7740d3f6a9af481f65aa1c4c6d660db9c66b6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:04:38 2022 +0800

工时审核 创建人缺失 修复

commit 0e349e10278422433f7478593c2b4809e4538279
Merge: 86c7844 6bcae78
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:19:54 2022 +0800

Merge branch 'develop_0715' into develop
解决冲突
# Conflicts:
# src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js
# src/pages/PurchaseAdmin/PurchaseList/Detail/HistoryDrawer.js
# src/pages/PurchaseAdmin/PurchaseList/Detail/Index.js

commit 86c7844828487be838e1795aa76932f56c91d2f6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 11:38:29 2022 +0800

项目详情 研发项目隐藏多余信息

commit fe90240aa44690d51acd871a06bc16a3b49ec1f2
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 16:05:56 2022 +0800

浏览器缓存配置修改

commit 66bd343da7766fccef3b791d6acf84f0ebc1cfd2
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 16:00:44 2022 +0800

Squashed commit of the following:
merge devlop_0715
commit 6c38bc02e3ad84491745076a2f5abf2241bbd06f
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:57:38 2022 +0800

修改地址

commit d06b6ae6af266634f7f742559402069e4296d585
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:56:03 2022 +0800

修改查看流程/历史版本

commit 9fdd0969977a5a10205684cb66d4d27b8fcb5a39
Author: Renxy <18510891294@163.com>
Date: Wed Jul 20 20:18:38 2022 +0800

多节点审批/业务节点权限控制

commit b7c21ca5d7abd551ef8913defacd2b834f53a5d3
Author: Renxy <18510891294@163.com>
Date: Fri Jul 15 16:44:49 2022 +0800

添加业务节点权限配置

commit 6061f798d045f760116c2221e3d384583e667655
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 15:51:23 2022 +0800

chart改动

commit b6e60eae15a717f2938873ed4c1b9a90531fca3b
Merge: ccff8a2 12407a8
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 11:42:09 2022 +0800

Merge branch 'feature/mobile' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into feature/mobile

commit 12407a809c15673c8f288d29d927efa324f80928
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:22:06 2022 +0800

样式调整

commit e007db195a6063090284c29162cb29136d7f09c2
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:19:57 2022 +0800

手机移动端图标页面样式

commit ccff8a230e6ac92a43c4a4b628f513f4c382f856
Author: xujunjie <645007605@qq.com>
Date: Thu Jul 21 14:06:51 2022 +0800

移动端引入xflow

commit 6869f837608fad6527f19d6e7d40d854fafd0015
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Wed Jul 20 18:24:58 2022 +0800

update

commit 591b702812ac84f54506bb8a0a5b0c121c5d7f49
Author: xujunjie <645007605@qq.com>
Date: Tue Jul 19 09:13:24 2022 +0800

创建文件

Renxy 2 жил өмнө
parent
commit
fd25edb400

+ 6 - 26
src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js

@@ -62,32 +62,12 @@ function FlowModal(props) {
           data = [...data, arr];
         }
       });
-      
+      data.sort((a,b) => a.id - b.id)
       data.forEach((item, id)=>{
         //解决key报错问题
         data[id].key=`${id}-${item.name}`;
         item.isParent = true;
       })
-
-      // let dataNew = [...nameSet].map(name=>{
-      //   let list = data.filter(item=>item.version_name == name)
-      //   if(list.length == 1) {
-      //     return list[0]
-      //   }else if(list.filter(item=>!item.version_no).length > 0) {
-      //     return list.filter(item=>!item.version_no)[0]
-      //   }else {
-      //     return list.reduce((a, b)=> a.version_no > b.version_no ? b : a)
-      //   }
-      // })
-      // // let dataNew = data.filter(item=>!item.version_no);
-      // dataNew.forEach(item=>{
-      //   let curItem = data.find(node => node.version_name == item.version_name && node.version_id != item.version_id)
-      //   if(curItem) {
-      //     curItem.isChild = true;
-      //     item.children = [curItem]
-      //   };
-      // })
-      // setData(dataNew);
       setData(data);
     } catch (error) {
       console.log(error);
@@ -156,7 +136,7 @@ function FlowModal(props) {
       },
       {
         title: '状态',
-        width: '20%',
+        width: '30%',
         render: item => {
           let style = {  color: getColor(item) };
           let txt = '';
@@ -168,16 +148,16 @@ function FlowModal(props) {
               txt = '待审批';
               break;
             case 2:
-              txt = '拒绝';
+              txt = '拒绝';
               break;
             case 3:
-              txt = '通过';
+              txt = '通过';
               break;
             case 4:
               txt = '已提交';
               break;
           }
-          if(item.status == 1)  txt = '失效';
+          if(item.status == 1)  txt = '失效';
           return  item.audit_status != 0  ? 
             <Button onClick={()=>handleChangeClick(item)}>{txt}</Button> :
             <span style={style} >{txt}</span>
@@ -194,7 +174,7 @@ function FlowModal(props) {
                 onClose();
               }}
             >
-              切换
+              加载
             </a>
           ),
       },

+ 1 - 1
src/pages/PurchaseAdmin/PurchaseList/Detail/HistoryDrawer.js

@@ -55,7 +55,7 @@ function HistoryDrawer(props) {
                 onClose();
               }}
             >
-              切换
+              加载
             </a>
           ),
       },

+ 2 - 2
src/pages/PurchaseAdmin/PurchaseList/Detail/Index.js

@@ -554,7 +554,7 @@ function Detail(props) {
       <Menu.Item key="attachment">附件</Menu.Item>,
     ];
     // version.audit_status:4 为副本。不可操作
-    if (version.audit_status != 4) {
+    if (version.audit_status != 4 ) {
       //判断权限配置,如果配置了,就指定权限的人可提交,没配置就全部人都可提交
       const getIsSubmit = () => {
         const nodeId = version.template_node_id;
@@ -567,7 +567,7 @@ function Detail(props) {
         return true;
       }
       console.log("是否有权限提交流转   ", getIsSubmit())
-      if(getIsSubmit()) menuList.push(<Menu.Item key="commitAudit">提交流转</Menu.Item>);
+      if(getIsSubmit() && version.audit_status != 3) menuList.push(<Menu.Item key="commitAudit">提交流转</Menu.Item>);
       
 
       if (!isAuditor && canEdit() && !version.flow_id) {