Procházet zdrojové kódy

1. 投标版PSR和签字版PSR节点下的表单只允许查看不允许编辑
2. 修改流程图模板

xujunjie před 1 rokem
rodič
revize
ed659ffefe

+ 12 - 6
src/pages/Detail/Index.js

@@ -114,6 +114,13 @@ function Detail(props) {
     localStorage['JWT-TOKEN'] = TOKEN;
   }
 
+  const node = useMemo(() => {
+    if (version.template_node_id && flowDetail.nodes.length > 0) {
+      return flowDetail.nodes.find(item => item.Id == version.template_node_id);
+    }
+    return null;
+  }, [flowDetail, version.template_node_id]);
+
   const flow = useMemo(() => {
     let data = {
       active: 0,
@@ -270,7 +277,7 @@ function Detail(props) {
     await queryDelSheetRecord(params);
   };
 
-  const onAudit = (data) => {
+  const onAudit = data => {
     const flowNode = flow.currentNode;
     dispatch({
       type: 'detail/approve',
@@ -279,7 +286,7 @@ function Detail(props) {
         project_id: projectId,
         flow_id: flowNode.flow_id,
         node_id: flowNode.seq,
-        ...data
+        ...data,
       },
       callback: newVersion => {
         setAuditVisible(false);
@@ -442,11 +449,9 @@ function Detail(props) {
 
   //是否展示psr表上面的按钮
   const showPsrBtns = useMemo(() => {
-    let Id = version.template_node_id;
-    const node = flowDetail.nodes.find?.(item => item.Id == Id);
-    if (node?.node_type_psr >= 1 && node?.node_type_psr <= 4) return true;
+    if (node?.node_type_psr == 3 || node?.node_type_psr == 4) return true;
     return false;
-  }, [flowDetail, version]);
+  }, [node]);
 
   const getUser = newUser => {
     try {
@@ -627,6 +632,7 @@ function Detail(props) {
                   permissions={currentUser.Permission}
                   version={version}
                   templateId={templateId}
+                  node={node}
                   getUser={getUser}
                   onUpdate={onUpdate}
                   onDelSheet={onDelSheet}

+ 9 - 1
src/pages/Detail/LuckySheet.js

@@ -73,6 +73,7 @@ class LuckySheet extends React.Component {
       templateId,
       onDelSheet,
       permissions,
+      node,
     } = this.props;
     const data = currentData || this.props.data;
     const _this = this;
@@ -185,7 +186,8 @@ class LuckySheet extends React.Component {
         option.enableAddBackTop = false;
         option.showsheetbarConfig = {
           add: false,
-          sheet: false,
+          menu: false,
+          // sheet: false,
         };
         option.cellRightClickConfig = {
           copy: false, // 复制
@@ -230,6 +232,12 @@ class LuckySheet extends React.Component {
           hintText: '当前清单不可编辑!',
         };
         unableEdit(option);
+      } else if (node?.node_type_psr == 1 ||node?.node_type_psr == 2 || node?.node_type_psr == 5 ) {
+        option.authority = {
+          sheet: true,
+          hintText: '流程已完结,不可编辑!',
+        };
+        unableEdit(option);
       }
     } else if (data && data.length > 0) {
       option.data = JSON.parse(JSON.stringify(data));

+ 1 - 1
src/pages/Flow/FlowDetail.json

@@ -118,7 +118,7 @@
       "x": -789,
       "y": 26,
       "flow_id": 0,
-      "node_type_psr": 0,
+      "node_type_psr": 5,
       "count": 0,
       "role_list": ""
     },