@bit-sun/business-component 2.3.25 → 2.3.27

package/dist/index.esm.js

@@ -2,7 +2,7 @@ import axios from 'axios';
 import { message as message$1, Image, Popover, Card, Avatar, Tooltip, Menu, Space, Dropdown, Button, Checkbox, Input, Modal, Select, Form, Divider, Spin, Table, TreeSelect, Tag, InputNumber, Typography, Alert, Anchor, Breadcrumb, Drawer as Drawer$1, List, Tree, Row, Col, Tabs, Affix, Cascader, DatePicker, TimePicker, Switch } from 'antd';
 import _, { omit, debounce, cloneDeep as cloneDeep$1, throttle, isEmpty } from 'lodash';
 import { history, formatMessage, useLocation, Link, useModel, useIntl } from 'umi';
-import isEqual$1 from 'lodash/isEqual';
+import isEqual from 'lodash/isEqual';
 import React, { useState, useEffect, forwardRef, useImperativeHandle, useRef, useMemo, Component, useLayoutEffect, createRef } from 'react';
 import moment$1 from 'moment';
 import { UnorderedListOutlined, ProfileTwoTone, ExclamationCircleOutlined, DownOutlined, CopyOutlined, SearchOutlined, CaretLeftOutlined, CloseCircleOutlined, ArrowLeftOutlined, FolderOutlined, EllipsisOutlined, CaretDownOutlined, HomeOutlined, DoubleLeftOutlined, DoubleRightOutlined, MenuUnfoldOutlined, DashOutlined, SettingOutlined, BulbOutlined, PlayCircleOutlined, SaveOutlined, FullscreenExitOutlined, EditOutlined, MinusCircleOutlined, PlusCircleOutlined } from '@ant-design/icons';
@@ -762,52 +762,41 @@ var precisionQuantity = function precisionQuantity(num, accuracy) {
   return '';
 };
 
