2 年之前 · bd4be7a1f9
--- a/public/luckysheet.html
+++ b/public/luckysheet.html
@@ -8,20 +8,20 @@
 
				   <title>Document</title>
			
 
				 
			
 
				   <!-- 线上发布使用路径 -->
			
 
				-  <link rel="stylesheet" href="/bom/Luckysheet/plugins/css/pluginsCss.css" />
			
 
				+  <!-- <link rel="stylesheet" href="/bom/Luckysheet/plugins/css/pluginsCss.css" />
			
 
				   <link rel="stylesheet" href="/bom/Luckysheet/plugins/plugins.css" />
			
 
				   <link rel="stylesheet" href="/bom/Luckysheet/css/luckysheet.css" />
			
 
				   <link rel="stylesheet" href="/bom/Luckysheet/assets/iconfont/iconfont.css" />
			
 
				   <script src="/bom/Luckysheet/plugins/js/plugin.js"></script>
			
 
				-  <script src="/bom/Luckysheet/luckysheet.umd.js"></script>
			
 
				+  <script src="/bom/Luckysheet/luckysheet.umd.js"></script> -->
			
 
				 
			
 
				   <!-- 本地开发使用路径 -->
			
 
				-  <!-- <link rel='stylesheet' href='http://localhost:3000/plugins/css/pluginsCss.css' />
			
 
				+  <link rel='stylesheet' href='http://localhost:3000/plugins/css/pluginsCss.css' />
			
 
				   <link rel='stylesheet' href='http://localhost:3000/plugins/plugins.css' />
			
 
				   <link rel='stylesheet' href='http://localhost:3000/css/luckysheet.css' />
			
 
				   <link rel='stylesheet' href='http://localhost:3000/assets/iconfont/iconfont.css' />
			
 
				   <script src="http://localhost:3000/plugins/js/plugin.js"></script>
			
 
				-  <script src="http://localhost:3000/luckysheet.umd.js"></script> -->
			
 
				+  <script src="http://localhost:3000/luckysheet.umd.js"></script>
			
 
				 </head>
			
 
				 
			
 
				 <body>
			
--- a/src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js
+++ b/src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js
@@ -77,7 +77,7 @@ function FlowModal(props) {
 
				           data = [...data, arr];
			
 
				         }
			
 
				       });
			
 
				-      data.sort((a, b) => a.id - b.id);
			
 
				+      data.sort((a, b) => b.id - a.id);
			
 
				       data.forEach((item, id) => {
			
 
				         //解决key报错问题
			
 
				         data[id].key = `${id}-${item.name}`;
			
@@ -148,7 +148,9 @@ function FlowModal(props) {
 
				         // width: '33%',
			
 
				         render: item => (
			
 
				           <span style={{ color: item.audit_status != 0 ? '#9b9b9b' : '' }}>
			
 
				-            {item.id == version.id && <CheckOutlined style={{ marginRight: 10 }} />}
			
 
				+            {item.id == version.id && !item.isParent && (
			
 
				+              <CheckOutlined style={{ marginRight: 10 }} />
			
 
				+            )}
			
 
				             {item.version_no && !item.isParent
			
 
				               ? `${item.version_name}.${item.version_no}`
			
 
				               : item.version_name}
			
@@ -159,7 +161,7 @@ function FlowModal(props) {
 
				         title: '状态',
			
 
				         width: '30%',
			
 
				         render: item => {
			
 
				-          // if (!item.flow_id && item.isParent) return;
			
 
				+          if (!item.flow_id && item.isParent) return;
			
 
				           let style = { color: getColor(item) };
			
 
				           let txt = '';
			
 
				           switch (item.audit_status) {
			
@@ -195,6 +197,7 @@ function FlowModal(props) {
 
				           item.id != version.id && (
			
 
				             <a
			
 
				               onClick={() => {
			
 
				+                console.log(item);
			
 
				                 onChangeVersion(item);
			
 
				                 onClose();
			
 
				               }}