From a830a73fd10a21e3793c79a35be4e532de124c6f Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 17 十月 2023 17:25:16 +0800
Subject: [PATCH] 10.17.1

---
 cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js |   75 +++++++++++++++++++++++++++++++++++--
 1 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js b/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js
index 9403aa8..685ba76 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js
@@ -14,7 +14,7 @@
 TStudent.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: '所在省', field: 'province', visible: true, align: 'center', valign: 'middle'},
             {title: '所在市', field: 'city', visible: true, align: 'center', valign: 'middle'},
             {title: '预约门店', field: 'name', visible: true, align: 'center', valign: 'middle'},
@@ -127,23 +127,88 @@
  */
 TStudent.openTStudentDetail = function () {
     if (this.check()) {
+
+        if (TStudent.seItem.status!=1){
+            Feng.error("请选择待核销的数据")
+            return
+        }
         var index = layer.open({
             type: 2,
             title: '详情',
             area: ['100%', '100%'],  //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/ball/pre_edit/' + TStudent.seItem.id
+            content: Feng.ctxPath + '/ball/yueyue_edit/' + TStudent.seItem.id
         });
         this.layerIndex = index;
     }
 };
 
 
+
+TStudent.openTStudentDetail5 = function () {
+    if (this.check()) {
+
+
+        var index = layer.open({
+            type: 2,
+            title: '详情',
+            area: ['100%', '100%'],  //宽高
+            fix: false, //不固定
+            maxmin: true,
+            content: Feng.ctxPath + '/ball/yueyue_info/' + TStudent.seItem.id
+        });
+        this.layerIndex = index;
+    }
+};
 /**
- * 打开详情
+ * 确认到店
  */
 TStudent.openTStudentDetail1 = function () {
+    if (this.check()) {
+
+        if (TStudent.seItem.status!=1){
+            Feng.error("请选择待核销的数据")
+            return
+        }
+        var index = layer.open({
+            type: 2,
+            title: '',
+            area: ['20%', '25%'],  //宽高
+            fix: false, //不固定
+            maxmin: true,
+            content: Feng.ctxPath + '/ball/joinmethod/' + TStudent.seItem.id
+        });
+
+        this.layerIndex = index;
+    }
+};
+
+
+/**
+ * 确认到店
+ */
+TStudent.openTStudentDetail4 = function () {
+    if (this.check()) {
+
+        if (TStudent.seItem.status!=1){
+            Feng.error("请选择待核销的数据")
+            return
+        }
+        var index = layer.open({
+            type: 2,
+            title: '',
+            area: ['30%', '40%'],  //宽高
+            fix: false, //不固定
+            maxmin: true,
+            content: Feng.ctxPath + '/ball/tocancel/' + TStudent.seItem.id
+        });
+
+        this.layerIndex = index;
+    }
+};
+
+TStudent.openTStudentDetail2 = function () {
     if (this.check()) {
         var index = layer.open({
             type: 2,
@@ -185,7 +250,9 @@
     queryData['store'] = $("#store").val();
     queryData['peopleName'] = $("#peopleName").val();
     queryData['phone'] = $("#phone").val();
-    queryData['date'] = $("#peopleName").val();
+    queryData['date'] = $("#date").val();
+    queryData['payMethod'] = $("#payMethod").val();
+    queryData['state'] = $("#state").val();
 
 
 

--
Gitblit v1.7.1