@kmkf-fe-packages/basic-components 2.2.13-beta.5 → 2.2.13-beta.8

package/dist/index.esm.js

@@ -9559,7 +9559,7 @@ var renderMap = {
     return /*#__PURE__*/React.createElement(FileRender, {
       id: "fileRender",
       fileList: value,
-      canDownload: !['ks', 'fxg'].includes(platform || '')
+      canDownload: !['ks', 'fxg', 'xiaozhi'].includes(platform || '')
     });
   },
   CHECKBOX: function CHECKBOX(value) {
@@ -9662,7 +9662,7 @@ var EditFileRender = function EditFileRender(_ref7) {
   })), /*#__PURE__*/React.createElement(FileRender, {
     id: "fileEdit",
     fileList: val,
-    canDownload: !['ks', 'fxg'].includes(platform)
+    canDownload: !['ks', 'fxg', 'xiaozhi'].includes(platform)
   }));
 };
 var EditRenderMap = {
@@ -20295,7 +20295,7 @@ var getColumns$7 = function getColumns(_ref) {
       width: 150
     }, {
       dataIndex: 'goodsClass',
-      title: "\u8D27\u54C1ID",
+      title: "\u8D27\u54C1\u7C7B\u522B",
       width: 150
     }, {
       dataIndex: 'code',
@@ -20331,12 +20331,6 @@ var getColumns$7 = function getColumns(_ref) {
       align: 'center',
       ellipsis: true,
       width: 150
-    }, {
-      dataIndex: 'productCode',
-      title: "\u7CFB\u7EDF\u5546\u54C1\u7F16\u7801",
-      align: 'center',
-      ellipsis: true,
-      width: 150
     }, {
       dataIndex: 'productId',
       title: "\u7CFB\u7EDF\u5546\u54C1ID",
@@ -20386,7 +20380,7 @@ var getColumns$7 = function getColumns(_ref) {
       ellipsis: true,
       width: 150
     }, {
-      dataIndex: 'sellcount',
+      dataIndex: 'sellCount',
       title: "\u6570\u91CF",
       width: 100,
       render: function render(val, record, index) {
@@ -20488,10 +20482,6 @@ var getColumns$7 = function getColumns(_ref) {
           }]
         }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
       }
-    }, {
-      dataIndex: 'skuNote',
-      title: "\u5546\u54C1\u5907\u6CE8",
-      width: 150
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
         align: 'center',
@@ -21180,6 +21170,13 @@ var processGoods$1 = function processGoods(_ref) {
       canUpdateNumber: canUpdateNumber,
       source: source
     });
+  } else if (isErpType.isJy(type)) {
+    newList = processJyGoods({
+      list: list,
+      type: type,
+      canUpdateNumber: canUpdateNumber,
+      source: source
+    });
   } else {
     newList = processDefaultGoods({
       list: list,
@@ -21190,11 +21187,26 @@ var processGoods$1 = function processGoods(_ref) {
   }
   return newList;
 };
-// 处理不同类型的商品数据
-var processWdtGoods$1 = function processWdtGoods(_ref2) {
+var processJyGoods = function processJyGoods(_ref2) {
   var list = _ref2.list,
-    type = _ref2.type,
     canUpdateNumber = _ref2.canUpdateNumber;
+  return list.map(function (item) {
+    return _objectSpread2(_objectSpread2({}, item), {}, {
+      uuid: uuid(),
+      canDelete: true,
+      sellCount: 1,
+      sellPrice: 0,
+      sellTotal: 0,
+      canEdit: true,
+      canUpdateNumber: canUpdateNumber
+    });
+  });
+};
+// 处理不同类型的商品数据
+var processWdtGoods$1 = function processWdtGoods(_ref3) {
+  var list = _ref3.list,
+    type = _ref3.type,
+    canUpdateNumber = _ref3.canUpdateNumber;
   return list.map(function (item) {
     var processedItem = _objectSpread2(_objectSpread2({}, item), {}, {
       uuid: uuid(),
@@ -21212,9 +21224,9 @@ var processWdtGoods$1 = function processWdtGoods(_ref2) {
     return processedItem;
   });
 };
-var processBsE3Goods$1 = function processBsE3Goods(_ref3) {
-  var list = _ref3.list,
-    canUpdateNumber = _ref3.canUpdateNumber;
+var processBsE3Goods$1 = function processBsE3Goods(_ref4) {
+  var list = _ref4.list,
+    canUpdateNumber = _ref4.canUpdateNumber;
   return list.map(function (item) {
     var specNo = item.specNo,
       specId = item.specId,
@@ -21249,9 +21261,9 @@ var processBsE3Goods$1 = function processBsE3Goods(_ref3) {
     });
   });
 };
-var processGyGoods$1 = function processGyGoods(_ref4) {
-  var list = _ref4.list,
-    source = _ref4.source;
+var processGyGoods$1 = function processGyGoods(_ref5) {
+  var list = _ref5.list,
+    source = _ref5.source;
   var isFormWorkOrder = source === 'workOrder';
   return list.map(function (item) {
     var goodName = item.goodName,
@@ -21278,8 +21290,8 @@ var processGyGoods$1 = function processGyGoods(_ref4) {
     });
   });
 };
-var processJstGoods$1 = function processJstGoods(_ref5) {
-  var list = _ref5.list;
+var processJstGoods$1 = function processJstGoods(_ref6) {
+  var list = _ref6.list;
   return list.map(function (item) {
     return {
       name: item.goodName,
@@ -21297,9 +21309,9 @@ var processJstGoods$1 = function processJstGoods(_ref5) {
     };
   });
 };
-var processKmGoods$1 = function processKmGoods(_ref6) {
-  var list = _ref6.list,
-    type = _ref6.type;
+var processKmGoods$1 = function processKmGoods(_ref7) {
+  var list = _ref7.list,
+    type = _ref7.type;
   var initParamsMap = {
     KM_GOODS: {
       num: 1
@@ -21329,9 +21341,9 @@ var processKmGoods$1 = function processKmGoods(_ref6) {
     }, initParamsMap[type] || {});
   });
 };
-var processDefaultGoods = function processDefaultGoods(_ref7) {
-  var list = _ref7.list,
-    canUpdateNumber = _ref7.canUpdateNumber;
+var processDefaultGoods = function processDefaultGoods(_ref8) {
+  var list = _ref8.list,
+    canUpdateNumber = _ref8.canUpdateNumber;
   return list.map(function (item) {
     var goodsId = item.goodsId,
       name = item.name,
@@ -22764,7 +22776,7 @@ var getJyOrderListSingleton = function getJyOrderListSingleton(orderNo) {
         singletonMap$6.delete(orderNo);
         reject(err);
       };
-      extendRequest('/qy/gdfw/oms/jyOrderDetail', {
+      extendRequest('/qy/gdfw/order/jyOrderDetail', {
         method: 'post',
         data: {
           tid: orderNo
@@ -24073,6 +24085,11 @@ var processAllOrders = function processAllOrders(_ref) {
     newList = processWlnOrders({
       data: data
     });
+  } else if (isErpType$1.isJy(type)) {
+    newList = processJyOrders({
+      data: data,
+      orderNo: orderNo
+    });
   } else {
     newList = processDefaultOrders({
       data: data
@@ -24104,12 +24121,20 @@ var processGyOrders = function processGyOrders(_ref4) {
   });
   return trades;
 };
-var processWlnOrders = function processWlnOrders(_ref5) {
-  var data = _ref5.data;
-  return (data === null || data === void 0 ? void 0 : data.orders) || [];
+var processJyOrders = function processJyOrders(_ref5) {
+  var data = _ref5.data,
+    orderNo = _ref5.orderNo;
+  var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
+    return getIsPlatformCodesIncludeOrderNos(item.platformCode, orderNo);
+  });
+  return trades;
 };
-var processDefaultOrders = function processDefaultOrders(_ref6) {
+var processWlnOrders = function processWlnOrders(_ref6) {
   var data = _ref6.data;
+  return (data === null || data === void 0 ? void 0 : data.orders) || [];
+};
+var processDefaultOrders = function processDefaultOrders(_ref7) {
+  var data = _ref7.data;
   return data || [];
 };
 

package/dist/index.js

@@ -9574,7 +9574,7 @@ var renderMap = {
     return /*#__PURE__*/React__default['default'].createElement(FileRender, {
       id: "fileRender",
       fileList: value,
-      canDownload: !['ks', 'fxg'].includes(platform || '')
+      canDownload: !['ks', 'fxg', 'xiaozhi'].includes(platform || '')
     });
   },
   CHECKBOX: function CHECKBOX(value) {
@@ -9677,7 +9677,7 @@ var EditFileRender = function EditFileRender(_ref7) {
   })), /*#__PURE__*/React__default['default'].createElement(FileRender, {
     id: "fileEdit",
     fileList: val,
-    canDownload: !['ks', 'fxg'].includes(platform)
+    canDownload: !['ks', 'fxg', 'xiaozhi'].includes(platform)
   }));
 };
 var EditRenderMap = {
@@ -20310,7 +20310,7 @@ var getColumns$7 = function getColumns(_ref) {
       width: 150
     }, {
       dataIndex: 'goodsClass',
-      title: "\u8D27\u54C1ID",
+      title: "\u8D27\u54C1\u7C7B\u522B",
       width: 150
     }, {
       dataIndex: 'code',
@@ -20346,12 +20346,6 @@ var getColumns$7 = function getColumns(_ref) {
       align: 'center',
       ellipsis: true,
       width: 150
-    }, {
-      dataIndex: 'productCode',
-      title: "\u7CFB\u7EDF\u5546\u54C1\u7F16\u7801",
-      align: 'center',
-      ellipsis: true,
-      width: 150
     }, {
       dataIndex: 'productId',
       title: "\u7CFB\u7EDF\u5546\u54C1ID",
@@ -20401,7 +20395,7 @@ var getColumns$7 = function getColumns(_ref) {
       ellipsis: true,
       width: 150
     }, {
-      dataIndex: 'sellcount',
+      dataIndex: 'sellCount',
       title: "\u6570\u91CF",
       width: 100,
       render: function render(val, record, index) {
@@ -20503,10 +20497,6 @@ var getColumns$7 = function getColumns(_ref) {
           }]
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$4(val));
       }
-    }, {
-      dataIndex: 'skuNote',
-      title: "\u5546\u54C1\u5907\u6CE8",
-      width: 150
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
         align: 'center',
@@ -21195,6 +21185,13 @@ var processGoods$1 = function processGoods(_ref) {
       canUpdateNumber: canUpdateNumber,
       source: source
     });
+  } else if (isErpType.isJy(type)) {
+    newList = processJyGoods({
+      list: list,
+      type: type,
+      canUpdateNumber: canUpdateNumber,
+      source: source
+    });
   } else {
     newList = processDefaultGoods({
       list: list,
@@ -21205,11 +21202,26 @@ var processGoods$1 = function processGoods(_ref) {
   }
   return newList;
 };
-// 处理不同类型的商品数据
-var processWdtGoods$1 = function processWdtGoods(_ref2) {
+var processJyGoods = function processJyGoods(_ref2) {
   var list = _ref2.list,
-    type = _ref2.type,
     canUpdateNumber = _ref2.canUpdateNumber;
+  return list.map(function (item) {
+    return _objectSpread2(_objectSpread2({}, item), {}, {
+      uuid: kmkfUtils.uuid(),
+      canDelete: true,
+      sellCount: 1,
+      sellPrice: 0,
+      sellTotal: 0,
+      canEdit: true,
+      canUpdateNumber: canUpdateNumber
+    });
+  });
+};
+// 处理不同类型的商品数据
+var processWdtGoods$1 = function processWdtGoods(_ref3) {
+  var list = _ref3.list,
+    type = _ref3.type,
+    canUpdateNumber = _ref3.canUpdateNumber;
   return list.map(function (item) {
     var processedItem = _objectSpread2(_objectSpread2({}, item), {}, {
       uuid: kmkfUtils.uuid(),
@@ -21227,9 +21239,9 @@ var processWdtGoods$1 = function processWdtGoods(_ref2) {
     return processedItem;
   });
 };
-var processBsE3Goods$1 = function processBsE3Goods(_ref3) {
-  var list = _ref3.list,
-    canUpdateNumber = _ref3.canUpdateNumber;
+var processBsE3Goods$1 = function processBsE3Goods(_ref4) {
+  var list = _ref4.list,
+    canUpdateNumber = _ref4.canUpdateNumber;
   return list.map(function (item) {
     var specNo = item.specNo,
       specId = item.specId,
@@ -21264,9 +21276,9 @@ var processBsE3Goods$1 = function processBsE3Goods(_ref3) {
     });
   });
 };
-var processGyGoods$1 = function processGyGoods(_ref4) {
-  var list = _ref4.list,
-    source = _ref4.source;
+var processGyGoods$1 = function processGyGoods(_ref5) {
+  var list = _ref5.list,
+    source = _ref5.source;
   var isFormWorkOrder = source === 'workOrder';
   return list.map(function (item) {
     var goodName = item.goodName,
@@ -21293,8 +21305,8 @@ var processGyGoods$1 = function processGyGoods(_ref4) {
     });
   });
 };
-var processJstGoods$1 = function processJstGoods(_ref5) {
-  var list = _ref5.list;
+var processJstGoods$1 = function processJstGoods(_ref6) {
+  var list = _ref6.list;
   return list.map(function (item) {
     return {
       name: item.goodName,
@@ -21312,9 +21324,9 @@ var processJstGoods$1 = function processJstGoods(_ref5) {
     };
   });
 };
-var processKmGoods$1 = function processKmGoods(_ref6) {
-  var list = _ref6.list,
-    type = _ref6.type;
+var processKmGoods$1 = function processKmGoods(_ref7) {
+  var list = _ref7.list,
+    type = _ref7.type;
   var initParamsMap = {
     KM_GOODS: {
       num: 1
@@ -21344,9 +21356,9 @@ var processKmGoods$1 = function processKmGoods(_ref6) {
     }, initParamsMap[type] || {});
   });
 };
-var processDefaultGoods = function processDefaultGoods(_ref7) {
-  var list = _ref7.list,
-    canUpdateNumber = _ref7.canUpdateNumber;
+var processDefaultGoods = function processDefaultGoods(_ref8) {
+  var list = _ref8.list,
+    canUpdateNumber = _ref8.canUpdateNumber;
   return list.map(function (item) {
     var goodsId = item.goodsId,
       name = item.name,
@@ -22779,7 +22791,7 @@ var getJyOrderListSingleton = function getJyOrderListSingleton(orderNo) {
         singletonMap$6.delete(orderNo);
         reject(err);
       };
-      extendRequest('/qy/gdfw/oms/jyOrderDetail', {
+      extendRequest('/qy/gdfw/order/jyOrderDetail', {
         method: 'post',
         data: {
           tid: orderNo
@@ -24088,6 +24100,11 @@ var processAllOrders = function processAllOrders(_ref) {
     newList = processWlnOrders({
       data: data
     });
+  } else if (isErpType$1.isJy(type)) {
+    newList = processJyOrders({
+      data: data,
+      orderNo: orderNo
+    });
   } else {
     newList = processDefaultOrders({
       data: data
@@ -24119,12 +24136,20 @@ var processGyOrders = function processGyOrders(_ref4) {
   });
   return trades;
 };
-var processWlnOrders = function processWlnOrders(_ref5) {
-  var data = _ref5.data;
-  return (data === null || data === void 0 ? void 0 : data.orders) || [];
+var processJyOrders = function processJyOrders(_ref5) {
+  var data = _ref5.data,
+    orderNo = _ref5.orderNo;
+  var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
+    return kmkfUtils.getIsPlatformCodesIncludeOrderNos(item.platformCode, orderNo);
+  });
+  return trades;
 };
-var processDefaultOrders = function processDefaultOrders(_ref6) {
+var processWlnOrders = function processWlnOrders(_ref6) {
   var data = _ref6.data;
+  return (data === null || data === void 0 ? void 0 : data.orders) || [];
+};
+var processDefaultOrders = function processDefaultOrders(_ref7) {
+  var data = _ref7.data;
   return data || [];
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.2.13-beta.5",
+  "version": "2.2.13-beta.8",
   "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.3",
+    "@kmkf-fe-packages/kmkf-utils": "2.2.13-beta.8",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3358a388585f748bd1439157578b8dd05532428a"
+  "gitHead": "2db797184619e2df510a5d81906af4670a55f494"
 }