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

package/dist/esm/WorkOrder/model/servers/request.js

@@ -8,12 +8,11 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Description:
  * @Author: litian
  * @Date: 2022-09-06 09:29:34
- * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-09-16 14:01:48
+ * @LastEditors: litian
+ * @LastEditTime: 2022-09-27 15:46:05
  */
 import { extend } from 'umi-request';
 import { message } from 'antd';
-import cache from "../../common/cache";
 
 var requestApi = function requestApi(_ref) {
   var url = _ref.url,
@@ -21,25 +20,21 @@ var requestApi = function requestApi(_ref) {
       data = _ref.data,
       _ref$headers = _ref.headers,
       headers = _ref$headers === void 0 ? {} : _ref$headers;
-  // const Host = cache.getHost() || 'https://kefu.kuaimai.com'
-  var Host = '';
-  var request = extend({
-    prefix: Host
-  });
+  var request = extend({});
   return new Promise(function (resolve, reject) {
-    var _cache$getCookie;
+    var _localStorage$getItem;
 
-    var cookies = (_cache$getCookie = cache.getCookie()) === null || _cache$getCookie === void 0 ? void 0 : _cache$getCookie.split(':');
-    console.log(cookies);
     var params = {
       method: method,
       headers: _objectSpread({
         'Content-type': 'application/json;charset=UTF-8'
       }, headers)
-    };
+    }; // const host = localStorage.getItem('kmkf_kmgd_host') || '';
+
+    var cookies = localStorage.getItem('kmkf_kmgd_cookie') ? (_localStorage$getItem = localStorage.getItem('kmkf_kmgd_cookie')) === null || _localStorage$getItem === void 0 ? void 0 : _localStorage$getItem.split(':') : [];
 
     if (cookies) {
-      params.headers = _objectSpread(_objectSpread({}, params.headers), {}, _defineProperty({}, cookies[0], [cookies[1]])); // params.credentials = 'include'
+      params.headers = _objectSpread(_objectSpread({}, params.headers), {}, _defineProperty({}, cookies[0], cookies[1]));
     }
 
     if (method === 'get') {
@@ -53,11 +48,8 @@ var requestApi = function requestApi(_ref) {
         resolve(res);
       } else {
         message.destroy();
-        message.error(res === null || res === void 0 ? void 0 : res.message); // reject(res)
-        //未登陆
-        // if (res.result === 700) {
-        //   redirectTo({ url: 'pages/login/index' })
-        // }
+        var msg = "".concat(url, "\u5931\u8D25\uFF1B").concat((res === null || res === void 0 ? void 0 : res.message) || '');
+        message.error(msg);
       }
     }).catch(function (e) {
       reject(e);

package/dist/esm/WorkOrder/model/workOrder.js

@@ -29,7 +29,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
  * @Author: litian
  * @Date: 2022-09-06 17:44:56
  * @LastEditors: litian
- * @LastEditTime: 2022-09-15 11:33:56
+ * @LastEditTime: 2022-09-23 14:35:55
  */
 import { createSlice, createAsyncThunk } from '@reduxjs/toolkit';
 import { queryGroupCustomTemplate, queryWorkOrder, queryCurrentCompanyUser, queryPaymentWorkOrderList } from "../model/servers/api";
@@ -56,7 +56,7 @@ var initialState = {
     pageNo: 1,
     pageSize: 20,
     tempSelect: [],
-    filterDay: 2,
+    filterDay: 29,
     isBuyer: true
   },
   paySearch: {
@@ -138,12 +138,13 @@ export var fetchQueryWorkOrder = createAsyncThunk('workOrder/queryWorkOrder', /*
               pageNo: pageNo,
               pageSize: pageSize,
               startEndDate: [startTime, endTime],
-              uniqueKey: tempSelect && tempSelect.length ? tempSelect[1] : ''
+              uniqueKey: tempSelect && tempSelect.length ? tempSelect[1] : '',
+              shopId: global.platformInfo.shopId
             };
 
             if (isBuyer) {
               params.buyerNick = global.platformInfo.buyerNick;
-              params.buyerId = global.platformInfo.buyerId;
+              params.buyerOpenUid = global.platformInfo.buyerId;
             }
 
             _context3.next = 8;
@@ -182,7 +183,8 @@ export var fetchQueryPaymentWorkOrderList = createAsyncThunk('workOrder/queryPay
             params = {
               workPayStatus: workPayStatus,
               pageNo: pageNo,
-              pageSize: pageSize
+              pageSize: pageSize,
+              shopId: global.platformInfo.shopId
             };
 
             if (timeType === 'submitTime') {
@@ -198,7 +200,7 @@ export var fetchQueryPaymentWorkOrderList = createAsyncThunk('workOrder/queryPay
 
             if (isBuyer) {
               params.buyerNick = global.platformInfo.buyerNick;
-              params.buyerId = global.platformInfo.buyerId;
+              params.buyerOpenUid = global.platformInfo.buyerId;
             }
 
             _context4.next = 9;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.0.1-alpha.1",
+  "version": "0.0.1-alpha.11",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -10,7 +10,9 @@
     "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
     "test": "umi-test",
     "test:coverage": "umi-test --coverage",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run build",
+    "async": "yarn build && yalc push",
+    "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "files": [
     "dist"
@@ -35,7 +37,7 @@
     "react-dom": "^17.0.2"
   },
   "dependencies": {
-    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.0.19-alpha.2",
+    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.0.21-alpha.2",
     "@reduxjs/toolkit": "^1.8.5",
     "react-redux": "^7.2.8",
     "store2": "^2.14.2",

package/dist/esm/WorkOrder/components/Widget/common/utils.js

@@ -1,98 +0,0 @@
-// import { get, isEmpty, find, keys } from 'lodash';
-// import V from 'voca';
-// const ONLY_SHOW_COMPONENT_TYPE = [
-//   'RADIO',
-//   'INPUT',
-//   'TEXTAREA',
-//   'CHECKBOX',
-//   'SELECT',
-//   'DATETIME',
-//   'PICTURE',
-//   'MULT_SELECT',
-//   'ORDINARY_INVOICE',
-// ];
-// /**
-//  * 校验数据是不是空
-//  * @param {*} value
-//  * @returns
-//  */
-// export const isNull = (value: number) => {
-//   return typeof value === 'object' ? isEmpty(value) : !value && value !== 0;
-// };
-// export const findLabelBySelectValue = (vales: any[], options: { [x: string]: { [x: string]: any; }; }) => {
-//   if (isEmpty(vales)) return [];
-//   const newKV: any[] = [];
-//   vales.map((value, index) => {
-//     const list = options[index]['list'];
-//     const flatt = keys(list).reduce((next: string | any[], cur: string | number) => {
-//       return next.concat(list[cur]);
-//     }, []);
-//     const label = get(find(flatt, { actived: value }), 'label');
-//     newKV.push({
-//       label,
-//       actived: value,
-//     });
-//   });
-//   return newKV;
-// };
-// export const formatPictures = (pictures: any) => {
-//   if (!pictures) return [];
-//   pictures = pictures.replace(/[\[\]]/g, '');
-//   pictures = pictures.replace(/\s/g, '');
-//   pictures = pictures ? pictures.split(',') : [];
-//   return pictures.map((item: any) => {
-//     return {
-//       thumbUrl: `http://gdfw.superboss.cc/${item}`,
-//       uid: `${Date.now()}-${Math.random()}`,
-//     };
-//   });
-// };
-// export const filterComponent = (originDataSource = []) => {
-//   return originDataSource.filter((data: any) =>
-//     ONLY_SHOW_COMPONENT_TYPE.includes(data?.workOrderComponentType),
-//   );
-// };
-// export const radioTextHandle = (radioValue: any, radioOtherValue: string) => {
-//   return radioValue === '其他'
-//     ? radioOtherValue
-//       ? `${radioValue}(${radioOtherValue})`
-//       : radioValue
-//     : radioValue;
-// };
-// const findNodeById = (tree: any[], actived: string = '') => {
-//   for (let i = 0; i < tree.length; i++) {
-//     if (tree[i].actived == actived) {
-//       return tree[i];
-//     }
-//     if (tree[i].children) {
-//       let result: any = findNodeById(tree[i].children, actived);
-//       if (result) {
-//         return result;
-//       }
-//     }
-//   }
-// };
-// /**
-//  * 多级下拉框数据转换成aPaas数据结构
-//  * @param {*} sourceOptions
-//  */
-// export const transMultSelectOptions = (sourceOptions: any[]) => {
-//   let tree: any[] = [];
-//   sourceOptions.map((item: any) => {
-//     if (tree.length === 0) {
-//       return (tree = tree.concat(get(item, 'list.1', [])));
-//     }
-//     Object.keys(item.list).map(l => {
-//       // 在树中找到l对应的节点，将当前数组放到children里面
-//       let result: any = findNodeById(tree, l);
-//       result && (result = { ...result, children: item.list[l] });
-//     });
-//   });
-//   return tree;
-// };
-// export const getCookie = (name: string) => {
-//   var arr,
-//     reg = new RegExp('(^| )' + name + '=([^;]*)(;|$)');
-//   if ((arr = document.cookie.match(reg))) return arr[2];
-//   else return null;
-// };