소스 검색

修改显示

Renxy 2 년 전
부모
커밋
4958d8b321

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

@@ -62,13 +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;
       })
-
       setData(data);
     } catch (error) {
       console.log(error);
@@ -137,7 +136,7 @@ function FlowModal(props) {
       },
       {
         title: '状态',
-        width: '20%',
+        width: '30%',
         render: item => {
           let style = {  color: getColor(item) };
           let txt = '';
@@ -149,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>
@@ -175,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) {