From d69f9a06fb73f9d5efea882a684d217f12e34a4f Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期三, 02 八月 2023 14:22:06 +0800
Subject: [PATCH] 创建省市县实体类+site的mapper实体映射修复

---
 cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCouponInfo.js |  396 ++++++++++++--------------------------------------------
 1 files changed, 85 insertions(+), 311 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCouponInfo.js b/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCouponInfo.js
index d4f5247..bbf243d 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCouponInfo.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCouponInfo.js
@@ -90,26 +90,6 @@
 }
 
 /**
- * 全部用户
- */
-function userGroup1() {
-    $("#demo2").show()
-}
-
-/**
- * 年度会员
- */
-function userGroup2() {
-    $("#demo2").show()
-}
-
-/**
- * 已有学员用户
- */
-function userGroup3() {
-    $("#demo2").show()
-}
-/**
  * 全国通用
  */
 function scopeOfApplication1() {
@@ -178,65 +158,99 @@
 }
 
 
+function changeCity(n){
 
+    var provinceSelect = null;
+    if (n === undefined || n === null || n === ''){
+        provinceSelect = document.getElementById("provinceData");
+    }else {
+        provinceSelect = document.getElementById("provinceData"+n);
+    }
 
-couponInfoDlg.addBranch = function () {
+    var citySelect = null;
+    if (n === undefined || n === null || n === ''){
+        citySelect = document.getElementById("cityData");
+    }else {
+        citySelect = document.getElementById("cityData"+n);
+    }
 
-    let companies = [];
-    let brands = [];
-    $.ajax({
-        url : Feng.ctxPath + "/tbMemberTag/getCompanyAndBranch",
-        method:'POST',
-        success:function (res) {
-            companies = res.companies;
-            brands = res.brands;
+    var selectedProvince = provinceSelect.value;
+    // 清空城市下拉框
+    citySelect.innerHTML = '<option value="">请选择</option>';
+    if (selectedProvince === "") {
+        return;
+    }
+    var ajax = new $ax(Feng.ctxPath + "/tCouponManage/getCity", function(data){
+        data.forEach(province => {
+            var option = document.createElement("option");
+            option.value = province.id;  // 根据你的数据结构确定省份的id字段
+            option.text = province.name;  // 根据你的数据结构确定省份的name字段
+            citySelect.appendChild(option);
+        });
+    },function(data){
+        console.log('data:',data)
+        Feng.error("获取失败!" + data.responseJSON.message + "!");
+    });
+    ajax.set('province',selectedProvince);
+    ajax.start();
+}
 
-            var str = "                            <div class=\"col-sm-12\">\n" +
-                "                                <label class=\"col-sm-1\">公司</label>\n" +
-                "                                <select class=\"col-sm-2\" id=\"brandCompany\" name='brandCompany' style=\"width: 88px\">\n" +
-                "                                    <option value=\"\">全部公司</option>\n";
-            if (companies.length > 0) {
-                for (let i = 0; i < companies.length; i++) {
-                    str += '<option value="'+companies[i].id+'">'+companies[i].name+'</option>'
-                }
-            }
-            str+= "                                </select>\n" +
-                "                                <label class=\"col-sm-1\">品牌</label>\n" +
-                "                                <select class=\"col-sm-2\" id=\"brandName\" name='brandName' style=\"width: 88px\">\n" +
-                "                                    <option value=\"\">全部品牌</option>\n";
-            if (brands.length > 0) {
-                for (let i = 0; i < brands.length; i++) {
-                    str += '<option value="' + brands[i].id + '">' + brands[i].name + '</option>';
-                }
-            }
-            str += "                                </select>\n" +
-                "                                <div class=\"col-sm-2\">\n" +
-                "                                    <input class=\"form-control\" id=\"brandDays\" name='brandDays' placeholder=\"近30天\" type=\"number\" min=\"1\"\n" +
-                "                                           max=\"31\">\n" +
-                "                                </div>\n" +
-                "                                <select class=\"col-sm-2\" id=\"brandSymbol\" name='brandSymbol' style=\"width: 88px\">\n" +
-                "                                    <option value=\"1\"> =</option>\n" +
-                "                                    <option value=\"2\"> ></option>\n" +
-                "                                    <option value=\"3\"> <</option>\n" +
-                "                                </select>\n" +
-                "                                <div class=\"col-sm-2\">\n" +
-                "                                    <input class=\"form-control\" id=\"brandCount\" name='brandCount' placeholder=\"次\">\n" +
-                "                                </div>\n" +
-                "                                <div class=\"col-sm-1\">\n" +
-                "                                    <label id=\"addBranch\" onclick='TbMemberTagInfoDlg.addBranch()' class=\"form-control\" style=\"border: 0px;cursor: pointer\"><i class=\"fa fa-plus\"></i></label>\n" +
-                "                                </div>\n" +
-                "                                <div class=\"col-sm-1\">\n" +
-                "                                    <label id=\"addBranch\" onclick='TbMemberTagInfoDlg.subtract(this)' class=\"form-control\" style=\"border: 0px;cursor: pointer\"><i class=\"fa fa-minus\"></i></label>\n" +
-                "                                </div>\n" +
-                "                            </div>";
-            $("#branch").append($(str));
+function getProvince(n){
+    var ajax = new $ax(Feng.ctxPath + "/tCouponManage/getProvince", function(data){
+        var provinceSelect = null;
+        if (n === undefined || n === null || ''){
+            provinceSelect = document.getElementById("provinceData");
+        }else {
+            provinceSelect = document.getElementById("provinceData"+n);
         }
-    })
+        data.forEach(province => {
+            var option = document.createElement("option");
+            option.value = province.id;  // 根据你的数据结构确定省份的id字段
+            option.text = province.name;  // 根据你的数据结构确定省份的name字段
+            provinceSelect.appendChild(option);
+        });
+    },function(data){
+        Feng.error("下拉失败!" + data.responseJSON.message + "!");
+    });
+    ajax.start();
+}
+
+function storeList(){
+    var index = layer.open({
+        type: 2,
+        title: '门店列表',
+        area: ['80%', '80%'], //宽高
+        fix: false, //不固定
+        maxmin: true,
+        content: Feng.ctxPath + '/tCouponManage/storeList'
+    });
+    this.layerIndex = index;
 }
 
 
-couponInfoDlg.delete = function () {
+var num = 0;
+couponInfoDlg.addBranch = function () {
+    var a= "";
+    a = "<div style=\'margin-left: 25%\' class=\"col-sm-9 control-label\">\n" +
+        "                            <select class=\"col-sm-1\"  id=\'provinceData"+num+"\' style=\"margin-top: 1%;width: 25%\" onchange=\'changeCity("+num+")\'>\n" +
+        "                                <option value=\"\">请选择</option>\n" +
+        "                            </select>\n" +
+        "                            <label class=\"col-sm-1\"  style=\"width: 9%;margin-top: 7px\">省</label>\n" +
+        "                            <select  class=\"col-sm-1\" style=\"margin-top: 1%;width: 25%\" id=\'cityData"+num+"\'>\n" +
+        "                                <option value=\"\">请选择</option>\n" +
+        "                            </select>\n" +
+        "                            <label class=\"col-sm-1\" style=\"width: 7%;margin-top: 7px\">市</label>\n" +
+        "                            <label name=\"addBranch\" class=\"col-sm-1\" onclick=\"couponInfoDlg.delete(this)\" style=\"border: 0px;cursor: pointer;margin-top: 1%\"><i class=\"fa fa-trash\"></i></label>"+
+        "                        </div>";
+    $("#cityDemo").append($(a));
+    getProvince(num);
+    num=num+1
+}
 
+
+
+couponInfoDlg.delete = function (o) {
+    $(o).parent("div").remove()
 }
 
 /**
@@ -285,248 +299,8 @@
         .set('useTimes');
 }
 
-function couponCheck() {
-    if ($("#couponType").val() == 6) {
-        $("#couponName1").show()
-    } else {
-        $("#couponName1").hide()
-    }
-}
-
-function checkCouponTimes() {
-    if ($("#inlineCheckbox").prop('checked')) {
-        $("#couponTimes").prop("disabled", true)
-        $("#couponTimes").val('')
-    } else {
-        $("#couponTimes").prop("disabled", false)
-    }
-}
-
-/**
- * 提交添加
- */
-couponInfoDlg.addSubmit = function () {
-    this.clearData();
-    this.collectData();
-
-    let times = 1;
-    if ($("#inlineCheckbox").get(0).checked) {
-        times = 0
-    } else {
-        let times1 = $("#couponTimes").val();
-        times = times1 != '' ? times1 : 1;
-        if (times > 100) {
-            Feng.error("服务次数最多为100次!")
-            return;
-        }
-        if (times < 1) {
-            Feng.error("服务次数至少为1次!")
-            return;
-        }
-    }
-    console.log(times);
-    var val2 = $("#number").val();
-    if (!val2) {
-        Feng.error("请输入服务券张数!")
-        return;
-    }
-    if (val2 <= 0) {
-        Feng.error("请输入正确的服务券张数!")
-        return;
-    }
-    let timeType = $(':radio[name="prescription"]:checked').val()
-    let expDay = 0
-    if (timeType == 2) {
-        expDay = $("#time").val()
-        if (expDay == null || expDay == '') {
-            Feng.info("请输入领取后有效天数")
-            return
-        }
-        if (expDay <= 0) {
-            Feng.info("请输入正确的天数")
-            return
-        }
-    }
-    var split = $('#createTime').val().split(" - ");
-    if (timeType == 1) {
-        if (split == null || split == '' || split == "-") {
-            Feng.info("请输入有效期")
-            return
-        }
-    }
-    if ($("#couponType").val() == 6) {
-        var val2 = $("#couponName1").val();
-        if (!val2) {
-            Feng.info("请输入服务卷名称")
-            return
-        }
-        if (val2.length > 4) {
-            Feng.info("请输入4个字以内券名称")
-            return
-        }
-    }
-
-    //分公司直接就默认自己
-    var val1 = $("#type_").val();
-    var val = xmSelect.get('#demo2', true).getValue('valueStr')
-    if (val1 == 1) {
-        if ($(':radio[name="company"]:checked').val() == 1) {
-            if (val == "") {
-                Feng.error("指定公司未选择!")
-                return;
-            }
-        }
-        if (val == "" || $(':radio[name="company"]:checked').val() == 0) {
-            val = 0;
-        }
-    } else {
-        val = $("#companyId_").val();
-    }
-    if (!$("#detail").val()) {
-        Feng.error("请输入服务描述")
-        return;
-    }
-    if (!$("#couponName").val()) {
-        Feng.error("请输入服务券名称!")
-        return;
-    }
-    //提交信息
-    var ajax = new $ax(Feng.ctxPath + "/couponServer/add", function (data) {
-        Feng.success("添加成功!");
-        window.parent.CouponServer.table.refresh();
-        couponInfoDlg.close();
-    }, function (data) {
-        Feng.error("添加失败!" + data.responseJSON.message + "!");
-    });
-    ajax.setData({
-        name: $("#couponName").val(),
-        type: $("#couponType").val(),
-        typeName: $("#couponName1").val(),
-        times: times,
-        sheetsNum: $("#number").val(),
-        remark: $("#detail").val(),
-        startTime: split[0],
-        endTime: split[1],
-        timeType: $(':radio[name="prescription"]:checked').val(),
-        expDay: $("#time").val(),
-        belongs: val,
-    });
-    ajax.start();
-}
-
-/**
- * 提交修改
- */
-couponInfoDlg.editSubmit = function () {
-
-    this.clearData();
-    this.collectData();
-
-    if (!$("#couponName").val()) {
-        Feng.error("请输入服务券名称!")
-        return;
-    }
-    let times = 1;
-    if ($("#inlineCheckbox").get(0).checked) {
-        times = 0
-    } else {
-        times = $("#couponTimes").val()
-        if (times > 100) {
-            Feng.error("服务次数最多为100次!")
-            return;
-        }
-        if (times < 1) {
-            Feng.error("服务次数至少为1次!")
-            return;
-        }
-    }
-    var val3 = $("#number").val();
-    if (!val3) {
-        Feng.error("请输入服务券张数!")
-        return;
-    }
-    if (val3 <= 0) {
-        Feng.error("请输入正确的服务券张数!")
-        return;
-    }
-    if ($("#couponType").val() == 6) {
-        var val2 = $("#couponName1").val();
-        if (!val2) {
-            Feng.info("请输入服务卷名称")
-            return
-        }
-        if (val2.length > 4) {
-            Feng.info("请输入4个字以内券名称")
-            return
-        }
-    }
-    let timeType = $(':radio[name="prescription"]:checked').val()
-    let expDay = 0
-    if (timeType == 2) {
-        expDay = $("#time").val()
-        if (expDay == null || expDay == '') {
-            Feng.info("请输入领取后有效天数")
-            return
-        }
-        if (expDay <= 0) {
-            Feng.info("请输入正确的天数")
-            return
-        }
-    }
-    var split = $('#createTime').val().split(" - ");
-    if (timeType == 1) {
-        if (split == null || split == '' || split == "-") {
-            Feng.info("请输入有效期")
-            return
-        }
-    }
-
-    //分公司直接就默认自己
-    var val1 = $("#type_").val();
-    var val = xmSelect.get('#demo2', true).getValue('valueStr')
-    if (val1 == 1) {
-        if ($(':radio[name="company"]:checked').val() == 1) {
-            if (val == "") {
-                Feng.error("指定公司未选择!")
-                return;
-            }
-        }
-        if (val == "" || $(':radio[name="company"]:checked').val() == 0) {
-            val = 0;
-        }
-    } else {
-        val = $("#companyId_").val();
-    }
-    if (!$("#detail").val()) {
-        Feng.error("请输入服务描述")
-        return;
-    }
-
-    //提交信息
-    var ajax = new $ax(Feng.ctxPath + "/couponServer/update", function (data) {
-        Feng.success("修改成功!");
-        window.parent.CouponServer.table.refresh();
-        couponInfoDlg.close();
-    }, function (data) {
-        Feng.error("修改失败!" + data.responseJSON.message + "!");
-    });
-    ajax.setData({
-        couponId: $("#couponId_").val(),
-        name: $("#couponName").val(),
-        type: $("#couponType").val(),
-        typeName: $("#couponName1").val(),
-        times: times,
-        sheetsNum: $("#number").val(),
-        remark: $("#detail").val(),
-        timeType: $(':radio[name="prescription"]:checked').val(),
-        expDay: $("#time").val(),
-        belongs: val,
-    });
-    ajax.set("startTimeStr", split[0]);
-    ajax.set("endTimeStr", split[1]);
-    ajax.start();
-}
 
 $(function () {
+    getProvince(null);
 
 });

--
Gitblit v1.7.1