-var safeIsNaN = Number.isNaN ||
-    function ponyfill(value) {
-        return typeof value === 'number' && value !== value;
-    };
-function isEqual(first, second) {
-    if (first === second) {
-        return true;
-    }
-    if (safeIsNaN(first) && safeIsNaN(second)) {
-        return true;
-    }
-    return false;
-}
-function areInputsEqual(newInputs, lastInputs) {
-    if (newInputs.length !== lastInputs.length) {
-        return false;
+var simpleIsEqual = function simpleIsEqual(a, b) {
+  return a === b;
+};
+
+function index$1 (resultFn, isEqual) {
+  if (isEqual === void 0) {
+    isEqual = simpleIsEqual;
+  }
+
+  var lastThis;
+  var lastArgs = [];
+  var lastResult;
+  var calledOnce = false;
+
+  var isNewArgEqualToLast = function isNewArgEqualToLast(newArg, index) {
+    return isEqual(newArg, lastArgs[index], index);
+  };
+
+  var result = function result() {
+    for (var _len = arguments.length, newArgs = new Array(_len), _key = 0; _key < _len; _key++) {
+      newArgs[_key] = arguments[_key];
     }
-    for (var i = 0; i < newInputs.length; i++) {
-        if (!isEqual(newInputs[i], lastInputs[i])) {
-            return false;
-        }
+
+    if (calledOnce && lastThis === this && newArgs.length === lastArgs.length && newArgs.every(isNewArgEqualToLast)) {
+      return lastResult;
     }
-    return true;
-}
 
-function memoizeOne(resultFn, isEqual) {
-    if (isEqual === void 0) { isEqual = areInputsEqual; }
-    var lastThis;
-    var lastArgs = [];
-    var lastResult;
-    var calledOnce = false;
-    function memoized() {
-        var newArgs = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            newArgs[_i] = arguments[_i];
-        }
-        if (calledOnce && lastThis === this && isEqual(newArgs, lastArgs)) {
-            return lastResult;
-        }
-        lastResult = resultFn.apply(this, newArgs);
-        calledOnce = true;
-        lastThis = this;
-        lastArgs = newArgs;
-        return lastResult;
-    }
-    return memoized;
+    lastResult = resultFn.apply(this, newArgs);
+    calledOnce = true;
+    lastThis = this;
+    lastArgs = newArgs;
+    return lastResult;
+  };
+
+  return result;
 }
 
 function styleInject(css, ref) {
@@ -1024,58 +1013,59 @@ var getItemDefaultWidth = function getItemDefaultWidth(item) {
  * @returns 返回处理后的查询参数
  */
 function queryParams(params, flag) {
-  for (var key in params) {
+  var _loop = function _loop() {
     if (Object.prototype.hasOwnProperty.call(params, key)) {
-      (function () {
-        var element = params[key];
-        if (element && key.indexOf('*number*') >= 0) {
-          var dataParams = key.split('*number*');
-          dataParams.forEach(function (value, index) {
-            params[value] = element[index];
-          });
-          delete params[key];
-        } else if (element && key.indexOf('*address*') >= 0) {
-          var _dataParams = key.split('*address*');
-          _dataParams.forEach(function (value, index) {
-            params[value] = element.PCDCode[index];
-          });
-          delete params[key];
-        } else if (element && key.indexOf('*costType*') >= 0) {
-          var _dataParams2 = key.split('*costType*');
-          // eslint-disable-next-line prefer-destructuring
-          params[_dataParams2[0]] = element[1];
-          delete params[key];
-        } else if (element && key.indexOf('*fullDate*') >= 0) {
-          var _dataParams3 = key.split('*fullDate*');
-          _dataParams3.forEach(function (value, index) {
-            if (index === 0) {
-              params[value] = moment$1(element[index]).millisecond(0).second(0).minute(0).hour(0).format('YYYY-MM-DD HH:mm:ss');
-            } else {
-              params[value] = moment$1(element[index]).millisecond(59).second(59).minute(59).hour(23).format('YYYY-MM-DD HH:mm:ss');
-            }
-          });
-          delete params[key];
-        } else if (element && key.indexOf('*') >= 0) {
-          var _dataParams4 = key.split('*');
-          _dataParams4.forEach(function (value, index) {
-            params[value] = element[index].format('YYYY-MM-DD HH:mm:ss');
-          });
-          delete params[key];
-        } else if (element && key.indexOf('_likeIn_') >= 0) {
-          var _dataParams5 = key.split('_likeIn_');
-          if (element.indexOf(',') >= 0) {
-            params["qp-".concat(_dataParams5[0], "-in")] = element.split(',').join(',');
-            params["qp-".concat(_dataParams5[0], "-like")] = null;
+      var element = params[key];
+      if (element && key.indexOf('*number*') >= 0) {
+        var dataParams = key.split('*number*');
+        dataParams.forEach(function (value, index) {
+          params[value] = element[index];
+        });
+        delete params[key];
+      } else if (element && key.indexOf('*address*') >= 0) {
+        var _dataParams = key.split('*address*');
+        _dataParams.forEach(function (value, index) {
+          params[value] = element.PCDCode[index];
+        });
+        delete params[key];
+      } else if (element && key.indexOf('*costType*') >= 0) {
+        var _dataParams2 = key.split('*costType*');
+        // eslint-disable-next-line prefer-destructuring
+        params[_dataParams2[0]] = element[1];
+        delete params[key];
+      } else if (element && key.indexOf('*fullDate*') >= 0) {
+        var _dataParams3 = key.split('*fullDate*');
+        _dataParams3.forEach(function (value, index) {
+          if (index === 0) {
+            params[value] = moment$1(element[index]).millisecond(0).second(0).minute(0).hour(0).format('YYYY-MM-DD HH:mm:ss');
           } else {
-            params["qp-".concat(_dataParams5[0], "-like")] = element;
-            params["qp-".concat(_dataParams5[0], "-in")] = null;
+            params[value] = moment$1(element[index]).millisecond(59).second(59).minute(59).hour(23).format('YYYY-MM-DD HH:mm:ss');
           }
-          delete params[key];
-        } else if (Array.isArray(element)) {
-          params[key] = element.join(',');
+        });
+        delete params[key];
+      } else if (element && key.indexOf('*') >= 0) {
+        var _dataParams4 = key.split('*');
+        _dataParams4.forEach(function (value, index) {
+          params[value] = element[index].format('YYYY-MM-DD HH:mm:ss');
+        });
+        delete params[key];
+      } else if (element && key.indexOf('_likeIn_') >= 0) {
+        var _dataParams5 = key.split('_likeIn_');
+        if (element.indexOf(',') >= 0) {
+          params["qp-".concat(_dataParams5[0], "-in")] = element.split(',').join(',');
+          params["qp-".concat(_dataParams5[0], "-like")] = null;
+        } else {
+          params["qp-".concat(_dataParams5[0], "-like")] = element;
+          params["qp-".concat(_dataParams5[0], "-in")] = null;
         }
-      })();
+        delete params[key];
+      } else if (Array.isArray(element)) {
+        params[key] = element.join(',');
+      }
     }
+  };
+  for (var key in params) {
+    _loop();
   }
   return flag ? params : qs.stringify(params);
 }
@@ -1121,7 +1111,7 @@ var formatter = function formatter(data, parentAuthority, parentName) {
     return item;
   });
 };
-var memoizeOneFormatter = memoizeOne(formatter, isEqual$1);
+var memoizeOneFormatter = index$1(formatter, isEqual);
 var go2BackAndClose = function go2BackAndClose() {
   localStorage.setItem(ENUM.BROWSER_CACHE.CHILD_APP_BACK, 1);
   history.goBack();
@@ -2804,84 +2794,85 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       });
     }
     // 数组对象处理,对带有特殊标记的name进行处理
-    for (var key in params) {
+    var _loop = function _loop() {
       if (Object.prototype.hasOwnProperty.call(params, key)) {
-        (function () {
-          var element = params[key];
-          if (element && key.indexOf('*number*') >= 0) {
-            var dataParams = key.split('*number*');
-            dataParams.forEach(function (value, index) {
-              params[value] = element[index];
-            });
-            delete params[key];
-          } else if (element && key.indexOf('*address*') >= 0) {
-            var _dataParams = key.split('*address*');
-            _dataParams.forEach(function (value, index) {
-              params[value] = element.PCDCode[index];
-            });
-            delete params[key];
-          } else if (element && key.indexOf('*costType*') >= 0) {
-            var _dataParams2 = key.split('*costType*');
-            // eslint-disable-next-line prefer-destructuring
-            params[_dataParams2[0]] = element[1];
-            delete params[key];
-          } else if (element && key.indexOf('*fullDate*') >= 0) {
-            var _dataParams3 = key.split('*fullDate*');
-            _dataParams3.forEach(function (value, index) {
-              if (index === 0) {
-                params[value] = moment(element[index]).millisecond(0).second(0).minute(0).hour(0).format('YYYY-MM-DD HH:mm:ss');
-              } else {
-                params[value] = moment(element[index]).millisecond(59).second(59).minute(59).hour(23).format('YYYY-MM-DD HH:mm:ss');
-              }
-            });
-            delete params[key];
-          } else if (typeof element === 'boolean' && key.indexOf('*checkBox*') >= 0) {
-            var _dataParams4 = key.split('*checkBox*');
-            if (element) {
-              params[_dataParams4[0]] = 0;
+        var element = params[key];
+        if (element && key.indexOf('*number*') >= 0) {
+          var dataParams = key.split('*number*');
+          dataParams.forEach(function (value, index) {
+            params[value] = element[index];
+          });
+          delete params[key];
+        } else if (element && key.indexOf('*address*') >= 0) {
+          var _dataParams = key.split('*address*');
+          _dataParams.forEach(function (value, index) {
+            params[value] = element.PCDCode[index];
+          });
+          delete params[key];
+        } else if (element && key.indexOf('*costType*') >= 0) {
+          var _dataParams2 = key.split('*costType*');
+          // eslint-disable-next-line prefer-destructuring
+          params[_dataParams2[0]] = element[1];
+          delete params[key];
+        } else if (element && key.indexOf('*fullDate*') >= 0) {
+          var _dataParams3 = key.split('*fullDate*');
+          _dataParams3.forEach(function (value, index) {
+            if (index === 0) {
+              params[value] = moment(element[index]).millisecond(0).second(0).minute(0).hour(0).format('YYYY-MM-DD HH:mm:ss');
+            } else {
+              params[value] = moment(element[index]).millisecond(59).second(59).minute(59).hour(23).format('YYYY-MM-DD HH:mm:ss');
             }
-            delete params[key];
-          } else if (element && key.indexOf('*cascader*') >= 0) {
-            var _dataParams5 = key.split('*cascader*');
-            params[_dataParams5[0]] = element[element.length - 1];
-            delete params[key];
-          } else if (element && key.indexOf('*date*') >= 0) {
-            var _dataParams6 = key.split('*date*');
-            _dataParams6.forEach(function (value, index) {
-              if (index === 0) {
-                params[value] = moment(element[index]).format('YYYY-MM-DD');
-              } else {
-                params[value] = moment(element[index]).format('YYYY-MM-DD');
-              }
-            });
-            delete params[key];
-          } else if (element && key.indexOf('*') >= 0) {
-            var _dataParams7 = key.split('*');
-            _dataParams7.forEach(function (value, index) {
-              params[value] = element[index].format('YYYY-MM-DD HH:mm:ss');
-            });
-            delete params[key];
-          } else if (element && key.indexOf('_selectNumberRange') >= 0) {
-            // key = xxxxx_selectNumberRange   qp-xxxxx-gt
-            var _dataParams8 = key.split('_selectNumberRange')[0];
-            if (params[key][0] === 'range') {
-              if (params[key][1][0]) {
-                params["qp-".concat(_dataParams8, "-ge")] = params[key][1][0];
-              }
-              if (params[key][1][1]) {
-                params["qp-".concat(_dataParams8, "-le")] = params[key][1][1];
-              }
+          });
+          delete params[key];
+        } else if (typeof element === 'boolean' && key.indexOf('*checkBox*') >= 0) {
+          var _dataParams4 = key.split('*checkBox*');
+          if (element) {
+            params[_dataParams4[0]] = 0;
+          }
+          delete params[key];
+        } else if (element && key.indexOf('*cascader*') >= 0) {
+          var _dataParams5 = key.split('*cascader*');
+          params[_dataParams5[0]] = element[element.length - 1];
+          delete params[key];
+        } else if (element && key.indexOf('*date*') >= 0) {
+          var _dataParams6 = key.split('*date*');
+          _dataParams6.forEach(function (value, index) {
+            if (index === 0) {
+              params[value] = moment(element[index]).format('YYYY-MM-DD');
             } else {
-              params["qp-".concat(_dataParams8, "-").concat(params[key][0])] = params[key][1];
+              params[value] = moment(element[index]).format('YYYY-MM-DD');
+            }
+          });
+          delete params[key];
+        } else if (element && key.indexOf('*') >= 0) {
+          var _dataParams7 = key.split('*');
+          _dataParams7.forEach(function (value, index) {
+            params[value] = element[index].format('YYYY-MM-DD HH:mm:ss');
+          });
+          delete params[key];
+        } else if (element && key.indexOf('_selectNumberRange') >= 0) {
+          // key = xxxxx_selectNumberRange   qp-xxxxx-gt
+          var _dataParams8 = key.split('_selectNumberRange')[0];
+          if (params[key][0] === 'range') {
+            if (params[key][1][0]) {
+              params["qp-".concat(_dataParams8, "-ge")] = params[key][1][0];
             }
-            delete params[key];
-          } else if (Array.isArray(element)) {
-            params[key] = element.join(',');
-          } else if (element == null || element === undefined || String(element).trim() === '') {
-            delete params[key];
+            if (params[key][1][1]) {
+              params["qp-".concat(_dataParams8, "-le")] = params[key][1][1];
+            }
+          } else {
+            params["qp-".concat(_dataParams8, "-").concat(params[key][0])] = params[key][1];
           }
-        })();
+          delete params[key];
+        } else if (Array.isArray(element)) {
+          params[key] = element.join(',');
+        } else if (element == null || element === undefined || String(element).trim() === '') {
+          delete params[key];
+        }
       }
+    };
+    for (var key in params) {
+      _loop();
     }
     var queryParams = _objectSpread2(_objectSpread2(_objectSpread2({
       pageSize: pageSize,
@@ -3462,9 +3453,6 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   }, currentSelectProps), {}, {
     getPopupContainer: function getPopupContainer(triggerNode) {
       return _getPopupContainer && _getPopupContainer(triggerNode) || triggerNode.parentElement;
-    },
-    onClear: function onClear() {
-      run();
     }
   }), items.map(function (item) {
     return /*#__PURE__*/React.createElement(Option$1, {
@@ -4573,76 +4561,74 @@ var AddSelect = function AddSelect(props) {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(bType, tList, recordKey, recordItem, selectItem, changeValue) {
       var result;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              if (!(bType == 'skc' && tList.some(function (i) {
-                return i[recordKey] == recordItem[recordKey] && i[selectItem.dataIndex] == changeValue;
-              }))) {
-                _context.next = 3;
-                break;
-              }
-              message$1.warning('相同skc配码不可设置相同哦');
-              return _context.abrupt("return", false);
-            case 3:
-              if (!(bType == 'spu')) {
-                _context.next = 26;
-                break;
-              }
-              if (!(selectItem.dataIndex == 'colorName' && tList.some(function (i) {
-                return i[recordKey] == recordItem[recordKey] && i.selectPropertyGroupCode == recordItem.selectPropertyGroupCode && i[selectItem.dataIndex] == changeValue;
-              }))) {
-                _context.next = 7;
-                break;
-              }
-              message$1.warning('相同商品相同配码颜色不可设置相同哦');
-              return _context.abrupt("return", false);
-            case 7:
-              if (!(selectItem.dataIndex == 'selectPropertyGroupCode' && !recordItem.colorName)) {
-                _context.next = 10;
-                break;
-              }
-              message$1.warning('请先选择颜色！');
-              return _context.abrupt("return", false);
-            case 10:
-              if (!(selectItem.dataIndex == 'selectPropertyGroupCode' && tList.some(function (i) {
-                return i[recordKey] == recordItem[recordKey] && i.colorName == recordItem.colorName && i[selectItem.dataIndex] == changeValue;
-              }))) {
-                _context.next = 13;
-                break;
-              }
-              message$1.warning('相同商品相同颜色配码不可设置相同哦');
-              return _context.abrupt("return", false);
-            case 13:
-              if (!(selectItem.dataIndex == 'selectPropertyGroupCode')) {
-                _context.next = 26;
-                break;
-              }
-              result = true;
-              _context.prev = 15;
-              _context.next = 18;
-              return checkSpuMatchCode({
-                skcCode: recordItem[recordKey],
-                matchingCode: changeValue,
-                ext1: recordItem.colorName
-              });
-            case 18:
-              result = _context.sent;
-              result = true;
-              _context.next = 25;
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!(bType == 'skc' && tList.some(function (i) {
+              return i[recordKey] == recordItem[recordKey] && i[selectItem.dataIndex] == changeValue;
+            }))) {
+              _context.next = 3;
               break;
-            case 22:
-              _context.prev = 22;
-              _context.t0 = _context["catch"](15);
-              result = typeof _context.t0 == 'boolean' ? _context.t0 : false;
-            case 25:
-              return _context.abrupt("return", result);
-            case 26:
-              return _context.abrupt("return", true);
-            case 27:
-            case "end":
-              return _context.stop();
-          }
+            }
+            message$1.warning('相同skc配码不可设置相同哦');
+            return _context.abrupt("return", false);
+          case 3:
+            if (!(bType == 'spu')) {
+              _context.next = 26;
+              break;
+            }
+            if (!(selectItem.dataIndex == 'colorName' && tList.some(function (i) {
+              return i[recordKey] == recordItem[recordKey] && i.selectPropertyGroupCode == recordItem.selectPropertyGroupCode && i[selectItem.dataIndex] == changeValue;
+            }))) {
+              _context.next = 7;
+              break;
+            }
+            message$1.warning('相同商品相同配码颜色不可设置相同哦');
+            return _context.abrupt("return", false);
+          case 7:
+            if (!(selectItem.dataIndex == 'selectPropertyGroupCode' && !recordItem.colorName)) {
+              _context.next = 10;
+              break;
+            }
+            message$1.warning('请先选择颜色！');
+            return _context.abrupt("return", false);
+          case 10:
+            if (!(selectItem.dataIndex == 'selectPropertyGroupCode' && tList.some(function (i) {
+              return i[recordKey] == recordItem[recordKey] && i.colorName == recordItem.colorName && i[selectItem.dataIndex] == changeValue;
+            }))) {
+              _context.next = 13;
+              break;
+            }
+            message$1.warning('相同商品相同颜色配码不可设置相同哦');
+            return _context.abrupt("return", false);
+          case 13:
+            if (!(selectItem.dataIndex == 'selectPropertyGroupCode')) {
+              _context.next = 26;
+              break;
+            }
+            result = true;
+            _context.prev = 15;
+            _context.next = 18;
+            return checkSpuMatchCode({
+              skcCode: recordItem[recordKey],
+              matchingCode: changeValue,
+              ext1: recordItem.colorName
+            });
+          case 18:
+            result = _context.sent;
+            result = true;
+            _context.next = 25;
+            break;
+          case 22:
+            _context.prev = 22;
+            _context.t0 = _context["catch"](15);
+            result = typeof _context.t0 == 'boolean' ? _context.t0 : false;
+          case 25:
+            return _context.abrupt("return", result);
+          case 26:
+            return _context.abrupt("return", true);
+          case 27:
+          case "end":
+            return _context.stop();
         }
       }, _callee, null, [[15, 22]]);
     }));
@@ -4834,29 +4820,27 @@ var AddSelect = function AddSelect(props) {
                   var _onChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(value) {
                     var isConformToTheRules, newPopValue;
                     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-                      while (1) {
-                        switch (_context2.prev = _context2.next) {
-                          case 0:
-                            _context2.next = 2;
-                            return checkSelectChange(businessType, popvalue, mappingValueField, record, item, value);
-                          case 2:
-                            isConformToTheRules = _context2.sent;
-                            if (isConformToTheRules) {
-                              record[item.dataIndex] = value;
-                            } else {
-                              record[item.dataIndex] = null;
+                      while (1) switch (_context2.prev = _context2.next) {
+                        case 0:
+                          _context2.next = 2;
+                          return checkSelectChange(businessType, popvalue, mappingValueField, record, item, value);
+                        case 2:
+                          isConformToTheRules = _context2.sent;
+                          if (isConformToTheRules) {
+                            record[item.dataIndex] = value;
+                          } else {
+                            record[item.dataIndex] = null;
+                          }
+                          newPopValue = popvalue.map(function (i, innerIndex) {
+                            if (innerIndex == index) {
+                              i[item.dataIndex] = record[item.dataIndex];
                             }
-                            newPopValue = popvalue.map(function (i, innerIndex) {
-                              if (innerIndex == index) {
-                                i[item.dataIndex] = record[item.dataIndex];
-                              }
-                              return i;
-                            });
-                            setPopValue(newPopValue);
-                          case 6:
-                          case "end":
-                            return _context2.stop();
-                        }
+                            return i;
+                          });
+                          setPopValue(newPopValue);
+                        case 6:
+                        case "end":
+                          return _context2.stop();
                       }
                     }, _callee2);
                   }));
@@ -4916,84 +4900,85 @@ var AddSelect = function AddSelect(props) {
       });
     }
     // 数组对象处理,对带有特殊标记的name进行处理
-    for (var key in params) {
+    var _loop = function _loop() {
       if (Object.prototype.hasOwnProperty.call(params, key)) {
-        (function () {
-          var element = params[key];
-          if (element && key.indexOf('*number*') >= 0) {
-            var dataParams = key.split('*number*');
-            dataParams.forEach(function (value, index) {
-              params[value] = element[index];
-            });
-            delete params[key];
-          } else if (element && key.indexOf('*address*') >= 0) {
-            var _dataParams = key.split('*address*');
-            _dataParams.forEach(function (value, index) {
-              params[value] = element.PCDCode[index];
-            });
-            delete params[key];
-          } else if (element && key.indexOf('*costType*') >= 0) {
-            var _dataParams2 = key.split('*costType*');
-            // eslint-disable-next-line prefer-destructuring
-            params[_dataParams2[0]] = element[1];
-            delete params[key];
-          } else if (element && key.indexOf('*fullDate*') >= 0) {
-            var _dataParams3 = key.split('*fullDate*');
-            _dataParams3.forEach(function (value, index) {
-              if (index === 0) {
-                params[value] = moment(element[index]).millisecond(0).second(0).minute(0).hour(0).format('YYYY-MM-DD HH:mm:ss');
-              } else {
-                params[value] = moment(element[index]).millisecond(59).second(59).minute(59).hour(23).format('YYYY-MM-DD HH:mm:ss');
-              }
-            });
-            delete params[key];
-          } else if (typeof element === 'boolean' && key.indexOf('*checkBox*') >= 0) {
-            var _dataParams4 = key.split('*checkBox*');
-            if (element) {
-              params[_dataParams4[0]] = 0;
+        var element = params[key];
+        if (element && key.indexOf('*number*') >= 0) {
+          var dataParams = key.split('*number*');
+          dataParams.forEach(function (value, index) {
+            params[value] = element[index];
+          });
+          delete params[key];
+        } else if (element && key.indexOf('*address*') >= 0) {
+          var _dataParams = key.split('*address*');
+          _dataParams.forEach(function (value, index) {
+            params[value] = element.PCDCode[index];
+          });
+          delete params[key];
+        } else if (element && key.indexOf('*costType*') >= 0) {
+          var _dataParams2 = key.split('*costType*');
+          // eslint-disable-next-line prefer-destructuring
+          params[_dataParams2[0]] = element[1];
+          delete params[key];
+        } else if (element && key.indexOf('*fullDate*') >= 0) {
+          var _dataParams3 = key.split('*fullDate*');
+          _dataParams3.forEach(function (value, index) {
+            if (index === 0) {
+              params[value] = moment(element[index]).millisecond(0).second(0).minute(0).hour(0).format('YYYY-MM-DD HH:mm:ss');
+            } else {
+              params[value] = moment(element[index]).millisecond(59).second(59).minute(59).hour(23).format('YYYY-MM-DD HH:mm:ss');
             }
-            delete params[key];
-          } else if (element && key.indexOf('*cascader*') >= 0) {
-            var _dataParams5 = key.split('*cascader*');
-            params[_dataParams5[0]] = element[element.length - 1];
-            delete params[key];
-          } else if (element && key.indexOf('*date*') >= 0) {
-            var _dataParams6 = key.split('*date*');
-            _dataParams6.forEach(function (value, index) {
-              if (index === 0) {
-                params[value] = moment(element[index]).format('YYYY-MM-DD');
-              } else {
-                params[value] = moment(element[index]).format('YYYY-MM-DD');
-              }
-            });
-            delete params[key];
-          } else if (element && key.indexOf('*') >= 0) {
-            var _dataParams7 = key.split('*');
-            _dataParams7.forEach(function (value, index) {
-              params[value] = element[index].format('YYYY-MM-DD HH:mm:ss');
-            });
-            delete params[key];
-          } else if (element && key.indexOf('_selectNumberRange') >= 0) {
-            // key = xxxxx_selectNumberRange   qp-xxxxx-gt
-            var _dataParams8 = key.split('_selectNumberRange')[0];
-            if (params[key][0] === 'range') {
-              if (params[key][1][0]) {
-                params["qp-".concat(_dataParams8, "-ge")] = params[key][1][0];
-              }
-              if (params[key][1][1]) {
-                params["qp-".concat(_dataParams8, "-le")] = params[key][1][1];
-              }
+          });
+          delete params[key];
+        } else if (typeof element === 'boolean' && key.indexOf('*checkBox*') >= 0) {
+          var _dataParams4 = key.split('*checkBox*');
+          if (element) {
+            params[_dataParams4[0]] = 0;
+          }
+          delete params[key];
+        } else if (element && key.indexOf('*cascader*') >= 0) {
+          var _dataParams5 = key.split('*cascader*');
+          params[_dataParams5[0]] = element[element.length - 1];
+          delete params[key];
+        } else if (element && key.indexOf('*date*') >= 0) {
+          var _dataParams6 = key.split('*date*');
+          _dataParams6.forEach(function (value, index) {
+            if (index === 0) {
+              params[value] = moment(element[index]).format('YYYY-MM-DD');
             } else {
-              params["qp-".concat(_dataParams8, "-").concat(params[key][0])] = params[key][1];
+              params[value] = moment(element[index]).format('YYYY-MM-DD');
+            }
+          });
+          delete params[key];
+        } else if (element && key.indexOf('*') >= 0) {
+          var _dataParams7 = key.split('*');
+          _dataParams7.forEach(function (value, index) {
+            params[value] = element[index].format('YYYY-MM-DD HH:mm:ss');
+          });
+          delete params[key];
+        } else if (element && key.indexOf('_selectNumberRange') >= 0) {
+          // key = xxxxx_selectNumberRange   qp-xxxxx-gt
+          var _dataParams8 = key.split('_selectNumberRange')[0];
+          if (params[key][0] === 'range') {
+            if (params[key][1][0]) {
+              params["qp-".concat(_dataParams8, "-ge")] = params[key][1][0];
+            }
+            if (params[key][1][1]) {
+              params["qp-".concat(_dataParams8, "-le")] = params[key][1][1];
             }
-            delete params[key];
-          } else if (Array.isArray(element)) {
-            params[key] = element.join(',');
-          } else if (element == null || element === undefined || String(element).trim() === '') {
-            delete params[key];
+          } else {
+            params["qp-".concat(_dataParams8, "-").concat(params[key][0])] = params[key][1];
           }
-        })();
+          delete params[key];
+        } else if (Array.isArray(element)) {
+          params[key] = element.join(',');
+        } else if (element == null || element === undefined || String(element).trim() === '') {
+          delete params[key];
+        }
       }
+    };
+    for (var key in params) {
+      _loop();
     }
     var queryParams = _objectSpread2(_objectSpread2(_objectSpread2({
       pageSize: pageSize,
@@ -6399,72 +6384,70 @@ var BillEntry = function BillEntry(_ref3) {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var canEntryObject, _canEntryObject$error, messageInfo;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              if (data === null || data === void 0 ? void 0 : data.length) {
-                _context.next = 3;
-                break;
-              }
-              message$1.warning('至少录入一条数据');
-              return _context.abrupt("return");
-            case 3:
-              if (data === null || data === void 0 ? void 0 : data.every(function (d) {
-                return d.skuCode && d.name;
-              })) {
-                _context.next = 6;
-                break;
-              }
-              message$1.warning('请选择商品！');
-              return _context.abrupt("return");
-            case 6:
-              if (data === null || data === void 0 ? void 0 : data.every(function (d) {
-                return d.count;
-              })) {
-                _context.next = 9;
-                break;
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (data === null || data === void 0 ? void 0 : data.length) {
+              _context.next = 3;
+              break;
+            }
+            message$1.warning('至少录入一条数据');
+            return _context.abrupt("return");
+          case 3:
+            if (data === null || data === void 0 ? void 0 : data.every(function (d) {
+              return d.skuCode && d.name;
+            })) {
+              _context.next = 6;
+              break;
+            }
+            message$1.warning('请选择商品！');
+            return _context.abrupt("return");
+          case 6:
+            if (data === null || data === void 0 ? void 0 : data.every(function (d) {
+              return d.count;
+            })) {
+              _context.next = 9;
+              break;
+            }
+            message$1.warning('请填写商品数量！');
+            return _context.abrupt("return");
+          case 9:
+            _context.next = 11;
+            return isSkuCanEntry(data);
+          case 11:
+            canEntryObject = _context.sent;
+            if (!((canEntryObject === null || canEntryObject === void 0 ? void 0 : canEntryObject.flag) === false)) {
+              _context.next = 16;
+              break;
+            }
+            messageInfo = (canEntryObject === null || canEntryObject === void 0 ? void 0 : (_canEntryObject$error = canEntryObject.errorList) === null || _canEntryObject$error === void 0 ? void 0 : _canEntryObject$error.length) && (canEntryObject === null || canEntryObject === void 0 ? void 0 : canEntryObject.errorList.map(function (i) {
+              return /*#__PURE__*/React.createElement("div", null, i.skuCode, "\u6821\u9A8C\u5931\u8D25\uFF1A", i.checkResults);
+            }));
+            messageInfo && message$1.warning({
+              content: messageInfo,
+              duration: 6
+            });
+            return _context.abrupt("return");
+          case 16:
+            setLoading(true);
+            onSaveCallback(data).then(function (res) {
+              {
+                var _Object$keys;
+                var initSuccessMessage = '保存成功';
+                var rmsbi = (res === null || res === void 0 ? void 0 : res.messageSuccessBackInfo) || {};
+                if (rmsbi && ((_Object$keys = Object.keys(rmsbi)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length)) {
+                  (rmsbi === null || rmsbi === void 0 ? void 0 : rmsbi.needThrowSuccess) ? message$1.success((rmsbi === null || rmsbi === void 0 ? void 0 : rmsbi.successMessage) || initSuccessMessage) : null;
+                } else {
+                  message$1.success(initSuccessMessage);
+                }
               }
-              message$1.warning('请填写商品数量！');
-              return _context.abrupt("return");
-            case 9:
-              _context.next = 11;
-              return isSkuCanEntry(data);
-            case 11:
-              canEntryObject = _context.sent;
-              if (!((canEntryObject === null || canEntryObject === void 0 ? void 0 : canEntryObject.flag) === false)) {
-                _context.next = 16;
-                break;
-              }
-              messageInfo = (canEntryObject === null || canEntryObject === void 0 ? void 0 : (_canEntryObject$error = canEntryObject.errorList) === null || _canEntryObject$error === void 0 ? void 0 : _canEntryObject$error.length) && (canEntryObject === null || canEntryObject === void 0 ? void 0 : canEntryObject.errorList.map(function (i) {
-                return /*#__PURE__*/React.createElement("div", null, i.skuCode, "\u6821\u9A8C\u5931\u8D25\uFF1A", i.checkResults);
-              }));
-              messageInfo && message$1.warning({
-                content: messageInfo,
-                duration: 6
-              });
-              return _context.abrupt("return");
-            case 16:
-              setLoading(true);
-              onSaveCallback(data).then(function (res) {
-                {
-                  var _Object$keys;
-                  var initSuccessMessage = '保存成功';
-                  var rmsbi = (res === null || res === void 0 ? void 0 : res.messageSuccessBackInfo) || {};
-                  if (rmsbi && ((_Object$keys = Object.keys(rmsbi)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length)) {
-                    (rmsbi === null || rmsbi === void 0 ? void 0 : rmsbi.needThrowSuccess) ? message$1.success((rmsbi === null || rmsbi === void 0 ? void 0 : rmsbi.successMessage) || initSuccessMessage) : null;
-                  } else {
-                    message$1.success(initSuccessMessage);
-                  }
-                }
-                setLoading(false);
-              }).catch(function (Error) {
-                message$1.error(Error);
-                setLoading(false);
-              });
-            case 18:
-            case "end":
-              return _context.stop();
-          }
+              setLoading(false);
+            }).catch(function (Error) {
+              message$1.error(Error);
+              setLoading(false);
+            });
+          case 18:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));
@@ -6697,6 +6680,7 @@ var handleDefaultPrefixUrl = function handleDefaultPrefixUrl(type) {
     case 'purchaseOrg':
     case 'salesOrg':
     case 'employee2':
+    case 'role':
       result = '/user';
       break;
     case 'deliveryMode':
@@ -8652,6 +8636,84 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       }]
     }, modalTableBusProps);
   }
+  // 角色选择器
+  if (type === 'role') {
+    requestConfig = _objectSpread2({
+      url: "".concat(prefixUrl.selectPrefix, "/role"),
+      filter: 'qp-name,code-orGroup,like',
+      mappingTextField: 'name',
+      mappingTextShowKeyField: 'code',
+      mappingValueField: 'code',
+      otherParams: {
+        'qp-status-eq': 10,
+        sorter: 'desc-id'
+      },
+      sourceName: 'roleCode'
+    }, requestConfigProp);
+    tableSearchForm = [{
+      name: 'qp-name-like',
+      label: '角色名称'
+    }, {
+      name: 'qp-code-like',
+      label: '角色编码'
+    }, {
+      name: 'qp-categoryCode-eq',
+      type: 'select',
+      label: '角色分类',
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
+    }];
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/permissionCategory"), {
+      pageSize: 5000,
+      currentPage: 1
+    })]).then(function (x) {
+      formatSource(x, 0, 2, tableSearchForm);
+    });
+    modalTableProps = _objectSpread2({
+      modalTableTitle: '选择角色',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: '角色编码',
+        dataIndex: 'code'
+      }, {
+        title: '角色名称',
+        dataIndex: 'name',
+        render: function render(text) {
+          return handleTextOverflow(text);
+        }
+      }, {
+        title: '角色分类',
+        dataIndex: 'categoryName',
+        render: function render(text) {
+          return handleTextOverflow(text);
+        }
+      }, {
+        dataIndex: 'remark',
+        title: '角色描述',
+        render: function render(text) {
+          return handleTextOverflow(text);
+        }
+      }, {
+        dataIndex: 'applicationName',
+        title: '应用',
+        render: function render(text) {
+          return handleTextOverflow(text);
+        }
+      }]
+    }, modalTableBusProps);
+  }
   return {
     modalTableProps: modalTableProps,
     requestConfig: requestConfig,
@@ -9869,7 +9931,7 @@ var CommodityEntry = function CommodityEntry(props) {
  * @LastEditTime: 2022-01-14 17:17:26
  * @LastEditors: rodchen
  */
-var index$1 = (function (storageKeyString) {
+var index$2 = (function (storageKeyString) {
   var seconds = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
   var tipsCallFunction = arguments.length > 2 ? arguments[2] : undefined;
   if (typeof seconds !== 'number') throw new Error('seconds should be number');
@@ -9996,44 +10058,42 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
         var _ctx$form;
         var resData, coverData, data, dataList;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                resData = (res === null || res === void 0 ? void 0 : res.data) || [];
-                if (!(resData.status === '0' || resData.code === '000000')) {
-                  _context.next = 13;
-                  break;
-                }
-                data = resData.data;
-                if (!remoteSource.converter) {
-                  _context.next = 9;
-                  break;
-                }
-                _context.next = 6;
-                return remoteSource.converter({
-                  data: [data]
-                });
-              case 6:
-                coverData = _context.sent;
-                _context.next = 11;
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              resData = (res === null || res === void 0 ? void 0 : res.data) || [];
+              if (!(resData.status === '0' || resData.code === '000000')) {
+                _context.next = 13;
                 break;
-              case 9:
-                dataList = data && Array.isArray(data) ? data : data && [data] || [];
-                coverData = dataList.length && dataList.map(function (ites) {
-                  return mapSearchTree(ites);
-                }) || [];
-              case 11:
-                _context.next = 14;
+              }
+              data = resData.data;
+              if (!remoteSource.converter) {
+                _context.next = 9;
                 break;
-              case 13:
-                coverData = [];
-              case 14:
-                setTreeData(coverData);
-                ctx === null || ctx === void 0 ? void 0 : (_ctx$form = ctx.form) === null || _ctx$form === void 0 ? void 0 : _ctx$form.setFieldSource(ctx.name, coverData);
-              case 16:
-              case "end":
-                return _context.stop();
-            }
+              }
+              _context.next = 6;
+              return remoteSource.converter({
+                data: [data]
+              });
+            case 6:
+              coverData = _context.sent;
+              _context.next = 11;
+              break;
+            case 9:
+              dataList = data && Array.isArray(data) ? data : data && [data] || [];
+              coverData = dataList.length && dataList.map(function (ites) {
+                return mapSearchTree(ites);
+              }) || [];
+            case 11:
+              _context.next = 14;
+              break;
+            case 13:
+              coverData = [];
+            case 14:
+              setTreeData(coverData);
+              ctx === null || ctx === void 0 ? void 0 : (_ctx$form = ctx.form) === null || _ctx$form === void 0 ? void 0 : _ctx$form.setFieldSource(ctx.name, coverData);
+            case 16:
+            case "end":
+              return _context.stop();
           }
         }, _callee);
       }));
@@ -10233,6 +10293,20 @@ var handleDefaultProps = function handleDefaultProps(type, otherRequestConfig) {
         }
       };
       break;
