@bit-sun/business-component 2.2.24 → 2.2.26

package/dist/index.esm.js

@@ -9881,6 +9881,22 @@ var loadSelectSource = function loadSelectSource(url, params) {
     });
   });
 };
+var checkSpuMatchCode = function checkSpuMatchCode(data) {
+  return new Promise(function (resolve, reject) {
+    axios.post("/stock/rwFrontRecordSkcDetail/checkSpuMatchCode", data).then(function (result) {
+      var _result3, _result4;
+      result = result.data;
+      if (((_result3 = result) === null || _result3 === void 0 ? void 0 : _result3.status) && result.status !== '0' || ((_result4 = result) === null || _result4 === void 0 ? void 0 : _result4.code) && result.code !== '000000') {
+        message.error(result.msg);
+        reject(false);
+        return;
+      }
+      resolve(result);
+    }).catch(function (err) {
+      reject(err);
+    });
+  });
+};
 var ResizeableTitle = function ResizeableTitle(props) {
   var onResize = props.onResize,
     width = props.width,
@@ -10121,6 +10137,87 @@ var AddSelect = function AddSelect(props) {
     setShowToChooseColumns = _useState46[1];
   var codeToChoose = tableCodeList[0] || initTableCode[businessType][0];
   var codeSelected = tableCodeList[1] || initTableCode[businessType][1];
+  var checkSelectChange = /*#__PURE__*/function () {
+    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.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.warning('相同商品相同配码颜色不可设置相同哦');
+              return _context.abrupt("return", false);
+            case 7:
+              if (!(selectItem.dataIndex == 'selectPropertyGroupCode' && !recordItem.colorName)) {
+                _context.next = 10;
+                break;
+              }
+              message.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.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]]);
+    }));
+    return function checkSelectChange(_x, _x2, _x3, _x4, _x5, _x6) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
   useEffect(function () {
     setTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns);
   }, [modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns]);
