kmkf-work-order-service-component 0.0.1-alpha.5 → 0.0.1-alpha.7

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

@@ -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

@@ -726,11 +726,11 @@ export var orderBack = /*#__PURE__*/function () {
 
             newData = calcWorkOrderList([{
               jsonMap: detailsValue
-            }], templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'init'); // console.log('detailsValue=========', formValue, detailsValue, newData[0]);
+            }], templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'init');
+            console.log('detailsValue=========', formValue, newData[0]);
+            form.setFieldsValue(_objectSpread(_objectSpread({}, newData[0]), formValue));
 
-            form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), newData[0]));
-
-          case 21:
+          case 22:
           case "end":
             return _context.stop();
         }
@@ -822,4 +822,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);
 };

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

@@ -329,6 +329,8 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
               } else {
                 //获取一些默认数据
                 jsonMap = _templateDetail === null || _templateDetail === void 0 ? void 0 : (_templateDetail$data2 = _templateDetail.data) === null || _templateDetail$data2 === void 0 ? void 0 : _templateDetail$data2.componentDtoList.reduce(function (prv, next) {
+                  console.log(next, next.workOrderComponentType);
+
                   if (next.workOrderComponentType === 'BUYER_NICK_INPUT') {
                     prv["".concat(next.uniqueKey, "_buyerOpenUid")] = buyerId;
                   }
@@ -338,7 +340,7 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
                   }
 
                   return prv;
-                });
+                }, {});
                 _transData = calcWorkOrderList([{
                   jsonMap: jsonMap
                 }], _templateDetail === null || _templateDetail === void 0 ? void 0 : (_templateDetail$data3 = _templateDetail.data) === null || _templateDetail$data3 === void 0 ? void 0 : _templateDetail$data3.componentDtoList, 'init');