+    case 'settle-organization':
+      result = {
+        isChoose: true,
+        remoteSource: {
+          url: "/user/orgViewNode/common/getTreeForOrgViewAndTenant",
+          headers: otherRequestConfig === null || otherRequestConfig === void 0 ? void 0 : otherRequestConfig.extralHeaders,
+          initialParams: {
+            'orgViewCode': 'settlement-organizational-view',
+            'qp-status-eq': 10
+          },
+          resKeyValue: ['code', 'name']
+        }
+      };
+      break;
     case 'market-area':
       result = {
         isChoose: true,
@@ -10283,7 +10357,7 @@ var BusinessTreeSearchSelect$1 = /*#__PURE__*/React.memo(BusinessTreeSearchSelec
 var css_248z$8 = ".form-status-label {\n  height: 48px;\n  margin-right: 12px;\n  display: inline-block;\n  position: relative;\n  background-color: #B0B4B7;\n  align-items: center;\n}\n.choosed-status-label.form-status-label {\n  background-color: #005CFF;\n}\n.form-status-label:last-child {\n  margin-right: 0px;\n}\n.form-status-label:first-child::after {\n  position: absolute;\n  display: block;\n  content: '';\n  right: -48px;\n  top: 0;\n  width: 48px;\n  height: 48px;\n  border: 24px solid;\n  border-color: transparent transparent transparent transparent;\n  border-left: 12px solid #B0B4B7;\n}\n.choosed-status-label.form-status-label::after {\n  border-left: 12px solid #005CFF;\n}\n.choosed-status-label.form-status-label:not(:first-child):not(:last-child)::after {\n  border-left: 12px solid #005CFF;\n}\n.form-status-label:last-child::after {\n  position: absolute;\n  display: block;\n  content: '';\n  left: 0;\n  top: 0;\n  width: 48px;\n  height: 48px;\n  border: 24px solid;\n  border-color: transparent transparent transparent transparent;\n  border-left: 12px solid #ffffff;\n}\n.form-status-label:not(:first-child):not(:last-child)::before {\n  position: absolute;\n  display: block;\n  content: '';\n  left: 0;\n  top: 0;\n  width: 48px;\n  height: 48px;\n  border: 24px solid;\n  border-color: transparent transparent transparent transparent;\n  border-left: 12px solid #ffffff;\n}\n.form-status-label:not(:first-child):not(:last-child)::after {\n  position: absolute;\n  display: block;\n  content: '';\n  right: -48px;\n  top: 0;\n  width: 48px;\n  height: 48px;\n  border: 24px solid;\n  border-color: transparent transparent transparent transparent;\n  border-left: 12px solid #B0B4B7;\n}\n.status-label-index {\n  display: inline-block;\n  width: 24px;\n  height: 24px;\n  border: 1px solid #FFFFFF;\n  color: #FFFFFF;\n  border-radius: 50%;\n  font-family: Montserrat;\n  font-size: 14px;\n  line-height: 24px;\n  text-align: center;\n  margin: 0 6px 0 20px;\n}\n.status-label-key {\n  width: 50px;\n  height: 100%;\n  display: inline-flex;\n  float: left;\n  align-items: center;\n  justify-content: center;\n}\n.status-label-operate {\n  float: left;\n  width: calc(100% - 50px);\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  height: 100%;\n  margin: 4px 0;\n}\n.status-label-operate > div {\n  font-size: 12px;\n  height: 20px;\n  line-height: 20px;\n  color: #FFFFFF;\n  font-family: PingFangSC;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n.status-label-operate > div:first-child {\n  font-size: 14px;\n  font-weight: 600;\n}\n.only-one-child.form-status-label::after,\n.only-one-child.form-status-label::before {\n  border-left: 0px;\n}\n";
 styleInject(css_248z$8);
 
-var index$2 = (function (props) {
+var index$3 = (function (props) {
   var _props$formStatusMapp = props.formStatusMapping,
     formStatusMapping = _props$formStatusMapp === void 0 ? [] : _props$formStatusMapp;
   return /*#__PURE__*/React.createElement("div", {
@@ -11707,7 +11781,7 @@ var iconMap = {
     src: moreIcon
   })
 };
-var index$3 = (function (props) {
+var index$4 = (function (props) {
   var _useLocation = useLocation(),
     pathname = _useLocation.pathname;
   var _useState = useState(pathname + 'id'),
@@ -11924,7 +11998,7 @@ var css_248z$d = ".home_page_head {\n  height: 54px;\n  display: flex;\n  justif
 styleInject(css_248z$d);
 
 var _excluded$c = ["children"];
-var index$4 = (function (props) {
+var index$5 = (function (props) {
   var _useLocation = useLocation(),
     pathname = _useLocation.pathname;
   var _useState = useState(pathname + 'id'),
@@ -14223,21 +14297,19 @@ function _outLogin() {
   _outLogin = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
     var res;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return axios({
-              url: '/user/web/loginOut',
-              method: 'GET'
-            });
-          case 2:
-            res = _context.sent;
-            return _context.abrupt("return", res);
-          case 4:
-          case "end":
-            return _context.stop();
-        }
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return axios({
+            url: '/user/web/loginOut',
+            method: 'GET'
+          });
+        case 2:
+          res = _context.sent;
+          return _context.abrupt("return", res);
+        case 4:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
   }));
@@ -14366,31 +14438,29 @@ var GlobalHeaderRight = function GlobalHeaderRight(_ref) {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var sessionId;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return getSessionId();
-            case 2:
-              sessionId = _context.sent;
-              _context.next = 5;
-              return outLogin({
-                sessionId: sessionId
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return getSessionId();
+          case 2:
+            sessionId = _context.sent;
+            _context.next = 5;
+            return outLogin({
+              sessionId: sessionId
+            });
+          case 5:
+            // @ts-ignore
+            if (BUILD_TYPE) {
+              message$1.success('退出登录成功');
+              history.replace({
+                pathname: '/user/login'
               });
-            case 5:
-              // @ts-ignore
-              if (BUILD_TYPE) {
-                message$1.success('退出登录成功');
-                history.replace({
-                  pathname: '/user/login'
-                });
-              } else {
-                setLoginOutPath();
-              }
-            case 6:
-            case "end":
-              return _context.stop();
-          }
+            } else {
+              setLoginOutPath();
+            }
+          case 6:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));
@@ -16218,6 +16288,7 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         showSubMenu: isShow
       });
     }, 500);
+    //设置tabs标签左右滚动
     _this.setTabNavTransLate = function (num) {
       var _document$getElementB, _document$getElementB2, _document$getElementB3, _document$getElementB4, _document$defaultView;
       var globalTabsNav = (_document$getElementB = document.getElementById('globalTabs')) === null || _document$getElementB === void 0 ? void 0 : (_document$getElementB2 = _document$getElementB.getElementsByClassName('ant-tabs-nav-list')) === null || _document$getElementB2 === void 0 ? void 0 : _document$getElementB2[0];
@@ -16898,14 +16969,12 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           request: function () {
             var _request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
               return _regeneratorRuntime().wrap(function _callee$(_context) {
-                while (1) {
-                  switch (_context.prev = _context.next) {
-                    case 0:
-                      return _context.abrupt("return", JSON.parse(localStorage.getItem("customerMenu_".concat(itemPath, "_front")) || '[]'));
-                    case 1:
-                    case "end":
-                      return _context.stop();
-                  }
+                while (1) switch (_context.prev = _context.next) {
+                  case 0:
+                    return _context.abrupt("return", JSON.parse(localStorage.getItem("customerMenu_".concat(itemPath, "_front")) || '[]'));
+                  case 1:
+                  case "end":
+                    return _context.stop();
                 }
               }, _callee);
             }));
@@ -17043,7 +17112,7 @@ var WrapperComponent = /*#__PURE__*/function (_React$Component) {
   }]);
   return WrapperComponent;
 }(React.Component);
-var index$5 = (function (props) {
+var index$6 = (function (props) {
   var _useModel = useModel('@@initialState'),
     _useModel$initialStat = _useModel.initialState,
     initialState = _useModel$initialStat === void 0 ? {} : _useModel$initialStat;
@@ -17285,7 +17354,7 @@ var FixedScrollBar = function FixedScrollBar(_ref, ref) {
 };
 var FixedScrollBar$1 = /*#__PURE__*/React.forwardRef(FixedScrollBar);
 
-var index$6 = /*#__PURE__*/forwardRef(function (props, ref) {
+var index$7 = /*#__PURE__*/forwardRef(function (props, ref) {
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     show = _useState2[0],
@@ -24357,8 +24426,7 @@ var inputTypes = {
       type: 'bs-employeeSearchSelect',
       props: _objectSpread2(_objectSpread2({}, normalSingleSelectProps), {}, {
         requestConfig: {
-          mappingValueField: 'employeeNumber',
-          filterInit: 'qp-employeeNumber-like'
+          mappingValueField: 'employeeNumber'
         }
       })
     },
@@ -24369,6 +24437,13 @@ var inputTypes = {
         treeCheckable: false
       }, normalSingleSelectProps)
     },
+    290: {
+      // 库存组织
+      type: 'bs-settleOrgSelect',
+      props: _objectSpread2({
+        treeCheckable: false
+      }, normalSingleSelectProps)
+    },
     310: {
       type: 'bs-deliveryModeSearchSelect',
       props: _objectSpread2({}, normalSingleSelectProps)
@@ -24386,6 +24461,14 @@ var inputTypes = {
       props: _objectSpread2({
         treeCheckable: false
       }, normalSingleSelectProps)
+    },
+    360: {
+      type: 'bs-roleSelect',
+      props: _objectSpread2(_objectSpread2({}, normalSingleSelectProps), {}, {
+        requestConfig: {
+          filter: 'qp-name,code-orGroup-in'
+        }
+      })
     }
   },
   30: {
@@ -24504,8 +24587,7 @@ var inputTypes = {
       type: 'bs-employeeSearchSelect',
       props: _objectSpread2(_objectSpread2({}, normalMultipleSelectProps), {}, {
         requestConfig: {
-          mappingValueField: 'employeeNumber',
-          filterInit: 'qp-employeeNumber-like'
+          mappingValueField: 'employeeNumber'
         }
       })
     },
@@ -24516,6 +24598,13 @@ var inputTypes = {
         treeCheckable: true
       }, normalMultipleSelectProps)
     },
+    290: {
+      // 结算组织
+      type: 'bs-settleOrgSelect',
+      props: _objectSpread2({
+        treeCheckable: true
+      }, normalMultipleSelectProps)
+    },
     310: {
       type: 'bs-deliveryModeSearchSelect',
       props: _objectSpread2(_objectSpread2({}, normalMultipleSelectProps), {}, {
@@ -24537,6 +24626,14 @@ var inputTypes = {
       props: _objectSpread2({
         treeCheckable: false
       }, normalSingleSelectProps)
+    },
+    360: {
+      type: 'bs-roleSelect',
+      props: _objectSpread2(_objectSpread2({}, normalMultipleSelectProps), {}, {
+        requestConfig: {
+          filter: 'qp-name,code-orGroup-in'
+        }
+      })
     }
   }
 };
@@ -24564,10 +24661,12 @@ var choiceType = Object.freeze({
   260: '店铺选择器',
   270: '员工选择器',
   280: '库存组织选择器',
+  290: '结算组织选择器',
   310: '配送方式选择器',
   330: '变量',
   340: '规则模板选择器',
-  350: '营销区域选择器'
+  350: '营销区域选择器',
+  360: '角色选择器'
 });
 var inputType = {
   10: '输入',
@@ -24588,28 +24687,26 @@ var valueType = {
 var getDynamicDict = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(dictionaryCode) {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return request$1({
-              url: "/basic/dictDynamicItem/getDynamicData/".concat(dictionaryCode),
-              converter: function converter(_ref2) {
-                var data = _ref2.data;
-                return data === null || data === void 0 ? void 0 : data.map(function (d) {
-                  return {
-                    text: d.name,
-                    value: d.code || d.brandCode
-                  };
-                });
-              }
-            });
-          case 2:
-            return _context.abrupt("return", _context.sent);
-          case 3:
-          case "end":
-            return _context.stop();
-        }
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return request$1({
+            url: "/basic/dictDynamicItem/getDynamicData/".concat(dictionaryCode),
+            converter: function converter(_ref2) {
+              var data = _ref2.data;
+              return data === null || data === void 0 ? void 0 : data.map(function (d) {
+                return {
+                  text: d.name,
+                  value: d.code || d.brandCode
+                };
+              });
+            }
+          });
+        case 2:
+          return _context.abrupt("return", _context.sent);
+        case 3:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
   }));
@@ -24659,55 +24756,53 @@ var FieldsModifyModal = function FieldsModifyModal(props) {
   useMount( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var _ref$current, source;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return setIsShowAndType(function (prev) {
-              if (record.inputType === 20 || record.inputType === 30) {
-                return {
-                  isShow: true,
-                  singleOrMultiple: record.inputType,
-                  type: record.choiceType
-                };
-              }
-              return prev;
-            });
-          case 2:
-            if (!record.dictionaryCode) {
-              _context.next = 17;
-              break;
-            }
-            if (!(record.choiceType == 20)) {
-              _context.next = 7;
-              break;
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return setIsShowAndType(function (prev) {
+            if (record.inputType === 20 || record.inputType === 30) {
+              return {
+                isShow: true,
+                singleOrMultiple: record.inputType,
+                type: record.choiceType
+              };
             }
-            _context.t0 = getDictionarySource(record.dictionaryCode);
-            _context.next = 15;
+            return prev;
+          });
+        case 2:
+          if (!record.dictionaryCode) {
+            _context.next = 17;
             break;
-          case 7:
-            if (!(record.choiceType == 30)) {
-              _context.next = 13;
-              break;
-            }
-            _context.next = 10;
-            return getDynamicDict(record.dictionaryCode);
-          case 10:
-            _context.t1 = _context.sent;
-            _context.next = 14;
+          }
+          if (!(record.choiceType == 20)) {
+            _context.next = 7;
             break;
-          case 13:
-            _context.t1 = [];
-          case 14:
-            _context.t0 = _context.t1;
-          case 15:
-            source = _context.t0;
-            // @ts-ignore
-            ref === null || ref === void 0 ? void 0 : (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.setFieldSource('defaultValue', source);
-          case 17:
-          case "end":
-            return _context.stop();
-        }
+          }
+          _context.t0 = getDictionarySource(record.dictionaryCode);
+          _context.next = 15;
+          break;
+        case 7:
+          if (!(record.choiceType == 30)) {
+            _context.next = 13;
+            break;
+          }
+          _context.next = 10;
+          return getDynamicDict(record.dictionaryCode);
+        case 10:
+          _context.t1 = _context.sent;
+          _context.next = 14;
+          break;
+        case 13:
+          _context.t1 = [];
+        case 14:
+          _context.t0 = _context.t1;
+        case 15:
+          source = _context.t0;
+          // @ts-ignore
+          ref === null || ref === void 0 ? void 0 : (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.setFieldSource('defaultValue', source);
+        case 17:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
   })));
@@ -24775,30 +24870,28 @@ var FieldsModifyModal = function FieldsModifyModal(props) {
               var _type = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
                 var form, values, name, relates, source;
                 return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-                  while (1) {
-                    switch (_context2.prev = _context2.next) {
-                      case 0:
-                        form = _ref3.form, values = _ref3.values, name = _ref3.name, relates = _ref3.relates;
-                        if (values[0]) {
-                          form === null || form === void 0 ? void 0 : form.setFieldSource(name[0], []);
-                          form === null || form === void 0 ? void 0 : form.setFieldValue(name[0], undefined);
-                          form === null || form === void 0 ? void 0 : form.setFieldSource(name[0], getDictionarySource(values[0]));
-                        }
-                        if (!values[1]) {
-                          _context2.next = 9;
-                          break;
-                        }
-                        _context2.next = 5;
-                        return getDynamicDict(record.dictionaryCode || values[1]);
-                      case 5:
-                        source = _context2.sent;
+                  while (1) switch (_context2.prev = _context2.next) {
+                    case 0:
+                      form = _ref3.form, values = _ref3.values, name = _ref3.name, relates = _ref3.relates;
+                      if (values[0]) {
                         form === null || form === void 0 ? void 0 : form.setFieldSource(name[0], []);
                         form === null || form === void 0 ? void 0 : form.setFieldValue(name[0], undefined);
-                        form === null || form === void 0 ? void 0 : form.setFieldSource(name[0], source);
-                      case 9:
-                      case "end":
-                        return _context2.stop();
-                    }
+                        form === null || form === void 0 ? void 0 : form.setFieldSource(name[0], getDictionarySource(values[0]));
+                      }
+                      if (!values[1]) {
+                        _context2.next = 9;
+                        break;
+                      }
+                      _context2.next = 5;
+                      return getDynamicDict(record.dictionaryCode || values[1]);
+                    case 5:
+                      source = _context2.sent;
+                      form === null || form === void 0 ? void 0 : form.setFieldSource(name[0], []);
+                      form === null || form === void 0 ? void 0 : form.setFieldValue(name[0], undefined);
+                      form === null || form === void 0 ? void 0 : form.setFieldSource(name[0], source);
+                    case 9:
+                    case "end":
+                      return _context2.stop();
                   }
                 }, _callee2);
               }));
@@ -25258,43 +25351,41 @@ var FieldsModifyModal = function FieldsModifyModal(props) {
             var _type2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref10) {
               var values, name, form, source;
               return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-                while (1) {
-                  switch (_context3.prev = _context3.next) {
-                    case 0:
-                      values = _ref10.values, name = _ref10.name, form = _ref10.form;
-                      if (values[1] === 40) {
-                        form === null || form === void 0 ? void 0 : form.setFieldValue(name, null);
-                        form.setFieldVisible(name, false);
-                      }
-                      if (!(values[0] === 30)) {
-                        _context3.next = 10;
-                        break;
-                      }
-                      _context3.next = 5;
-                      return request$1({
-                        url: '/basic/dictDynamicItem/queryList',
-                        converter: function converter(_ref11) {
-                          var data = _ref11.data;
-                          return data === null || data === void 0 ? void 0 : data.map(function (d) {
-                            return {
-                              text: d.dictCode,
-                              value: d.dictCode
-                            };
-                          });
-                        }
-                      });
-                    case 5:
-                      source = _context3.sent;
-                      form === null || form === void 0 ? void 0 : form.setFieldSource(name, source);
-                      form.setFieldVisible(name, true);
-                      _context3.next = 11;
-                      break;
-                    case 10:
+                while (1) switch (_context3.prev = _context3.next) {
+                  case 0:
+                    values = _ref10.values, name = _ref10.name, form = _ref10.form;
+                    if (values[1] === 40) {
+                      form === null || form === void 0 ? void 0 : form.setFieldValue(name, null);
                       form.setFieldVisible(name, false);
-                    case 11:
-                    case "end":
-                      return _context3.stop();
-                  }
+                    }
+                    if (!(values[0] === 30)) {
+                      _context3.next = 10;
+                      break;
+                    }
+                    _context3.next = 5;
+                    return request$1({
+                      url: '/basic/dictDynamicItem/queryList',
+                      converter: function converter(_ref11) {
+                        var data = _ref11.data;
+                        return data === null || data === void 0 ? void 0 : data.map(function (d) {
+                          return {
+                            text: d.dictCode,
+                            value: d.dictCode
+                          };
+                        });
+                      }
+                    });
+                  case 5:
+                    source = _context3.sent;
+                    form === null || form === void 0 ? void 0 : form.setFieldSource(name, source);
+                    form.setFieldVisible(name, true);
+                    _context3.next = 11;
+                    break;
+                  case 10:
+                    form.setFieldVisible(name, false);
+                  case 11:
+                  case "end":
+                    return _context3.stop();
                 }
               }, _callee3);
             }));
@@ -25483,66 +25574,64 @@ var FieldsModifyModal = function FieldsModifyModal(props) {
         var _ref$current4, _res$editableStatus;
         var res, _res$defaultValue;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) {
-            switch (_context4.prev = _context4.next) {
-              case 0:
-                _context4.next = 2;
-                return ref === null || ref === void 0 ? void 0 : (_ref$current4 = ref.current) === null || _ref$current4 === void 0 ? void 0 : _ref$current4.validateFields();
-              case 2:
-                res = _context4.sent;
-                res.editableStatus = (_res$editableStatus = res.editableStatus) === null || _res$editableStatus === void 0 ? void 0 : _res$editableStatus.join(',');
-                res.fieldGroup = record.fieldGroup;
-                res.businessType = record.businessType;
-                res.info = {
-                  enumeration: res.enumeration,
-                  dictionaryCode: res.dictionaryCode || (res === null || res === void 0 ? void 0 : res['dictionaryCode_dynamic']),
-                  formula: res.formula,
-                  scale: res.scale,
-                  variable: res.variable
-                };
-                res.createVisibleFlag = res.showValue.indexOf('createVisibleFlag') >= 0;
-                res.editVisibleFlag = res.showValue.indexOf('editVisibleFlag') >= 0;
-                res.createEditableFlag = res.showValue.indexOf('createEditableFlag') >= 0;
-                if (res.inputType === 40) {
-                  res.valueType = 22;
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              _context4.next = 2;
+              return ref === null || ref === void 0 ? void 0 : (_ref$current4 = ref.current) === null || _ref$current4 === void 0 ? void 0 : _ref$current4.validateFields();
+            case 2:
+              res = _context4.sent;
+              res.editableStatus = (_res$editableStatus = res.editableStatus) === null || _res$editableStatus === void 0 ? void 0 : _res$editableStatus.join(',');
+              res.fieldGroup = record.fieldGroup;
+              res.businessType = record.businessType;
+              res.info = {
+                enumeration: res.enumeration,
+                dictionaryCode: res.dictionaryCode || (res === null || res === void 0 ? void 0 : res['dictionaryCode_dynamic']),
+                formula: res.formula,
+                scale: res.scale,
+                variable: res.variable
+              };
+              res.createVisibleFlag = res.showValue.indexOf('createVisibleFlag') >= 0;
+              res.editVisibleFlag = res.showValue.indexOf('editVisibleFlag') >= 0;
+              res.createEditableFlag = res.showValue.indexOf('createEditableFlag') >= 0;
+              if (res.inputType === 40) {
+                res.valueType = 22;
+              }
+              // 把数组处理成文本
+              if (res.inputType === 30) {
+                if (res.defaultValue) {
+                  res.defaultValue = (_res$defaultValue = res.defaultValue) === null || _res$defaultValue === void 0 ? void 0 : _res$defaultValue.join(',');
                 }
-                // 把数组处理成文本
-                if (res.inputType === 30) {
-                  if (res.defaultValue) {
-                    res.defaultValue = (_res$defaultValue = res.defaultValue) === null || _res$defaultValue === void 0 ? void 0 : _res$defaultValue.join(',');
-                  }
+              }
+              res.fieldMapping = res.fieldMapping || '';
+              delete res.formula;
+              delete res.showValue;
+              if (!(mode === 'create')) {
+                _context4.next = 18;
+                break;
+              }
+              request$1({
+                url: "/basic/flow/businessField",
+                method: 'POST',
+                params: res,
+                successMessage: '创建成功！',
+                converter: function converter() {
+                  onParentOk();
                 }
-                res.fieldMapping = res.fieldMapping || '';
-                delete res.formula;
-                delete res.showValue;
-                if (!(mode === 'create')) {
-                  _context4.next = 18;
-                  break;
+              });
+              return _context4.abrupt("return");
+            case 18:
+              request$1({
+                url: "/basic/flow/businessField/".concat(record.id),
+                method: 'PATCH',
+                params: res,
+                successMessage: '修改成功！',
+                converter: function converter() {
+                  onParentOk();
                 }
-                request$1({
-                  url: "/basic/flow/businessField",
-                  method: 'POST',
-                  params: res,
-                  successMessage: '创建成功！',
-                  converter: function converter() {
-                    onParentOk();
-                  }
-                });
-                return _context4.abrupt("return");
-              case 18:
-                request$1({
-                  url: "/basic/flow/businessField/".concat(record.id),
-                  method: 'PATCH',
-                  params: res,
-                  successMessage: '修改成功！',
-                  converter: function converter() {
-                    onParentOk();
-                  }
-                });
-              case 19:
-              case "end":
-                return _context4.stop();
-            }
+              });
+            case 19:
+            case "end":
+              return _context4.stop();
           }
         }, _callee4);
       }));
@@ -26327,28 +26416,26 @@ var BsCascader = function BsCascader(_ref) {
   useEffect( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var resData, data;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            if (!(!source && initRequestSource)) {
-              _context.next = 6;
-              break;
-            }
-            _context.next = 3;
-            return initRequestSource();
-          case 3:
-            resData = _context.sent;
-            data = (resData === null || resData === void 0 ? void 0 : resData.map(function (item) {
-              return _objectSpread2(_objectSpread2({}, item), {}, {
-                label: item.text,
-                isLeaf: false
-              });
-            })) || [];
-            setHandSource(data);
-          case 6:
-          case "end":
-            return _context.stop();
-        }
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (!(!source && initRequestSource)) {
+            _context.next = 6;
+            break;
+          }
+          _context.next = 3;
+          return initRequestSource();
+        case 3:
+          resData = _context.sent;
+          data = (resData === null || resData === void 0 ? void 0 : resData.map(function (item) {
+            return _objectSpread2(_objectSpread2({}, item), {}, {
+              label: item.text,
+              isLeaf: false
+            });
+          })) || [];
+          setHandSource(data);
+        case 6:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
   })), []);
