Forráskód Böngészése

已提交审批页面删除状态,增加待审批人

xjj 2 éve
szülő
commit
55314f1a5c
1 módosított fájl, 35 hozzáadás és 27 törlés
  1. 35 27
      src/pages/Auth/Submit.js

+ 35 - 27
src/pages/Auth/Submit.js

@@ -3,11 +3,12 @@ import { Table, Collapse, Space } from 'antd';
 import { connect } from 'dva';
 import router from 'umi/router';
 import { querySubmitList } from '@/services/bomAuth';
+import { render } from '@/app';
 
 const { Panel } = Collapse;
 
 function Auth(props) {
-  const { dispatch, typeOptions, currentUser,project } = props;
+  const { dispatch, typeOptions, currentUser, project } = props;
   const [loading, setLoading] = useState(false);
   const [data, setData] = useState({
     list: [],
@@ -49,31 +50,32 @@ function Auth(props) {
       render: item => typeOptions.find(cur => cur.id == item.classify_id)?.name,
     },
     {
-      title: '状态',
+      title: '待审批人',
       width: '15%',
-      render: item => {
-        let style = { color: getColor(item.audit_status) };
-        let txt = '';
-        switch (item.audit_status) {
-          case 0:
-            txt = '未提交';
-            break;
-          case 1:
-            txt = '待审批';
-            break;
-          case 2:
-            txt = '已拒绝';
-            break;
-          case 3:
-            txt = '已通过';
-            break;
-          case 4:
-            txt = '已提交';
-            break;
-        }
-        if (item.status == 1) txt = '已失效';
-        return <span style={style}>{txt}</span>;
-      },
+      dataIndex: 'audit_comment',
+      // render: item => {
+      //   let style = { color: getColor(item.audit_status) };
+      //   let txt = '';
+      //   switch (item.audit_status) {
+      //     case 0:
+      //       txt = '未提交';
+      //       break;
+      //     case 1:
+      //       txt = '待审批';
+      //       break;
+      //     case 2:
+      //       txt = '已拒绝';
+      //       break;
+      //     case 3:
+      //       txt = '已通过';
+      //       break;
+      //     case 4:
+      //       txt = '已提交';
+      //       break;
+      //   }
+      //   if (item.status == 1) txt = '已失效';
+      //   return <span style={style}>{txt}</span>;
+      // },
     },
     {
       title: '操作',
@@ -90,9 +92,15 @@ function Auth(props) {
     //调用接口获取version信息
     dispatch({
       type: 'auth/queryVersionByNode',
-      payload: { template_node_id: item.node_id },
+      payload: { template_node_id: item.TemplateNodeInfo.Id },
       callback: versionList => {
-        let version = versionList.find(v => v.id == item.id) || {};
+        let version;
+        let parentVersion = versionList.find(v => v.id == item.version_id);
+        if (parentVersion && parentVersion.children) {
+          version = parentVersion.children.find(v => v.id == item.id);
+        } else {
+          version = versionList.find(v => v.id == item.id);
+        }
         localStorage.excelItem = JSON.stringify(version);
         router.push(`/home/detail/${item.project_id}/${item.template_id}`);
       },