tnx-shared 5.3.341 → 5.3.343

package/bundles/tnx-shared.umd.js

@@ -1038,6 +1038,8 @@
     var ActionThuHoiBase = '__THU_HOI';
     var ActionChoYKienBase = '__CHO_Y_KIEN';
     var ActionUpdateModel = '__UPDATE_MODEL';
+    var ActionChuyenXuLyBase = '__CHUYEN_XU_LY';
+    var TextActionChuyenXuLyBase = 'Chuyển xử lý';
     var FieldDefineHasTask = '__idTask';
 
     function mapProperty(init, toMap) {
@@ -9184,6 +9186,17 @@
             }
             return this.defaultPost(this.serviceUri + "/ChangeStateBase", itemWorkflowHistory);
         };
+        BaseService.prototype.chuyenXuLyBase = function (itemWorkflowHistory) {
+            if (itemWorkflowHistory) {
+                if (itemWorkflowHistory.departmentIds) {
+                    itemWorkflowHistory.donViIds = itemWorkflowHistory.departmentIds;
+                }
+                if (itemWorkflowHistory.departmentViewIds) {
+                    itemWorkflowHistory.donViViewIds = itemWorkflowHistory.departmentViewIds;
+                }
+            }
+            return this.defaultPost(this.serviceUri + "/ChuyenXuLyBase", itemWorkflowHistory);
+        };
         BaseService.prototype.choYKien = function (itemWorkflowHistory) {
             return this.defaultPost(this.serviceUri + "/ChoYKienBase", itemWorkflowHistory);
         };
@@ -20380,12 +20393,12 @@
         __extends(HoSoDoiTacService, _super);
         function HoSoDoiTacService(http, injector, _moduleConfigService) {
             var _this = _super.call(this, http, injector, _moduleConfigService.getConfig().environment.apiDomain
-                .doitacEndpoint + "/" + _moduleConfigService.getConfig().environment.apiVersion + "/HoSoDoiTac") || this;
+                .canboEndpoint + "/" + _moduleConfigService.getConfig().environment.apiVersion + "/HoSoDoiTac") || this;
             _this._moduleConfigService = _moduleConfigService;
             _this.entityName = 'HoSoDoiTac';
-            _this.serviceCode = 'doitac';
+            _this.serviceCode = 'canbo';
             _this.endPoint
-                = _moduleConfigService.getConfig().environment.apiDomain.doitacEndpoint;
+                = _moduleConfigService.getConfig().environment.apiDomain.canboEndpoint;
             return _this;
         }
         HoSoDoiTacService.prototype.genDropDownSchema = function (required, multiple, field, label, mdWidth, funcModifySchema) {
@@ -22134,6 +22147,7 @@
             _this.serviceManagers = {};
             _this.entityName = 'WorkflowPermissionDetail';
             _this.tableName = '';
+            _this.guidEmpty = '00000000-0000-0000-0000-000000000000';
             _this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.workflowEndpoint;
             _this._moduleConfig = _moduleConfigService.getConfig();
             return _this;
@@ -22180,9 +22194,9 @@
                                 filters.push(this.newFilter('userId', exports.Operator.equal, userIdCurrent));
                             }
                             else {
-                                sorts.push(new Sort({ field: 'permission', dir: -1 }), new Sort({ field: 'inComing', dir: -1 }));
+                                sorts.push(new Sort({ field: 'permission', dir: -1 }), new Sort({ field: 'inComing', dir: -1 }), new Sort({ field: 'isCOEdit', dir: -1 }));
                             }