@@ -26480,20 +26567,18 @@ function getRegularThresholdRange(_x) {
 function _getRegularThresholdRange() {
   _getRegularThresholdRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            return _context.abrupt("return", axios({
-              url: "/basic/regularThresholdRange/getVals/".concat(params.queryIdentify),
-              method: 'POST',
-              data: _objectSpread2(_objectSpread2({}, params), {}, {
-                queryIdentify: undefined
-              })
-            }));
-          case 1:
-          case "end":
-            return _context.stop();
-        }
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.abrupt("return", axios({
+            url: "/basic/regularThresholdRange/getVals/".concat(params.queryIdentify),
+            method: 'POST',
+            data: _objectSpread2(_objectSpread2({}, params), {}, {
+              queryIdentify: undefined
+            })
+          }));
+        case 1:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
   }));
@@ -26632,137 +26717,134 @@ var RuleField = /*#__PURE__*/function (_Component) {
         _this.getRegularThresholdRange(queryIdentify, propertyCode, queryIdentifyType);
       });
     };
+    //规则对象属性枚举值查询处理 queryIdentify有值是表示该属性有枚举选择
     _this.getRegularThresholdRange = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(queryIdentify, propertyCode, queryIdentifyType) {
         var thresholdQuery, extraRequestUrl, querParams, needQueryList, res;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                if (queryIdentify) {
-                  _context.next = 2;
-                  break;
-                }
-                return _context.abrupt("return");
-              case 2:
-                thresholdQuery = _this.state.thresholdQuery;
-                extraRequestUrl = '';
-                querParams = setParams(propertyCode, thresholdQuery);
-                if (!queryIdentityInfo.find(function (item) {
-                  return item.identity == propertyCode;
-                })) {
-                  _context.next = 10;
-                  break;
-                }
-                //判断查询属性枚举时有没有必传参数，如果必传参数没有值则不调用查询接口
-                needQueryList = queryIdentityInfo.find(function (item) {
-                  return item.identity == propertyCode;
-                }).queryParam.filter(function (item) {
-                  return item.isRequired;
-                }).map(function (item) {
-                  return item.queryKey;
-                });
-                if (!needQueryList.some(function (item) {
-                  return !querParams[item] || !querParams[item].length;
-                })) {
-                  _context.next = 9;
-                  break;
-                }
-                return _context.abrupt("return");
-              case 9:
-                extraRequestUrl = queryIdentityInfo.find(function (item) {
-                  return item.identity == propertyCode;
-                }).requestUrl || '';
-              case 10:
-                if (queryIdentifyType === 'dictCodeIdentify') {
-                  extraRequestUrl = "bscDictItem/selectDictItemsByDictCode"; // 字典接口
-                  querParams = {
-                    dictCode: queryIdentify
-                  };
-                } else if (queryIdentifyType === 'dynamicDictCodeIdentify') {
-                  extraRequestUrl = "dictDynamicItem/getDynamicData/".concat(queryIdentify); // 字典接口
-                  // querParams = { dictCode: queryIdentify }
-                }
-                if (!extraRequestUrl) {
-                  _context.next = 16;
-                  break;
-                }
-                if (queryIdentify == 'maintain_area_code') {
-                  extraRequestUrl = "/basic/".concat(extraRequestUrl).concat(querParams.memberCardCode, "?").concat(stringify(querParams));
-                } else if (queryIdentifyType == 'dictCodeIdentify') {
-                  extraRequestUrl = "/basic/".concat(extraRequestUrl, "?").concat(stringify(querParams));
-                } else if (queryIdentifyType == 'dynamicDictCodeIdentify') {
-                  extraRequestUrl = "/basic/".concat(extraRequestUrl);
-                }
-                request$1({
-                  url: extraRequestUrl,
-                  method: 'get',
-                  converter: function converter(res) {
-                    if (handleError(res)) {
-                      var _handleData = (res === null || res === void 0 ? void 0 : res.data) || [];
-                      if (queryIdentifyType === 'dictCodeIdentify') {
-                        var _handleData2;
-                        _handleData = ((_handleData2 = _handleData) === null || _handleData2 === void 0 ? void 0 : _handleData2.length) ? _handleData.map(function (i) {
-                          return {
-                            code: i.dictItemCode,
-                            name: i.dictItemName
-                          };
-                        }) : [];
-                      }
-                      if (queryIdentifyType === 'dynamicDictCodeIdentify') {
-                        var _handleData3;
-                        _handleData = ((_handleData3 = _handleData) === null || _handleData3 === void 0 ? void 0 : _handleData3.length) ? _handleData.map(function (i) {
-                          return {
-                            code: i.code.toString(),
-                            name: i.name
-                          };
-                        }) : [];
-                      }
-                      _this.setState({
-                        thresholdList: _handleData
-                      });
-                    }
-                    return handleData;
-                  }
-                });
-                _context.next = 29;
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              if (queryIdentify) {
+                _context.next = 2;
                 break;
-              case 16:
-                if (!(queryIdentifyType == 'objectPropertyListIdentify')) {
-                  _context.next = 20;
-                  break;
-                }
-                _this.setState({
-                  thresholdList: queryIdentify
-                });
-                _context.next = 29;
+              }
+              return _context.abrupt("return");
+            case 2:
+              thresholdQuery = _this.state.thresholdQuery;
+              extraRequestUrl = '';
+              querParams = setParams(propertyCode, thresholdQuery);
+              if (!queryIdentityInfo.find(function (item) {
+                return item.identity == propertyCode;
+              })) {
+                _context.next = 10;
                 break;
-              case 20:
-                if (!(queryIdentifyType == 'objectPropertyCodeIdentify')) {
-                  _context.next = 24;
-                  break;
-                }
-                // TODO待处理
-                _this.setState({
-                  thresholdList: []
-                });
-                _context.next = 29;
+              }
+              //判断查询属性枚举时有没有必传参数，如果必传参数没有值则不调用查询接口
+              needQueryList = queryIdentityInfo.find(function (item) {
+                return item.identity == propertyCode;
+              }).queryParam.filter(function (item) {
+                return item.isRequired;
+              }).map(function (item) {
+                return item.queryKey;
+              });
+              if (!needQueryList.some(function (item) {
+                return !querParams[item] || !querParams[item].length;
+              })) {
+                _context.next = 9;
+                break;
+              }
+              return _context.abrupt("return");
+            case 9:
+              extraRequestUrl = queryIdentityInfo.find(function (item) {
+                return item.identity == propertyCode;
+              }).requestUrl || '';
+            case 10:
+              if (queryIdentifyType === 'dictCodeIdentify') {
+                extraRequestUrl = "bscDictItem/selectDictItemsByDictCode"; // 字典接口
+                querParams = {
+                  dictCode: queryIdentify
+                };
+              } else if (queryIdentifyType === 'dynamicDictCodeIdentify') {
+                extraRequestUrl = "dictDynamicItem/getDynamicData/".concat(queryIdentify); // 字典接口
+                // querParams = { dictCode: queryIdentify }
+              }
+              if (!extraRequestUrl) {
+                _context.next = 16;
                 break;
-              case 24:
-                querParams.queryIdentify = queryIdentify;
-                _context.next = 27;
-                return getRegularThresholdRange(querParams);
-              case 27:
-                res = _context.sent;
-                if (handleError(res)) {
+              }
+              if (queryIdentify == 'maintain_area_code') {
+                extraRequestUrl = "/basic/".concat(extraRequestUrl).concat(querParams.memberCardCode, "?").concat(stringify(querParams));
+              } else if (queryIdentifyType == 'dictCodeIdentify') {
+                extraRequestUrl = "/basic/".concat(extraRequestUrl, "?").concat(stringify(querParams));
+              } else if (queryIdentifyType == 'dynamicDictCodeIdentify') {
+                extraRequestUrl = "/basic/".concat(extraRequestUrl);
+              }
+              request$1({
+                url: extraRequestUrl,
+                method: 'get',
+                converter: function converter(res) {
+                  var handleData = (res === null || res === void 0 ? void 0 : res.data) || [];
+                  if (queryIdentifyType === 'dictCodeIdentify') {
+                    var _handleData;
+                    handleData = ((_handleData = handleData) === null || _handleData === void 0 ? void 0 : _handleData.length) ? handleData.map(function (i) {
+                      return {
+                        code: i.dictItemCode,
+                        name: i.dictItemName
+                      };
+                    }) : [];
+                  }
+                  if (queryIdentifyType === 'dynamicDictCodeIdentify') {
+                    var _handleData2;
+                    handleData = ((_handleData2 = handleData) === null || _handleData2 === void 0 ? void 0 : _handleData2.length) ? handleData.map(function (i) {
+                      return {
+                        code: i.code.toString(),
+                        name: i.name
+                      };
+                    }) : [];
+                  }
                   _this.setState({
-                    thresholdList: (res === null || res === void 0 ? void 0 : res.data) || []
+                    thresholdList: handleData
                   });
+                  return handleData;
                 }
-              case 29:
-              case "end":
-                return _context.stop();
-            }
+              });
+              _context.next = 29;
+              break;
+            case 16:
+              if (!(queryIdentifyType == 'objectPropertyListIdentify')) {
+                _context.next = 20;
+                break;
+              }
+              _this.setState({
+                thresholdList: queryIdentify
+              });
+              _context.next = 29;
+              break;
+            case 20:
+              if (!(queryIdentifyType == 'objectPropertyCodeIdentify')) {
+                _context.next = 24;
+                break;
+              }
+              // TODO待处理
+              _this.setState({
+                thresholdList: []
+              });
+              _context.next = 29;
+              break;
+            case 24:
+              querParams.queryIdentify = queryIdentify;
+              _context.next = 27;
+              return getRegularThresholdRange(querParams);
+            case 27:
+              res = _context.sent;
+              if (handleError(res)) {
+                _this.setState({
+                  thresholdList: (res === null || res === void 0 ? void 0 : res.data) || []
+                });
+              }
+            case 29:
+            case "end":
+              return _context.stop();
           }
         }, _callee);
       }));
