From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity.js | 26 ++++----------------------
1 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity.js b/cloud-server-management/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity.js
index 4b9d8b6..096394d 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity.js
@@ -14,7 +14,7 @@
SysCouponActivity.initColumn = function () {
return [
{field: 'selectItem', radio: true},
- {title: 'id', 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);
@@ -131,13 +131,7 @@
SysCouponActivity.check = function (type) {
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{
@@ -147,13 +141,7 @@
return true;
}else if(type==1 && selected[0].status!=1){
- if(language==1){
- Feng.info("当前状态不能审核！");
- }else if(language==2){
- Feng.info("The current status cannot be audited！");
- }else {
- Feng.info("Status saat ini tidak dapat diaudisikan！");
- }
+ Feng.info("当前状态不能审核！");
return false;
}else if(type==2 && selected[0].status!=2){
var companyId = $("#companyId").val()
@@ -168,13 +156,7 @@
}
}
- if(language==1){
- Feng.info("当前状态不能编辑！");
- }else if(language==2){
- Feng.info("The current status cannot be edited！");
- }else {
- Feng.info("Status saat ini tidak dapat diedit！");
- }
+ Feng.info("当前状态不能编辑！");
return false;
}
--
Gitblit v1.7.1