From c09987510f7686f2d6a7517d427c7eda464f3e90 Mon Sep 17 00:00:00 2001
From: 仲国强 <519541279@qq.com>
Date: 星期三, 01 九月 2021 17:19:05 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/基础资料/生产基础资料/Gy_BadReason.html | 9 +++++++++
WebTM/views/user/login.html | 4 ++--
WebTM/views/基础资料/销售基础资料/Gy_Customer_Edit.html | 2 +-
WebTM/views/模治具管理/模治具管理/Sc_MouldRepairCheckBillList.html | 8 ++++----
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_BadReason.html | 34 +++++++---------------------------
5 files changed, 23 insertions(+), 34 deletions(-)
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index b2f1473..5840e51 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -32,11 +32,11 @@
</div>
<div class="layui-form-item">
<label class="layadmin-user-login-icon layui-icon layui-icon-username login-input" for="LAY-user-login-password"></label>
- <input type="text" name="username" id="LAY-user-login-username" lay-verify="required" placeholder="鐢ㄦ埛鍚�" class="layui-input" style="background-color:transparent;" autocomplete="off">
+ <input type="text" name="username" id="LAY-user-login-username" lay-verify="required" placeholder="鐢ㄦ埛鍚�" class="layui-input" style="background-color:transparent;color:white !important" autocomplete="off">
</div>
<div class="layui-form-item">
<label class="layadmin-user-login-icon layui-icon layui-icon-password login-input" for="LAY-user-login-password"></label>
- <input type="password" name="password" id="LAY-user-login-password" lay-verify="required" placeholder="瀵嗙爜" class="layui-input" style="background-color:transparent;" autocomplete="off">
+ <input type="password" name="password" id="LAY-user-login-password" lay-verify="required" placeholder="瀵嗙爜" class="layui-input" style="background-color:transparent;color:white !important" autocomplete="off">
</div>
<div class="layui-form-item">
<button type="button" lay-submit="" class="layui-btn layui-btn-fluid" id="LAY-user-login-submit" name="LAY-user-login-submit" lay-filter="LAY-user-login-submit">鐧� 鍏�</button>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html"
index 1aa1168..556984b 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html"
@@ -87,8 +87,8 @@
<div class="layui-form-item">
<label class="layui-form-label"> 绂佺敤鏍囧織:</label>
<div class="layui-input-inline">
- <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true">
- <input type="hidden" value="false" name="HStopflag" id="HStopflag">
+ <!--<input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true">-->
+ <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
</div>
</div>
<div class="layui-form-item">
@@ -158,7 +158,8 @@
form.on('submit(Saver)', function (data) {//淇濆瓨
var isEndCheck = document.getElementById("HStopflag").checked;
- data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+ isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
var sMainStr = JSON.stringify(data.field);
if (AllowLoadData()) {
$.ajax(
@@ -174,7 +175,6 @@
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
}
else {
-
f_alert(data.Message);
console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
}
@@ -266,7 +266,7 @@
})
});
////绂佺敤鏍囧織
- //form.on('checkbox(checkboxHStopflag)', function (data) {
+ //form.on('checkbox(HStopflag)', function (data) {
// $("#HStopflag").val(data.elem.checked);
//});
//鐩戝惉鎻愪氦
@@ -316,29 +316,9 @@
$("#HProcName").val(data.宸ュ簭鍚嶇О);//榛樿宸ュ簭
$("#HProcID").val(data.宸ュ簭ID);//宸ュ簭ID
$("#HProcNumber").val(data.宸ュ簭浠ｇ爜);//宸ュ簭浠ｇ爜
- $("input[name='HStopflag']").prop("checked", data.绂佺敤鏍囪);//true:閫変腑 false:涓嶉�変腑
- layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
$("#HRemark").val(data.澶囨敞);//澶囨敞
-
- //var IsHStopflag = data.绂佺敤鏍囪;
- ////绂佺敤鏍囪
- //if (IsHStopflag == "true") {
- // $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
- //}
- //form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- // "HNumber": data.涓嶈壇鍘熷洜浠ｇ爜
- // , "HItemID": data.HItemID
- // , "HName": data.涓嶈壇鍘熷洜鍚嶇О
- // , "HHelpCode": data.鍔╄浠ｇ爜
- // , "HDeptNumber": data.閮ㄩ棬浠ｇ爜
- // , "HDepName": data.閮ㄩ棬鍚嶇О
- // , "HDeptID": data.閮ㄩ棬ID
- // , "HProcName": data.宸ュ簭鍚嶇О
- // , "HProcID": data.宸ュ簭ID
- // , "HProcNumber": data.宸ュ簭浠ｇ爜
- // , "HStopflag": data.绂佺敤鏍囪
- // , "HRemark": data.澶囨敞
- //});
+ $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囪);//true:閫変腑 false:涓嶉�変腑
+ layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html"
index d17ff84..f09c46a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html"
@@ -144,6 +144,15 @@
, { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
, { field: '澶囨敞', title: '澶囨敞' }
]]
+ //灏嗙鐢ㄧ殑鏁版嵁鏍囩孩
+ //, done: function (res, cuur, count) {
+ // for (var i = 0; i < res.data.length; i++)
+ // {
+ // if (res.data[i].绂佺敤鏍囪=='Y') {
+ // $("table tbody tr").eq(i).css('color','red')
+ // }
+ // }
+ //}
};
}
//鏌ヨ
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
index e8252d6..9adf412 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
@@ -704,7 +704,7 @@
$("#HTaxNum").val(d.data[0].绋庡姟鐧昏鍙�);
$("#HTaxRate").val(d.data[0].澧炲�肩◣鐜�);
$("#HEnglishName").val(d.data[0].鑻辨枃鍚嶇О);
- $("#HEngLishAddress").val(d.data[0].鑻辨枃鍦板潃);
+ $("#HEnglishAddress").val(d.data[0].鑻辨枃鍦板潃);
$("#HCountry").val(d.data[0].鍥藉);
$("#HCusStatus").val(d.data[0].瀹㈡埛鐘舵��);
$("input[name='HStopflag']").prop("checked", d.data[0].绂佺敤鏍囧織);//true:閫変腑 false:涓嶉�変腑
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldRepairCheckBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldRepairCheckBillList.html"
index c6bf877..bb432a3 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldRepairCheckBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldRepairCheckBillList.html"
@@ -359,16 +359,16 @@
var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
if (HBillNo) {
- sWhere += " and HBillNo like '%" + HBillNo + "%'";
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
if (HCreateBy) {
- sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
+ sWhere += " and 鍒跺崟浜� like '%" + HCreateBy + "%'";
}
if (BenginHCreateDate) {
- sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + BenginHCreateDate + "'";
}
if (EndHCreateDate) {
- sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + EndHCreateDate + "'";
}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
--
Gitblit v1.9.1