@@ -27581,32 +27663,30 @@ var RuleField = /*#__PURE__*/function (_Component) {
               notChangeOnSelect: true,
               initRequestSource: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
                 return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-                  while (1) {
-                    switch (_context2.prev = _context2.next) {
-                      case 0:
-                        _context2.next = 2;
-                        return request$1({
-                          url: '/basic/bscArea/getBscAreaList?qp-level-eq=1&qp-pid-eq=100000',
-                          method: 'get',
-                          converter: function converter(_ref3) {
-                            var data = _ref3.data;
-                            var handleData = data && data[0] ? data === null || data === void 0 ? void 0 : data.map(function (item) {
-                              return {
-                                text: item.name,
-                                value: item.id,
-                                level: item.level,
-                                id: item.id
-                              };
-                            }) : [];
-                            return handleData;
-                          }
-                        });
-                      case 2:
-                        return _context2.abrupt("return", _context2.sent);
-                      case 3:
-                      case "end":
-                        return _context2.stop();
-                    }
+                  while (1) switch (_context2.prev = _context2.next) {
+                    case 0:
+                      _context2.next = 2;
+                      return request$1({
+                        url: '/basic/bscArea/getBscAreaList?qp-level-eq=1&qp-pid-eq=100000',
+                        method: 'get',
+                        converter: function converter(_ref3) {
+                          var data = _ref3.data;
+                          var handleData = data && data[0] ? data === null || data === void 0 ? void 0 : data.map(function (item) {
+                            return {
+                              text: item.name,
+                              value: item.id,
+                              level: item.level,
+                              id: item.id
+                            };
+                          }) : [];
+                          return handleData;
+                        }
+                      });
+                    case 2:
+                      return _context2.abrupt("return", _context2.sent);
+                    case 3:
+                    case "end":
+                      return _context2.stop();
                   }
                 }, _callee2);
               })),
