hrsass-components 1.7.64 → 1.7.65
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/hrsass-components.js
CHANGED
|
@@ -65,7 +65,7 @@ var contentStyle = _interopDefault(require('!!raw-loader!tinymce/skins/content/d
|
|
|
65
65
|
var SvgPanZoom = _interopDefault(require('svg-pan-zoom'));
|
|
66
66
|
var saveSvgAsPng = require('save-svg-as-png');
|
|
67
67
|
|
|
68
|
-
var version = "1.7.
|
|
68
|
+
var version = "1.7.65";
|
|
69
69
|
|
|
70
70
|
/**
|
|
71
71
|
* 版本号
|
|
@@ -3896,7 +3896,13 @@ var HrSelectEmp = {
|
|
|
3896
3896
|
queryData: queryData
|
|
3897
3897
|
}).then(function () {
|
|
3898
3898
|
var res = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
|
|
3899
|
-
_this.result = res
|
|
3899
|
+
_this.result = res.map(function (item) {
|
|
3900
|
+
var empTypeName = item.empTypeName,
|
|
3901
|
+
empStatusName = item.empStatusName;
|
|
3902
|
+
return _objectSpread$7(_objectSpread$7({}, item), {}, {
|
|
3903
|
+
empTypeInfo: "".concat(empTypeName || empStatusName ? '(' : '').concat(empTypeName ? empTypeName : '').concat(empTypeName && empStatusName ? '/' : '').concat(empStatusName ? empStatusName : '').concat(empTypeName || empStatusName ? ')' : '')
|
|
3904
|
+
});
|
|
3905
|
+
});
|
|
3900
3906
|
_this.$nextTick(function () {
|
|
3901
3907
|
var index = _this.getValueIndex(_this.value);
|
|
3902
3908
|
if (index >= 0) {
|
|
@@ -3994,8 +4000,7 @@ var HrSelectEmp = {
|
|
|
3994
4000
|
empEngName = emp.empEngName,
|
|
3995
4001
|
empCode = emp.empCode,
|
|
3996
4002
|
photoId = emp.photoId,
|
|
3997
|
-
|
|
3998
|
-
empTypeName = emp.empTypeName;
|
|
4003
|
+
empTypeInfo = emp.empTypeInfo;
|
|
3999
4004
|
var otherInfo = _.compact([compName, deptName, position]).join('/');
|
|
4000
4005
|
return h("a-select-option", {
|
|
4001
4006
|
key: "".concat(empId, "$$").concat(index),
|
|
@@ -4023,7 +4028,7 @@ var HrSelectEmp = {
|
|
|
4023
4028
|
"class": "emp-info-other"
|
|
4024
4029
|
}, [h("span", [otherInfo || '-']), h("span", {
|
|
4025
4030
|
"class": "emp-type-info"
|
|
4026
|
-
}, [
|
|
4031
|
+
}, [empTypeInfo])])])])]);
|
|
4027
4032
|
})])]);
|
|
4028
4033
|
},
|
|
4029
4034
|
created: function created() {
|