-                            return [4 /*yield*/, this.getAll(filters, 'itemId,userId,trangThai,textTrangThai,workflowCode,permission', sorts, 'ForCrudList')];
+                            return [4 /*yield*/, this.getAll(filters, 'itemId,userId,trangThai,textTrangThai,workflowCode,permission,isCOEdit', sorts, 'ForCrudList')];
                         case 1:
                             dataStatus = (_a.sent()).data;
                             if (dataStatus == null) {
@@ -22196,6 +22210,7 @@
             });
         };
         WorkflowPermissionDetailService.prototype.appendWorkflowInfoToItem = function (data, itemId, userIdCurrent, ignoreWorkflow, dataStatus, callBackWhenNotHaveStatus) {
+            var _this = this;
             if (callBackWhenNotHaveStatus === void 0) { callBackWhenNotHaveStatus = null; }
             var itemStatus = {
                 textTrangThai: 'Chưa chạy quy trình'
@@ -22219,6 +22234,7 @@
             if (!itemStatus.trangThai) {
                 callBackWhenNotHaveStatus(itemStatus, data);
             }
+            data.__isCoEdit = dataStatus.some(function (x) { return x.itemId === itemId && x.userId != _this.guidEmpty && x.isCOEdit; });
             data.__trangThai = itemStatus.trangThai;
             data.__textTrangThai = itemStatus.textTrangThai;
             if (itemStatus.workflowCode == DummyWorkflowCode) {
@@ -22280,8 +22296,8 @@
                             // if (!ignoreWorkflow) {
                             //     filters.push(this.newFilter('userId', Operator.equal, userIdCurrent));
                             // }
-                            sorts.push(new Sort({ field: 'permission', dir: -1 }), new Sort({ field: 'inComing', dir: -1 }));
-                            return [4 /*yield*/, this.getAll(filters, 'itemId,userId,trangThai,textTrangThai,workflowCode,permission', sorts, 'ForCrudList')];
+                            sorts.push(new Sort({ field: 'permission', dir: -1 }), new Sort({ field: 'inComing', dir: -1 }), new Sort({ field: 'isCOEdit', dir: -1 }));
+                            return [4 /*yield*/, this.getAll(filters, 'itemId,userId,trangThai,textTrangThai,workflowCode,permission,isCOEdit', sorts, 'ForCrudList')];
                         case 1:
                             dataStatus = (_a.sent()).data;
                             if (dataStatus == null) {
@@ -25820,6 +25836,14 @@
                             if (userId) {
                                 userIdStringUpper = userId.toUpperCase();
                             }
+                            if (rowData.__isCoEdit) {
+                                buttonContexts.push({
+                                    icon: 'pi pi-backward',
+                                    label: TextActionChuyenXuLyBase,
+                                    actionCode: ActionChuyenXuLyBase,
+                                    command: function () { return _this.showFormChuyenXuLy(crudListSetting, itemWorkflowSetting_1, rowData); }
+                                });
+                            }
                             return [4 /*yield*/, workflowHistoryService.changeEndpoint(crudListSetting.baseService).getLastByItemId(rowData.id)];
                         case 3:
                             itemWorkflowHistoryLast = (_h.sent()).data;
@@ -26011,6 +26035,51 @@
                 });
             });
         };
