kmkf-work-order-service-component 0.0.1-alpha.1 → 0.0.1-alpha.10

package/README.md

@@ -1,3 +1,11 @@
+<!--
+ * @Description:
+ * @Author: litian
+ * @Date: 2022-09-21 09:16:51
+ * @LastEditors: litian
+ * @LastEditTime: 2022-09-22 11:27:58
+-->
+
 # kmkf-work-order-service-component
 
 ## Getting Started
@@ -31,3 +39,33 @@ Build library via `father`,
 ```bash
 $ npm run build
 ```
+
+## 企业工单工单项目抽离模块
+
+- 自定义工单
+- 打款工单
+
+link 方式 https://cloud.tencent.com/developer/article/1842631
+
+模块引用方式
+
+```
+import { WorkOrder } from 'kmkf-work-order-service-component'
+
+cosnt Text = ()=>{
+  return <WorkOrder platform="FXG"
+        shopId={shopId}
+        buyerNick={buyerNick}
+        buyerId={buyerId}
+        orderNo={orderNo}></WorkOrder>
+}
+
+```
+
+| 字段      | 说明     | 数据类型                             |
+| --------- | -------- | ------------------------------------ |
+| platform  | 平台     | TAOBAO =淘宝\|FXG=抖音\|PDD=拼多多\| |
+| shopId    | 店铺 ID  | number                               |
+| buyerNick | 买家昵称 | string                               |
+| buyerId   | 买家 id  | string                               |
+| orderNo   | 订单 id  | string                               |

package/dist/esm/WorkOrder/common/cache/index.d.ts

@@ -10,11 +10,13 @@ declare const _default: {
     getAllFormatExpressData: () => any;
     setHistoryList: (data?: historyListType[]) => void;
     getHistoryList: () => historyListType[];
-    setGrayEnv: (isGray: boolean) => void;
-    getGrayEnv: () => any;
+    setGrayEnv: (isGray: string) => void;
+    getGrayEnv: () => string | null;
     setHost: (host: string) => void;
     getHost: () => any;
+    removeHost: () => any;
     setCookie: (cookie: string) => void;
     getCookie: () => any;
+    removeCookie: () => void;
 };
 export default _default;

package/dist/esm/WorkOrder/common/cache/index.js

@@ -2,83 +2,91 @@
  * @Author: wangzhenggui jianjia.wzg@raycloud.com
  * @Date: 2022-09-14 15:05:38
  * @LastEditors: litian
- * @LastEditTime: 2022-09-15 17:32:16
+ * @LastEditTime: 2022-09-21 10:06:27
  * @FilePath: /dy-work-order/src/common/cache/index.ts
  * @Description:
  *
  * Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved.
  */
