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

package.json

@@ -122,7 +122,7 @@
         "js-calendar-converter": "0.0.4",
         "lodash": "4.17.11",
         "minimist": "1.2.0",
-        "panda-xform": "^4.1.5",
+        "panda-xform": "^4.3.6",
         "prop-types": "15.7.2",
         "quill": "^1.3.7",
         "rc-tween-one": "^3.0.6",

src/pages/bsmanager/base/tablemanager/components/TableView.jsx

@@ -881,7 +881,7 @@ const TableView = props => {
               {addArr.map((item, index) =>
                 item.IsAddFieldConfig ? (
                   <div className={styles.subItem}>
-                    <span>{item.Alias || item.Name}</span>{' '}
+                    <span>{item.Name}</span>{' '}
                     <span className={styles.deleteItem} onClick={() => deleteAddField(item, index)}>
                       X
                     </span>

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

@@ -553,7 +553,7 @@ const FlowModal = props => {
             onChange={e => {
               prefix(e.target.value);
             }}
-            readOnly={modalType === 'edit'}
+            disabled={modalType === 'edit'}
           />
         </Form.Item>
         <Form.Item

src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/flowChartComponents/NodeModal.jsx

@@ -59,14 +59,18 @@ const NodeModal = props => {
       ...refConfigTimeLimit.current?.getParmar(),
     };
 
-    if (!obj.TableName) {
-      message.error('请选择节点表名');
-      return;
-    }
+    // 开始中间结束节点才校验表名编辑字段
+    const arr = ['0', '1', '2'];
+    if (arr.includes(editMsg.NodeType)) {
+      if (!obj.TableName) {
+        message.error('请选择节点表名');
+        return;
+      }
 
-    if (!obj.Fields) {
-      message.error('请选择编辑字段');
-      return;
+      if (!obj.Fields) {
+        message.error('请选择编辑字段');
+        return;
+      }
     }
 
     for (let i = 0; i < obj.RuleList.length; i++) {

src/services/standingBook/api.js

@@ -130,3 +130,7 @@ export const CheckImportLedgerConfig = data =>
 // 导入台账
 export const ImportLedgerConfig = data =>
   post(`${PUBLISH_SERVICE}/WorkOrderCenter/ImportLedgerConfig`, data);
+
+// 获取台账字段配置数据
+export const Ledger_QueryLedger = query =>
+  get(`${PUBLISH_SERVICE}/WorkOrderCenter/Ledger_QueryLedger`, query);