@bchr/bchr-front-lib 0.3.124 → 0.3.129

package/lib/base/AppFormulaFunctions.js

@@ -5,6 +5,12 @@ var _moment = _interopRequireDefault(require("moment"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 window.AppFormulaFunctions = {
+  getCurrentMonthFirstDay: function getCurrentMonthFirstDay() {
+    return (0, _moment["default"])().date(1).format("YYYY-MM-DD");
+  },
+  getCurrentDateNextMonthFirstDay: function getCurrentDateNextMonthFirstDay() {
+    return (0, _moment["default"])().add(1, 'months').date(1).format("YYYY-MM-DD");
+  },
   currentMonthStartDay: function currentMonthStartDay(dateStr) {
     if (dateStr) {
       var baseDate = (0, _moment["default"])(dateStr, "YYYY-MM-DD");

package/lib/base/layout/ProcessLink.js

@@ -30,12 +30,18 @@ var ProcessLink = function ProcessLink(props) {
     }
 
     return data.map(function (item) {
+      var cardContent = (item.deal_process = 0 || item[status] == WorkflowLinkContext.setUp) ? null : /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("p", null, "\u5904\u7406\u4EBA\u540D\u79F0\uFF1A", item.handler_ext_name)), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("p", null, "\u5904\u7406\u4EBA\u6240\u5C5E\u516C\u53F8\uFF1A", item.handler_corp_ext_name)), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("p", null, "\u5904\u7406\u4EBA\u6240\u5C5E\u90E8\u95E8\uFF1A", item.handler_dept_ext_name)), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("p", null, "\u5904\u7406\u4EBA\u6240\u5C5E\u5C97\u4F4D\uFF1A", item.handler_post_ext_name)), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("p", null, "\u5904\u7406\u4EBA\u529E\u516C\u7535\u8BDD\uFF1A", item.handler_mobile)));
       var status_css_class = "process-item-status-set-up",
           status_icon_css_class = "icon-bchr-time";
+      var handlerTipTitle = cardContent;
 
       if (item[status] === WorkflowLinkContext.haveInHand) {
         status_css_class = "process-item-status-have-in-hand";
         status_icon_css_class = "icon-bchr-refresh";
+
+        if (!item.b_assign_handler) {
+          handlerTipTitle = "工单还未分配处理人";
+        }
       } else if (item[status] === WorkflowLinkContext.approved) {
         status_css_class = "process-item-status-finish";
         status_icon_css_class = "icon-bchr-tick";
@@ -45,6 +51,7 @@ var ProcessLink = function ProcessLink(props) {
       } else {
         status_css_class = "process-item-status-set-up";
         status_icon_css_class = "icon-bchr-time";
+        handlerTipTitle = "工单处理还未到此环节";
       }
 
       return /*#__PURE__*/_react["default"].createElement("div", {
@@ -56,7 +63,12 @@ var ProcessLink = function ProcessLink(props) {
       }, /*#__PURE__*/_react["default"].createElement("span", null, item[tag])), /*#__PURE__*/_react["default"].createElement("div", {
         className: "process-item-label",
         title: item[field]
-      }, item[field]), /*#__PURE__*/_react["default"].createElement("div", {
+      }, item[field]), /*#__PURE__*/_react["default"].createElement(_antd.Tooltip, {
+        title: handlerTipTitle,
+        color: "#5cb85c",
+        key: item.segment_pk,
+        placement: "bottom"
+      }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "process-item-status"
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "process-item-status-bar"
@@ -64,7 +76,7 @@ var ProcessLink = function ProcessLink(props) {
         className: "process-item-status-tag"
       }, /*#__PURE__*/_react["default"].createElement("span", {
         className: "iconfont ".concat(status_icon_css_class)
-      }))));
+      })))));
     });
   };
 

package/lib/base/layout/addTabOrBlankLink.js