@@ -451,7 +453,7 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
   };
 
   return /*#__PURE__*/_jsx(Drawer, {
-    title: title || '工单录入',
+    title: (templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.name) || '工单录入',
     width: '100%',
     open: visible,
     onClose: closeModal,

package/dist/esm/WorkOrder/components/CustomizeFormModal/index.module.less

@@ -74,6 +74,7 @@
   :global(.ant-form-item-label) {
     position: relative;
     max-width: 30%;
+    overflow: initial;
     color: rgba(0, 0, 0, 0.55);
     // font-weight: bold;
     font-size: 14px;
@@ -86,11 +87,11 @@
     text-align: left;
     // font-family: 'PingFangSC-Semibold';
 
-    &[title='处理客服'] {
-      padding-left: 0;
-      font-weight: lighter;
-      font-family: 'PingFangSC-Regular';
-    }
+    // &[title='处理客服'] {
+    //   padding-left: 0;
+    //   font-weight: lighter;
+    //   font-family: 'PingFangSC-Regular';
+    // }
   }
 
   :global(.label-title--index) {

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

@@ -21,7 +21,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * @Author: litian
  * @Date: 2022-09-07 17:04:02
  * @LastEditors: litian
- * @LastEditTime: 2022-09-23 10:06:53
+ * @LastEditTime: 2022-09-27 16:01:53
  */
 import React from 'react';
 import { factory } from "../Widget";
@@ -184,17 +184,20 @@ function ListOrderItem(props) {
     var showEditorBtn = isAfterSalePayment(componentDtoList);
     return /*#__PURE__*/_jsxs("div", {
       className: styles.orderItem,
-      children: [/*#__PURE__*/_jsxs("div", {
+      children: [/*#__PURE__*/_jsx("div", {
         className: styles.orderItemLeft,
-        children: [/*#__PURE__*/_jsxs("div", {
+        children: /*#__PURE__*/_jsxs("div", {
           className: styles.orderItemType,
           children: [/*#__PURE__*/_jsx("div", {
             className: styles.orderItemLeftIcon
-          }), templateDetailDto ? templateDetailDto.name : '']
-        }), showMsg.length > 1 && /*#__PURE__*/_jsx("div", {
-          className: "".concat(styles.orderItemStatus, " ").concat(showMsg.includes('已') ? styles.done : styles.undo),
-          children: showMsg
-        })]
+          }), /*#__PURE__*/_jsxs("div", {
+            className: styles.orderItemLeftName,
+            children: [templateDetailDto ? templateDetailDto.name : '', showMsg.length > 1 && /*#__PURE__*/_jsx("div", {
+              className: "".concat(styles.orderItemStatus, " ").concat(showMsg.includes('已') ? styles.done : styles.undo),
+              children: showMsg
+            })]
+          })]
+        })
       }), /*#__PURE__*/_jsxs("div", {
         className: styles.orderItemRight,
         children: [hasStatus ? /*#__PURE__*/_jsx("div", {

package/dist/esm/WorkOrder/components/ListOrderItem/index.module.less

@@ -30,16 +30,23 @@
         margin-right: 8px;
         background: #1966ff;
       }
+
+      .orderItemLeftName {
+        width: 115px;
+        line-height: 16px;
+      }
     }
 
     .orderItemStatus {
-      display: flex;
-      align-items: center;
-      justify-content: center;
+      display: inline-block;
       box-sizing: border-box;
       height: 24px;
-      margin-left: 12px;
       padding: 0px 4px;
+      line-height: 23px;
+      white-space: nowrap;
+      // align-items: center;
+      // justify-content: center;
+      text-align: center;
       border-radius: 2px;
     }
 
@@ -67,9 +74,10 @@
   align-items: center;
   justify-content: center;
   box-sizing: border-box;
-  width: 48px;
   height: 24px;
   margin: 0 4px;
+  // width: 48px;
+  padding: 0 8px;
   color: #1966ff;
   font-weight: normal;
   white-space: nowrap;

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

@@ -64,6 +64,10 @@ var PAY_STATUS = [{
   label: '打款关闭',
   color: 'rgba(156,156,156)'
 }];
+var PAY_STATUS_ICON = {
+  WAITING_EXAMINE: '#FF4050',
+  EXAMINED: '#43BF0A'
+};
 
 function PayListOrderItem(props) {
   var _props$record = props.record,
@@ -314,7 +318,7 @@ function PayListOrderItem(props) {
       content: /*#__PURE__*/_jsxs("div", {
         children: [/*#__PURE__*/_jsx("span", {
           className: styles.red,
-          children: "\u53D6\u6D88\u5BA1\u6838\u540E\uFF0C\u5DE5\u5355\u72B6\u6001\u53D8\u66F4\u4E3A\u672A\u6253\u6B3E\u72B6\u6001\uFF0C"
+          children: "\u53D6\u6D88\u5BA1\u6838\u540E\uFF0C\u5DE5\u5355\u72B6\u6001\u53D8\u66F4\u4E3A\u672A\u6253\u6B3E\u72B6\u6001"
         }), "\uFF0C \u4F60\u8FD8\u8981\u7EE7\u7EED\u5417\uFF1F"]
       }),
       okText: '确认',
@@ -409,7 +413,10 @@ function PayListOrderItem(props) {
         children: /*#__PURE__*/_jsxs("div", {
           className: styles.orderItemType,
           children: [/*#__PURE__*/_jsx("div", {
-            className: styles.orderItemLeftIcon
+            className: styles.orderItemLeftIcon,
+            style: {
+              backgroundColor: PAY_STATUS_ICON[workPayStatus] ? PAY_STATUS_ICON[workPayStatus] : '#1966FF'
+            }
           }), /*#__PURE__*/_jsx("span", {
             style: {
               color: getColor(workPayStatus) || 'rgba(156,156,156)'

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

@@ -31,13 +31,14 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Author: litian
  * @Date: 2022-09-07 17:58:35
  * @LastEditors: litian
- * @LastEditTime: 2022-09-19 16:30:01
+ * @LastEditTime: 2022-09-27 16:17:25
  */
 import React from 'react';
 import BasicComponent from "../../BasicComponent";
 import { getFormItem } from "../../common/formItemWrap";
-import { ApaasUpload } from '@raycloud-apaas-fe-setup/apaas-react-basics-widgets';
+import { ApaasUploadAsync } 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";
 
 var BasicPicture = /*#__PURE__*/function (_BasicComponent) {
@@ -61,7 +62,10 @@ var BasicPicture = /*#__PURE__*/function (_BasicComponent) {
           },
           children: /*#__PURE__*/_jsx(Image, {
             width: 32,
-            src: pic
+            src: imgResize(pic || ''),
+            preview: {
+              src: pic
+            }
           })
         });
       });
@@ -75,7 +79,9 @@ 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(ApaasUpload, _objectSpread({}, _this.componentConfig))
+        component: /*#__PURE__*/_jsx(ApaasUploadAsync, _objectSpread(_objectSpread({}, _this.componentConfig), {}, {
+          uniqueKey: _this.id
+        }))
       }, value));
     });
 

package/dist/esm/WorkOrder/components/Widget/electricity/EItemEncode/index.js

@@ -35,7 +35,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Author: litian
  * @Date: 2022-08-15 14:37:33
  * @LastEditors: litian
- * @LastEditTime: 2022-09-19 14:08:03
+ * @LastEditTime: 2022-09-27 10:55:47
  */
 import React from 'react';
 import BasicComponent from "../../BasicComponent";
@@ -95,7 +95,7 @@ var EItemSelect = /*#__PURE__*/function (_BasicComponent) {
         component: /*#__PURE__*/_jsx(ItemEncode, _objectSpread(_objectSpread({}, _this.componentConfig), {}, {
           shopId: (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.shopId,
           shopList: (_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.shopList,
-          width: "80%"
+          width: "90%"
         }))
       }, value));
     });

package/dist/esm/WorkOrder/components/Widget/electricity/EItemId/index.js

@@ -35,7 +35,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Author: litian
  * @Date: 2022-08-15 14:37:33
  * @LastEditors: litian
- * @LastEditTime: 2022-09-19 14:07:31
+ * @LastEditTime: 2022-09-27 16:15:00
  */
 import React from 'react';
 import BasicComponent from "../../BasicComponent";
@@ -95,7 +95,7 @@ var EItemId = /*#__PURE__*/function (_BasicComponent) {
         component: /*#__PURE__*/_jsx(ItemId, _objectSpread(_objectSpread({}, _this.componentConfig), {}, {
           shopId: (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.shopId,
           shopList: (_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.shopList,
-          width: "80%"
+          width: "90%"
         }))
       }, value));
     });

package/dist/esm/WorkOrder/components/Widget/electricity/EItemSelect/index.js

@@ -35,7 +35,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Author: litian
  * @Date: 2022-08-15 14:37:33
  * @LastEditors: litian
- * @LastEditTime: 2022-09-19 14:07:38
+ * @LastEditTime: 2022-09-27 10:55:53
  */
 import React from 'react';
 import BasicComponent from "../../BasicComponent";
@@ -72,7 +72,7 @@ var EItemSelect = /*#__PURE__*/function (_BasicComponent) {
         component: /*#__PURE__*/_jsx(ItemSelect, _objectSpread(_objectSpread({}, _this.componentConfig), {}, {
           shopId: (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.shopId,
           shopList: (_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.shopList,
-          width: "80%"
+          width: "90%"
         }))
       }, value));
     });

package/dist/esm/WorkOrder/components/Widget/third/ItemSelect/index.js

@@ -35,7 +35,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Author: litian
  * @Date: 2022-08-15 14:37:33
  * @LastEditors: litian
- * @LastEditTime: 2022-09-19 14:08:20
+ * @LastEditTime: 2022-09-27 10:56:05
  */
 import React from 'react';
 import BasicComponent from "../../BasicComponent";
@@ -104,7 +104,7 @@ var ItemSelectThird = /*#__PURE__*/function (_BasicComponent) {
           type: 4,
           shopId: (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.shopId,
           shopList: (_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.shopList,
-          width: "80%"
+          width: "90%"
         }))
       }, value));
     });

