From 0f64a74ee3b818bb42b7b9c9b01a9d33c279781b Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期一, 14 八月 2023 18:31:21 +0800
Subject: [PATCH] 管理后台:修复积分商品列表的数据展示

---
 cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods.js |  354 ++++++++++++++++------------------------------------------
 1 files changed, 97 insertions(+), 257 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods.js b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods.js
index e6151cd..a913f80 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods.js
@@ -1,8 +1,8 @@
 /**
  * 车辆管理管理初始化
  */
-var TCompetition = {
-    id: "TCompetitionTable",	//表格id
+var TPointProducts = {
+    id: "TPointProductsTable",	//表格id
     seItem: null,		//选中的条目
     table: null,
     layerIndex: -1
@@ -11,42 +11,51 @@
 /**
  * 初始化表格的列
  */
-TCompetition.initColumn = function () {
+TPointProducts.initColumn = function () {
     return [
         {field: 'selectItem', radio: true},
-        {title: '商品类型', field: 'province', visible: true, align: 'center', valign: 'middle'
+        {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
+        {title: '商品类型', field: 'type', visible: true, align: 'center', valign: 'middle',
+            formatter: function (value, row, index) {
+                return {1: "实体商品", 2: "课包商品", 3: "门票商品", 4: "优惠券"}[value]
+            }
         },
-        {title: '商品名称', field: 'city', visible: true, align: 'center', valign: 'middle'},
-        {title: '商品封面', field: 'name', visible: true, align: 'center', valign: 'middle'
+        {title: '商品名称', field: 'name', visible: true, align: 'center', valign: 'middle'},
+        {title: '商品封面', field: 'cover', visible: true, align: 'center', valign: 'middle',
+            formatter: function (value, row, index) {
+                value = typeof value == "undefined" || value == '' ? '/static/img/NoPIC.png' : value;
+                return '<img src="' + value + '" style="height: 100px;"/>'
+            }
         },
-        {title:  '有效期', field: 'phone', visible: true, align: 'center', valign: 'middle'
+        {title:  '有效期', field: 'timeValue', visible: true, align: 'center', valign: 'middle'
         },
-        {title: '兑换地点', field: 'state', visible: true, align: 'center', valign: 'middle'
-
+        {title: '兑换地点', field: 'useScope', visible: true, align: 'center', valign: 'middle',
+            formatter: function (value, row, index) {
+                return {1: "全国", 2: "指定城市", 3: "指定门店"}[value]
+            }
         },
-        {title: '用户人群', field: 'state', visible: true, align: 'center', valign: 'middle'
-
+        {title: '用户人群', field: 'userPopulation', visible: true, align: 'center', valign: 'middle',
+            formatter: function (value, row, index) {
+                return {1: "全部用户", 2: "年度会员", 3: "已有学员用户"}[value]
+            }
         },
-        {title: '发放数量', field: 'state', visible: true, align: 'center', valign: 'middle'
-
+        {title: '发放数量', field: 'quantityIssued', visible: true, align: 'center', valign: 'middle'
         },
-        {title: '限领数量', field: 'state', visible: true, align: 'center', valign: 'middle'
-
+        {title: '限领数量', field: 'pickUpQuantity', visible: true, align: 'center', valign: 'middle'
         },
-        {title: '已领数量', field: 'state', visible: true, align: 'center', valign: 'middle'
-
+        {title: '已领数量', field: 'hasPickQty', visible: true, align: 'center', valign: 'middle'
         },
-        {title: '已兑换数量', field: 'state', visible: true, align: 'center', valign: 'middle'
-
+        {title: '已兑换数量', field: 'hasExchangeQty', visible: true, align: 'center', valign: 'middle'
         },
-        {title: '排序', field: 'state', visible: true, align: 'center', valign: 'middle'
-
+        {title: '排序', field: 'sort', visible: true, align: 'center', valign: 'middle'
         },
         {title: '活动状态', field: 'state', visible: true, align: 'center', valign: 'middle'
 
         },
-        {title: '可售状态', field: 'state', visible: true, align: 'center', valign: 'middle'
-
+        {title: '可售状态', field: 'shelves', visible: true, align: 'center', valign: 'middle',
+            formatter: function (value, row, index) {
+                return {1: "上架", 2: "下架"}[value]
+            }
         },
     ];
 };
@@ -86,21 +95,21 @@
 /**
  * 检查是否选中
  */
-TCompetition.check = function () {
+TPointProducts.check = function () {
     var selected = $('#' + this.id).bootstrapTable('getSelections');
     if(selected.length == 0){
             Feng.info("请先选中表格中的某一记录!");
         return false;
     }else{
-        TCompetition.seItem = selected[0];
+        TPointProducts.seItem = selected[0];
         return true;
     }
 };
 
 /**
- * 点击添加车辆管理
+ * 添加
  */
-TCompetition.openAddTCompetition = function () {
+TPointProducts.openAddTPointProducts = function () {
     var index = layer.open({
         type: 2,
         title: '添加',
@@ -113,9 +122,9 @@
 };
 
 /**
- * 打开查看车辆管理详情
+ * 查看详情
  */
-TCompetition.openTCompetitionDetail = function () {
+TPointProducts.detail = function () {
     if (this.check()) {
         var index = layer.open({
             type: 2,
@@ -123,132 +132,62 @@
             area: ['100%', '100%'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/tCity/tCity_update/' + TCompetition.seItem.id
+            content: Feng.ctxPath + '/tGoods/tCity_update/' + TPointProducts.seItem.id
         });
         this.layerIndex = index;
     }
 };
 
 /**
- * 删除车辆管理
+ * 购买详情
  */
-TCompetition.delete = function () {
-    if (this.check()) {
-        var nickname = TCompetition.seItem.carLicensePlate;
-        if (nickname == "" || nickname == null || nickname == undefined){
-                nickname = "该车辆";
-        }else{
-            nickname = "【"+nickname+"】";
-        }
-        swal({
-           title: language==1?"您是否确认删除" + nickname + "?":(language==2?"Are you sure to delete the" + nickname + "?":"Apakah Anda pasti akan menghapus" + nickname + "?"),
-            text: language==1?"请谨慎操作!":(language==2?' Please operate with caution!':'Harap beroperasi dengan hati -hati!'),
-            type: "warning",
-            showCancelButton: true,
-            confirmButtonColor: "#DD6B55",
-            confirmButtonText: language==1?"删除":(language==2?'Delete':'Hapus'),
-            closeOnConfirm: true
-        }, function () {
-            var ajax = new $ax(Feng.ctxPath + "/TCompetition/delete", function (data) {
-                  if(language==1){
-                    swal("删除成功", "您已经成功删除了" + nickname + "。", "success");
-                }else if(language==2){
-                    swal("Delete succeeded!", "You have successfully deleted it" + nickname + "。", "success");
-                }else {
-                    swal("Hapus berhasil!", "Anda berhasil menghapus" + nickname + "。", "success");
-                }
-                TCompetition.table.refresh();
-            }, function (data) {
-                if(language==1){
-                    swal("删除失败", data.responseJSON.message + "!", "warning");
-                }else if(language==2){
-                    swal("Failed to delete", data.responseJSON.message + "!", "warning");
-                }else {
-                    swal("Hapus Gagal", data.responseJSON.message + "!", "warning");
-                }
-
-            });
-            ajax.set("TCompetitionId",TCompetition.seItem.id);
-            ajax.start();
-        });
-    }
-};
-TCompetition.oneChange = function (e) {
-    console.log(111)
-    var oneId=$(e).val();
-    var ajax = new $ax(Feng.ctxPath + "/tCompetition/onChange", function(data){
-        if(data!=null){
-            if(language==1){
-                var content='<option value="">选择市</option>';
-            }else if(language==2){
-                var content='<option value="">Choose your franchisee</option>';
-            }else {
-                var content='<option value="">Pilih franchisee Anda</option>';
-            }
-            $.each(data, function(k,v) {
-                content += "<option value='"+v.code+"'>"+v.name+"</option>";
-            });
-            $("#cCode").empty().append(content);
-        }
-    });
-    ajax.set("oneId",oneId);
-    ajax.start();
-}
-
-TCompetition.freeze = function () {
-    if (this.check()) {
-        var ajax = new $ax(Feng.ctxPath + "/tCity/freeze", function (data) {
-            Feng.success("冻结成功!");
-            TCompetition.table.refresh();
-        }, function (data) {
-            Feng.error("冻结失败!" + data.responseJSON.message + "!");
-        });
-        ajax.set("id",this.seItem.id);
-        ajax.start();
-    }
-};
-TCompetition.unfreeze = function () {
-    if (this.check()) {
-        var ajax = new $ax(Feng.ctxPath + "/tCity/unfreeze", function (data) {
-            Feng.success("解冻成功!");
-            TCompetition.table.refresh();
-        }, function (data) {
-            Feng.error("解冻失败!" + data.responseJSON.message + "!");
-        });
-        ajax.set("id",this.seItem.id);
-        ajax.start();
-    }
-};
-TCompetition.reload = function () {
-    if (this.check()) {
-        let id = this.seItem.id
-        var operation = function(){
-            var ajax = new $ax(Feng.ctxPath + "/tCity/pwd", function (data) {
-                Feng.success("重置成功!");
-                TCompetition.table.refresh();
-            }, function (data) {
-                Feng.error("重置失败!" + data.responseJSON.message + "!");
-            });
-            ajax.set("id",id);
-            ajax.start();
-        }
-        Feng.confirm("确认重置密码?重置后密码为:a123456", operation);
-    }
-
-};
-
-TCompetition.carInsurance = function () {
+TPointProducts.payDetail = function () {
     if (this.check()) {
         var index = layer.open({
             type: 2,
-            title: language==1?'车辆保险':(language==2?'Vehicle insurance':'Asuransi kendaraan'),
+            title:'编辑',
             area: ['100%', '100%'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/TCompetition/carInsurance?carId=' + TCompetition.seItem.id
+            content: Feng.ctxPath + '/tGoods/tCity_update/' + TPointProducts.seItem.id
         });
         this.layerIndex = index;
     }
+};
+
+/**
+ * 编辑页面
+ */
+TPointProducts.openEditPage = function () {
+    if (this.check()) {
+        var index = layer.open({
+            type: 2,
+            title:'编辑',
+            area: ['100%', '100%'], //宽高
+            fix: false, //不固定
+            maxmin: true,
+            content: Feng.ctxPath + '/tGoods/tCity_update/' + TPointProducts.seItem.id
+        });
+        this.layerIndex = index;
+    }
+}
+
+/**
+ * 上下架处理
+ * @param m
+ */
+TPointProducts.grounding = function (m) {
+    console.log('m:',m);
+    // if (this.check()) {
+    //     var ajax = new $ax(Feng.ctxPath + "/tGoods/freeze", function (data) {
+    //         Feng.success("冻结成功!");
+    //         TPointProducts.table.refresh();
+    //     }, function (data) {
+    //         Feng.error("冻结失败!" + data.responseJSON.message + "!");
+    //     });
+    //     ajax.set("id",this.seItem.id);
+    //     ajax.start();
+    // }
 };
 
 
@@ -256,129 +195,30 @@
 /**
  * 查询车辆管理列表
  */
-TCompetition.search = function () {
+TPointProducts.search = function () {
     var queryData = {};
-    queryData['provinceCode'] = $("#pCode").val();
-    queryData['cityCode'] = $("#cCode").val();
     queryData['name'] = $("#name").val();
-    queryData['phone'] = $("#phone").val();
-    TCompetition.table.refresh({query: queryData});
+    queryData['type'] = $("#type").val();
+    queryData['redemptionMethod'] = $("#redemptionMethod").val();
+    queryData['userPopulation'] = $("#userPopulation").val();
+    queryData['activeStatus'] = $("#activeStatus").val();
+    queryData['state'] = $("#state").val();
+    TPointProducts.table.refresh({query: queryData});
 };
 
-TCompetition.resetSearch = function () {
-    $("#pCode").val("");
-    $("#cCode").val("");
+TPointProducts.resetSearch = function () {
     $("#name").val("");
-    $("#phone").val("");
-    TCompetition.search();
+    $("#type").val("");
+    $("#redemptionMethod").val("");
+    $("#userPopulation").val("");
+    $("#activeStatus").val("");
+    $("#state").val("");
+    TPointProducts.search();
 };
 
 $(function () {
-    var defaultColunms = TCompetition.initColumn();
-    var table = new BSTable(TCompetition.id, "/tCity/list", defaultColunms);
-    table.setPaginationType("server");
-    TCompetition.table = table.init();
-});
-
-/**
- * 下载模板
- */
-TCompetition.uploadCarModel = function () {
-    window.location.href = Feng.ctxPath + "/TCompetition/uploadCarModel";
-}
-
-var agreement = function(){
-    this.init = function(){
-        //模拟上传excel  
-        $("#uploadEventBtn").unbind("click").bind("click",function(){
-            $("#uploadEventFile").click();
-        });
-    };
-}
-/**
- * 导入合同
- */
-TCompetition.exporTCompetition = function () {
-    var uploadEventFile = $("#uploadEventFile").val();
-    if(uploadEventFile == ''){
-        if(language==1){
-            Feng.info("请选择Excel,再上传");
-        }else if(language==2){
-            Feng.info("Please select Excel and upload");
-        }else {
-            Feng.info("Silakan pilih Excel dan upload");
-        }
-    }else if(uploadEventFile.lastIndexOf(".xls")<0){//可判断以.xls和.xlsx结尾的excel  
-        if(language==1){
-            Feng.info("只能上传Excel文件");
-        }else if(language==2){
-            Feng.info("Only Excel files can be uploaded");
-        }else {
-            Feng.info("Hanya berkas Excel yang dapat diunggah");
-        }
-    }else{
-        var url = Feng.ctxPath + '/TCompetition/exporTCompetition';
-        var file = document.querySelector('input[name=file]').files[0];
-        var reader = new FileReader();
-        if (file) {
-            var formData = new FormData();
-            formData.append("myfile", file);
-            this.sendAjaxRequest(url, 'POST', formData);
-        }
-    }
-}
-TCompetition.sendAjaxRequest = function(url,type,data){
-    $.ajax({
-        url : url,
-        type : type,
-        data : data,
-        success : function(result) {
-            if(result.code==500) {
-                Feng.info(result.message);
-            }else {
-                if(language==1){
-                    Feng.success("导入成功!");
-                }else if(language==2){
-                    Feng.success("SUCCESSFUL IMPORT!");
-                }else {
-                    Feng.success("Import berhasil!");
-                }
-            }
-            TCompetition.table.refresh();
-        },
-        error : function() {
-            if(language==1){
-                Feng.error("excel上传失败!");
-            }else if(language==2){
-                Feng.error("Uploading excel Fails. Procedure!");
-            }else {
-                Feng.error("Gagal mengunggah excel!");
-            }
-        },
-        cache : false,
-        contentType : false,
-        processData : false
-    });
-};
-
-var agreement;
-$(function(){
-    agreement = new agreement();
-    agreement.init();
-});
-
-/**
- * 导出车辆操作
- */
-TCompetition.ouTCompetition = function () {
-    var operation = function() {
-        window.location.href = Feng.ctxPath + "/TCompetition/ouTCompetition";
-    };
-    if(language==1){
-        Feng.confirm("是否确认导出车辆信息?", operation);
-    }else if(language==2){
-        Feng.confirm("Are you sure to export vehicle information?", operation);
-    }else {
-        Feng.confirm("Apakah Anda pasti akan mengekspor informasi kendaraan?", operation);
-    }
-}
\ No newline at end of file
+    var defaultColunms = TPointProducts.initColumn();
+    var table = new BSTable(TPointProducts.id, "/tGoods/list", defaultColunms);
+    table.setPaginationType("client");
+    TPointProducts.table = table.init();
+});
\ No newline at end of file

--
Gitblit v1.7.1