+        ListComponentBase.prototype.showFormChuyenXuLy = function (crudListSetting, itemWorkflowSetting, rowData) {
+            return __awaiter(this, void 0, void 0, function () {
+                var workflowHistoryService, itemWorkflowHistoryLast, currentState, compRef, action;
+                var _this = this;
+                return __generator(this, function (_h) {
+                    switch (_h.label) {
+                        case 0:
+                            workflowHistoryService = this._injector.get(WorkflowHistoryService);
+                            workflowHistoryService.changeEndpoint(this.setting.baseService);
+                            return [4 /*yield*/, workflowHistoryService.changeEndpoint(crudListSetting.baseService).getLastByItemId(rowData.id)];
+                        case 1:
+                            itemWorkflowHistoryLast = (_h.sent()).data;
+                            if (!itemWorkflowHistoryLast) {
+                                return [2 /*return*/, this._notifierService.showWarning('Không tìm thấy bước thực hiện gần nhất của bảng ghi!')];
+                            }
+                            currentState = itemWorkflowSetting.data.machines.find(function (x) { return x.code == rowData.__trangThai; });
+                            this.processWorkflowModel.showEditForm = true;
+                            this.processWorkflowModel.header = TextActionChuyenXuLyBase;
+                            return [4 /*yield*/, this._federationService.loadRemoteNewComponent('commonapp', 'ProcessWorkflowFormComponent', this.processWorkflowFormViewContainer)];
+                        case 2:
+                            compRef = _h.sent();
+                            if (this.dialogProcessWorkflowForm) {
+                                this.dialogProcessWorkflowForm.buttonTemplateInput = compRef.instance.buttonTemplate;
+                            }
+                            compRef.instance.item = this.currentItem;
+                            compRef.instance.businessSetting = crudListSetting;
+                            compRef.instance.workflow = itemWorkflowSetting;
+                            action = new WfAction();
+                            action.code = ActionChuyenXuLyBase;
+                            action.name = TextActionChuyenXuLyBase;
+                            action.data = {};
+                            action.openPopup = true;
+                            action.target = currentState.id || this.guidEmpty;
+                            action.source = currentState.id || this.guidEmpty;
+                            compRef.instance.action = action;
+                            compRef.instance.onSaved.subscribe(function (event) {
+                                _this.processWorkflowModel.showEditForm = false;
+                                _this.getData();
+                            });
+                            compRef.instance.onCancel.subscribe(function (event) { return _this.processWorkflowModel.showEditForm = false; });
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
         ListComponentBase.prototype.startWorkflow = function (rowData, workflow) {
             return __awaiter(this, void 0, void 0, function () {
                 var _this = this;
@@ -44545,6 +44614,7 @@
             this.setting.hiddenSettingPermission = true;
             this.setting.fieldSearchText = this.control.fieldSearchText;
             this.setting.columnSetting.sortField = this.control.sortField;
+            this.setting.columnSetting.sortDir = this.control.sortDir;
             this.control.columns.forEach(function (column) {
                 if (column.isDisplay) {
                     var col = new ColumnSchemaBase(Object.assign(Object.assign({}, column), { visible: true, field: column.code || column.field, label: _this._translateService.instant(column.label) }));
@@ -45389,7 +45459,7 @@
         }
         CoCauToChucPickerListComponent.prototype.ngOnInit = function () {
             this.control._component = this;
-            this.controlPicker = new AutoCompletePickerControlSchema(Object.assign(Object.assign({}, this.control), { field: 'arrIdNguoiDung', label: 'Đơn vị', title: 'Chọn đơn vị', baseService: this._coCauToChucService, multiple: this.control.multiple, valueField: this.control.valueField, defaultFilters: this.control.defaultFilters, sortField: 'idDuongDan', required: true, columns: [
+            this.controlPicker = new AutoCompletePickerControlSchema(Object.assign(Object.assign({}, this.control), { field: 'arrIdNguoiDung', label: 'Đơn vị', title: 'Chọn đơn vị', baseService: this._coCauToChucService, multiple: this.control.multiple, valueField: this.control.valueField, defaultFilters: this.control.defaultFilters, sortField: 'idDuongDan', sortDir: 1, required: true, columns: [
                     new EntityPickerColumn({
                         label: 'Tên đơn vị',
                         code: this.control.displayField,
@@ -56863,6 +56933,7 @@
     exports.AccessDeniedComponent = AccessDeniedComponent;
     exports.Action = Action;
     exports.ActionChoYKienBase = ActionChoYKienBase;
+    exports.ActionChuyenXuLyBase = ActionChuyenXuLyBase;
     exports.ActionThuHoiBase = ActionThuHoiBase;
     exports.ActionUpdateModel = ActionUpdateModel;
     exports.AddressControlSchema = AddressControlSchema;
@@ -57185,6 +57256,7 @@
     exports.TemplateTextV4Service = TemplateTextV4Service;
     exports.TemplateV4Service = TemplateV4Service;
     exports.TenContainer = TenContainer;
+    exports.TextActionChuyenXuLyBase = TextActionChuyenXuLyBase;
     exports.TextAreaControlSchema = TextAreaControlSchema;
     exports.TextControlSchema = TextControlSchema;
     exports.TextControlSchemaWithService = TextControlSchemaWithService;