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

src/components/DDComponents/DDCode/index.js

@@ -46,7 +46,7 @@ function DDCode(props) {
         </div>
       ) : (
         <Spin spinning={loading}>
-          <QRCode size={128} value={`http://192.168.20.80:8000/bom/#/bom/dd-login/${DingUserId}`} />
+          <QRCode size={128} value={`http://47.96.12.136:8896/#/bom/dd-login/${DingUserId}`} />
           请使用钉钉扫码授权<a onClick={queryCode}>刷新</a>
         </Spin>
       )}

src/pages/PurchaseAdmin/PurchaseList/Detail/AuditFlow.js

@@ -18,6 +18,7 @@ function AuditFlow(props) {
     tasks,
     userList,
     cc_userids = [],
+    canShowAudit = false,
     onApprove,
   } = props;
   const [flow, setFlow] = useState({ workflowActivityRules: [] });
@@ -50,6 +51,7 @@ function AuditFlow(props) {
   }, [tasks, flow]);
 
   const showAduit = useMemo(() => {
+    if (!canShowAudit) return false;
     //当前处理中的审批人和登录人是一个人显示审批通过和拒绝
     if (!tasks || tasks.length == 0) {
       return false;

src/pages/PurchaseAdmin/PurchaseList/Detail/Index.js

@@ -959,7 +959,7 @@ function Detail(props) {
         />
       </div>
       {/* <TimeNode flow={flow} isAuditor={isAuditor} onApprove={onApprove}></TimeNode> */}
-      {version.flow_id ? <AuditFlow {...auditDetail} onApprove={onApprove} /> : null}
+      {version.flow_id ? <AuditFlow {...auditDetail} canShowAudit={true} onApprove={onApprove} /> : null}
 
       {/* {renderAlert()} */}
       {/* 判断是否为比对模式 */}