From 6a2cf9f4e0180ca707c5e0eb188f92ab74da5763 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 02 八月 2024 15:09:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/采购基础资料/Gy_Supplier_Edit.html | 196 +++++++++++++++++++++++++++++++++++++--
WebTM/views/基础资料/生产基础资料/Gy_Source.html | 2
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Warehouse.html | 18 +++
WebTM/layuiadmin/Scripts/webConfig.js | 6
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 32 ++++++
WebTM/views/设备管理/Sb_EquipDotCheckBill_PDA.html | 5
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 37 +++++++
7 files changed, 275 insertions(+), 21 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 85b2ec5..2752599 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -8,9 +8,9 @@
/*var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
//var WEBURL = "http://localhost:81/API/"; //鐜嬪浆鏈湴閰嶇疆
/*var WEBURL = "http://localhost:8083/API/"; //闄堥洴闈欐湰鍦伴厤缃�*/
- /* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
- var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- // var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
+ var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ /*var WEBURL = "http://localhost:8082/API/"; *//*//寮犵憺骞挎湰鍦伴厤缃�*/
+ /*var WEBURL = "http://localhost:8082/LuBaoAPI/";*/ //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
/* var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�*/
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
index ecfb313..a431536 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
@@ -670,7 +670,8 @@
//鑾峰彇 閫掑叆鍙傛暟
var params = getUrlVars();
var hID = params[params[0]];//缂栬緫鏌ョ湅
- var OperationType = params[params[1]];//1 鏂板 2澶嶅埗 3缂栬緫
+ var OperationType = params[params[1]];//1 鏂板 2澶嶅埗 3缂栬緫 4娴佹按鍙锋柊澧�
+ var HMaterTypeID = params[params[2]];//绫诲瀷id
//鍒濆鍖� 鍙� 鍏敤鍙橀噺
var date = new Date();
var day = date.getDate();
@@ -746,7 +747,12 @@
PicUpload();
getFile();
}
-
+ //娴佹按鍙锋柊澧�
+ if (OperationType == 4) {
+ $("#HNumber").attr("readonly", true);
+ setHNumber(HMaterTypeID);
+
+ }
$(this).removeAttr("lay-key");
//鎵ц涓�涓猯aydate瀹炰緥
@@ -1012,6 +1018,28 @@
});
}
+ //娴佹按鍙锋柊澧炶幏鍙栫紪鐮�
+ function setHNumber(TypeID) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Material/getMaxNum',
+ type: "GET",
+ data: { "HMaterTypeID": TypeID, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"]},
+ success: function (data1) {
+ if (data1.data != null) {
+ layer.close(ajaxLoad);
+ $("#HNumber").val(data1.data)
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
//淇濆瓨鎸夐挳
form.on('submit(Saver)', function (data) {
console.log(data.field.HCHECKINCOMING)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html"
index 08c2315..f36ce38 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html"
@@ -97,6 +97,13 @@
<input type="hidden" value="0" name="HSPFlag" id="HSPFlag">
</div>
</div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">璐熷簱瀛樻帶鍒舵爣璁�</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="checkboxHStockCtrlFlag" id="checkboxHStockCtrlFlag" lay-skin="primary" lay-filter="checkboxHStockCtrlFlag" value="true" title="鏄惁鍚敤">
+ <input type="hidden" value="false" name="HStockCtrlFlag" id="HStockCtrlFlag">
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-col-xs8 layui-inline">
@@ -221,6 +228,11 @@
Pub_Close(1);
})
+ //璐熷簱瀛樻帶鍒舵寜閽�
+ form.on('checkbox(checkboxHStockCtrlFlag)', function (data) {
+ $("#HStockCtrlFlag").val(data.elem.checked);
+ });
+
//鏄惁绂佺敤鎸夐挳
form.on('checkbox(checkboxHStopflag)', function (data) {
$("#HStopflag").val(data.elem.checked);
@@ -321,10 +333,15 @@
var data = result.data[0];
var IsHStopflag = data.绂佺敤鏍囪;
var HSPFlag = data.鍚敤浠撲綅;
+ var IsHStockCtrlFlag = data.璐熷簱瀛樻帶鍒舵爣璁�;
var IsHTypeFlow = data.鏄庣粏鏍囪;
//绂佺敤鏍囪
if (IsHStopflag) {
$("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
+ }
+ //璐熷簱瀛樻帶鍒舵爣璁�
+ if (IsHStockCtrlFlag) {
+ $("input[name='checkboxHStockCtrlFlag'][value='" + IsHStockCtrlFlag + "']").attr("checked", true);
}
//鍚敤鏍囪
if (HSPFlag=="Y") {
@@ -346,6 +363,7 @@
, "HAddress": data.浠撳簱鍦板潃
, "HPhone": data.鑱旂郴鐢佃瘽
, "HStopflag": data.绂佺敤鏍囪
+ , "HStockCtrlFlag": data.璐熷簱瀛樻帶鍒舵爣璁�
, "HSPFlag": data.鍚敤浠撲綅 == "Y" ? 1 : 0
, "HRemark": data.HRemark
, "HRemark": data.HRemark
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
index cdd0cf9..173bc0c 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
@@ -131,6 +131,7 @@
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layuiiconlayuiicontips"></i>棰勮</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-iconlayuiiconfileb"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-NumAdd" id="btn-NumAdd"><i class="layui-iconlayuiiconfileb"></i>娴佹按鍙锋柊澧�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layuiiconlayuiiconform"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-copy" id="btn-copy"><i class="layuiiconlayuiiconform"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layuiiconlayuiicon-delete"></i>鍒犻櫎</button>
@@ -200,6 +201,7 @@
var titleData = ["HItemID", "HUnitID", "HParentID", "HUSEORGID", "HMinPickQty", "HEndFlag", "HStopFlag"];
var ins; //鐢ㄤ簬瀵煎嚭excel
+ var HMaterTypeID = 0; //鐗╂枡鍒嗙被鑺傜偣id
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
@@ -240,6 +242,10 @@
//鏂板鎸夐挳
case 'btn-Add':
set_AddNew();
+ break;
+ //鏂板娴佹按鍙锋寜閽�
+ case 'btn-NumAdd':
+ set_NumAddNew();
break;
case 'btn-Edit':
set_ShowBill();
@@ -805,6 +811,34 @@
}
//#endregion
+ //#region 娴佹按鍙锋柊澧�
+ function set_NumAddNew() {
+ if (HMaterTypeID == 0 || HMaterTypeID == null) {
+ layer.msg('璇烽�夋嫨鍏蜂綋鐗╂枡鍒嗙被锛�');
+ }
+ else {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板鐗╂枡',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Material.html?hID=0&OperationType=4&HMaterTypeID=' + HMaterTypeID,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery(table, option);
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+
+ }
+ //#endregion
+
//#region 缂栬緫鍗曟嵁
function set_ShowBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -937,10 +971,13 @@
var data = obj.data; //鑾峰彇褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
if (data.id == "100") {
sql = " and HMaterTypeID=0 ";
+ HMaterTypeID = 0;
} else if (data.id == "0") {
sql = "";
+ HMaterTypeID = 0;
} else {
sql = " and HMaterTypeID='" + data.id + "' ";
+ HMaterTypeID = data.id;
}
get_Display(sql);
}
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_Source.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_Source.html"
index 8e7cac6..3376d0b 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_Source.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_Source.html"
@@ -89,7 +89,7 @@
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName1" id="ColName1 " class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
</select>
</div>
</div>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
index 55bb2df..06f0fa3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
@@ -47,7 +47,7 @@
<label class="layui-form-label">鍒涘缓缁勭粐</label>
<div class="layui-input-inline" style="margin-right: 0px;width: 100px;">
<input type="text" name="HCreateOrg" id="HCreateOrg" lay-verify="HCreateOrg" autocomplete="off" placeholder="" class="layui-input" value="" readonly="readonly" style="width: 134%;">
- <input type="hidden" name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID" value="0" autocomplete="off" class="layui-input" >
+ <input type="hidden" name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID" value="0" autocomplete="off" class="layui-input">
</div>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HCreateOrgID_BT" style=" margin-left: 36px; width: 42px; padding: 0 10px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -222,7 +222,7 @@
<div class="layui-row" style="margin-bottom:5px">
<div class="layui-inline" style="width: 585px;">
<label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline" >
+ <div class="layui-input-inline">
<input type="text" name="HRemark" id="HRemark" lay-verify="HRemark" autocomplete="off" placeholder="" class="layui-input">
</div>
</div>
@@ -325,11 +325,32 @@
<input type="hidden" name="lngBillKey" id="lngBillKey">
<input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
<input type="hidden" name="HMaker" id="HMaker"><!--鍒跺崟浜�-->
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">浠樻璁″垝</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--瀛愯〃-->
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ </div>
+ </script>
+ </div>
+ </div>
+ </div>
</form>
</div>
</div>
</div>
-
+ <!--椤圭洰闃舵琛細鍒犻櫎-->
+ <script type="text/html" id="barDemo">
+ <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -365,16 +386,20 @@
var sWhere = "";
//#endregion
-
+ var option;
//#region 杩涘叆椤甸潰鏃㈠姞杞�
$("#HCreator").val(sessionStorage["HUserName"]);//鍒涘缓浜�
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
set_AddFNew();
+ //鍒濆鍖栬〃
+ get_InitGrid();
}
else if (OperationType == 3) {//缂栬緫
$("#HInterID").val(linterid);
set_EditFromGrid();
+ //鍒濆鍖栬〃
+ get_InitGrid();
}
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
@@ -383,6 +408,58 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ //鏂板琛岃〃鏍兼暟鎹�
+
+ var NewRow = {
+ "HPayType": ""
+ , "HPayRate": "0"
+ , "HPayTime": "0"
+ , "HPayRemark": ""
+ };
+ switch (obj.event) {
+ case 'btn-AddLine':
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+
+ table.render(option);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ break;
+ case 'btn-CopyLine':
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ break;
+
+ }
+ });
+
+ //#region 瀛愯〃锛氳鍐呬簨浠�
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ /*set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�*/
+
+ });
+ //#endregion
+
//缁撶畻鏂瑰紡寮圭獥
form.on('submit(btnSearchProc)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -524,10 +601,19 @@
var isEndCheck = document.getElementById("HStopflag").checked;
isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
-
+ //瀛愯〃
+ var num = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ num.push(table.cache["mainTable"][i])
+ }
+ }
+ //瀛愯〃搴忓垪鍖�
+ var sSubStr = JSON.stringify(num);
var oMain = JSON.stringify(data.field)
- var sBillModeify = oMain + ';' + linterid + ';' + user + ';' + ModRightNameAdd;
+ var sBillModeify = oMain + ';' + sSubStr + ';' + linterid + ';' + user + ';' + ModRightNameAdd;
if (AllowLoadData()) {
if (OperationType == "3") {
$.ajax({
@@ -561,7 +647,7 @@
type: "POST",
url: GetWEBURL() + "/Gy_Supplier/AddBill",
async: true,
- data: { "oMain": oMain },
+ data: { "oMain": oMain + ';' + sSubStr },
dataType: "json",
success: function (data) {
if (data.count == 1) {
@@ -633,6 +719,62 @@
}
});
}
+
+
+ //#region 璁″垝琛�
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+ //#endregion
+
+ //#region 璁″垝琛ㄥ垵濮嬪寲
+ function get_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , totalRow: true
+ , cellMinWidth: 120
+ , height: 400
+ , cols: [[
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+ , { field: 'HPayType', title: '浠樻闃舵', edit: 'text' }
+ , { field: 'HPayRate', title: '浠樻姣斾緥% ', edit: 'text'}
+ , { field: 'HPayTime', title: '缁撶畻鍛ㄦ湡', edit: 'text' }
+ , { field: 'HPayRemark', title: '澶囨敞璇存槑', edit: 'text' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ }
+
+ var rowdata = [
+ {
+ "HPayType": ""
+ , "HPayRate": "0"
+ , "HPayTime": "0"
+ , "HPayRemark": ""
+ }
+ ];
+ option.data = rowdata;
+ table.render(option);
+ }
+ //#endregion
+
+
//缂栬緫椤甸潰鍔犺浇
function set_EditFromGrid() {
$.ajax({
@@ -682,6 +824,8 @@
form.render('select');
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+ option.data = d.list[0]["Gy_Supplier_PayPlan"];
+ table.render(option);
//table.reload(layTableId, {
// data: ajaxReturnData
//});
@@ -695,6 +839,28 @@
}
//鏁版嵁楠岃瘉
function AllowLoadData() {
+
+ var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
+
+ //#region 瀛愯〃鏍￠獙
+ for (var i = 0; i < option.data.length; i++) {
+
+ //鏁伴噺鏍煎紡鏍￠獙
+ temp = option.data[i]["HPayRate"] + "";
+ if (!ref.test(temp)) {
+ layer.msg("绗�" + (i + 1) + "琛岋細浠樻姣斾緥璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ return false;
+ }
+
+ //鍗曚环鏍煎紡鏍￠獙
+ temp = option.data[i]["HPayTime"] + "";
+ if (!ref.test(temp)) {
+ layer.msg("绗�" + (i + 1) + "琛岋細缁撶畻鍛ㄦ湡璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ return false;
+ }
+ }
+ //#endregion
+
var HNumber = $("#HNumber").val();
if (HNumber == null || HNumber == undefined || HNumber == "") {
layer.msg("璇疯緭鍏ヤ緵搴斿晢缂栫爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -703,6 +869,15 @@
var HName = $("#HName").val();
if (HName == null || HName == undefined || HName == "") {
layer.msg("璇疯緭鍏ヤ緵搴斿晢鍚嶇О", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ var HTaxRate = $("#HTaxRate").val();
+ if (HTaxRate == null || HTaxRate == undefined || HTaxRate == "") {
+ layer.msg("璇疯緭鍏ュ鍊肩◣鐜�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(HTaxRate)) {
+ layer.msg("绗�" + (i + 1) + "琛岋細澧炲�肩◣鐜囪杈撳叆澶т簬0鐨勬暟瀛楋紒");
return false;
}
//var HAddress = $("#HAddress").val();
@@ -731,13 +906,12 @@
return false;
}
var reg1 = /^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/;
- if (reg1.test($("#HEmail").val()) == false && $("#HEmail").val() != "" ) {
+ if (reg1.test($("#HEmail").val()) == false && $("#HEmail").val() != "") {
layer.msg("璇峰～鍐欐纭牸寮忕殑閭", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
var reg2 = /^[1][3,4,5,7,8][0-9]{9}$/;
- if (reg2.test($("#HMobilePhone").val()) == false && $("#HMobilePhone").val() != "")
- {
+ if (reg2.test($("#HMobilePhone").val()) == false && $("#HMobilePhone").val() != "") {
layer.msg("璇峰～鍐欐纭牸寮忕殑鎵嬫満鍙�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
@@ -804,7 +978,7 @@
//#endregion
});
- //浠ヤ笂涓簂ayui妯″潡
+ //浠ヤ笂涓簂ayui妯″潡
</script>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
index 6db322f..231c1a0 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
@@ -307,10 +307,7 @@
<tbody id="ProImgByList">
</tbody>
</table>
- </div>
- <div>
- <button class="layui-btn" id="cameraBtn">璋冪敤鐩告満</button>
- </div>
+ </div>
</div>
</div>
</div>
--
Gitblit v1.9.1