From cfa7d0a90e7da9b52606ab8fca364fa5bddddcd4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 28 八月 2025 20:14:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/webapp/static/modular/system/tHuiminCard/tHuiminCard2.js | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 109 insertions(+), 7 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tHuiminCard/tHuiminCard2.js b/cloud-server-management/src/main/webapp/static/modular/system/tHuiminCard/tHuiminCard2.js
index 994fce8..d000307 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tHuiminCard/tHuiminCard2.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tHuiminCard/tHuiminCard2.js
@@ -3,11 +3,13 @@
data() {
return {
query: {
- name: '',
- type: '',
+ huiMinName: '',
+ huiMinType: '',
dateRange: [],
- status: ''
+ status: '',
+ huiMinStatus: '',
},
+ loading: false,
currentPage: 1,
pageSize: 10,
total: 800,
@@ -19,11 +21,12 @@
methods: {
handleSearch() {
console.log('搜索条件:', this.query)
- // 修复方案：使用箭头函数 + 字段校验
+ this.loading = true;
const vm = this; // 保留Vue实例引用
let ajax = new $ax(Feng.ctxPath + "/tHuiminCard/list",
(data) => { // 改用箭头函数
console.log('原始数据:', data);
+ this.loading = false;
if(data.rows && Array.isArray(data.rows)){
vm.tableData = data.rows;
vm.total = data.total;
@@ -33,13 +36,17 @@
}
},
(data) => {
+ this.loading = false;
Feng.error("搜索失败: " + (data.responseJSON?.message || '服务器异常')); // 错误提示优化
});
+ console.log('请求参数222:', this.query.dateRange)
// 添加请求参数
ajax.set({
- pageNum: this.currentPage,
- pageSize: this.pageSize,
+ current: this.currentPage,
+ size: this.pageSize,
+ startTime: this.query.dateRange !=null && this.query.dateRange.length > 0 ? this.query.dateRange[0] : null,
+ endTime: this.query.dateRange !=null && this.query.dateRange.length > 0 ? this.query.dateRange[1] : null,
...this.query
});
ajax.start();
@@ -108,9 +115,11 @@
},
handleSizeChange(val) {
this.pageSize = val
+ this.handleSearch()
},
handleCurrentChange(val) {
this.currentPage = val
+ this.handleSearch()
},
handleSelectionChange(selection) {
// 多选处理
@@ -134,10 +143,103 @@
id = this.ids[0]
}
THuiminCard.openTHuiminCardDetail(id,'detail')
+ },
+ addOrder() {
+ THuiminCard.addOrder()
}
},
created() {
// 初始化逻辑
this.handleSearch()
}
-});
\ No newline at end of file
+});
+var THuiminCardInfo = {
+ goodsPicArray: [],
+ tCarInfoData : {},
+ validateFields: {
+ }
+};
+THuiminCardInfo.close = function() {
+ parent.layer.close(window.parent.THuiminCard.layerIndex);
+}
+THuiminCardInfo.checkUser = function (e) {
+ console.log("用户手机号")
+ console.log(e)
+ var ajax = new $ax(Feng.ctxPath + "/tHuiminCard/checkUser", function(data){
+ if(data==500){
+ $("#userList").empty()
+ Feng.error("操作失败,当前用户未注册")
+ return;
+ }else if (data==501){
+ $("#userList").empty()
+ Feng.error("操作失败,当前用户未添加人员信息")
+ return;
+ }
+
+ else{
+ var content='<option value="">选择人员</option>';
+ $.each(data, function(k,v) {
+ content += "<option value='"+v.id+"'>"+v.name+"</option>";
+ });
+ $("#userList").empty().append(content);
+ $("#shopId").empty();
+ $("#cards").empty();
+ }
+ });
+ ajax.set("phone",phone);
+ ajax.start();
+}
+THuiminCardInfo.getStores = function (e) {
+ var operatorId=$(e).val();
+ var ajax = new $ax(Feng.ctxPath + "/tHuiminCard/getStores", function(data){
+ if(data!=null){
+ var content='<option value="">选择门店</option>';
+ $.each(data, function(k,v) {
+ content += "<option value='"+v.id+"'>"+v.name+"</option>";
+ });
+ $("#shopId").empty().append(content);
+ $("#cards").empty()
+ }
+ });
+ ajax.set("operatorId",operatorId);
+ ajax.start();
+}
+THuiminCardInfo.getCards = function (e) {
+ var operatorId=$(e).val();
+ var ajax = new $ax(Feng.ctxPath + "/tHuiminCard/getCards", function(data){
+ if(data!=null){
+ var content='<option value="">选择玩湃惠民卡</option>';
+ $.each(data, function(k,v) {
+ content += "<option value='"+v.id+"'>"+v.name+"</option>";
+ });
+ $("#cards").empty().append(content);
+ }
+ });
+ ajax.set("storeId",operatorId);
+ ajax.start();
+}
+THuiminCardInfo.addSubmit = function () {
+ let cardId = $("#cards").val()
+ if(cardId==""){
+ Feng.info("请选择惠民卡")
+ return;
+ }
+ let user = $("#user").val()
+ if(user==""){
+ Feng.info("请选择绑定人员信息")
+ return;
+ }
+ var operatorId=$(e).val();
+ var ajax = new $ax(Feng.ctxPath + "/tHuiminCard/addPayHuiMing", function(data){
+ if(data!=null){
+ var content='<option value="">选择玩湃惠民卡</option>';
+ $.each(data, function(k,v) {
+ content += "<option value='"+v.id+"'>"+v.name+"</option>";
+ });
+ $("#cards").empty().append(content);
+ }
+ });
+ ajax.set("studentId",user);
+ ajax.set("cardId",cardId);
+ ajax.start();
+}
\ No newline at end of file
--
Gitblit v1.7.1