@@ -41,6 +41,8 @@ var addTabOrBlankLink = function addTabOrBlankLink(location) {
         host += "3016";
       } else if (location.url.indexOf('talent') !== -1) {
         host += "3017";
+      } else if (location.url.indexOf('lzyq') !== -1) {
+        host += "3062";
       }
 
       if (pageTargetBlankObj && !pageTargetBlank) {

package/lib/base/layout/ui_tpl/form/FormForModify.js

@@ -344,6 +344,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
       display_code = display_code || code;
       var initialValue = data[code];
       var displayValue = data[display_code];
+      var dataType = "any";
       var component, valuePropName;
 
       if (custom_form_items && custom_form_items[code + "_form_item"] && typeof custom_form_items[code + "_form_item"] === "function") {
@@ -365,6 +366,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
 
         switch (ui_render_type) {
           case _consts.UI_RENDER_TYPE.INPUT:
+            dataType = "string";
             component = b_readonly ? /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("span", null, displayValue)) : /*#__PURE__*/_react["default"].createElement(_antd.Input, _extends({
               key: form_id + "_" + code,
               placeholder: "请填写" + name,
@@ -386,6 +388,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
             break;
 
           case _consts.UI_RENDER_TYPE.INPUT_PASSWORD:
+            dataType = "string";
             component = b_readonly ? /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_InputPassword["default"], {
               ui_render_type: 'browse',
               initValue: displayValue
@@ -399,6 +402,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
             break;
 
           case _consts.UI_RENDER_TYPE.TEXT_AREA:
+            dataType = "string";
             component = b_readonly ? /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("span", null, displayValue)) : /*#__PURE__*/_react["default"].createElement(_antd.Input.TextArea, _extends({
               key: form_id + "_" + code,
               placeholder: "请填写" + name,
@@ -640,11 +644,13 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
         rules: [{
           required: !dataItem.b_readonly && b_required,
           message: "请填写" + name,
+          type: dataType,
           whitespace: true,
           validator: _this2.validator.bind(_assertThisInitialized(_this2), !dataItem.b_readonly && b_required, ui_render_type)
         }, {
           required: false,
           message: name + "格式不正确",
+          type: dataType,
           whitespace: true,
           validator: _this2.formatValidator.bind(_assertThisInitialized(_this2)),
           pattern: regexp_pattern

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bchr/bchr-front-lib",
-  "version": "0.3.124",
+  "version": "0.3.129",
   "description": "bchr front lib",
   "main": "lib/index.js",
   "scripts": {

package/src/base/AppFormulaFunctions.js

@@ -1,6 +1,14 @@
 import moment from "moment";
 
 window.AppFormulaFunctions = {
+    getCurrentMonthFirstDay : function () {
+        return  moment().date(1).format("YYYY-MM-DD");
+    },
+
+    getCurrentDateNextMonthFirstDay : function () {
+        return moment().add(1,'months').date(1).format("YYYY-MM-DD");
+    },
+
     currentMonthStartDay : function (dateStr) {
         if (dateStr) {
             let baseDate = moment(dateStr, "YYYY-MM-DD");

package/src/base/layout/ProcessLink.js

@@ -1,5 +1,5 @@
 import React from "react";
-import {Empty} from "antd";
+import {Empty, Tooltip} from "antd";
 
 const WorkflowLinkContext = {
     setUp: 0,
@@ -21,11 +21,25 @@ const ProcessLink = (props) => {
             return <Empty/>
         }
         return data.map(item => {
+
+            let cardContent = (item.deal_process = 0 || item[status] == WorkflowLinkContext.setUp) ? null : <div>
+                <div><p>处理人名称：{item.handler_ext_name}</p></div>
+                <div><p>处理人所属公司：{item.handler_corp_ext_name}</p></div>
+                <div><p>处理人所属部门：{item.handler_dept_ext_name}</p></div>
+                <div><p>处理人所属岗位：{item.handler_post_ext_name}</p></div>
+                <div><p>处理人办公电话：{item.handler_mobile}</p></div>
+            </div>
+
             let status_css_class = "process-item-status-set-up",
                 status_icon_css_class = "icon-bchr-time";
+            let handlerTipTitle = cardContent;
             if (item[status] === WorkflowLinkContext.haveInHand) {
                 status_css_class = "process-item-status-have-in-hand";
                 status_icon_css_class = "icon-bchr-refresh";
+
+                if (!item.b_assign_handler) {
+                    handlerTipTitle = "工单还未分配处理人"
+                }
             } else if (item[status] === WorkflowLinkContext.approved) {
                 status_css_class = "process-item-status-finish";
                 status_icon_css_class = "icon-bchr-tick";
@@ -35,16 +49,20 @@ const ProcessLink = (props) => {
             } else {
                 status_css_class = "process-item-status-set-up";
                 status_icon_css_class = "icon-bchr-time";
+                handlerTipTitle = "工单处理还未到此环节";
             }
+
             return <div key={item.pk} className={`process-item ${status_css_class}`}>
                 {tag && <div className="process-item-tag" title={item[tag]}><span>{item[tag]}</span></div>}
                 <div className="process-item-label" title={item[field]}>{item[field]}</div>
-                <div className="process-item-status">
-                    <div className="process-item-status-bar"/>
-                    <div className="process-item-status-tag">
-                        <span className={`iconfont ${status_icon_css_class}`}/>
+                <Tooltip title={handlerTipTitle} color={"#5cb85c"} key={item.segment_pk} placement="bottom">
+                    <div className="process-item-status">
+                        <div className="process-item-status-bar"/>
+                        <div className="process-item-status-tag">
+                            <span className={`iconfont ${status_icon_css_class}`}/>
+                        </div>
                     </div>
-                </div>
+                </Tooltip>
             </div>
         })
     }

package/src/base/layout/addTabOrBlankLink.js

@@ -33,6 +33,8 @@ const addTabOrBlankLink = (location) => {
                 host += "3016";
             } else if (location.url.indexOf('talent') !== -1) {
                 host += "3017";
+            } else if (location.url.indexOf('lzyq') !== -1) {
+                host += "3062";
             }
 
             if (pageTargetBlankObj && !pageTargetBlank) {

package/src/base/layout/ui_tpl/form/FormForModify.js

@@ -338,6 +338,7 @@ class FormForModify extends React.Component{
         display_code = display_code || code;
         let initialValue = data[code];
         let displayValue = data[display_code];
+        let dataType= "any";
 
         let component, valuePropName;
         if (custom_form_items && custom_form_items[code + "_form_item"] && typeof custom_form_items[code + "_form_item"] === "function") {
@@ -358,6 +359,7 @@ class FormForModify extends React.Component{
 
             switch (ui_render_type) {
                 case UI_RENDER_TYPE.INPUT:
+                    dataType = "string";
                     component = b_readonly ? (
                             <div>
                                 <span>{displayValue}</span>
@@ -395,6 +397,7 @@ class FormForModify extends React.Component{
                         );
                     break;
                 case UI_RENDER_TYPE.INPUT_PASSWORD:
+                    dataType = "string";
                     component = b_readonly ? (
                             <div>
                                 <InputPassword ui_render_type={'browse'} initValue={displayValue}/>
@@ -413,6 +416,7 @@ class FormForModify extends React.Component{
                         );
                     break;
                 case UI_RENDER_TYPE.TEXT_AREA:
+                    dataType = "string";
                     component = b_readonly ? (
                             <div>
                                 <span>{displayValue}</span>
@@ -728,8 +732,8 @@ class FormForModify extends React.Component{
                     name={code}
                     initialValue={initialValue}
                     rules={[
-                        {required: (!dataItem.b_readonly && b_required), message: ("请填写" + name), whitespace: true, validator: this.validator.bind(this, (!dataItem.b_readonly && b_required), ui_render_type)},
-                        {required: false, message: (name + "格式不正确"), whitespace: true, validator: this.formatValidator.bind(this), pattern: regexp_pattern}
+                        {required: (!dataItem.b_readonly && b_required), message: ("请填写" + name), type: dataType,  whitespace: true, validator: this.validator.bind(this, (!dataItem.b_readonly && b_required), ui_render_type)},
+                        {required: false, message: (name + "格式不正确"), type: dataType, whitespace: true, validator: this.formatValidator.bind(this), pattern: regexp_pattern}
                     ]}
                     hasFeedback={(!dataItem.b_readonly && b_required)}
                     valuePropName={valuePropName ? valuePropName : "value"}