Merge remote-tracking branch 'origin/develop' into unsure

src/pages/Detail/LuckySheet.js

@@ -625,8 +625,12 @@ class LuckySheet extends React.Component {
     return comment;
   }
 
-  async goalSeek(type, goal,order = 2) {
+  async goalSeek(type, goal,setting) {
     let luckysheet = this.luckysheet;
+    const sheet = this.luckysheet.getSheet({
+      name: '毛利概算'
+    })
+    let order = sheet.order;
 
     const fn = function(x) {
       return new Promise(resolve => {
@@ -661,9 +665,8 @@ class LuckySheet extends React.Component {
         fn,
         fnParams: [defaultValue],
         maxIterations: 1000,
-        maxStep: 0.03,
-        percentTolerance: 1,
         independentVariableIdx: 0,
+        ...setting
       });
       console.log(result);
     } catch (error) {

src/pages/Detail/PsrControl.js

@@ -27,8 +27,20 @@ function PsrControl(props) {
 
   const goalSeek = (type, value) => {
     setLoading(true);
+    let setting = null;
     try {
-      sheetRef.current.goalSeek(type, value);
+      if (type == 3) {
+        setting = {
+          maxStep: 0.0001,
+          percentTolerance: 0.01,
+        };
+      } else {
+        setting = {
+          maxStep: 0.03,
+          percentTolerance: 1,
+        };
+      }
+      sheetRef.current.goalSeek(type, value, setting);
     } catch (error) {}
     setLoading(false);
   };

src/pages/Flow/FlowDetail.json

@@ -95,7 +95,8 @@
       "flow_id": 0,
       "node_type_psr": 0,
       "count": 0,
-      "role_list": ""
+      "role_list": "",
+      "is_seal": 1
     },
     {
       "id": "5216c5dc",

src/utils/uploadExcelByUrl.js

@@ -2,7 +2,7 @@ import LuckyExcel from 'luckyexcel';
 import { getToken } from '@/utils/utils';
 
 const uploadExcelByUrl = (nodeType, versionId, projectName) => {
-  const TEMPLATE_URL = 'https://gt-digitization.oss-cn-hangzhou.aliyuncs.com/public/bom/psr.xlsx';
+  const TEMPLATE_URL = 'https://gt-digitization.oss-cn-hangzhou.aliyuncs.com/public/bom/psr0913.xlsx';
 
   return new Promise((resolve, reject) => {
     LuckyExcel.transformExcelToLuckyByUrl(