@@ -27632,32 +27712,30 @@ var RuleField = /*#__PURE__*/function (_Component) {
               notChangeOnSelect: true,
               initRequestSource: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
                 return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-                  while (1) {
-                    switch (_context3.prev = _context3.next) {
-                      case 0:
-                        _context3.next = 2;
-                        return request$1({
-                          url: '/basic/bscArea/getBscAreaList?qp-level-eq=1&qp-pid-eq=100000',
-                          method: 'get',
-                          converter: function converter(_ref5) {
-                            var data = _ref5.data;
-                            var handleData = data && data[0] ? data === null || data === void 0 ? void 0 : data.map(function (item) {
-                              return {
-                                text: item.name,
-                                value: item.id,
-                                level: item.level,
-                                id: item.id
-                              };
-                            }) : [];
-                            return handleData;
-                          }
-                        });
-                      case 2:
-                        return _context3.abrupt("return", _context3.sent);
-                      case 3:
-                      case "end":
-                        return _context3.stop();
-                    }
+                  while (1) switch (_context3.prev = _context3.next) {
+                    case 0:
+                      _context3.next = 2;
+                      return request$1({
+                        url: '/basic/bscArea/getBscAreaList?qp-level-eq=1&qp-pid-eq=100000',
+                        method: 'get',
+                        converter: function converter(_ref5) {
+                          var data = _ref5.data;
+                          var handleData = data && data[0] ? data === null || data === void 0 ? void 0 : data.map(function (item) {
+                            return {
+                              text: item.name,
+                              value: item.id,
+                              level: item.level,
+                              id: item.id
+                            };
+                          }) : [];
+                          return handleData;
+                        }
+                      });
+                    case 2:
+                      return _context3.abrupt("return", _context3.sent);
+                    case 3:
+                    case "end":
+                      return _context3.stop();
                   }
                 }, _callee3);
               })),
