tnx-shared 5.3.63 → 5.3.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/bundles/tnx-shared.umd.js +5 -5
- package/bundles/tnx-shared.umd.js.map +1 -1
- package/bundles/tnx-shared.umd.min.js +1 -1
- package/bundles/tnx-shared.umd.min.js.map +1 -1
- package/esm2015/services/canbo-hoso.service.js +4 -4
- package/esm2015/services/common.service.js +3 -3
- package/fesm2015/tnx-shared.js +5 -5
- package/fesm2015/tnx-shared.js.map +1 -1
- package/package.json +2 -2
- package/services/common.service.d.ts +1 -1
- package/services/common.service.d.ts.map +1 -1
|
@@ -3342,7 +3342,7 @@
|
|
|
3342
3342
|
};
|
|
3343
3343
|
CommonService.prototype.addDays = function (date, days) {
|
|
3344
3344
|
var cloned = new Date(date);
|
|
3345
|
-
cloned.setDate(
|
|
3345
|
+
cloned.setDate(cloned.getDate() + days);
|
|
3346
3346
|
return cloned;
|
|
3347
3347
|
};
|
|
3348
3348
|
CommonService.prototype.addHours = function (date, hours) {
|
|
@@ -3895,7 +3895,7 @@
|
|
|
3895
3895
|
}
|
|
3896
3896
|
}
|
|
3897
3897
|
else if (number > -100) {
|
|
3898
|
-
var r = this.addDays(new Date(), number);
|
|
3898
|
+
var r = this.addDays((new Date()).toLocaleDateString(), number);
|
|
3899
3899
|
if (showTime) {
|
|
3900
3900
|
r.setHours(hNow);
|
|
3901
3901
|
r.setMinutes(mNow);
|
|
@@ -45051,12 +45051,12 @@
|
|
|
45051
45051
|
CanBoHoSoService.prototype.generatePickerControlSchema = function (control) {
|
|
45052
45052
|
var _this = this;
|
|
45053
45053
|
var result = new AutoCompletePickerControlSchema(Object.assign({ field: 'idCanBo', label: 'Cán bộ', title: 'Chọn cán bộ', multiple: false, baseService: this, plusUrl: 'WithChucDanhChucVu', displayField: 'hoVaTen', fieldPlus: 'code', funcGetLabel: function (item) {
|
|
45054
|
-
var result =
|
|
45054
|
+
var result = item.hoVaTen;
|
|
45055
45055
|
if (item.code) {
|
|
45056
|
-
result = item.code + "-" + result;
|
|
45056
|
+
result = item.code + " - " + result + " ";
|
|
45057
45057
|
}
|
|
45058
45058
|
if (item.tenDonVi) {
|
|
45059
|
-
result
|
|
45059
|
+
result += "- " + item.tenDonVi;
|
|
45060
45060
|
}
|
|
45061
45061
|
return result;
|
|
45062
45062
|
}, required: true, afterGetDataDropdown: function (dataSource, element) {
|