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

package/dist/esm/SingleShopWorkOrder/components/Card/index.js

@@ -125,10 +125,7 @@ function CustomizeWorkOrderCard(props) {
       style: {
         margin: '8px 0'
       }
-    }), /*#__PURE__*/_jsx(ItemView, {
-      label: "\u5E97\u94FA\u540D\u79F0",
-      value: transData.shopName
-    }, "shopName"), componentDtoList.map(function (t) {
+    }), componentDtoList.map(function (t) {
       var instance = factory(t.workOrderComponentType, {
         id: t.uniqueKey,
         name: t.name,

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

@@ -42,7 +42,7 @@ import moment from 'moment';
 import 'moment/locale/zh-cn';
 import { calcWorkOrderList, submitDataTransOldFormat, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME } from "../../../common/utils/tools";
 import { factory } from "../../../WorkOrder/components/Widget";
-import { querySingleShopTemplateDetail, addWorkOrder, querySingleShopWorkOrderDetail, updateSingleShopWorkOrder, replaceCheck } from "../../../model/servers/api";
+import { querySingleShopTemplateDetail, addSingleShopWorkOrder, querySingleShopWorkOrderDetail, updateSingleShopWorkOrder, replaceCheck } from "../../../model/servers/api";
 import { selectorFormModalVisible, selectorCurrentCustomizeRecord } from "../../../model/singleShopWorkOrder/selector";
 import { setFormModalVisible } from "../../../model/singleShopWorkOrder";
 import "./index.less";
@@ -112,7 +112,7 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
 
   var asyncDoSave = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(workOrderDetail, templateDetail) {
-      var data, res, params, submitData, _yield$updateSingleSh, success, result, platformMap, _params, hasEnterPrisePayment, getEnterPrisePaymentData, uniqueKey, componentConfig, _yield$addWorkOrder, _success, _result;
+      var data, res, params, submitData, _yield$updateSingleSh, success, result, platformMap, _params, hasEnterPrisePayment, getEnterPrisePaymentData, uniqueKey, componentConfig, _yield$addSingleShopW, _success, _result;
 
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
@@ -221,12 +221,12 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
 
               console.debug('增加数据参数', _params);
               _context.next = 31;
-              return addWorkOrder(_params);
+              return addSingleShopWorkOrder(_params);
 
             case 31:
-              _yield$addWorkOrder = _context.sent;
-              _success = _yield$addWorkOrder.success;
-              _result = _yield$addWorkOrder.data;
+              _yield$addSingleShopW = _context.sent;
+              _success = _yield$addSingleShopW.success;
+              _result = _yield$addSingleShopW.data;
 
               if (_success && typeof onSuccess === 'function') {
                 closeModal();
@@ -309,6 +309,13 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
         item.componentConfig = _objectSpread(_objectSpread({}, item.componentConfig), {}, {
           disabled: true
         });
+      } // 这里将图片上传组件中增加一个单店版属性，让他调用快麦工单上传接口
+
+
+      if (item.workOrderComponentType === 'PICTURE') {
+        item.componentConfig = _objectSpread(_objectSpread({}, item.componentConfig), {}, {
+          isSingleShop: true
+        });
       }
 
       var instance = factory(item.workOrderComponentType, {

package/dist/esm/SingleShopWorkOrder/index.js

@@ -76,6 +76,7 @@ var SingleShopWorkOrder = function SingleShopWorkOrder() {
   var submit = search.submit;
   var dataSource = tableProps.dataSource,
       pagination = tableProps.pagination;
+  console.log('pagination', pagination);
   useEffect(function () {
     dispatch(fetchTemplateList);
   }, []);
@@ -92,9 +93,16 @@ var SingleShopWorkOrder = function SingleShopWorkOrder() {
     dispatch(setTemplateId(id));
   };
 
+  var handleChangePagination = function handleChangePagination(page, pageSize) {
+    tableProps === null || tableProps === void 0 ? void 0 : tableProps.onChange(_objectSpread(_objectSpread({}, pagination), {}, {
+      current: page,
+      pageSize: pageSize
+    }));
+  };
+
   return /*#__PURE__*/_jsxs(Spin, {
     spinning: loading,
-    children: [/*#__PURE__*/_jsx("div", {
+    children: [(templateList === null || templateList === void 0 ? void 0 : templateList.length) === 0 ? /*#__PURE__*/_jsx(Empty, {}) : /*#__PURE__*/_jsx("div", {
       className: "single-shop-template-list",
       children: templateList === null || templateList === void 0 ? void 0 : templateList.map(function (t) {
         return /*#__PURE__*/_jsx("div", {
@@ -105,7 +113,7 @@ var SingleShopWorkOrder = function SingleShopWorkOrder() {
           children: t.label
         });
       })
-    }), /*#__PURE__*/_jsxs("main", {
+    }), (templateList === null || templateList === void 0 ? void 0 : templateList.length) > 0 && /*#__PURE__*/_jsxs("main", {
       className: "list-container",
       children: [/*#__PURE__*/_jsxs(Form, {
         form: form,
@@ -119,6 +127,9 @@ var SingleShopWorkOrder = function SingleShopWorkOrder() {
           children: /*#__PURE__*/_jsx(RangePicker, {
             onChange: function onChange() {
               return submit();
+            },
+            style: {
+              width: '100%'
             }
           })
         }), /*#__PURE__*/_jsx(Form.Item, {
@@ -140,7 +151,9 @@ var SingleShopWorkOrder = function SingleShopWorkOrder() {
         })]
       }), (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) > 0 ? /*#__PURE__*/_jsx(OrderList, {
         list: dataSource
-      }) : /*#__PURE__*/_jsx(Empty, {}), (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) > 0 && /*#__PURE__*/_jsx(Pagination, _objectSpread({}, pagination)), /*#__PURE__*/_jsx(DeleteCustomizeOrderModal, {
+      }) : /*#__PURE__*/_jsx(Empty, {}), (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) > 0 && /*#__PURE__*/_jsx(Pagination, _objectSpread(_objectSpread({}, pagination), {}, {
+        onChange: handleChangePagination
+      })), /*#__PURE__*/_jsx(DeleteCustomizeOrderModal, {
         submit: submit
       }), /*#__PURE__*/_jsx(CustomizeFormModal, {
         shopList: [],

package/dist/esm/SingleShopWorkOrder/index.less

@@ -5,6 +5,7 @@
   overflow-y: auto;
   background: #fff;
   .template-button {
+    height: 32px;
     margin: 4px;
     padding: 4px 8px;
     border: 1px solid #d9d9d9;
@@ -13,5 +14,7 @@
   }
 }
 .list-container {
-  margin-top: 16px;
+  margin-top: 4px;
+  padding: 8px 12px;
+  background: #fff;
 }

package/dist/esm/WorkOrder/components/Widget/basic/Picture/index.js

@@ -36,7 +36,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import React from 'react';
 import BasicComponent from "../../BasicComponent";
 import { getFormItem } from "../../common/formItemWrap";
-import { ApaasUploadAsync } from '@raycloud-apaas-fe-setup/apaas-react-basics-widgets';
+import { ApaasUploadAsync, ApaasUpload } from '@raycloud-apaas-fe-setup/apaas-react-basics-widgets';
 import { Image } from 'antd';
 import { imgResize } from "../../../../../common/utils/tools";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -79,7 +79,7 @@ var BasicPicture = /*#__PURE__*/function (_BasicComponent) {
         name: _this.id,
         rules: [],
         required: (_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.required,
-        component: /*#__PURE__*/_jsx(ApaasUploadAsync, _objectSpread(_objectSpread({}, _this.componentConfig), {}, {
+        component: _this.componentConfig.isSingleShop ? /*#__PURE__*/_jsx(ApaasUpload, _objectSpread({}, _this.componentConfig)) : /*#__PURE__*/_jsx(ApaasUploadAsync, _objectSpread(_objectSpread({}, _this.componentConfig), {}, {
           uniqueKey: _this.id,
           hostUrl: "https://kefu.kuaimai.com"
         }))

package/dist/esm/model/servers/api.d.ts

@@ -50,3 +50,4 @@ export declare const querySingleShopTemplateDetail: (data: {
 }) => Promise<any>;
 export declare const querySingleShopWorkOrderDetail: (data: any) => Promise<any>;
 export declare const updateSingleShopWorkOrder: (data: any) => Promise<any>;
+export declare const addSingleShopWorkOrder: (data: any) => Promise<any>;

package/dist/esm/model/servers/api.js

@@ -294,4 +294,12 @@ export var updateSingleShopWorkOrder = function updateSingleShopWorkOrder(data)
     method: 'post',
     data: data
   });
+}; // 添加工单
+
+export var addSingleShopWorkOrder = function addSingleShopWorkOrder(data) {
+  return request({
+    url: '/gdfw/workOrder/addWorkOrder',
+    method: 'post',
+    data: data
+  });
 };

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

@@ -27,7 +27,6 @@ var requestApi = function requestApi(_ref) {
       params.data = data;
     }
 
-    debugger;
     request(url, params).then(function (res) {
       if (res.result === 100 || res.success) {
         resolve(res);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.3.6-alpha.1",
+  "version": "0.3.6-alpha.10",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.1.1-alpha.2",
+    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.1.1",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",