Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/maintenance

src/components/RuleConfig/index.jsx

@@ -10,7 +10,16 @@ const fnList = [
   { label: '上报人工单统计', value: '$fn.caseNum()' },
 ];
 const RuleConfig = props => {
-  const { visible, handleCancel, fieldList, onSubumit, RuleContent, flag, flowID } = props;
+  const {
+    visible,
+    handleCancel,
+    fieldList,
+    onSubumit,
+    RuleContent,
+    flag,
+    flowID,
+    showInsertFn,
+  } = props;
   const [rule, setRule] = useState([]);
   const [expandedKey, setExpandedKey] = useState(''); // 默认展开项
   const [currentSelectId, setCurrentSelectId] = useState(''); // 选中得节点
@@ -109,9 +118,11 @@ const RuleConfig = props => {
           <div className={styles.rightContent}>
             {flag == 1 && <div className={styles.title}>符合以下条件时工单扭转到对应的节点</div>}
             <div className={styles.textAreaBox}>
-              <Dropdown overlay={fnListRender} placement="bottom" arrow>
-                <div className={styles.insertFn}>插入函数</div>
-              </Dropdown>
+              {flag == 1 && (
+                <Dropdown overlay={fnListRender} placement="bottom" arrow>
+                  <div className={styles.insertFn}>插入函数</div>
+                </Dropdown>
+              )}
 
               <TextArea
                 id="ruleText"

src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/FlowChartRt.jsx

@@ -155,17 +155,21 @@ const FlowChart = props => {
           delLinks.add(item.data.LineId);
         }
       });
-      CheckDoingFlowNodes({ activityIds: [...delNodes] }).then(res => {
-        if (res.code === 0) {
-          if (res.data > 0) {
-            showCloseList([...delNodeIds], [...delNodes], [...delLinks], res.data);
+      if (delNodes.size === 0) {
+        delNode([...delNodeIds], [...delNodes], [...delLinks]);
+      } else {
+        CheckDoingFlowNodes({ activityIds: [...delNodes] }).then(res => {
+          if (res.code === 0) {
+            if (res.data > 0) {
+              showCloseList([...delNodeIds], [...delNodes], [...delLinks], res.data);
+            } else {
+              showDeleteConfirm([...delNodeIds], [...delNodes], [...delLinks]);
+            }
           } else {
-            showDeleteConfirm([...delNodeIds], [...delNodes], [...delLinks]);
+            message.error(res.msg);
           }
-        } else {
-          message.error(res.msg);
-        }
-      });
+        });
+      }
 
       return false;
     };
@@ -1039,9 +1043,11 @@ const FlowChart = props => {
         }).then(response => {
           if (response.code === 0) {
             console.log(currentNode.current);
-            let list = JSON.parse(JSON.stringify(currentNode.current));
-            list.FlowNodeBackfillConfigs = jsonData(list.FlowNodeBackfillConfigs);
-            currentNode.current = list;
+            // let list = JSON.parse(JSON.stringify(currentNode.current));
+            // list.FlowNodeBackfillConfigs = jsonData(list.FlowNodeBackfillConfigs);
+            // currentNode.current = list;
+            let flowNodeBackfillConfigs = currentNode.current.FlowNodeBackfillConfigs;
+            currentNode.current.FlowNodeBackfillConfigs = jsonData(flowNodeBackfillConfigs);
             console.log(currentNode.current);
             FlowNodeSave({
               PreviewImage: response.data,
@@ -1083,10 +1089,8 @@ const FlowChart = props => {
     let listArr = [];
     val.map((item, index) => {
       console.log(item);
-      debugger;
       if (!item.Config) {
         console.log(item);
-        debugger;
         let arr = [];
         arr.push({
           mapServer: item.schemeName,
@@ -1278,7 +1282,6 @@ const FlowChart = props => {
       }),
       1.2, // 压缩比例
       base64 => {
-        console.log(base64);
         SaveWorkFlowImage({
           flowName: flowData.flowName,
           base64Data: base64,

src/services/maintenance/api.js

@@ -47,3 +47,9 @@ export const CM_XWBPlan_ChangeOrder = planIds =>
 // 获取父级维保模板
 export const GetParentDeviceTemplate = query =>
   get(`${PUBLISH_SERVICE}/WorkOrderCenter/GetParentDeviceTemplate`, query);
+
+export const GetFeedbackTableFields = query =>
+  get(`${PUBLISH_SERVICE}/WorkOrderCenter/GetFeedbackTableFields`, query);
+
+export const GetAccountConfigInfo = query =>
+  get(`/PandaWorkFlow/WorkFlow/AccountManage/GetAccountConfigInfo`, query);
\ No newline at end of file