From 614b0106f079e67bb674a37ede2bd0fe3df2a430 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 27 七月 2023 17:45:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/static/modular/system/dept/dept.js | 54 +++++++++++++++++-------------------------------------
1 files changed, 17 insertions(+), 37 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/dept/dept.js b/cloud-server-management/src/main/webapp/static/modular/system/dept/dept.js
index b758fb1..ce863cd 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/dept/dept.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/dept/dept.js
@@ -7,7 +7,7 @@
table: null,
layerIndex: -1
};
-var language =$("#language").val()
+
/**
* 初始化表格的列
*/
@@ -15,10 +15,10 @@
return [
{field: 'selectItem', radio: true},
{title: 'id', field: 'id', align: 'center', valign: 'middle',width:'50px'},
- {title: language==1?'部门简称':(language==2?'Abbreviation of department':'Persingkatan departemen'), field: 'simplename', align: 'center', valign: 'middle', sortable: true},
- {title: language==1?'部门全称':(language==2?'Full Name of Department':'Nama Penuh Departemen'), field: 'fullname', align: 'center', valign: 'middle', sortable: true},
- {title: language==1?'排序':(language==2?'Sort':'Urutkan'), field: 'num', align: 'center', valign: 'middle', sortable: true},
- {title: language==1?'备注':(language==2?'Remarks':'Catatan'), field: 'tips', align: 'center', valign: 'middle', sortable: true}];
+ {title: '部门简称', field: 'simplename', align: 'center', valign: 'middle', sortable: true},
+ {title: '部门全称', field: 'fullname', align: 'center', valign: 'middle', sortable: true},
+ {title: '排序', field: 'num', align: 'center', valign: 'middle', sortable: true},
+ {title: '备注', field: 'tips', align: 'center', valign: 'middle', sortable: true}];
};
/**
@@ -27,14 +27,7 @@
Dept.check = function () {
var selected = $('#' + this.id).bootstrapTreeTable('getSelections');
if(selected.length == 0){
- if(language==1){
- Feng.info("请先选中表格中的某一记录！");
- }else if(language==2){
- Feng.info("Please select a record in the table first！");
- }else {
- Feng.info("Pilih catatan di tabel terlebih dahulu！");
- }
-
+ Feng.info("请先选中表格中的某一记录！");
return false;
}else{
Dept.seItem = selected[0];
@@ -48,7 +41,7 @@
Dept.openAddDept = function () {
var index = layer.open({
type: 2,
- title: language==1?'添加':(language==2?'Add':'Tambahkan'),
+ title: '添加部门',
area: ['800px', '420px'], //宽高
fix: false, //不固定
maxmin: true,
@@ -64,7 +57,7 @@
if (this.check()) {
var index = layer.open({
type: 2,
- title: language==1?'详情':(language==2?'details':'details'),
+ title: '部门详情',
area: ['800px', '420px'], //宽高
fix: false, //不固定
maxmin: true,
@@ -82,35 +75,16 @@
var operation = function(){
var ajax = new $ax(Feng.ctxPath + "/dept/delete", function () {
- if(language==1){
- Feng.success("删除成功!");
- }else if(language==2){
- Feng.success("Delete succeeded!");
- }else {
- Feng.success("Hapus berhasil!");
- }
+ Feng.success("删除成功!");
Dept.table.refresh();
}, function (data) {
- if(language==1){
- Feng.error("删除失败!" + data.responseJSON.message + "!");
- }else if(language==2){
- Feng.error("Delete failed!" + data.responseJSON.message + "!");
- }else {
- Feng.error("Hapus gagal!" + data.responseJSON.message + "!");
- }
+ Feng.error("删除失败!" + data.responseJSON.message + "!");
});
ajax.set("deptId",Dept.seItem.id);
ajax.start();
};
- if(language==1){
- Feng.confirm("是否刪除该部门?", operation);
- }else if(language==2){
- Feng.confirm("Whether to delete the department?", operation);
- }else {
- Feng.confirm("Apakah untuk menghapus departemen?", operation);
- }
-
+ Feng.confirm("是否刪除该部门?", operation);
}
};
@@ -123,6 +97,12 @@
Dept.table.refresh({query: queryData});
};
+Dept.resetSearch = function(){
+ $("#condition").val('');
+ Dept.search();
+}
+
+
$(function () {
var defaultColunms = Dept.initColumn();
var table = new BSTreeTable(Dept.id, "/dept/list", defaultColunms);
--
Gitblit v1.7.1