|
@@ -32,6 +32,7 @@
|
|
<div class="my-title">设备信息</div>
|
|
<div class="my-title">设备信息</div>
|
|
<input class="my-input" type="hidden" value="${device.deviceId!}" name="deviceId" id="deviceId" placeholder="请输入设备编号"/>
|
|
<input class="my-input" type="hidden" value="${device.deviceId!}" name="deviceId" id="deviceId" placeholder="请输入设备编号"/>
|
|
<div class="input-box"><span class="input-dic">设备编号</span><input class="my-input" type="text" value="${device.deviceNumber!}" name="deviceNumber" id="deviceNumber" placeholder="请输入设备编号"/> </div>
|
|
<div class="input-box"><span class="input-dic">设备编号</span><input class="my-input" type="text" value="${device.deviceNumber!}" name="deviceNumber" id="deviceNumber" placeholder="请输入设备编号"/> </div>
|
|
|
|
+ <input type="hidden" id="hiddenDeviceId" value="${device.deviceNumber!}">
|
|
<div class="input-box"><span class="input-dic">设备名称</span><input class="my-input" type="text" value="${device.deviceName!}" name="deviceName" id="deviceName" placeholder="请输入设备姓名"/> </div>
|
|
<div class="input-box"><span class="input-dic">设备名称</span><input class="my-input" type="text" value="${device.deviceName!}" name="deviceName" id="deviceName" placeholder="请输入设备姓名"/> </div>
|
|
<div class="input-box"><span class="input-dic">购买日期</span><input class="my-input-date" type="text" value="${(device.deviceDate?string("yyyy-MM-dd"))!''}" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" name="device_date" id="device_date" placeholder="请选择购买日期" readonly="readonly"/> </div>
|
|
<div class="input-box"><span class="input-dic">购买日期</span><input class="my-input-date" type="text" value="${(device.deviceDate?string("yyyy-MM-dd"))!''}" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" name="device_date" id="device_date" placeholder="请选择购买日期" readonly="readonly"/> </div>
|
|
<div class="input-box"><span class="input-dic">设备状态</span>
|
|
<div class="input-box"><span class="input-dic">设备状态</span>
|
|
@@ -58,30 +59,34 @@
|
|
var deviceName = $('#deviceName').val();
|
|
var deviceName = $('#deviceName').val();
|
|
var device_date = $('#device_date').val();
|
|
var device_date = $('#device_date').val();
|
|
var deviceRemake = $('#deviceRemake').val();
|
|
var deviceRemake = $('#deviceRemake').val();
|
|
|
|
+ var hiddenDeviceId = $('#hiddenDeviceId').val();
|
|
if (deviceNumber == null || !check_number.test(deviceNumber)) {
|
|
if (deviceNumber == null || !check_number.test(deviceNumber)) {
|
|
flag = false;
|
|
flag = false;
|
|
layer.msg('设备编号格式不正确,请重新输入!',{icon: 5,time:1000});
|
|
layer.msg('设备编号格式不正确,请重新输入!',{icon: 5,time:1000});
|
|
return flag;
|
|
return flag;
|
|
}
|
|
}
|
|
- $.ajax({
|
|
|
|
- cache: true,
|
|
|
|
- type: "POST",
|
|
|
|
- data: {
|
|
|
|
- deviceNumber:deviceNumber
|
|
|
|
- },
|
|
|
|
- url: "${path}/admin/equipment/is_equipment",
|
|
|
|
- async: false,
|
|
|
|
- success: function(data){
|
|
|
|
- if (data.returnCode == 200) {
|
|
|
|
- flag = false;
|
|
|
|
- layer.msg('该设备编号已存在',{icon: 5,time:1000});
|
|
|
|
|
|
+ if(hiddenDeviceId != deviceNumber){
|
|
|
|
+ $.ajax({
|
|
|
|
+ cache: true,
|
|
|
|
+ type: "POST",
|
|
|
|
+ data: {
|
|
|
|
+ deviceNumber:deviceNumber
|
|
|
|
+ },
|
|
|
|
+ url: "${path}/admin/equipment/is_equipment",
|
|
|
|
+ async: false,
|
|
|
|
+ success: function(data){
|
|
|
|
+ if (data.returnCode == 200) {
|
|
|
|
+ flag = false;
|
|
|
|
+ layer.msg('该设备编号已存在',{icon: 5,time:1000});
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ },
|
|
|
|
+ error: function(XmlHttpRequest, textStatus, errorThrown){
|
|
|
|
|
|
}
|
|
}
|
|
- },
|
|
|
|
- error: function(XmlHttpRequest, textStatus, errorThrown){
|
|
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
|
|
- }
|
|
|
|
- });
|
|
|
|
if(flag == false){
|
|
if(flag == false){
|
|
return flag;
|
|
return flag;
|
|
}
|
|
}
|
|
@@ -120,7 +125,6 @@
|
|
"deviceStatus":deviceStatus,
|
|
"deviceStatus":deviceStatus,
|
|
"deviceId":deviceId
|
|
"deviceId":deviceId
|
|
}
|
|
}
|
|
-
|
|
|
|
$.ajax({
|
|
$.ajax({
|
|
cache: true,
|
|
cache: true,
|
|
type: "POST",
|
|
type: "POST",
|