kmkf-work-order-service-component 0.0.1-alpha.21 → 0.0.1-alpha.23

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

@@ -621,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, newData;
+    var order_no, form, shopId, shopList, templateDetail, shopSourceStr, _yield$orderDetail, data, orderNo, provinceCode, cityCode, townCode, orderCreateDateTime, orderPaymentDateTime, orderDeliveryDateTime, orderClosingDateTime, itemList, transField, finalResponse, formValue, detail, componentsParams, detailsValue;
 
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
@@ -652,7 +652,7 @@ export var orderBack = /*#__PURE__*/function () {
             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;
+            orderNo = data.orderNo, provinceCode = data.provinceCode, cityCode = data.cityCode, townCode = data.townCode, orderCreateDateTime = data.orderCreateDateTime, orderPaymentDateTime = data.orderPaymentDateTime, orderDeliveryDateTime = data.orderDeliveryDateTime, orderClosingDateTime = data.orderClosingDateTime, itemList = data.itemList;
             transField = {
               tradeId: orderNo,
               province: provinceCode,
@@ -662,8 +662,8 @@ export var orderBack = /*#__PURE__*/function () {
               tradePaymentDateTime: orderPaymentDateTime,
               tradeDeliveryDateTime: orderDeliveryDateTime,
               tradeClosingDateTime: orderClosingDateTime,
-              goodId: productId,
-              goodSerial: productCode
+              goodId: itemList,
+              goodSerial: itemList
             };
             finalResponse = _objectSpread(_objectSpread({}, data), transField); //获取当前表单字段
 
@@ -683,82 +683,58 @@ export var orderBack = /*#__PURE__*/function () {
               if (detail[next]) {
                 switch (next) {
                   case 'province':
-                    prv[uniqueKey + '_province'] = detail['province'];
-                    prv[uniqueKey + '_city'] = detail['city'] || '';
-                    prv[uniqueKey + '_district'] = detail['district'] || '';
-                    prv[uniqueKey + '_address'] = detail['address'] || '';
+                    prv[uniqueKey] = {
+                      address: [detail['province'], detail['city'], detail['district']],
+                      detail: detail['address'] || ''
+                    };
                     break;
 
                   case 'expressLogisticsCompany':
-                    prv[uniqueKey + '_expressLogisticsCompany'] = detail['expressLogisticsCompany'];
-                    prv[uniqueKey + '_expressLogisticsCode'] = detail['expressLogisticsCode'];
+                    prv[uniqueKey] = {
+                      company: detail['expressLogisticsCompany'],
+                      order: detail['expressLogisticsCode']
+                    };
                     break;
 
                   case 'alipayName':
-                    prv[uniqueKey + '_alipayName'] = detail['alipayName'];
-                    prv[uniqueKey + '_alipayAccount'] = detail['alipayAccount'];
+                    prv[uniqueKey] = {
+                      name: detail['alipayName'],
+                      user: detail['alipayAccount']
+                    };
                     break;
 
                   case 'tradePaymentDateTime':
                   case 'tradeCreateDateTime':
                   case 'tradeClosingDateTime':
                   case 'tradeDeliveryDateTime':
-                    prv["".concat(uniqueKey, "_").concat(key)] = detail[key] ? moment(detail[key]).format('YYYY-MM-DD HH:mm:ss') : '';
+                    prv[uniqueKey] = 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'];
+                    prv[uniqueKey] = {
+                      remark: detail['remark'] || '',
+                      flag: detail['flag']
+                    };
+                    break;
+
+                  case 'goodId':
+                  case 'goodSerial':
+                  case 'itemList':
+                    prv[uniqueKey] = detail['itemList'];
                     break;
 
                   default:
-                    prv["".concat(uniqueKey, "_").concat(key)] = detail[key];
+                    prv["".concat(uniqueKey)] = detail[key];
                     break;
                 }
               }
 
               return prv;
-            }, {}); //有打款组件返填订单编号
-
-            console.log('formValue', formValue);
-            ((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]['enterprisePaymentBuyerOpenUid'];
-                detailsValue["".concat(item.uniqueKey, "_enterprisePaymentBuyerNick")] = formValue[item.uniqueKey]['enterprisePaymentBuyerNick'];
-              }
+            }, {}); // console.log('detailsValue++', formValue, detailsValue);
 