@@ -10270,40 +10367,55 @@ var AddSelect = function AddSelect(props) {
         return _objectSpread2(_objectSpread2({}, item), {}, {
           render: function render(text, record, index) {
             var _item$dataSource;
-            if ((_item$dataSource = item.dataSource) === null || _item$dataSource === void 0 ? void 0 : _item$dataSource.length) {
+            if ((item === null || item === void 0 ? void 0 : (_item$dataSource = item.dataSource) === null || _item$dataSource === void 0 ? void 0 : _item$dataSource.length) || (item === null || item === void 0 ? void 0 : item.dataSourceCode)) {
+              var _item$dataSourceMappi, _item$dataSourceMappi2;
+              var dataSourceList = item.dataSource || (record === null || record === void 0 ? void 0 : record[item === null || item === void 0 ? void 0 : item.dataSourceCode]) || [];
+              var selectKey = (item === null || item === void 0 ? void 0 : (_item$dataSourceMappi = item.dataSourceMapping) === null || _item$dataSourceMappi === void 0 ? void 0 : _item$dataSourceMappi[0]) || 'code';
+              var selectText = (item === null || item === void 0 ? void 0 : (_item$dataSourceMappi2 = item.dataSourceMapping) === null || _item$dataSourceMappi2 === void 0 ? void 0 : _item$dataSourceMappi2[1]) || 'name';
               return /*#__PURE__*/React.createElement(Select, {
                 value: text || null,
-                onChange: function onChange(value) {
-                  if (businessType == 'skc' && popvalue.some(function (i) {
-                    return i.code == record.code && i[item.dataIndex] == value;
-                  })) {
-                    message.warning('相同skc配码不可设置相同哦');
-                    record[item.dataIndex] = null;
-                    var _newPopValue = popvalue.map(function (i, innerIndex) {
-                      if (innerIndex == index) {
-                        i[item.dataIndex] = record[item.dataIndex];
+                onChange: function () {
+                  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;
+                            }
+                            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);
-                    return false;
+                    }, _callee2);
+                  }));
+                  function onChange(_x7) {
+                    return _onChange.apply(this, arguments);
                   }
-                  record[item.dataIndex] = value;
-                  var newPopValue = popvalue.map(function (i, innerIndex) {
-                    if (innerIndex == index) {
-                      i[item.dataIndex] = record[item.dataIndex];
-                    }
-                    return i;
-                  });
-                  setPopValue(newPopValue);
-                },
+                  return onChange;
+                }(),
                 style: {
                   width: '160px'
                 }
-              }, item.dataSource.map(function (item) {
+              }, dataSourceList.map(function (item) {
                 return /*#__PURE__*/React.createElement(Select.Option, {
-                  value: item.code
-                }, item.name);
+                  value: item[selectKey]
+                }, item[selectText]);
               }));
             }
             return /*#__PURE__*/React.createElement(React.Fragment, null);
@@ -10432,10 +10544,10 @@ var AddSelect = function AddSelect(props) {
       currentPage: currentPage
     }, otherParams), fixedParam), params);
     axios.get("".concat(url, "?").concat(stringify(queryParams))).then(function (result) {
-      var _result3, _result4;
+      var _result5, _result6;
       setFetching(false);
       result = result.data;
-      if (((_result3 = result) === null || _result3 === void 0 ? void 0 : _result3.status) && result.status !== '0' || ((_result4 = result) === null || _result4 === void 0 ? void 0 : _result4.code) && result.code !== '000000') {
+      if (((_result5 = result) === null || _result5 === void 0 ? void 0 : _result5.status) && result.status !== '0' || ((_result6 = result) === null || _result6 === void 0 ? void 0 : _result6.code) && result.code !== '000000') {
         message.error(result.msg);
         return;
       }
@@ -10680,10 +10792,11 @@ var AddSelect = function AddSelect(props) {
     getData(_objectSpread2(_objectSpread2({}, params), {}, {
       pageSize: tableInitPageSize
     }), 2);
-    if (selectMode) {
-      getData(params);
-    }
+    // if (selectMode) {
+    //   getData(params)
+    // }
   };
+
   var onResetTable = function onResetTable() {
     form.resetFields();
     setTableFormParams({});
@@ -10861,8 +10974,8 @@ var AddSelect = function AddSelect(props) {
     });
   }, [tableColumns]);
   var handleResize = function handleResize(arr, index, callback) {
-    return function (_, _ref4) {
-      var size = _ref4.size;
+    return function (_, _ref5) {
+      var size = _ref5.size;
       var newColumns = arr.map(function (col) {
         return _objectSpread2({}, col);
       });
@@ -14221,14 +14334,9 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     },
     beforeShowModal: parProps === null || parProps === void 0 ? void 0 : parProps.beforeShowModal,
     onSaveCallback: parProps.onSaveCallback,
-    businessType: 'sku'
-    // onSaveCallback: (rows) => {
-    //   console.log('save call', rows);
-    //   // return Promise.resolve(true);
-    //   // return Promise.reject('FAILE')
-    // }
+    businessType: 'sku',
+    isAllowRepeatedSelect: !!(parProps === null || parProps === void 0 ? void 0 : parProps.isAllowRepeatedSelect)
   };
-
   var modalTableProps = {
     modalTableTitle: '选择商品',
     tableSearchForm: [{
@@ -14519,8 +14627,9 @@ var AddSkcSelect = function AddSkcSelect(parProps) {
     beforeShowModal: parProps === null || parProps === void 0 ? void 0 : parProps.beforeShowModal,
     onSaveCallback: parProps.onSaveCallback,
     businessType: 'skc',
-    isAllowRepeatedSelect: true
+    isAllowRepeatedSelect: (parProps === null || parProps === void 0 ? void 0 : parProps.isAllowRepeatedSelect) !== undefined ? !!(parProps === null || parProps === void 0 ? void 0 : parProps.isAllowRepeatedSelect) : true // 默认开启一行选多次
   };
+
   var modalTableProps = {
     modalTableTitle: '选择商品',
     tableSearchForm: [{
@@ -14713,6 +14822,25 @@ var AddSpuSelect = function AddSpuSelect(parProps) {
     _useState8 = _slicedToArray(_useState7, 2),
     value = _useState8[0],
     setValue = _useState8[1];
+  var _useState9 = useState([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    propertyList = _useState10[0],
+    setPropertyList = _useState10[1];
+  useEffect(function () {
+    if (parProps === null || parProps === void 0 ? void 0 : parProps.isSingleColor) {
+      // type: 1 尺码组; 2 配码组
+      axios.get("/items/itemPropertyValueGroup/listNoPage?qp-type-eq=2&qp-status-eq=1").then(function (result) {
+        var _result3, _result4;
+        result = result.data;
+        if (((_result3 = result) === null || _result3 === void 0 ? void 0 : _result3.status) && result.status !== '0' || ((_result4 = result) === null || _result4 === void 0 ? void 0 : _result4.code) && result.code !== '000000') {
+          message.error(result.msg);
+          return;
+        }
+        var data = result.data || [];
+        setPropertyList(data);
+      }).catch(function (err) {});
+    }
+  }, []);
   //注⚠️：自定义过表头的请记得传tableCodeList参数
   var initialSelectColumn = [{
     title: '商品编码',
@@ -14731,6 +14859,19 @@ var AddSpuSelect = function AddSpuSelect(parProps) {
       }, text);
     },
     dataIndex: 'name'
+  }, {
+    title: '颜色',
+    dataIndex: 'colorName',
+    width: 200,
+    isSelectItem: true,
+    dataSourceCode: 'colorValues',
+    dataSourceMapping: ['value', 'value']
+  }, {
+    title: '配码',
+    dataIndex: 'selectPropertyGroupCode',
+    width: 160,
+    isSelectItem: true,
+    dataSource: propertyList
   }, {
     title: '数量',
     width: 100,
@@ -14773,14 +14914,9 @@ var AddSpuSelect = function AddSpuSelect(parProps) {
     },
     beforeShowModal: parProps === null || parProps === void 0 ? void 0 : parProps.beforeShowModal,
     onSaveCallback: parProps.onSaveCallback,
-    businessType: 'spu'
-    // onSaveCallback: (rows) => {
-    //   console.log('save call', rows);
-    //   // return Promise.resolve(true);
-    //   // return Promise.reject('FAILE')
-    // }
+    businessType: 'spu',
+    isAllowRepeatedSelect: !!(parProps === null || parProps === void 0 ? void 0 : parProps.isAllowRepeatedSelect)
   };
-
   var modalTableProps = {
     modalTableTitle: '选择商品',
     tableSearchForm: [{
@@ -15310,7 +15446,8 @@ var handleDefaultProps = function handleDefaultProps(type) {
         remoteSource: {
           url: "/user/orgViewNode/common/getTreeForOrgViewAndTenant",
           initialParams: {
-            'orgViewCode': 'sales-organizational-view'
+            'orgViewCode': 'sales-organizational-view',
+            'qp-status-eq': 10
           },
           resKeyValue: ['code', 'name']
         }
@@ -15322,7 +15459,8 @@ var handleDefaultProps = function handleDefaultProps(type) {
         remoteSource: {
           url: "/user/orgViewNode/common/getTreeForOrgViewAndTenant",
           initialParams: {
-            'orgViewCode': 'purchase-organizational-view'
+            'orgViewCode': 'purchase-organizational-view',
+            'qp-status-eq': 10
           },
           resKeyValue: ['code', 'name']
         }
@@ -15334,7 +15472,8 @@ var handleDefaultProps = function handleDefaultProps(type) {
         remoteSource: {
           url: "/user/orgViewNode/common/getTreeForOrgViewAndTenant",
           initialParams: {
-            'orgViewCode': 'stock-organizational-view'
+            'orgViewCode': 'stock-organizational-view',
+            'qp-status-eq': 10
           },
           resKeyValue: ['code', 'name']
         }