@@ -27685,32 +27763,30 @@ var RuleField = /*#__PURE__*/function (_Component) {
               notChangeOnSelect: true,
               initRequestSource: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
                 return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-                  while (1) {
-                    switch (_context4.prev = _context4.next) {
-                      case 0:
-                        _context4.next = 2;
-                        return request$1({
-                          url: '/basic/bscArea/getBscAreaList?qp-level-eq=1&qp-pid-eq=100000',
-                          method: 'get',
-                          converter: function converter(_ref7) {
-                            var data = _ref7.data;
-                            var handleData = data && data[0] ? data === null || data === void 0 ? void 0 : data.map(function (item) {
-                              return {
-                                text: item.name,
-                                value: item.id,
-                                level: item.level,
-                                id: item.id
-                              };
-                            }) : [];
-                            return handleData;
-                          }
-                        });
-                      case 2:
-                        return _context4.abrupt("return", _context4.sent);
-                      case 3:
-                      case "end":
-                        return _context4.stop();
-                    }
+                  while (1) switch (_context4.prev = _context4.next) {
+                    case 0:
+                      _context4.next = 2;
+                      return request$1({
+                        url: '/basic/bscArea/getBscAreaList?qp-level-eq=1&qp-pid-eq=100000',
+                        method: 'get',
+                        converter: function converter(_ref7) {
+                          var data = _ref7.data;
+                          var handleData = data && data[0] ? data === null || data === void 0 ? void 0 : data.map(function (item) {
+                            return {
+                              text: item.name,
+                              value: item.id,
+                              level: item.level,
+                              id: item.id
+                            };
+                          }) : [];
+                          return handleData;
+                        }
+                      });
+                    case 2:
+                      return _context4.abrupt("return", _context4.sent);
+                    case 3:
+                    case "end":
+                      return _context4.stop();
                   }
                 }, _callee4);
               })),
@@ -28507,6 +28583,86 @@ var RuleField = /*#__PURE__*/function (_Component) {
             });
           }
         }
+        // 结算组织选择器
+        if (dataChoiceBusinessType == 290) {
+          if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
+            return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(BusinessTreeSearchSelect$1, {
+              disabled: disabled,
+              treeCheckable: dataInputBusinessType === 12,
+              businessType: "settle-organization",
+              labelInValue: true,
+              value: values[0],
+              style: styleCommon,
+              onChange: function onChange(value) {
+                if (dataInputBusinessType === 12) {
+                  values[0] = value.map(function (i) {
+                    return i.key;
+                  });
+                  valueNames[0] = value.map(function (i) {
+                    return i.label || '';
+                  });
+                } else {
+                  values[0] = [value.key];
+                  valueNames[0] = [value.label || ''];
+                }
+                callback(values, valueNames);
+              },
+              getPopupContainer: function getPopupContainer() {
+                return document.body;
+              }
+            }), /*#__PURE__*/React.createElement("span", null, "~"), /*#__PURE__*/React.createElement(BusinessTreeSearchSelect$1, {
+              disabled: disabled,
+              treeCheckable: dataInputBusinessType === 12,
+              businessType: "settle-organization",
+              labelInValue: true,
+              value: values[0],
+              style: styleCommon,
+              onChange: function onChange(value) {
+                if (dataInputBusinessType === 12) {
+                  values[1] = value.map(function (i) {
+                    return i.key;
+                  });
+                  valueNames[1] = value.map(function (i) {
+                    return i.label || '';
+                  });
+                } else {
+                  values[1] = [value.key];
+                  valueNames[1] = [value.label || ''];
+                }
+                callback(values, valueNames);
+              },
+              getPopupContainer: function getPopupContainer() {
+                return document.body;
+              }
+            }));
+          } else {
+            return /*#__PURE__*/React.createElement(BusinessTreeSearchSelect$1, {
+              disabled: disabled,
+              treeCheckable: dataInputBusinessType === 12,
+              businessType: "settle-organization",
+              labelInValue: true,
+              value: values[0],
+              style: styleCommon,
+              onChange: function onChange(value) {
+                if (dataInputBusinessType === 12) {
+                  values = value.map(function (i) {
+                    return i.key;
+                  }) || [];
+                  valueNames = value.map(function (i) {
+                    return i.label || '';
+                  }) || [];
+                } else {
+                  values = (value === null || value === void 0 ? void 0 : value.key) ? [value.key] : [];
+                  valueNames = (value === null || value === void 0 ? void 0 : value.label) ? [value.label] : [];
+                }
+                callback(values, valueNames);
+              },
+              getPopupContainer: function getPopupContainer() {
+                return document.body;
+              }
+            });
+          }
+        }
         // 配送方式选择器
         if (dataChoiceBusinessType == 310) {
           if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
@@ -28621,6 +28777,120 @@ var RuleField = /*#__PURE__*/function (_Component) {
             });
           }
         }
+        // 角色选择器
+        if (dataChoiceBusinessType == 360) {
+          if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
+            return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(BusinessSearchSelect$1, {
+              selectBusinessType: "role",
+              selectProps: _objectSpread2({
+                style: styleCommon,
+                placeholder: '请选择角色'
+              }, dataInputBusinessType === 12 ? {
+                mode: 'multiple',
+                maxTagCount: 1
+              } : {}),
+              disabled: disabled,
+              labelInValue: true,
+              value: values[0],
+              requestConfig: {
+                filterInit: 'qp-code-in'
+              },
+              onChange: function onChange(value) {
+                if (dataInputBusinessType === 12) {
+                  values[0] = value.map(function (i) {
+                    return i.key;
+                  });
+                  valueNames[0] = value.map(function (i) {
+                    return i.label || '';
+                  });
+                } else {
+                  values[0] = [value.key];
+                  valueNames[0] = [value.label || ''];
+                }
+                callback(values, valueNames);
+              },
+              getPopupContainer: function getPopupContainer() {
+                return document.body;
+              }
+            }), /*#__PURE__*/React.createElement("span", null, "~"), /*#__PURE__*/React.createElement(BusinessSearchSelect$1, {
+              selectBusinessType: "role",
+              selectProps: _objectSpread2({
+                style: styleCommon,
+                placeholder: '请选择角色'
+              }, dataInputBusinessType === 12 ? {
+                mode: 'multiple',
+                maxTagCount: 1
+              } : {}),
+              disabled: disabled,
+              labelInValue: true,
+              value: values[1],
+              requestConfig: {
+                filterInit: 'qp-code-in'
+              },
+              onChange: function onChange(value) {
+                if (dataInputBusinessType === 12) {
+                  values[1] = value.map(function (i) {
+                    return i.key;
+                  });
+                  valueNames[1] = value.map(function (i) {
+                    return i.label || '';
+                  });
+                } else {
+                  values[1] = [value.key];
+                  valueNames[1] = [value.label || ''];
+                }
+                callback(values, valueNames);
+              },
+              getPopupContainer: function getPopupContainer() {
+                return document.body;
+              }
+            }));
+          } else {
+            var _values12;
+            var _currentValue11 = dataInputBusinessType === 12 ? ((_values12 = values) === null || _values12 === void 0 ? void 0 : _values12.map(function (s, vIndex) {
+              return {
+                key: s,
+                label: valueNames[vIndex]
+              };
+            })) || [] : values[0] && {
+              key: values[0],
+              label: valueNames[0]
+            } || {};
+            return /*#__PURE__*/React.createElement(BusinessSearchSelect$1, {
+              selectBusinessType: "role",
+              selectProps: _objectSpread2({
+                style: styleCommon,
+                placeholder: '请选择角色'
+              }, dataInputBusinessType === 12 ? {
+                mode: 'multiple',
+                maxTagCount: 1
+              } : {}),
+              disabled: disabled,
+              labelInValue: true,
+              value: _currentValue11,
+              requestConfig: {
+                filterInit: 'qp-code-in'
+              },
+              onChange: function onChange(value) {
+                if (dataInputBusinessType === 12) {
+                  values = value.map(function (i) {
+                    return i.key;
+                  }) || [];
+                  valueNames = value.map(function (i) {
+                    return i.label || '';
+                  }) || [];
+                } else {
+                  values = (value === null || value === void 0 ? void 0 : value.key) ? [value.key] : [];
+                  valueNames = (value === null || value === void 0 ? void 0 : value.label) ? [value.label] : [];
+                }
+                callback(values, valueNames);
+              },
+              getPopupContainer: function getPopupContainer() {
+                return document.body;
+              }
+            });
+          }
+        }
       } else {
         if (dataTypeCode == 22 || dataTypeCode == 21 || dataTypeCode == 24 || dataTypeCode == 23) {
           //数值22, 字符串21, 布尔类型24, long23
@@ -28827,8 +29097,6 @@ var RuleField = /*#__PURE__*/function (_Component) {
         });
       }
     }
