From ab64b09ce3020b376af1e6ee0326ea71330d34ad Mon Sep 17 00:00:00 2001
From: fei.wang <wf18701153496@163.com>
Date: 星期四, 21 三月 2024 09:52:42 +0800
Subject: [PATCH] 修改bug
---
src/webapp/page/index1.jsp | 256 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 170 insertions(+), 86 deletions(-)
diff --git a/src/webapp/page/index1.jsp b/src/webapp/page/index1.jsp
index c32d913..711f4c3 100644
--- a/src/webapp/page/index1.jsp
+++ b/src/webapp/page/index1.jsp
@@ -37,13 +37,13 @@
<body>
<form class="layui-form layui-row layui-col-space16" style="width: 1672px;margin-left: 12px;padding-bottom: 10px">
- <div class="layui-col-md4" style="position: relative;top: 89px;z-index: 999;width: 150px;left: 500px">
+ <div class="layui-col-md4" style="position: relative;top: 30px;z-index: 999;width: 150px;left: 500px">
<div class="layui-input-wrap">
- <input type="text" name="cardnumber" style="width: 220px" value="" placeholder="璇疯緭鍏ュ崱鍙�/澶囨敞" class="layui-input" lay-affix="clear">
+ <input type="text" name="cardnumber" style="width: 220px" value="" placeholder="璇疯緭鍏ュ崱鍙�" class="layui-input" lay-affix="clear">
</div>
</div>
<div class="layui-col-md4" style="margin-left: 20px">
- <div class="layui-input-wrap" style="position: relative;top: 89px;z-index: 999;width: 150px;left: 560px">
+ <div class="layui-input-wrap" style="position: relative;top: 30px;z-index: 999;width: 150px;left: 560px">
<input type="text" name="company" style="width: 150px" placeholder="璇疯緭鍏ユ墍灞炲叕鍙�" lay-affix="clear" class="layui-input">
</div>
</div>
@@ -52,8 +52,8 @@
<%-- <input type="text" name="bindid" style="width: 150px" placeholder="璇疯緭鍏ョ粦瀹氳澶�" lay-affix="clear" class="layui-input">--%>
<%-- </div>--%>
<%-- </div>--%>
- <button style="position: relative;top: 96.5px;z-index: 999;width: 70px;left: -400px" id="relo" class="layui-btn layui-btn-normal" lay-filter="demo-table-search1">鍒锋柊</button>
- <button style="position: relative;top: 96.5px;z-index: 999;width: 80px;left: 90px" class="layui-btn layui-btn-normal" lay-submit lay-filter="demo-table-search" lay-event="getselect">鏌ヨ</button>
+ <button style="position: relative;top: 36.5px;z-index: 999;width: 70px;left: -400px" id="relo" class="layui-btn layui-btn-normal" lay-filter="demo-table-search1">鍒锋柊</button>
+ <button style="position: relative;top: 36.5px;z-index: 999;width: 80px;left: 90px" class="layui-btn layui-btn-normal" lay-submit lay-filter="demo-table-search" lay-event="getselect">鏌ヨ</button>
</form>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container" style="margin-left: 0px;margin-top: 20px;display: inline-block">
@@ -70,12 +70,12 @@
<button class="layui-btn" lay-event="getchongzhi">鍏呭��</button>
</div>
</script>
-<div style="display: inline-block;width: 100%;margin-left: 20px">
+<div style="display: inline-block;width: 100%;margin-top: -60px">
<table id="demo" lay-filter="demo"></table>
</div>
-<div class="heimu" style="display: none;width: 100%;height: 100%;position: fixed;top: 0px;left: 0px;z-index: 9999;background-color: black;opacity: 0.8"></div>
+<%--<div class="heimu" style="display: none;width: 100%;height: 100%;position: fixed;top: 0px;left: 0px;z-index: 9999;background-color: black;opacity: 0.8"></div>--%>
<div class="add" style="display: none;width: 600px;background-color: white;border: 1px solid #cccccc;padding: 50px;border-radius: 20px;position: fixed;top: 50px;left: 450px;z-index: 99999">
- <form class="layui-form" action="/HxzkFlow/hxzk/addCard" method="post" lay-filter="example" onsubmit="return checkadd()">
+ <form class="layui-form" method="post" lay-filter="example" onsubmit="return checkadd()">
<div class="layui-form-item">
<label class="layui-form-label">鎵�灞炲叕鍙革細</label>
<div class="layui-input-block">
@@ -245,7 +245,7 @@
</form>
</div>
<div class="updateZong" style="width: 500px;border: 1px solid #ccc;padding: 50px;border-radius: 20px;position: fixed;top: 150px;left: 500px;z-index: 99999;background-color: white;display: none">
- <form class="layui-form" action="/HxzkFlow/hxzk/Update" method="post" lay-filter="example">
+ <form class="layui-form" method="post" lay-filter="example" onsubmit="return checkupdate()">
<input type="text" name="num" style="display: none" class="upnum"/>
<div class="layui-form-item">
<label class="layui-form-label">鍗″彿锛�</label>
@@ -286,7 +286,7 @@
<div class="layui-form-item">
<label class="layui-form-label">閫夋嫨娴侀噺锛�</label>
<div class="layui-input-block">
- <select name="flow" lay-filter="ddtt">
+ <select name="flow" id="flowu" lay-filter="ddtt">
<option value="12G/骞�">12G/骞�</option>
<option value="24G/骞�">24G/骞�</option>
<option value="36G/骞�">36G/骞�</option>
@@ -297,11 +297,10 @@
<div class="layui-form-item">
<label class="layui-form-label">杩愯惀鍟嗭細</label>
<div class="layui-input-block">
- <select name="operator" lay-filter="aihao" >
-<%-- <option value="operatoru">#{operatoru}</option>--%>
+ <select name="operator" id="operatoru" lay-filter="operatoru" >
<option value="绉诲姩" >绉诲姩</option>
<option value="鑱旈��" >鑱旈��</option>
- <option value="鐢典俊">鐢典俊</option>
+ <option value="鐢典俊" >鐢典俊</option>
</select>
</div>
</div>
@@ -315,13 +314,13 @@
</div>
<div class="layui-form-item">
<div class="layui-input-block">
- <button type="submit" class="layui-btn" onclick="chongzhitj()" lay-filter="demoupdate">绔嬪嵆鎻愪氦</button>
+ <button type="submit" class="layui-btn" lay-filter="demoupdate">绔嬪嵆鎻愪氦</button>
<button type="button" class="layui-btn layui-btn-normal" lay-filter="demo1" onclick="canselupdate()" style="margin-left: 200px">鍙栨秷</button>
</div>
</div>
</form>
</div>
-<div id="fhfrom"></div>
+
<script type="text/html" id="titleTpl">
{{# if(d.status === '寰呮縺娲�') { }}
@@ -371,7 +370,10 @@
value = parseFloat(0).toFixed(0);
return value;
}
-
+ // layui.use('form', function(){
+ // var form = layui.form;
+ // form.render('select'); // 閲嶆柊娓叉煋select妗�
+ // });
function xzGongSi(){
var company = $("#companyadd1").val();
var data = "companyname="+company
@@ -403,6 +405,8 @@
for(var i = 0;i<items.length;i++){
itemTitle = items[i].value;
}
+ console.log(itemTitle)
+ console.log(items)
}
if(qb === "鍗庢槦鏅烘帶"){
// url: 'https://api.spruceiot.cn/api/v1/sim/detail/query',
@@ -611,9 +615,11 @@
table.render({
elem: '#demo'
,layEvent: 'LAYTABLE_TIPS'
- ,height: 695
+ ,height: 780
,url: '/HxzkFlow/hxzk/FindCard' //鏁版嵁鎺ュ彛
- ,cellMinWidth: 80
+ // ,cellMinWidth: 80
+ ,width: 1680
+ ,autoWidth: true
,page: true //寮�鍚垎椤�
,toolbar:'#toolbarDemo'
,defaultToolbar: ['filter', 'exports', 'print', { //鑷畾涔夊ご閮ㄥ伐鍏锋爮鍙充晶鍥炬爣銆傚鏃犻渶鑷畾涔夛紝鍘婚櫎璇ュ弬鏁板嵆鍙�
@@ -623,26 +629,26 @@
}]
,cols: [[ //琛ㄥご
{type:'checkbox',sort: true,fixed: "left"}
- ,{field: 'num', title: '搴忓彿', sort: true,width:'5%'}
- ,{field: 'company', title: '鎵�灞炲叕鍙�', }
- ,{field: 'cardnumber', title: '鍗″彿', sort: true}
- ,{field:'status', title: '鐘舵��',templet: '#titleTpl'}
- ,{field: 'flow', title: '娴侀噺', sort: true}
+ ,{field: 'num', title: '搴忓彿', sort: true,width:'75'}
+ ,{field: 'company', title: '鎵�灞炲叕鍙�', width:'250'}
+ ,{field: 'cardnumber', title: '鍗″彿', sort: true,width:'200'}
+ ,{field:'status', title: '鐘舵��',templet: '#titleTpl',width:'90'}
+ ,{field: 'flow', title: '娴侀噺', sort: true,width:'80'}
// ,{field: 'zflow', title: '鎬绘祦閲�(MB)', }
// ,{field: 'syflow', title: '宸茬敤娴侀噺(MB)', }
- ,{field: 'remainingdays', title: '鍓╀綑澶╂暟', }
+ ,{field: 'remainingdays', title: '鍓╀綑澶╂暟', width:'85'}
// ,{field: 'syll', title: '鍓╀綑娴侀噺(MB)', }
- ,{field: 'carddate', title: '寮�濮嬫棩鏈�', sort: true}
- ,{field: 'operator', title: '杩愯惀鍟�', sort: true}
+ ,{field: 'carddate', title: '寮�濮嬫棩鏈�', sort: true,width:'110'}
+ ,{field: 'operator', title: '杩愯惀鍟�', sort: true,width:'110'}
- ,{field: 'unitprice', title: '鍗曚环', sort: true}
- ,{field: 'bindid', title: '缁戝畾璁惧'}
+ ,{field: 'unitprice', title: '鍗曚环', sort: true,width:'75'}
+ ,{field: 'bindid', title: '缁戝畾璁惧',width:'90'}
// ,{field: 'location', title: '鎵�鍦ㄥ湴', sort: true}
- ,{field: 'notes', title: '澶囨敞', sort: true}
- ,{field: 'enddate', title: '缁撴潫鏃ユ湡', sort: true}
- // ,{field: 'enterdate', title: '褰曞叆鏃ユ湡', sort: true}
- ,{field: 'rechargedate', title: '鏈�杩戝厖鍊兼棩鏈�', sort: true}
- ,{field: 'rechargemoney', title: '鍏呭�奸噾棰�', sort: true}
+ // ,{field: 'notes', title: '澶囨敞', sort: true}
+ ,{field: 'enddate', title: '缁撴潫鏃ユ湡', sort: true,width:'110'}
+ ,{field: 'enterdate', title: '褰曞叆鏃ユ湡', sort: true,width:'110'}
+ ,{field: 'rechargedate', title: '鏈�杩戝厖鍊兼棩鏈�', sort: true,width:'110'}
+ ,{field: 'rechargemoney', title: '鍏呭�奸噾棰�', sort: true,width:'100'}
]],
@@ -658,7 +664,7 @@
table.render({
elem: '#demo'
,layEvent: 'LAYTABLE_TIPS'
- ,height: 695
+ ,height: 780
,url: '/HxzkFlow/hxzk/FindCardZi?Zong='+jc //鏁版嵁鎺ュ彛
,cellMinWidth: 80
,page: true //寮�鍚垎椤�
@@ -682,7 +688,7 @@
,{field: 'remainingdays', title: '鍓╀綑澶╂暟', }
,{field: 'carddate', title: '寮�濮嬫棩鏈�', sort: true}
,{field: 'operator', title: '杩愯惀鍟�', sort: true}
-
+ ,{field: 'enddate', title: '缁撴潫鏃ユ湡', sort: true}
,{field: 'unitprice', title: '鍗曚环', sort: true}
,{field: 'rechargedate', title: '鏈�杩戝厖鍊兼棩鏈�', sort: true}
,{field: 'rechargemoney', title: '鍏呭�奸噾棰�', sort: true}
@@ -729,6 +735,10 @@
layer.alert("璇烽�変腑涓�鏉℃暟鎹�")
}else{
showUpdate();
+ console.log(data[0])
+ var o = data[0].operator
+ console.log("tijiao11111111111")
+ $("#card").val(data[0])
$("#cardnumber").val(data[0].cardnumber)
$(".upnum").val(data[0].num);
$("#xgkh").val(data[0].cardnumber);
@@ -736,8 +746,9 @@
$("#carddateu").val(data[0].carddate);
$("#enddateu").val(data[0].enddate);
$("#unitpriceu").val(data[0].unitprice);
- $("#operatoru").append(new Option(data[0].operator,data[0].operator));
- $("#flowu").append(new Option(data[0].flow,data[0].flow));
+ $("#operatoru").val(data[0].operator);
+ $("#flowu").val(data[0].flow);
+ form.render();
}
break;
case 'getadd':
@@ -961,6 +972,7 @@
$(".updateZong").hide();
}
function showUpdate(){
+ console.log("tijiao2222222222222")
var gsjc = localStorage.getItem("gsjc");
if(gsjc == "鍗庢槦鏅烘帶"){
$(".updateZong").show();
@@ -971,8 +983,67 @@
}
}
+
+ function checkupdate() {
+ console.log("11111111111111111")
+ console.log($("#card").val())
+ console.log($("#cardnumber").val())
+ var add1 = $("#xggs").val();
+ var add2 = $("#cardnumber").val();
+ var add3 = $("#carddateu").val();
+ var add4 = $("#operatoru").val();
+ // var add4 = $("#flowadd1").val();
+ var add12 = $("#unitpriceu").val();
+ // var add5 = $("#bindidadd1").val();
+ // var add6 = $("#locationadd1").val();
+ // var add7 = $("#notesadd1").val();
+ var add8 = $("#enddateu").val();
+ var add9 = "0";
+ var add10 = $("#flowu").val();
+ // var add11 = $("#feiyongadd").val();
+ if(add1 == "" || add1 == null){
+ layer.alert("璇烽�夋嫨鎵�灞炲叕鍙�")
+ return false;
+ }else if(add2 == "" || add2 == null){
+ layer.alert("璇疯緭鍏ュ崱鍙�")
+ return false;
+ }else if(add3 == "" || add3 == null){
+ layer.alert("璇烽�夋嫨寮�濮嬫棩鏈�")
+ return false;
+ }else if(add8 == "" || add8 == null){
+ layer.alert("璇烽�夋嫨缁撴潫鏃ユ湡")
+ return false;
+ }else if(add4 == "" || add4 == null){
+ layer.alert("璇烽�夋嫨杩愯惀鍟�")
+ return false;
+ }else if(add10 == "" || add10 == null){
+ layer.alert("璇烽�夋嫨娴侀噺")
+ return false;
+ }else if(add12 == "" || add12 == null){
+ layer.alert("璇烽�夋嫨鍗曚环")
+ return false;
+ }else{
+ // if(parts.length>1){
+ // for (var i = 0 ; i<parts.length;i++){
+
+ var upp = "company="+add1+"&cardnumber="+add2+"&carddate="+add3+"&operator="+add4+"&enddate="+add8+"&flow="+add10+"&unitprice="+add12
+ console.log(upp)
+ $.post("/HxzkFlow/hxzk/UpdateChong",upp,function (data){
+
+ })
+ console.log(66666666)
+ return true;
+ }
+ // var parts = add2.replace(/\s*/g,"").split(";");
+ // var parts;
+ // var parts1 = add5.split(";");
+
+
+ }
//鏂板鎴愬姛
function checkadd() {
+ console.log("11111111111111111")
+ console.log( $("#cardnumberadd1").val())
var add1 = $("#companyadd1").val();
var add2 = $("#cardnumberadd1").val();
var add3 = $("#carddateadd1").val();
@@ -986,53 +1057,6 @@
var add9 = "0";
var add10 = $("#flowadd1").val();
var add11 = $("#feiyongadd").val();
- var parts = add2.replace(/\s*/g,"").split(";");
- // var parts;
- var parts1 = add5.split(";");
- if(parts.length>1){
- for (var i = 0 ; i<parts.length;i++){
- var data = "cardnumber="+parts[i]
- $.ajax({
- url: "/HxzkFlow/hxzk/ifCard",
- type: "POST",
- data: data,
- async: false,
- success: function(data) {
- if(data != ""){
- //宸茬粡瀛樺湪锛� 鏍规嵁鍗″彿淇敼淇℃伅
- var upp = "company="+add1+"&cardnumber="+parts[i]+"&carddate="+add3+"&operator="+add4+"&bindid="+parts1[i]+"&location="+add6+"¬es="+add7+"&enddate="+add8+"&flow="+add10+"&unitprice="+add11
- $.post("/HxzkFlow/hxzk/UpdateChong",upp,function (data){
-
- })
- $("#cardnumberadd1").val(parts[i])
- }else{
-
- }
-
- }
- });
-
- }
- if(add9 == "1"){
- alert("璇ュ崱鍙蜂腑鍙兘鏈夊凡缁忓瓨鍦ㄨ繃鐨�")
- }
- }else{
- var data = "cardnumber="+add2
- $.ajax({
- url: "/HxzkFlow/hxzk/ifCard",
- type: "POST",
- data: data,
- async: false,
- success: function(data) {
- if(data != ""){
- alert("璇ュ崱鍙峰凡瀛樺湪锛�")
- add9 = "1";
- }else{
- add9 = "0";
- }
- }
- });
- }
if(add1 == "" || add1 == null){
layer.alert("璇烽�夋嫨鎵�灞炲叕鍙�")
return false;
@@ -1056,9 +1080,69 @@
return false;
}else if (add9 == "1"){
return false;
- }else if (add9 == "0"){
- return true
}
+ var parts = add2.replace(/\s*/g,"").split(";");
+ // var parts;
+ var parts1 = add5.split(";");
+ console.log(parts)
+ console.log(parts.length)
+ if(parts.length>1){
+ for (var i = 0 ; i<parts.length;i++){
+
+ console.log("=================")
+ var data = "cardnumber="+parts[i]
+ $.ajax({
+ url: "/HxzkFlow/hxzk/ifCard",
+ type: "POST",
+ data: data,
+ async: false,
+ success: function(data) {
+ if(data != ""){
+ //宸茬粡瀛樺湪锛� 鏍规嵁鍗″彿淇敼淇℃伅
+ var upp = "company="+add1+"&cardnumber="+parts[i]+"&carddate="+add3+"&operator="+add4+"&bindid="+add5+"&location="+add6+"¬es="+add7+"&enddate="+add8+"&flow="+add10+"&unitprice="+add11
+ console.log(upp)
+ $.post("/HxzkFlow/hxzk/UpdateChong",upp,function (data){
+
+ })
+ // parts.splice(i,2)
+ // $("#cardnumberadd1").val(parts)
+ }else{
+ console.log("33333332")
+ var upp = "company="+add1+"&cardnumber="+parts[i]+"&carddate="+add3+"&operator="+add4+"&bindid="+add5+"&location="+add6+"¬es="+add7+"&enddate="+add8+"&flow="+add10+"&unitprice="+add11
+ $.post("/HxzkFlow/hxzk/addCard",upp,function (data){
+
+ })
+ }
+ console.log(parts)
+ }
+
+ });
+
+ }
+ if(add9 == "1"){
+ alert("璇ュ崱鍙蜂腑鍙兘鏈夊凡缁忓瓨鍦ㄨ繃鐨�")
+ }
+ }else{
+ var data = "cardnumber="+add2
+ $.ajax({
+ url: "/HxzkFlow/hxzk/ifCard",
+ type: "POST",
+ data: data,
+ async: false,
+ success: function(data) {
+ if(data != ""){
+ alert("璇ュ崱鍙峰凡瀛樺湪锛�")
+ add9 = "1";
+ }else{
+ var upp = "company="+add1+"&cardnumber="+add2+"&carddate="+add3+"&operator="+add4+"&bindid="+add5+"&location="+add6+"¬es="+add7+"&enddate="+add8+"&flow="+add10+"&unitprice="+add11
+ $.post("/HxzkFlow/hxzk/addCard",upp,function (data){
+
+ })
+ }
+ }
+ });
+ }
+
}
//閫夋嫨娴侀噺
//鐩戝惉閫変腑浜嬩欢
--
Gitblit v1.9.3