package/dist/esm/WorkOrder/index.js

@@ -28,7 +28,7 @@ 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-09-26 17:13:40
+ * @LastEditTime: 2022-09-27 09:54:27
  * @FilePath: /kmkf-work-order-service-component/src/WorkOrder/index.tsx
  * @Description:
  *

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

@@ -9,7 +9,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Author: litian
  * @Date: 2022-09-06 09:29:34
  * @LastEditors: litian
- * @LastEditTime: 2022-09-26 16:52:59
+ * @LastEditTime: 2022-09-27 15:46:05
  */
 import { extend } from 'umi-request';
 import { message } from 'antd';
@@ -20,24 +20,7 @@ var requestApi = function requestApi(_ref) {
       data = _ref.data,
       _ref$headers = _ref.headers,
       headers = _ref$headers === void 0 ? {} : _ref$headers;
-  var request = extend({}); // request.interceptors.request.use((url, options) => {
-  //   const host = localStorage.getItem('kmkf_kmgd_host') || '';
-  //   const cookies: any = localStorage.getItem('kmkf_kmgd_cookie') ? localStorage.getItem('kmkf_kmgd_cookie')?.split(':') : []
-  //   let headers: any = {
-  //     ...options.headers,
-  //   }
-  //   if (cookies.length) {
-  //     headers[cookies[0]] = cookies[1]
-  //   }
-  //   return {
-  //     url: host + url,
-  //     options: {
-  //       ...options,
-  //       headers
-  //     },
-  //   }
-  // })
-
+  var request = extend({});
   return new Promise(function (resolve, reject) {
     var _localStorage$getItem;
 
@@ -46,8 +29,8 @@ var requestApi = function requestApi(_ref) {
       headers: _objectSpread({
         'Content-type': 'application/json;charset=UTF-8'
       }, headers)
-    };
-    var host = localStorage.getItem('kmkf_kmgd_host') || '';
+    }; // 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) {
@@ -60,7 +43,7 @@ var requestApi = function requestApi(_ref) {
       params.data = data;
     }
 
-    request(host + url, params).then(function (res) {
+    request(url, params).then(function (res) {
       if (res.result === 100 || res.success) {
         resolve(res);
       } else {

package/package.json

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