-              if (item.workOrderComponentType === 'BUYER_NICK_INPUT') {
-                detailsValue["".concat(item.uniqueKey, "_buyerNick")] = formValue[item.uniqueKey]['buyerNick'];
-                detailsValue["".concat(item.uniqueKey, "_buyerOpenUid")] = formValue[item.uniqueKey]['buyerOpenUid'];
-              }
-
-              var GOOD_LIST = ['ITEM_ENCODE', 'ITEM_ID', 'ITEM_SELECT', 'ITEM_SELECT_THIRD'];
-
-              if (GOOD_LIST.includes(item.workOrderComponentType)) {
-                var itemList = detail['itemList'] || []; // let newList = itemList.map((t: any) => {
-                //   const { numIid, outerId, picUrl, platform, price, title } = t
-                //   let value = {
-                //     numIid,
-                //     outerId,
-                //     picUrl,
-                //     platform: platform.toLowerCase(),
-                //     price,
-                //     title
-                //   };
-                //   return value
-                // })
-
-                detailsValue["".concat(item.uniqueKey, "_itemList")] = JSON.stringify(itemList);
-              }
-            });
-            newData = calcWorkOrderList([{
-              jsonMap: detailsValue
-            }], templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'init');
-            console.log('detailsValue++', detailsValue, newData[0]);
-            form.setFieldsValue(_objectSpread({}, newData[0]));
+            form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), detailsValue));
 
-          case 22:
+          case 18:
           case "end":
             return _context.stop();
         }

package/dist/esm/WorkOrder/components/CustomizeFormModal/index.js

