From a550e674f03c486e9d7f13e3eaf7fe76acea9ffc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 三月 2024 18:15:20 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/webapp/static/modular/system/sysCouponRecord/sysCouponRecord.js | 34 +++++-----------------------------
1 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/sysCouponRecord/sysCouponRecord.js b/cloud-server-management/src/main/webapp/static/modular/system/sysCouponRecord/sysCouponRecord.js
index 382fc89..5174832 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/sysCouponRecord/sysCouponRecord.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/sysCouponRecord/sysCouponRecord.js
@@ -14,7 +14,7 @@
SysCouponRecord.initColumn = function () {
return [
{field: 'selectItem', radio: true},
- {title: '', field: 'id', visible: false, align: 'center', valign: 'middle'},
+ {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
{title: language==1?'添加时间':(language==2?'Add Time':'Tambahkan waktu'), field: 'insertTime', visible: true, align: 'center', valign: 'middle',
formatter:function (data) {
return currentTime(data)
@@ -142,13 +142,7 @@
SysCouponRecord.check = function () {
var selected = $('#' + this.id).bootstrapTable('getSelections');
if(selected.length == 0){
- if(language==1){
- Feng.info("请先选中表格中的某一记录！");
- }else if(language==2){
- Feng.info("Please select 条记录 in the table first！");
- }else {
- Feng.info("Pilih catatan di tabel terlebih dahulu！");
- }
+ Feng.info("请先选中表格中的某一记录！");
return false;
}else{
SysCouponRecord.seItem = selected[0];
@@ -175,13 +169,7 @@
SysCouponRecord.audit = function () {
if (this.check()) {
if(SysCouponRecord.seItem.status!=1){
- if(language==1){
- Feng.info("请在待审核状态下操作")
- }else if(language==2){
- Feng.info("Please operate in the pending state")
- }else {
- Feng.info("Silakan beroperasi dalam keadaan menunggu")
- }
+ Feng.info("请在待审核状态下操作")
return;
}
var index = layer.open({
@@ -219,22 +207,10 @@
SysCouponRecord.delete = function () {
if (this.check()) {
var ajax = new $ax(Feng.ctxPath + "/sysCouponRecord/delete", function (data) {
- if(language==1){
- Feng.success("删除成功!");
- }else if(language==2){
- Feng.success("Delete succeeded!");
- }else {
- Feng.success("Hapus berhasil!");
- }
+ Feng.success("删除成功!");
SysCouponRecord.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("sysCouponRecordId",this.seItem.id);
ajax.start();
--
Gitblit v1.7.1