-import store from 'store2';
-
 // 地市信息
 var setAddressData = function setAddressData(data) {
-  store.set('addressData', data);
+  localStorage.setItem('addressData', JSON.stringify(data));
 };
 
 var getAddressData = function getAddressData() {
-  return store.get('addressData');
+  return JSON.parse(localStorage.getItem('addressData') || '[]');
 };
 
 var setAddressNameMap = function setAddressNameMap(data) {
-  store.set('addressNameMap', data);
+  localStorage.setItem('addressNameMap', JSON.stringify(data));
 };
 
 var getAddressNameMap = function getAddressNameMap() {
-  return store.get('addressNameMap');
+  return JSON.parse(localStorage.getItem('addressNameMap') || '{}');
 }; // 物流公司信息
 
 
 var setAllOriginExpressData = function setAllOriginExpressData(data) {
-  store.set('allOriginExpressData', data);
+  localStorage.setItem('allOriginExpressData', JSON.stringify(data));
 };
 
 var getAllOriginExpressData = function getAllOriginExpressData() {
-  return store.get('allOriginExpressData');
+  return JSON.parse(localStorage.getItem('allOriginExpressData') || '[]');
 };
 
 var setAllFormatExpressData = function setAllFormatExpressData(data) {
-  store.set('allFormatExpressData', data);
+  localStorage.setItem('allFormatExpressData', JSON.stringify(data));
 };
 
 var getAllFormatExpressData = function getAllFormatExpressData() {
-  return store.get('allFormatExpressData');
+  return JSON.parse(localStorage.getItem('allFormatExpressData') || '[]');
 }; // 用户登陆信息
 
 
 var setHistoryList = function setHistoryList() {
   var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  store.set('historyList', data);
+  localStorage.setItem('historyList', JSON.stringify(data) || '[]');
 };
 
 var getHistoryList = function getHistoryList() {
-  return store.get('historyList') || [];
+  return JSON.parse(localStorage.getItem('historyList') || '[]');
 }; // 设置灰度环境
 
 
 var setGrayEnv = function setGrayEnv(isGray) {
-  store.set('grayEnv', isGray);
+  localStorage.setItem('grayEnv', isGray);
 };
 
 var getGrayEnv = function getGrayEnv() {
-  return store.get('grayEnv');
+  return localStorage.getItem('grayEnv');
 }; // 设置当前host
 
 
 var setHost = function setHost(host) {
-  store.local.set('kmkf_kmgd_host', host);
+  localStorage.setItem('kmkf_kmgd_host', host);
 };
 
 var getHost = function getHost() {
-  return store.local.get('kmkf_kmgd_host');
+  return localStorage.getItem('kmkf_kmgd_host');
+};
+
+var removeHost = function removeHost() {
+  return localStorage.removeItem('kmkf_kmgd_host');
 }; // 设置cookie
 
 
 var setCookie = function setCookie(cookie) {
-  store.local.set('kmkf_kmgd_cookie', cookie);
-};
+  localStorage.setItem('kmkf_kmgd_cookie', cookie);
+}; //获取cookie
+
 
 var getCookie = function getCookie() {
-  return store.local.get('kmkf_kmgd_cookie');
+  return localStorage.getItem('kmkf_kmgd_cookie');
+}; //删除cookie
+
+
+var removeCookie = function removeCookie() {
+  localStorage.removeItem('kmkf_kmgd_cookie');
 };
 
 export default {
@@ -96,6 +104,8 @@ export default {
   getGrayEnv: getGrayEnv,
   setHost: setHost,
   getHost: getHost,
+  removeHost: removeHost,
   setCookie: setCookie,
-  getCookie: getCookie
+  getCookie: getCookie,
+  removeCookie: removeCookie
 };

package/dist/esm/WorkOrder/common/constant.js

@@ -1,8 +1,8 @@
 /*
  * @Author: wangzhenggui jianjia.wzg@raycloud.com
  * @Date: 2022-09-14 16:01:46
- * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-09-14 16:04:02
+ * @LastEditors: litian
+ * @LastEditTime: 2022-09-19 17:33:45
  * @FilePath: /dy-work-order/src/common/constant.ts
  * @Description:
  *

package/dist/esm/WorkOrder/common/styles/base.less

@@ -1,3 +1,3 @@
-@import 'antd/dist/antd.css';
-@import 'normalize.css';
+// @import 'antd/dist/antd.css';
+// @import 'normalize.css';
 @import './theme.less';

package/dist/esm/WorkOrder/common/styles/theme.less

@@ -24,6 +24,7 @@ a {
   height: 24px;
 }
 
+.ant-modal-content .ant-btn-primary,
 .ant-btn-primary {
   background: #1966ff;
 }
@@ -31,7 +32,9 @@ a {
 .ant-input,
 .ant-btn-primary,
 .ant-pagination-options-quick-jumper input,
-.ant-select:not(.ant-select-customize-input) .ant-select-selector {
+.ant-select:not(.ant-select-customize-input) .ant-select-selector,
+.ant-modal-content,
+.ant-btn {
   border-radius: 4px;
 }
 
@@ -49,3 +52,45 @@ a {
 .ant-upload-picture-card-wrapper {
   width: auto;
 }
+
+.ant-form-item-label {
+  color: rgba(0, 0, 0, 0.55);
+  font-weight: normal;
+  font-size: 14px;
+  text-align: left;
+}
+
+.ant-form-item {
+  margin-bottom: 20px;
+}
+
+.ant-cascader-menu-item-content {
+  max-width: 150px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.ant-picker-panel-container .ant-picker-panels {
+  flex-wrap: wrap;
+}
+
+.goodsMain {
+  height: 260px;
+
+  .goodItem {
+    box-sizing: border-box;
+    width: 85px;
+    height: 126px;
+    margin: 0 8px 8px 0;
+    padding: 4px;
+    background: #ffffff;
+    border: 1px solid rgba(0, 0, 0, 0.15);
+    border-radius: 4px;
+
+    .goodImg {
+      width: 77px;
+      height: 77px;
+    }
+  }
+}

package/dist/esm/WorkOrder/common/utils/formatAddrData.js

@@ -11,7 +11,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
  * @Author: litian
  * @Date: 2022-09-07 18:12:23
  * @LastEditors: litian
- * @LastEditTime: 2022-09-15 19:15:02
+ * @LastEditTime: 2022-09-21 10:34:39
  */
 
 /*处理省市区*/
@@ -34,7 +34,7 @@ var formatAddrData = {
             case 0:
               apaasAddress = window.localStorage.getItem('address');
               apaasAddressMap = window.localStorage.getItem('addressMap');
-              apaasSaveTime = window.localStorage.getItem('apaasSaveTime'); //判断是否过期 缓存7天
+              apaasSaveTime = window.localStorage.getItem('addressSaveTime'); //判断是否过期 缓存7天
 
               isExpire = apaasSaveTime ? Number(apaasSaveTime) + 7 * 3600 * 24 * 1000 < new Date().getTime() : true;
 
@@ -43,8 +43,8 @@ var formatAddrData = {
                 break;
               }
 
-              this.addrData = apaasAddress;
-              this.addrNameMap = apaasAddressMap;
+              this.addrData = JSON.parse(apaasAddress);
+              this.addrNameMap = JSON.parse(apaasAddressMap || '{}');
               return _context.abrupt("return");
 
             case 8:
@@ -71,7 +71,7 @@ var formatAddrData = {
               this.addrNameMap = map;
               window.localStorage.setItem('address', JSON.stringify(res));
               window.localStorage.setItem('addressMap', JSON.stringify(map));
-              window.localStorage.setItem('apaasSaveTime', new Date().getTime().toString());
+              window.localStorage.setItem('addressSaveTime', new Date().getTime().toString());
 
             case 19:
             case "end":
@@ -128,6 +128,7 @@ var formatAddrData = {
     }
   },
   getNameByCode: function getNameByCode(code) {
+    console.log('getNameByCode', code, ((this.addrData || {})[code] || [])[0]);
     return ((this.addrData || {})[code] || [])[0];
   }
 };

package/dist/esm/WorkOrder/common/utils/tools.d.ts

@@ -13,7 +13,7 @@ export declare const findLabelBySelectValue: (vales: any[], options: {
  * 多级下拉框数据转换成aPaas数据结构
  * @param {*} sourceOptions
  */
-export declare const transMultSelectOptions: (sourceOptions: any[]) => any[];
+export declare const transMultSelectOptions: (sourceOptions: any[]) => any;
 /**
  * @param {*} nowData
  * @param {*} sourceTemplateDetail
@@ -61,3 +61,4 @@ export interface WorkOrderDetail {
 export declare const formatPictures: (pictures: any) => any;
 export declare const calcWorkOrderList: (source: Partial<WorkOrderDetail>[], templateColumns: TemplateColumnConfig[], type?: string) => any[];
 export declare const orderBack: ({ order_no, form, shopId, shopList, templateDetail }: any) => Promise<void>;
+export declare const imgResize: (url: string, w?: number, h?: number) => string;

package/dist/esm/WorkOrder/common/utils/tools.js

@@ -17,6 +17,7 @@ import V from 'voca';
 import { orderDetail } from "../../model/servers/api";
 import moment from 'moment';
 import express from "./express";
+import cache from "../cache";
 var ONLY_SHOW_COMPONENT_TYPE = ['RADIO', 'INPUT', 'TEXTAREA', 'CHECKBOX', 'SELECT', 'DATETIME', 'PICTURE', 'MULT_SELECT', 'ORDINARY_INVOICE'];
 /**
  * 校验数据是不是空
@@ -94,7 +95,8 @@ var findNodeById = function findNodeById(tree) {
 
 export var transMultSelectOptions = function transMultSelectOptions(sourceOptions) {
   var tree = [];
-  sourceOptions.map(function (item) {
+  var newOptions = JSON.parse(JSON.stringify(sourceOptions));
+  newOptions.map(function (item) {
     if (tree.length === 0) {
       return tree = tree.concat(get(item, 'list.1', []));
     }
@@ -102,9 +104,7 @@ export var transMultSelectOptions = function transMultSelectOptions(sourceOption
     Object.keys(item.list).map(function (l) {
       // 在树中找到l对应的节点，将当前数组放到children里面
       var result = findNodeById(tree, l);
-      result && (result = _objectSpread(_objectSpread({}, result), {}, {
-        children: item.list[l]
-      }));
+      result && (result.children = item.list[l]);
     });
   });
   return tree;
@@ -147,6 +147,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         name: item.name
       });
       params.buyerNick = get(nowData, "".concat(item.uniqueKey, ".buyerNick"), '');
+      params.buyerOpenUid = get(nowData, "".concat(item.uniqueKey, ".buyerOpenUid"), '');
     } else if (item.workOrderComponentType === 'RECEIVER_ADDRESS_INPUT') {
       contentVoList.push({
         uniqueKey: "".concat(item.uniqueKey, "_province"),
@@ -235,6 +236,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
     } else if (item.workOrderComponentType === 'PICTURE') {
       var _value$map;
 
+      var host = cache.getHost();
       var value = nowData[item.uniqueKey];
       contentVoList.push({
         uniqueKey: "".concat(item.uniqueKey, "_picture"),
@@ -245,8 +247,8 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
             item = item.substring(1, item.length);
           }
 
-          if (item.startsWith(window.location.origin)) {
-            item = item.replace("".concat(window.location.origin, "/"), '');
+          if (item.startsWith(host)) {
+            item = item.replace("".concat(host, "/"), '');
           }
 
           return item;
@@ -362,6 +364,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         });
       });
 
+      params.buyerNick = get(nowData, "".concat(item.uniqueKey, ".enterprisePaymentBuyerNick"), '');
       params.buyerOpenUid = get(nowData, "".concat(item.uniqueKey, ".enterprisePaymentBuyerOpenUid"), '');
     } else if (item.workOrderComponentType === 'ITEM_ID') {
       contentVoList.push({
@@ -511,8 +514,9 @@ var transDataSource = function transDataSource(templateColumns) {
       } else if (nex.workOrderComponentType === 'DATETIME') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_dateTime")], item.jsonMap["".concat(nex.uniqueKey, "_dateTime")]) || config.dateTime));
       } else if (nex.workOrderComponentType === 'PICTURE') {
+        var host = cache.getHost();
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_picture")] ? formatPictures(item.jsonMap["".concat(nex.uniqueKey, "_picture")]).map(function (item) {
-          return "".concat(window.location.origin, "/").concat(item);
+          return "".concat(host, "/").concat(item);
         }) : []));
       } else if (nex.workOrderComponentType === 'BASIC_MULT_SELECT') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_basicMultSelect")], '') || config.basicMultSelect || []));
@@ -617,7 +621,7 @@ export var orderBack = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
     var _shopList$find;
 
-    var order_no, form, shopId, shopList, templateDetail, shopSourceStr, _yield$orderDetail, data, orderNo, provinceCode, cityCode, townCode, orderCreateDateTime, orderPaymentDateTime, orderDeliveryDateTime, orderClosingDateTime, productId, productCode, transField, finalResponse, formValue, detail, componentsParams, detailsValue, enterprisePayment, newData;
+    var order_no, form, shopId, shopList, templateDetail, shopSourceStr, _yield$orderDetail, data, orderNo, provinceCode, cityCode, townCode, orderCreateDateTime, orderPaymentDateTime, orderDeliveryDateTime, orderClosingDateTime, productId, productCode, transField, finalResponse, formValue, detail, componentsParams, detailsValue, newData;
 
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
@@ -628,16 +632,7 @@ export var orderBack = /*#__PURE__*/function () {
             shopSourceStr = (_shopList$find = shopList.find(function (item) {
               return item.shopId == shopId;
             })) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopSourceStr;
-
-            if (!(shopSourceStr !== 'FXG')) {
-              _context.next = 5;
-              break;
-            }
-
-            return _context.abrupt("return");
-
-          case 5:
-            _context.next = 7;
+            _context.next = 5;
             return orderDetail({
               shopId: shopId,
               //店铺id
@@ -645,10 +640,18 @@ export var orderBack = /*#__PURE__*/function () {
 
             });
 
-          case 7:
+          case 5:
             _yield$orderDetail = _context.sent;
             data = _yield$orderDetail.data;
-            console.log(data);
+
+            if (data) {
+              _context.next = 9;
+              break;
+            }
+
+            return _context.abrupt("return");
+
+          case 9:
             orderNo = data.orderNo, provinceCode = data.provinceCode, cityCode = data.cityCode, townCode = data.townCode, orderCreateDateTime = data.orderCreateDateTime, orderPaymentDateTime = data.orderPaymentDateTime, orderDeliveryDateTime = data.orderDeliveryDateTime, orderClosingDateTime = data.orderClosingDateTime, productId = data.productId, productCode = data.productCode;
             transField = {
               tradeId: orderNo,
@@ -665,8 +668,7 @@ export var orderBack = /*#__PURE__*/function () {
             finalResponse = _objectSpread(_objectSpread({}, data), transField); //获取当前表单字段
 
             formValue = form.getFieldsValue();
-            detail = finalResponse || {};
-            console.log(shopSourceStr, finalResponse); //抖音数据
+            detail = finalResponse || {}; //抖音数据
 
             if (shopSourceStr === 'FXG') {
               detail = updateDYDetails(finalResponse);
@@ -704,6 +706,11 @@ export var orderBack = /*#__PURE__*/function () {
                     prv["".concat(uniqueKey, "_").concat(key)] = detail[key] ? moment(detail[key]).format('YYYY-MM-DD HH:mm:ss') : '';
                     break;
 
+                  case 'remark':
+                    prv[uniqueKey + '_remark'] = detail['remark'];
+                    prv[uniqueKey + '_flag'] = detail['flag'];
+                    break;
+
                   default:
                     prv["".concat(uniqueKey, "_").concat(key)] = detail[key];
                     break;
@@ -713,21 +720,23 @@ export var orderBack = /*#__PURE__*/function () {
               return prv;
             }, {}); //有打款组件返填订单编号
 
-            enterprisePayment = ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.children) || []).find(function (item) {
-              return item.type === 'ENTERPRISE_PAYMENT';
-            });
-
-            if (enterprisePayment) {
-              detailsValue["".concat(enterprisePayment.uniqueKey, "_enterprisePaymentTid")] = detail['tradeId'];
-            }
+            ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).forEach(function (item) {
+              if (item.workOrderComponentType === 'ENTERPRISE_PAYMENT') {
+                detailsValue["".concat(item.uniqueKey, "_enterprisePaymentTid")] = detail['tradeId'];
+                detailsValue["".concat(item.uniqueKey, "_enterprisePaymentBuyerOpenUid")] = formValue[item.uniqueKey]['buyerOpenUid'];
+              }
 
+              if (item.workOrderComponentType === 'BUYER_NICK_INPUT') {
+                detailsValue["".concat(item.uniqueKey, "_buyerOpenUid")] = formValue[item.uniqueKey]['buyerOpenUid'];
+              }
+            });
             newData = calcWorkOrderList([{
               jsonMap: detailsValue
-            }], templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'init');
-            console.log('detailsValue=========', formValue, detailsValue, newData[0]);
-            form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), newData[0]));
+            }], templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'init'); // console.log('detailsValue++', formValue, newData[0]);
 
-          case 24:
+            form.setFieldsValue(_objectSpread({}, newData[0]));
+
+          case 20:
           case "end":
             return _context.stop();
         }
@@ -819,4 +828,11 @@ var getComponentsValue = function getComponentsValue() {
 
     return prv;
   }, {});
+}; //图片压缩
+
+
+export var imgResize = function imgResize(url) {
+  var w = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 60;
+  var h = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 60;
+  return "".concat(url, "?x-oss-process=image/resize,h_").concat(h, ",w_").concat(w);
 };