kmkf-work-order-service-component 0.0.1-alpha.8 → 0.0.1

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

@@ -28,8 +28,8 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
  * @Description:
  * @Author: litian
  * @Date: 2022-09-06 17:44:56
- * @LastEditors: litian
- * @LastEditTime: 2022-09-23 14:35:55
+ * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
+ * @LastEditTime: 2022-10-11 16:40:30
  */
 import { createSlice, createAsyncThunk } from '@reduxjs/toolkit';
 import { queryGroupCustomTemplate, queryWorkOrder, queryCurrentCompanyUser, queryPaymentWorkOrderList } from "../model/servers/api";
@@ -51,13 +51,14 @@ var initialState = {
   //打款工单列表数量
   userInfo: {},
   //用户信息
+  loading: false,
   customSearch: {
     //自定义工单搜索条件
     pageNo: 1,
     pageSize: 20,
     tempSelect: [],
     filterDay: 29,
-    isBuyer: true
+    isBuyer: false
   },
   paySearch: {
     //打款工单搜索条件
@@ -66,7 +67,7 @@ var initialState = {
     time: [moment().subtract(31, 'day').startOf('day'), moment().endOf('day')],
     workPayStatus: '',
     timeType: 'submitTime',
-    isBuyer: true
+    isBuyer: false
   },
   templateDetails: {} //打开的模版
 
@@ -143,7 +144,7 @@ export var fetchQueryWorkOrder = createAsyncThunk('workOrder/queryWorkOrder', /*
             };
 
             if (isBuyer) {
-              params.buyerNick = global.platformInfo.buyerNick;
+              // params.buyerNick = global.platformInfo.buyerNick;
               params.buyerOpenUid = global.platformInfo.buyerId;
             }
 
@@ -199,7 +200,7 @@ export var fetchQueryPaymentWorkOrderList = createAsyncThunk('workOrder/queryPay
             }
 
             if (isBuyer) {
-              params.buyerNick = global.platformInfo.buyerNick;
+              // params.buyerNick = global.platformInfo.buyerNick;
               params.buyerOpenUid = global.platformInfo.buyerId;
             }
 
@@ -229,6 +230,10 @@ export var workOrderSlice = createSlice({
   reducers: {
     setState: function setState(state, action) {
       return _objectSpread(_objectSpread({}, state), action.payload);
+    },
+    setIsBuyer: function setIsBuyer(state, action) {
+      state.customSearch.isBuyer = action.payload;
+      state.paySearch.isBuyer = action.payload;
     }
   },
   extraReducers: function extraReducers(builder) {
@@ -265,18 +270,28 @@ export var workOrderSlice = createSlice({
       });
       state.groupAllList = groupAllList;
       state.customSearch.tempSelect = (groupAllList === null || groupAllList === void 0 ? void 0 : groupAllList.length) && [(_groupAllList$ = groupAllList[0]) === null || _groupAllList$ === void 0 ? void 0 : _groupAllList$.value, (_groupAllList$2 = groupAllList[0]) === null || _groupAllList$2 === void 0 ? void 0 : (_groupAllList$2$child = _groupAllList$2.children[0]) === null || _groupAllList$2$child === void 0 ? void 0 : _groupAllList$2$child.value];
-    }), builder.addCase(fetchQueryWorkOrder.fulfilled, function (state, action) {
+    }), builder.addCase(fetchQueryWorkOrder.pending, function (state) {
+      state.loading = true;
+    }).addCase(fetchQueryWorkOrder.fulfilled, function (state, action) {
       var _action$payload = action.payload,
           list = _action$payload.list,
           total = _action$payload.total;
       state.orderList = list || [];
       state.orderListTotal = total;
-    }), builder.addCase(fetchQueryPaymentWorkOrderList.fulfilled, function (state, action) {
+      state.loading = false;
+    }).addCase(fetchQueryWorkOrder.rejected, function (state) {
+      state.loading = false;
+    }), builder.addCase(fetchQueryPaymentWorkOrderList.pending, function (state) {
+      state.loading = true;
+    }).addCase(fetchQueryPaymentWorkOrderList.fulfilled, function (state, action) {
       var _action$payload2 = action.payload,
           list = _action$payload2.list,
           total = _action$payload2.total;
       state.payOrderList = list || [];
       state.payOrderListTotal = total;
+      state.loading = false;
+    }).addCase(fetchQueryPaymentWorkOrderList.rejected, function (state) {
+      state.loading = false;
     }), builder.addCase(fetchQueryCurrentCompanyUser.fulfilled, function (state, action) {
       var newData = action.payload;
       newData.shopList.forEach(function (item) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.0.1-alpha.8",
+  "version": "0.0.1",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -37,7 +37,7 @@
     "react-dom": "^17.0.2"
   },
   "dependencies": {
-    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.0.21-alpha.2",
+    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.0.22-alpha.6",
     "@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;
-// };