From eb4168a55e5cbfc04fe4e2b6c99d8a232f85ad2e Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 24 十一月 2023 18:30:42 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js b/cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js
index 4d66d36..5d64418 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js
@@ -14,7 +14,7 @@
TPointProducts.initColumn = function () {
return [
{field: 'selectItem', checkbox: true},
- {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
+ {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
{title: '商品名称', field: 'name', visible: true, align: 'center', valign: 'middle',
// formatter: function (value, row, index) {
// return {1: "日卡票", 2: "月卡票", 3: "季卡票", 4: "年卡票"}[value]
@@ -42,9 +42,9 @@
},
{title: '限领数量', field: 'pickUpQuantity', visible: true, align: 'center', valign: 'middle'
},
- {title: '已领数量', field: 'hasPickQty', visible: true, align: 'center', valign: 'middle'
+ {title: '已领数量', field: 'hasExchangeQty', visible: true, align: 'center', valign: 'middle'
},
- {title: '已兑换数量', field: 'hasExchangeQty', visible: true, align: 'center', valign: 'middle'
+ {title: '已兑换数量', field: 'hasPickQty', visible: true, align: 'center', valign: 'middle'
},
{title: '排序', field: 'sort', visible: true, align: 'center', valign: 'middle'},
{title: '活动状态', field: 'activeStatus', visible: true, align: 'center', valign: 'middle',
@@ -57,6 +57,10 @@
return {1: "上架", 2: "下架"}[value]
}
},
+ {title: '审核状态', field: 'auditStatus', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row, index) {
+ return {2: "待审核", 1: "已通过",3: "已拒绝"}[value]
+ }},
];
};
function currentTime(timestamp){
@@ -132,7 +136,7 @@
area: ['100%', '100%'], //宽高
fix: false, //不固定
maxmin: true,
- content: Feng.ctxPath + '/tGoods/tCity_update/' + TPointProducts.seItem.id
+ content: Feng.ctxPath + '/tGoods/goods_info/' + TPointProducts.seItem.id
});
this.layerIndex = index;
}
@@ -149,7 +153,7 @@
area: ['70%', '70%'], //宽高
fix: false, //不固定
maxmin: true,
- content: Feng.ctxPath + '/tGoods/tPay_detail/' + TPointProducts.seItem.id
+ content: Feng.ctxPath + '/tGoods/tPay_detail1/' + TPointProducts.seItem.id
});
this.layerIndex = index;
}
@@ -160,6 +164,11 @@
*/
TPointProducts.openEditPage = function () {
if (this.check()) {
+ let size = TPointProducts.seItem.size
+ if(size>0){
+ Feng.info("没有操作权限");
+ return;
+ }
var index = layer.open({
type: 2,
title:'编辑',
@@ -178,6 +187,11 @@
*/
TPointProducts.onShelf = function () {
if (this.check()){
+ let size = TPointProducts.seItem.size
+ if(size>0){
+ Feng.info("没有操作权限");
+ return;
+ }
var selected = $('#' + this.id).bootstrapTable('getSelections');
const data1 = {
ids:[],
@@ -211,6 +225,11 @@
*/
TPointProducts.offShelf = function () {
if (this.check()){
+ let size = TPointProducts.seItem.size
+ if(size>0){
+ Feng.info("没有操作权限");
+ return;
+ }
var selected = $('#' + this.id).bootstrapTable('getSelections');
const data1 = {
ids:[],
--
Gitblit v1.7.1