@kmkf-fe-packages/kmkf-work-order-service-component 2.2.13-beta.87 → 2.2.13-beta.89
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -180,6 +180,10 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
|
|
|
180
180
|
var bindERP = useAppSelector(function (state) {
|
|
181
181
|
return state.workOrder.userInfo.bindERP;
|
|
182
182
|
});
|
|
183
|
+
var hasBindWdt = useAppSelector(function (state) {
|
|
184
|
+
var _JSON$parse, _JSON$parse$plugins, _JSON$parse$plugins$w;
|
|
185
|
+
return ((_JSON$parse = JSON.parse(state.workOrder.userInfo.companyUserConfig || '{}')) === null || _JSON$parse === void 0 ? void 0 : (_JSON$parse$plugins = _JSON$parse.plugins) === null || _JSON$parse$plugins === void 0 ? void 0 : (_JSON$parse$plugins$w = _JSON$parse$plugins.wdt) === null || _JSON$parse$plugins$w === void 0 ? void 0 : _JSON$parse$plugins$w.show) || false;
|
|
186
|
+
});
|
|
183
187
|
var hasSuperAdminRole = useAppSelector(function (state) {
|
|
184
188
|
return state.workOrder.userInfo.hasSuperAdminRole;
|
|
185
189
|
});
|
|
@@ -639,7 +643,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
|
|
|
639
643
|
shopId: shopId,
|
|
640
644
|
userKey: userKey,
|
|
641
645
|
companyKey: companyKey,
|
|
642
|
-
bindERP: bindERP,
|
|
646
|
+
bindERP: bindERP || hasBindWdt,
|
|
643
647
|
hasSuperAdminRole: hasSuperAdminRole
|
|
644
648
|
},
|
|
645
649
|
callbackDealWorkOrderSuccess: onDealWorkOrderSuccess,
|
|
@@ -148,7 +148,6 @@ declare const _default: {
|
|
|
148
148
|
orderNo: string;
|
|
149
149
|
buyerNick: string;
|
|
150
150
|
buyerOpenUid: string | number;
|
|
151
|
-
statusDesc: string;
|
|
152
151
|
orderCreateDateTime: string | number;
|
|
153
152
|
orderPaymentDateTime: string | number;
|
|
154
153
|
actualReceiptPayment: number | undefined;
|
|
@@ -188,7 +187,6 @@ declare const _default: {
|
|
|
188
187
|
};
|
|
189
188
|
}[];
|
|
190
189
|
remark: string;
|
|
191
|
-
statusDesc?: undefined;
|
|
192
190
|
actualReceiptPayment?: undefined;
|
|
193
191
|
expressLogisticsCode?: undefined;
|
|
194
192
|
flag?: undefined;
|
|
@@ -220,8 +220,8 @@ var transformTardeInfo = function transformTardeInfo(buyer, tradeInfo) {
|
|
|
220
220
|
// BUYER_NICK_INPUT 买家昵称
|
|
221
221
|
buyerNick: buyer.buyerNick,
|
|
222
222
|
buyerOpenUid: buyer.buyerId,
|
|
223
|
-
// ERP_ORDER_STATUS
|
|
224
|
-
statusDesc: tradeInfo.orderStatusStr,
|
|
223
|
+
// // ERP_ORDER_STATUS 这个值和后端接口拿到的不一致,所以不反填了
|
|
224
|
+
// statusDesc: tradeInfo.orderStatusStr,
|
|
225
225
|
// RECEIVER_NAME_INPUT 收件人姓名
|
|
226
226
|
// RECEIVER_MOBILE_INPUT 收件人手机号
|
|
227
227
|
// RECEIVER_ADDRESS_INPUT 收货地址
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/kmkf-work-order-service-component",
|
|
3
|
-
"version": "2.2.13-beta.
|
|
3
|
+
"version": "2.2.13-beta.89",
|
|
4
4
|
"module": "dist/esm/index.js",
|
|
5
5
|
"typings": "dist/esm/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -74,7 +74,7 @@
|
|
|
74
74
|
"publishConfig": {
|
|
75
75
|
"access": "public"
|
|
76
76
|
},
|
|
77
|
-
"gitHead": "
|
|
77
|
+
"gitHead": "7d51da1d9748451c7097d8821f9cd71acc1b8eed",
|
|
78
78
|
"gitHooks": {
|
|
79
79
|
"pre-commit": "lint-staged"
|
|
80
80
|
}
|