-
-    //规则对象属性枚举值查询处理 queryIdentify有值是表示该属性有枚举选择
   }, {
     key: "render",
     value: function render() {
@@ -29306,6 +29574,54 @@ var RuleField$1 = /*#__PURE__*/function (_Component) {
   return RuleField;
 }(Component);
 
+var InnerSelect = (function (props) {
+  var disabled = props.disabled,
+    inputType = props.inputType,
+    defaultValue = props.defaultValue,
+    styleCommon = props.styleCommon,
+    value = props.value,
+    _onChange = props.onChange,
+    dictionaryCode = props.dictionaryCode;
+  var _useState = useState(getDictionarySource(dictionaryCode !== null && dictionaryCode !== void 0 ? dictionaryCode : '') || []),
+    _useState2 = _slicedToArray(_useState, 2),
+    dataSource = _useState2[0],
+    setDataSource = _useState2[1];
+  useEffect(function () {
+    if (!!dictionaryCode && !getDictionarySource(dictionaryCode)) {
+      request$1({
+        url: "/basic/bscDictItem/allItemList?qp-code-eq=".concat(dictionaryCode),
+        method: 'get',
+        converter: function converter(_ref) {
+          var _data$map;
+          var data = _ref.data;
+          var dataList = (data === null || data === void 0 ? void 0 : (_data$map = data.map) === null || _data$map === void 0 ? void 0 : _data$map.call(data, function (item) {
+            return {
+              label: item.dictItemName,
+              value: item.dictItemCode
+            };
+          })) || [];
+          setDataSource(dataList);
+          return dataList;
+        }
+      });
+    }
+  }, [dictionaryCode]);
+  return /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({
+    disabled: disabled
+  }, inputType === 30 ? {
+    mode: 'multiple'
+  } : {}), {}, {
+    defaultValue: defaultValue,
+    style: styleCommon,
+    value: value === null || value === void 0 ? void 0 : value.split(','),
+    onChange: function onChange(changeValue) {
+      _onChange(changeValue);
+      // handleEdit(ites.code, value);
+    },
+    options: dataSource
+  }));
+});
+
 var RangePicker$1 = DatePicker.RangePicker;
 var RuleObjectComponent = /*#__PURE__*/function (_Component) {
   _inherits(RuleObjectComponent, _Component);
@@ -29659,6 +29975,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         callBack(ruleClassData);
       });
     };
+    // 树结构 转化成 平行树 (递归函数)
     _this.coverToParallel = function (treeData, result) {
       treeData.forEach(function (el) {
         result.push(el);
@@ -29722,18 +30039,18 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           onClick: function onClick() {
             _this.handleLogicalTypeChange(itemDetail, 'or');
           }
-        }, "OR"), /*#__PURE__*/React.createElement("p", {
+        }, "\u6216\u8005"), /*#__PURE__*/React.createElement("p", {
           className: 'choose_logical_type',
           onClick: function onClick() {
             _this.handleLogicalTypeChange(itemDetail, 'and');
           }
-        }, "AND")),
+        }, "\u5E76\u4E14")),
         trigger: "focus"
       }, /*#__PURE__*/React.createElement(Button, {
         disabled: disabled,
         type: "link",
         className: 'logical_item_btn'
-      }, (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.operationCode) == 'or' ? 'OR' : 'AND', /*#__PURE__*/React.createElement(DownOutlined, {
+      }, (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.operationCode) == 'or' ? '或者' : '并且', /*#__PURE__*/React.createElement(DownOutlined, {
         style: {
           marginLeft: '6px'
         }
@@ -29914,6 +30231,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         callBack(ruleClassData);
       });
     };
+    // 场景需要返回值2022.11.15
     _this.renderResItem = function (itemDetail, parentDetail, ruleReturnConfig, classDataIndex, disabled, boxStyle) {
       var _ruleReturnConfig$rig;
       var isShowResponse = itemDetail.response['enable'];
@@ -30058,23 +30376,17 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           key: it,
           value: it
         }, ites.enumeration[it]);
-      })) || null, ((ites === null || ites === void 0 ? void 0 : ites.inputType) === 20 || (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30) && (ites === null || ites === void 0 ? void 0 : ites.choiceType) === 20 && /*#__PURE__*/React.createElement(Select, _extends({
-        disabled: disabled
-      }, (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30 ? {
-        mode: 'multiple'
-      } : {}, {
+      })) || null, ((ites === null || ites === void 0 ? void 0 : ites.inputType) === 20 || (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30) && (ites === null || ites === void 0 ? void 0 : ites.choiceType) === 20 && /*#__PURE__*/React.createElement(InnerSelect, {
+        disabled: disabled,
+        inputType: ites === null || ites === void 0 ? void 0 : ites.inputType,
         defaultValue: ites.defaultValue,
-        style: styleCommon,
+        styleCommon: styleCommon,
         value: showValue(ites.code),
         onChange: function onChange(value) {
           handleEdit(ites.code, value);
-        }
-      }), getDictionarySource(ites === null || ites === void 0 ? void 0 : ites.dictionaryCode).map(function (it) {
-        return /*#__PURE__*/React.createElement(Select.Option, {
-          key: it.value,
-          value: it.value
-        }, it.text);
-      })) || null, ((ites === null || ites === void 0 ? void 0 : ites.inputType) === 20 || (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30) && (ites === null || ites === void 0 ? void 0 : ites.choiceType) === 110 && /*#__PURE__*/React.createElement(BusinessSearchSelect$1, {
+        },
+        dictionaryCode: ites.dictionaryCode
+      }) || null, ((ites === null || ites === void 0 ? void 0 : ites.inputType) === 20 || (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30) && (ites === null || ites === void 0 ? void 0 : ites.choiceType) === 110 && /*#__PURE__*/React.createElement(BusinessSearchSelect$1, {
         selectBusinessType: "physicalWarehouse",
         selectProps: _objectSpread2({
           style: styleCommon,
@@ -30211,32 +30523,30 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         notChangeOnSelect: true,
         initRequestSource: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
           return _regeneratorRuntime().wrap(function _callee$(_context) {
-            while (1) {
-              switch (_context.prev = _context.next) {
-                case 0:
-                  _context.next = 2;
-                  return request$1({
-                    url: '/basic/bscArea/getBscAreaList?qp-level-eq=1&qp-pid-eq=100000',
-                    method: 'get',
-                    converter: function converter(_ref2) {
-                      var data = _ref2.data;
-                      var handleData = data && data[0] ? data === null || data === void 0 ? void 0 : data.map(function (item) {
-                        return {
-                          text: item.name,
-                          value: item.id,
-                          level: item.level,
-                          id: item.id
-                        };
-                      }) : [];
-                      return handleData;
-                    }
-                  });
-                case 2:
-                  return _context.abrupt("return", _context.sent);
-                case 3:
-                case "end":
-                  return _context.stop();
-              }
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return request$1({
+                  url: '/basic/bscArea/getBscAreaList?qp-level-eq=1&qp-pid-eq=100000',
+                  method: 'get',
+                  converter: function converter(_ref2) {
+                    var data = _ref2.data;
+                    var handleData = data && data[0] ? data === null || data === void 0 ? void 0 : data.map(function (item) {
+                      return {
+                        text: item.name,
+                        value: item.id,
+                        level: item.level,
+                        id: item.id
+                      };
+                    }) : [];
+                    return handleData;
+                  }
+                });
+              case 2:
+                return _context.abrupt("return", _context.sent);
+              case 3:
+              case "end":
+                return _context.stop();
             }
           }, _callee);
         })),
@@ -30383,6 +30693,19 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         getPopupContainer: function getPopupContainer() {
           return document.body;
         }
+      }) || null, ((ites === null || ites === void 0 ? void 0 : ites.inputType) === 20 || (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30) && (ites === null || ites === void 0 ? void 0 : ites.choiceType) === 290 && /*#__PURE__*/React.createElement(BusinessTreeSearchSelect$1, {
+        disabled: disabled,
+        treeCheckable: (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30,
+        businessType: "settle-organization",
+        labelInValue: true,
+        value: showValue(ites.code),
+        style: styleCommon,
+        onChange: function onChange(value) {
+          handleEdit(ites.code, value);
+        },
+        getPopupContainer: function getPopupContainer() {
+          return document.body;
+        }
       }) || null, ((ites === null || ites === void 0 ? void 0 : ites.inputType) === 20 || (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30) && (ites === null || ites === void 0 ? void 0 : ites.choiceType) === 310 && /*#__PURE__*/React.createElement(BusinessSearchSelect$1, {
         selectBusinessType: "deliveryMode",
         selectProps: _objectSpread2({
@@ -30570,6 +30893,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         }
       }, "\u65B0\u589E\u8FD4\u56DE\u503C")), isHaveRuleReturnConfig && _this.renderResItem(itemDetail, parentDetail, ruleReturnConfig, classDataIndex, disabled, RuleActionItemStyle) || null, isHaveRuleTypeData && _this.renderActionList(itemDetail, parentDetail, handleRuleTypeData, selectRuleActionData, classDataIndex, disabled, RuleActionItemStyle) || null);
     };
+    //添加同一层级条件
     _this.addPeerRule = function (itemDetail) {
       var ruleClassData = _this.state.ruleClassData;
       var _this$props4 = _this.props,
@@ -30590,6 +30914,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         callBack(ruleClassData);
       });
     };
+    //添加子层级条件
     _this.addChildRules = function (itemDetail) {
       var ruleClassData = _this.state.ruleClassData;
       var callBack = _this.props.callBack;
@@ -30665,6 +30990,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         callBack(ruleClassData);
       });
     };
+    // 新增执行顺序
     _this.handleSelectRuleAction = function (keys, classDataIndex, callback) {
       callback();
       var callBack = _this.props.callBack;
@@ -30815,4 +31141,4 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
   return RuleObjectComponent;
 }(Component);
 
-export { AddSelect, AddSkcSelect, AddSkuSelect, AddSpuSelect, BillEntry, BsCascader, index$5 as BsLayout, BsSulaQueryTable, BusinessSearchSelect$1 as BusinessSearchSelect, BusinessTreeSearchSelect$1 as BusinessTreeSearchSelect, index$1 as CheckOneUser, ColumnSettingTable, CommodityEntry, DataImport, DataValidation, index$3 as DetailPageWrapper, EllipsisTooltip, ExportIcon, GuideWrapper, index$4 as HomePageWrapper, JsonQueryTable, index$6 as MoreTreeTable, QueryMutipleInput, RuleObjectComponent as RuleComponent, SearchSelect, index$2 as StateFlow, ColumnSettingSulaTable as SulaColumnSettingTable, TableColumnSetting, TreeSearchSelect };
+export { AddSelect, AddSkcSelect, AddSkuSelect, AddSpuSelect, BillEntry, BsCascader, index$6 as BsLayout, BsSulaQueryTable, BusinessSearchSelect$1 as BusinessSearchSelect, BusinessTreeSearchSelect$1 as BusinessTreeSearchSelect, index$2 as CheckOneUser, ColumnSettingTable, CommodityEntry, DataImport, DataValidation, index$4 as DetailPageWrapper, EllipsisTooltip, ExportIcon, GuideWrapper, index$5 as HomePageWrapper, JsonQueryTable, index$7 as MoreTreeTable, QueryMutipleInput, RuleObjectComponent as RuleComponent, SearchSelect, index$3 as StateFlow, ColumnSettingSulaTable as SulaColumnSettingTable, TableColumnSetting, TreeSearchSelect };