@@ -319,8 +319,8 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
               setWorkOrderDetail(_workOrderDetail.data);
 
               if (workOrderId) {
-                transData = calcWorkOrderList([(_workOrderDetail3 = _workOrderDetail) === null || _workOrderDetail3 === void 0 ? void 0 : _workOrderDetail3.data], _templateDetail === null || _templateDetail === void 0 ? void 0 : (_templateDetail$data = _templateDetail.data) === null || _templateDetail$data === void 0 ? void 0 : _templateDetail$data.componentDtoList); // console.log(transData);
-
+                transData = calcWorkOrderList([(_workOrderDetail3 = _workOrderDetail) === null || _workOrderDetail3 === void 0 ? void 0 : _workOrderDetail3.data], _templateDetail === null || _templateDetail === void 0 ? void 0 : (_templateDetail$data = _templateDetail.data) === null || _templateDetail$data === void 0 ? void 0 : _templateDetail$data.componentDtoList);
+                console.log(transData);
                 form.setFieldsValue(_objectSpread(_objectSpread({}, get(transData, '0', {})), {}, {
                   shopId: shopId,
                   shopName: record.shopName,

package/dist/esm/WorkOrder/components/TransferOrderModal/index.js

@@ -22,8 +22,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * @Description:
  * @Author: litian
  * @Date: 2022-09-15 10:51:44
- * @LastEditors: litian
- * @LastEditTime: 2022-09-28 13:55:39
+ * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
+ * @LastEditTime: 2022-10-11 17:53:02
  */
 import React, { useState, useImperativeHandle, forwardRef } from 'react';
 import { Modal, Form, Select } from 'antd';
@@ -118,6 +118,8 @@ var TransCustomerModal = function TransCustomerModal(props, ref) {
     centered: true,
     visible: visible,
     width: 400,
+    okText: "\u786E\u5B9A",
+    cancelText: "\u53D6\u6D88",
     onCancel: closeModal,
     onOk: handleTransCustomer,
     children: /*#__PURE__*/_jsx(Form.Item, {

package/dist/esm/WorkOrder/index.js

@@ -27,8 +27,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 /*
  * @Author: wangzhenggui jianjia.wzg@raycloud.com
  * @Date: 2022-09-16 11:19:43
- * @LastEditors: litian
- * @LastEditTime: 2022-10-10 17:28:55
+ * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
+ * @LastEditTime: 2022-10-11 16:54:06
  * @FilePath: /kmkf-work-order-service-component/src/WorkOrder/index.tsx
  * @Description:
  *
@@ -83,6 +83,19 @@ var WorkOrder = function WorkOrder(props) {
       tabActive = _useState2[0],
       setTabActive = _useState2[1];
 
+  useEffect(function () {
+    if (buyerNick) {
+      dispatch({
+        type: 'workOrder/setIsBuyer',
+        payload: true
+      });
+    } else {
+      dispatch({
+        type: 'workOrder/setIsBuyer',
+        payload: false
+      });
+    }
+  }, [buyerNick]);
   useEffect(function () {
     if (shopId != platformInfo.shopId) {
       initHandle();
@@ -188,10 +201,12 @@ var OrderList = function OrderList(tabActive) {
 
 
   var upDateState = function upDateState(type, val) {
+    var _objectSpread2;
+
     dispatch({
       type: 'workOrder/setState',
       payload: {
-        customSearch: _objectSpread(_objectSpread({}, customSearch), {}, _defineProperty({}, type, val))
+        customSearch: _objectSpread(_objectSpread({}, customSearch), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, type, val), _defineProperty(_objectSpread2, "pageNo", 1), _objectSpread2))
       }
     });
   }; //分页
@@ -368,7 +383,11 @@ var OrderList = function OrderList(tabActive) {
           className: "custom_box_search_buyer",
           checked: customSearch.isBuyer,
           onChange: function onChange(e) {
-            return upDateState('isBuyer', e.target.checked);
+            if (!platformInfo.buyerNick) {
+              return message.warning('请先选择买家，再查询工单!');
+            }
+
+            upDateState('isBuyer', e.target.checked);
           },
           children: "\u5F53\u524D\u4E70\u5BB6"
         })]
@@ -529,13 +548,12 @@ var PayOrderList = function PayOrderList(tabActive) {
 
 
   var upDateState = function upDateState(type, value) {
-    // if(type === 'time'){
-    //   value = value.length ? [value[0].valueOf(), value[1].valueOf()]:[]
-    // }
+    var _objectSpread3;
+
     dispatch({
       type: 'workOrder/setState',
       payload: {
-        paySearch: _objectSpread(_objectSpread({}, paySearch), {}, _defineProperty({}, type, value))
+        paySearch: _objectSpread(_objectSpread({}, paySearch), {}, (_objectSpread3 = {}, _defineProperty(_objectSpread3, type, value), _defineProperty(_objectSpread3, "pageNo", 1), _objectSpread3))
       }
     });
   };
@@ -604,7 +622,11 @@ var PayOrderList = function PayOrderList(tabActive) {
           className: "custom_box_search_buyer",
           checked: paySearch.isBuyer,
           onChange: function onChange(e) {
-            return upDateState('isBuyer', e.target.checked);
+            if (!platformInfo.buyerNick) {
+              return message.warning('请先选择买家，再查询工单!');
+            }
+
+            upDateState('isBuyer', e.target.checked);
           },
           children: "\u5F53\u524D\u4E70\u5BB6"
         }), /*#__PURE__*/_jsx(RangePicker, {

package/dist/esm/WorkOrder/model/workOrder.d.ts

@@ -21,6 +21,10 @@ export declare const workOrderSlice: import("@reduxjs/toolkit").Slice<any, {
         payload: any;
         type: string;
     }) => any;
+    setIsBuyer: (state: import("immer/dist/internal").WritableDraft<WorkOrderState>, action: {
+        payload: any;
+        type: string;
+    }) => void;
 }, "workOrder">;
 export declare const setState: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, string>;
 declare const _default: import("redux").Reducer<any, import("redux").AnyAction>;

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: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-10-10 15:41:22
+ * @LastEditTime: 2022-10-11 16:40:30
  */
 import { createSlice, createAsyncThunk } from '@reduxjs/toolkit';
 import { queryGroupCustomTemplate, queryWorkOrder, queryCurrentCompanyUser, queryPaymentWorkOrderList } from "../model/servers/api";
@@ -58,7 +58,7 @@ var initialState = {
     pageSize: 20,
     tempSelect: [],
     filterDay: 29,
-    isBuyer: true
+    isBuyer: false
   },
   paySearch: {
     //打款工单搜索条件
@@ -67,7 +67,7 @@ var initialState = {
     time: [moment().subtract(31, 'day').startOf('day'), moment().endOf('day')],
     workPayStatus: '',
     timeType: 'submitTime',
-    isBuyer: true
+    isBuyer: false
   },
   templateDetails: {} //打开的模版
 
@@ -230,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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.0.1-alpha.21",
+  "version": "0.0.1-alpha.23",
   "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.22-alpha.2",
+    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.0.22-alpha.3",
     "@reduxjs/toolkit": "^1.8.5",
     "react-redux": "^7.2.8",
     "store2": "^2.14.2",