@kmkf-fe-packages/basic-components 2.2.13-beta.11 → 2.2.13-beta.13

package/dist/index.esm.js

@@ -20270,10 +20270,6 @@ var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
   if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
   return false;
 };
-var getYesOrNo$4 = function getYesOrNo(val) {
-  if (isNull(val)) return null;
-  return val ? '是' : '否';
-};
 var getColumns$7 = function getColumns(_ref) {
   var _ref$text = _ref.text,
     disabled = _ref.disabled,
@@ -20495,19 +20491,23 @@ var getColumns$7 = function getColumns(_ref) {
       });
     }),
     // 巨益补发商品信息
-    JY_REISSUE_GOODS: [{
-      dataIndex: 'goodsName',
-      title: "\u8D27\u54C1\u540D\u79F0",
-      width: 150
-    }, {
-      dataIndex: 'goodsCode',
-      title: "\u8D27\u54C1\u7F16\u53F7",
-      width: 200
-    }, {
-      dataIndex: 'goodsId',
-      title: "\u8D27\u54C1ID",
-      width: 150
-    }, {
+    JY_REISSUE_GOODS: [
+    // {
+    //   dataIndex: 'goodsName',
+    //   title: `货品名称`,
+    //   width: 150,
+    // },
+    // {
+    //   dataIndex: 'goodsCode',
+    //   title: `货品编号`,
+    //   width: 200,
+    // },
+    // {
+    //   dataIndex: 'goodsId',
+    //   title: `货品ID`,
+    //   width: 150,
+    // },
+    {
       dataIndex: 'goodsClass',
       title: "\u8D27\u54C1\u7C7B\u522B",
       width: 150
@@ -20515,19 +20515,22 @@ var getColumns$7 = function getColumns(_ref) {
       dataIndex: 'code',
       title: "\u6761\u7801",
       width: 150
-    }, {
-      dataIndex: 'specName',
-      title: "\u89C4\u683C\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 200
-    }, {
-      dataIndex: 'specCode',
-      title: "\u89C4\u683C\u7F16\u53F7",
-      align: 'center',
-      ellipsis: true,
-      width: 150
-    }, {
+    },
+    // {
+    //   dataIndex: 'specName',
+    //   title: `规格名称`,
+    //   align: 'center',
+    //   ellipsis: true,
+    //   width: 200,
+    // },
+    // {
+    //   dataIndex: 'specCode',
+    //   title: `规格编号`,
+    //   align: 'center',
+    //   ellipsis: true,
+    //   width: 150,
+    // },
+    {
       dataIndex: 'specId',
       title: "\u89C4\u683CID",
       align: 'center',
@@ -20607,9 +20610,8 @@ var getColumns$7 = function getColumns(_ref) {
           precision: 0,
           onChange: function onChange(num) {
             updateDataHandle({
-              qty: num,
-              amount: num && isNumberOrNumberString$1(record.price) ? num * record.price : null,
-              originAmount: num && isNumberOrNumberString$1(record.originPrice) ? num * record.originPrice : null
+              sellCount: num,
+              sellTotal: num && isNumberOrNumberString$1(record.sellPrice) ? num * record.sellPrice : null
             }, index);
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
@@ -20628,8 +20630,8 @@ var getColumns$7 = function getColumns(_ref) {
           precision: 2,
           onChange: function onChange(num) {
             updateDataHandle({
-              price: num,
-              amount: num && isNumberOrNumberString$1(record.qty) ? num * record.qty : null
+              sellPrice: num,
+              sellTotal: num && isNumberOrNumberString$1(record.sellCount) ? num * record.sellCount : null
             }, index);
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
@@ -20654,12 +20656,12 @@ var getColumns$7 = function getColumns(_ref) {
           },
           options: [{
             label: '是',
-            value: 1
+            value: 'True'
           }, {
             label: '否',
-            value: 0
+            value: 'False'
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+        }) : /*#__PURE__*/React.createElement("span", null, val === 'True' ? '是' : '否');
       }
     }, {
       dataIndex: 'combinationName',
@@ -20681,12 +20683,12 @@ var getColumns$7 = function getColumns(_ref) {
           },
           options: [{
             label: '是',
-            value: 1
+            value: '1'
           }, {
             label: '否',
-            value: 0
+            value: '0'
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+        }) : /*#__PURE__*/React.createElement("span", null, val === '1' ? '是' : '否');
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -25342,6 +25344,10 @@ var PublicReissue = function PublicReissue(props) {
         orderBackGoodsLevel: props.orderBackGoodsLevel,
         canEdit: true
       };
+    } else if (['JY_REISSUE_GOODS', 'JY_RETURN_GOODS'].includes(type)) {
+      orderRest = {
+        canEdit: true
+      };
     }
     var goodDetails = (order === null || order === void 0 ? void 0 : (_order$typeMap$type$g = order[typeMap$2[type].goodDetailsKey]) === null || _order$typeMap$type$g === void 0 ? void 0 : _order$typeMap$type$g.length) ? typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.updateGoodsHandle([order], orderRest)) : (_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.updateGoodsHandle([order], orderRest) : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;

package/dist/index.js

@@ -20285,10 +20285,6 @@ var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
   if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
   return false;
 };
-var getYesOrNo$4 = function getYesOrNo(val) {
-  if (kmkfUtils.isNull(val)) return null;
-  return val ? '是' : '否';
-};
 var getColumns$7 = function getColumns(_ref) {
   var _ref$text = _ref.text,
     disabled = _ref.disabled,
@@ -20510,19 +20506,23 @@ var getColumns$7 = function getColumns(_ref) {
       });
     }),
     // 巨益补发商品信息
-    JY_REISSUE_GOODS: [{
-      dataIndex: 'goodsName',
-      title: "\u8D27\u54C1\u540D\u79F0",
-      width: 150
-    }, {
-      dataIndex: 'goodsCode',
-      title: "\u8D27\u54C1\u7F16\u53F7",
-      width: 200
-    }, {
-      dataIndex: 'goodsId',
-      title: "\u8D27\u54C1ID",
-      width: 150
-    }, {
+    JY_REISSUE_GOODS: [
+    // {
+    //   dataIndex: 'goodsName',
+    //   title: `货品名称`,
+    //   width: 150,
+    // },
+    // {
+    //   dataIndex: 'goodsCode',
+    //   title: `货品编号`,
+    //   width: 200,
+    // },
+    // {
+    //   dataIndex: 'goodsId',
+    //   title: `货品ID`,
+    //   width: 150,
+    // },
+    {
       dataIndex: 'goodsClass',
       title: "\u8D27\u54C1\u7C7B\u522B",
       width: 150
@@ -20530,19 +20530,22 @@ var getColumns$7 = function getColumns(_ref) {
       dataIndex: 'code',
       title: "\u6761\u7801",
       width: 150
-    }, {
-      dataIndex: 'specName',
-      title: "\u89C4\u683C\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 200
-    }, {
-      dataIndex: 'specCode',
-      title: "\u89C4\u683C\u7F16\u53F7",
-      align: 'center',
-      ellipsis: true,
-      width: 150
-    }, {
+    },
+    // {
+    //   dataIndex: 'specName',
+    //   title: `规格名称`,
+    //   align: 'center',
+    //   ellipsis: true,
+    //   width: 200,
+    // },
+    // {
+    //   dataIndex: 'specCode',
+    //   title: `规格编号`,
+    //   align: 'center',
+    //   ellipsis: true,
+    //   width: 150,
+    // },
+    {
       dataIndex: 'specId',
       title: "\u89C4\u683CID",
       align: 'center',
@@ -20622,9 +20625,8 @@ var getColumns$7 = function getColumns(_ref) {
           precision: 0,
           onChange: function onChange(num) {
             updateDataHandle({
-              qty: num,
-              amount: num && isNumberOrNumberString$1(record.price) ? num * record.price : null,
-              originAmount: num && isNumberOrNumberString$1(record.originPrice) ? num * record.originPrice : null
+              sellCount: num,
+              sellTotal: num && isNumberOrNumberString$1(record.sellPrice) ? num * record.sellPrice : null
             }, index);
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
@@ -20643,8 +20645,8 @@ var getColumns$7 = function getColumns(_ref) {
           precision: 2,
           onChange: function onChange(num) {
             updateDataHandle({
-              price: num,
-              amount: num && isNumberOrNumberString$1(record.qty) ? num * record.qty : null
+              sellPrice: num,
+              sellTotal: num && isNumberOrNumberString$1(record.sellCount) ? num * record.sellCount : null
             }, index);
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
@@ -20669,12 +20671,12 @@ var getColumns$7 = function getColumns(_ref) {
           },
           options: [{
             label: '是',
-            value: 1
+            value: 'True'
           }, {
             label: '否',
-            value: 0
+            value: 'False'
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$4(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 'True' ? '是' : '否');
       }
     }, {
       dataIndex: 'combinationName',
@@ -20696,12 +20698,12 @@ var getColumns$7 = function getColumns(_ref) {
           },
           options: [{
             label: '是',
-            value: 1
+            value: '1'
           }, {
             label: '否',
-            value: 0
+            value: '0'
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$4(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -25357,6 +25359,10 @@ var PublicReissue = function PublicReissue(props) {
         orderBackGoodsLevel: props.orderBackGoodsLevel,
         canEdit: true
       };
+    } else if (['JY_REISSUE_GOODS', 'JY_RETURN_GOODS'].includes(type)) {
+      orderRest = {
+        canEdit: true
+      };
     }
     var goodDetails = (order === null || order === void 0 ? void 0 : (_order$typeMap$type$g = order[typeMap$2[type].goodDetailsKey]) === null || _order$typeMap$type$g === void 0 ? void 0 : _order$typeMap$type$g.length) ? typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.updateGoodsHandle([order], orderRest)) : (_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.updateGoodsHandle([order], orderRest) : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.2.13-beta.11",
+  "version": "2.2.13-beta.13",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,7 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "2.2.13-beta.11",
+    "@kmkf-fe-packages/kmkf-utils": "2.2.13-beta.13",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "08f751ed4f907685178ea27d4fba6111a4b42f48"
+  "gitHead": "d13993c1a428abf279bedf9f20f00dd3e3fb360a"
 }