From 97fd11f21a7dcf2f6de866986bc9e6ee9da6a132 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 30 十二月 2024 09:26:41 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/layuiadmin/modules/tableSelect.js | 359 ++++++++++++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillList.html | 189 ++----
WebTM/WebTM.csproj.user | 2
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapInBillList.html | 63 ++
WebTM/views/user/login.html | 82 ++
WebTM/views/user/login_ICCard.html | 123 ++++
WebTM/layuiadmin/ax/images/iccard-bg.jpg | 0
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillList.html | 82 ++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html | 74 ++
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 24
WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdBackBillList.html | 1
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdBackBillList.html | 77 ++
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 485 ++++------------
WebTM/layuiadmin/QueryScheme.js | 1
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdMoveBillList.html | 58 +
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBillList.html | 59 +
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_BadReason.html | 46
WebTM/WebTM.csproj | 2
19 files changed, 1,164 insertions(+), 565 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index cc2291b..895b1ee 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -154,6 +154,7 @@
<Content Include="layuiadmin\style\tableFilter.css">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="layuiadmin\modules\tableSelect.js" />
<Content Include="layuiadmin\treeTable.js" />
<Content Include="layuiadmin\PubCustom.js" />
<Content Include="layuiadmin\PubJs\PubCheck.js" />
@@ -272,6 +273,7 @@
<Content Include="views\user\login.html" />
<Content Include="views\user\login_QiaoYi_PDA.html" />
<Content Include="views\user\login_QiaoYi_Web.html" />
+ <Content Include="views\user\login_ICCard.html" />
<Content Include="views\video\1.wav" />
<Content Include="views\video\jingbao.wav" />
<Content Include="views\video\success.wav" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 8f1260e..f96700a 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/layuiadmin/QueryScheme.js b/WebTM/layuiadmin/QueryScheme.js
index 5de7b7c..1cae082 100644
--- a/WebTM/layuiadmin/QueryScheme.js
+++ b/WebTM/layuiadmin/QueryScheme.js
@@ -276,6 +276,7 @@
}
})
}
+
//#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
function HFilterScheme(obj) //杩斿洖杩囨护鏂规
{
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 2705375..804b479 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -7,7 +7,7 @@
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
/* var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
diff --git a/WebTM/layuiadmin/ax/images/iccard-bg.jpg b/WebTM/layuiadmin/ax/images/iccard-bg.jpg
new file mode 100644
index 0000000..9788d1b
--- /dev/null
+++ b/WebTM/layuiadmin/ax/images/iccard-bg.jpg
Binary files differ
diff --git a/WebTM/layuiadmin/modules/tableSelect.js b/WebTM/layuiadmin/modules/tableSelect.js
new file mode 100644
index 0000000..dce9fa1
--- /dev/null
+++ b/WebTM/layuiadmin/modules/tableSelect.js
@@ -0,0 +1,359 @@
+/**
+ * layui鎵╁睍缁勪欢
+ * 杈撳叆妗嗙殑涓嬫媺琛ㄦ牸閫夋嫨锛堝垎椤碉級
+ * */
+layui.define(['table', 'jquery', 'form'], function (exports) {
+ "use strict";
+
+ var MOD_NAME = 'tableSelect',
+ $ = layui.jquery,
+ table = layui.table,
+ form = layui.form;
+ var tableSelect = function () {
+ this.v = '1.2.0';
+ };
+
+ /**
+ * 鍒濆鍖栬〃鏍奸�夋嫨鍣�
+ */
+ tableSelect.prototype.render = function (opt) {
+ var elem = $(opt.elem);
+
+ //榛樿璁剧疆
+ opt.searchKey = opt.searchKey || 'keyword';
+ opt.checkedKey = opt.checkedKey;
+ opt.table.page = opt.table.page || false;
+ opt.table.height = opt.table.height || 290;
+ elem.off('click').on('click', function(e) {
+ e.stopPropagation();
+ if($('div.tableSelect').length >= 1){
+ return false;
+ }
+
+ var t = elem.offset().top + elem.outerHeight()+"px";
+ var l = elem.offset().left +"px";
+ var tableName = "tableSelect_table_" + new Date().getTime();
+ var tableBox = '<div class="tableSelect layui-anim layui-anim-upbit" style="left:'+l+';top:'+t+';border: 1px solid #d2d2d2;background-color: #fff;box-shadow: 0 2px 4px rgba(0,0,0,.12);padding:10px 10px 0 10px;position: absolute;z-index:66666666;margin: 5px 0;border-radius: 2px;min-width:530px;">';
+ tableBox += '<div class="tableSelectBar">';
+ tableBox += '<button style="float:left;" class="layui-btn layui-btn-sm tableSelect_btn_select">閫夋嫨<span></span></button>';
+ tableBox += '</div>';
+ tableBox += '<table id="'+tableName+'" lay-filter="'+tableName+'" style="margin-top:20px"></table>';
+ tableBox += '</div>';
+ tableBox = $(tableBox);
+ $('body').append(tableBox);
+ //鏁版嵁缂撳瓨
+ var checkedData = [];
+ //娓叉煋TABLE
+ opt.table.elem = "#"+tableName;
+ opt.table.id = tableName;
+ opt.table.where['sWhere'] = opt.sWhere
+ opt.table.request={//璁剧疆椤靛弬鏁�
+ pageName: 'page', // 椤电爜鐨勫弬鏁板悕绉帮紝榛樿锛歱age
+ limitName: 'size' // 姣忛〉鏁版嵁鏉℃暟鐨勫弬鏁板悕锛岄粯璁わ細limit
+ };
+ opt.table.parseData=function(res){
+ return {
+ "code": 0, // 瑙ｆ瀽鎺ュ彛鐘舵��
+ "msg": res.Message, // 瑙ｆ瀽鎻愮ず鏂囨湰
+ "count": res.count, // 瑙ｆ瀽鏁版嵁闀垮害
+ "data": res.data // 瑙ｆ瀽鏁版嵁鍒楄〃
+ };
+ }
+ opt.table.done = function(res, curr, count){
+ defaultChecked(res, curr, count);
+ setChecked(res, curr, count);
+ };
+ var tableSelect_table = table.render(opt.table);
+
+ //鍒嗛〉閫変腑淇濆瓨鏁扮粍
+ table.on('radio('+tableName+')', function(obj){
+ if(opt.checkedKey){
+ checkedData = table.checkStatus(tableName).data
+ }
+ updataButton(table.checkStatus(tableName).data.length)
+ })
+ table.on('checkbox(' + tableName + ')', function (obj) {
+ if(opt.checkedKey){
+ if(obj.checked){
+ for (var i=0;i<table.checkStatus(tableName).data.length;i++){
+ checkedData.push(table.checkStatus(tableName).data[i])
+ }
+ }else{
+ if(obj.type=='all'){
+ for (var j=0;j<table.cache[tableName].length;j++) {
+ for (var i=0;i<checkedData.length;i++){
+ if(checkedData[i][opt.checkedKey] == table.cache[tableName][j][opt.checkedKey]){
+ checkedData.splice(i,1)
+ }
+ }
+ }
+ }else{
+ //鍥犱负LAYUI闂锛屾搷浣滃埌鍙樺寲鍏ㄩ�夌姸鎬佹椂鑾峰彇鍒扮殑obj涓虹┖锛岃繖閲岀敤鍑芥暟鑾峰彇鏈�変腑鐨勯」銆�
+ function nu (){
+ var noCheckedKey = '';
+ for (var i=0;i<table.cache[tableName].length;i++){
+ if(!table.cache[tableName][i].LAY_CHECKED){
+ noCheckedKey = table.cache[tableName][i][opt.checkedKey];
+ }
+ }
+ return noCheckedKey
+ }
+ var noCheckedKey = obj.data[opt.checkedKey] || nu();
+ for (var i=0;i<checkedData.length;i++){
+ if(checkedData[i][opt.checkedKey] == noCheckedKey){
+ checkedData.splice(i,1);
+ }
+ }
+ }
+ }
+ checkedData = uniqueObjArray(checkedData, opt.checkedKey);
+ updataButton(checkedData.length)
+ }else{
+ updataButton(table.checkStatus(tableName).data.length)
+ }
+ });
+
+ //娓叉煋琛ㄦ牸鍚庨�変腑
+ function setChecked (res, curr, count) {
+ for(var i=0;i<res.data.length;i++){
+ for (var j=0;j<checkedData.length;j++) {
+ if(res.data[i][opt.checkedKey] == checkedData[j][opt.checkedKey]){
+ res.data[i].LAY_CHECKED = true;
+ var index= res.data[i]['LAY_TABLE_INDEX'];
+ var checkbox = $('#'+tableName+'').next().find('tr[data-index=' + index + '] input[type="checkbox"]');
+ checkbox.prop('checked', true).next().addClass('layui-form-checked');
+ var radio = $('#'+tableName+'').next().find('tr[data-index=' + index + '] input[type="radio"]');
+ radio.prop('checked', true).next().addClass('layui-form-radioed').find("i").html('');
+ radio.closest('tr').addClass('layui-table-click');
+ }
+ }
+ }
+ var checkStatus = table.checkStatus(tableName);
+ if(checkStatus.isAll){
+ $('#'+tableName+'').next().find('.layui-table-header th[data-field="0"] input[type="checkbox"]').prop('checked', true);
+ $('#'+tableName+'').next().find('.layui-table-header th[data-field="0"] input[type="checkbox"]').next().addClass('layui-form-checked');
+ }
+ updataButton(checkedData.length)
+ }
+
+ //鍐欏叆榛樿閫変腑鍊�(puash checkedData)
+ function defaultChecked (res, curr, count){
+ if(opt.checkedKey && elem.attr('ts-selected')){
+ var selected = elem.attr('ts-selected').split(",");
+ for(var i=0;i<res.data.length;i++){
+ for(var j=0;j<selected.length;j++){
+ if(res.data[i][opt.checkedKey] == selected[j]){
+ checkedData.push(res.data[i])
+ }
+ }
+ }
+ checkedData = uniqueObjArray(checkedData, opt.checkedKey);
+ }
+ }
+
+ //鏇存柊閫変腑鏁伴噺
+ function updataButton (n) {
+ tableBox.find('.tableSelect_btn_select span').html(n==0?'':'('+n+')')
+ }
+
+ //鏁扮粍鍘婚噸
+ function uniqueObjArray(arr, type){
+ var newArr = [];
+ var tArr = [];
+ if(arr.length == 0){
+ return arr;
+ }else{
+ if(type){
+ for(var i=0;i<arr.length;i++){
+ if(!tArr[arr[i][type]]){
+ newArr.push(arr[i]);
+ tArr[arr[i][type]] = true;
+ }
+ }
+ return newArr;
+ }else{
+ for(var i=0;i<arr.length;i++){
+ if(!tArr[arr[i]]){
+ newArr.push(arr[i]);
+ tArr[arr[i]] = true;
+ }
+ }
+ return newArr;
+ }
+ }
+ }
+
+ //FIX浣嶇疆濡備綍涓嬮潰鏀句笉涓嬫斁涓婇潰
+ var overHeight = (elem.offset().top + elem.outerHeight() + tableBox.outerHeight() - $(window).scrollTop()) > $(window).height();
+ var overWidth = (elem.offset().left + tableBox.outerWidth()) > $(window).width();
+ overHeight && tableBox.css({ 'top': elem.offset().top - tableBox.outerHeight()+'px','bottom':'auto'});
+ overWidth && tableBox.css({'left':'auto','right':'5px'})
+
+ //杈撳叆妗嗕笂涓嬪洖杞﹀姩浣�
+ elem.off('keydown').on('keydown', function (e) {
+ var tableElem = $(opt.table.elem).next().find('tbody');
+ //鍗曢�夋涓婁笅閿姩浣�
+ if (opt.table.cols[0][0]["type"] == "radio") {
+ // 鑾峰彇琛ㄦ牸鐨勯�変腑鐨勮
+ var tr = tableElem.find('tr.layui-table-click');
+ switch (event.key) {
+ case "ArrowUp"://涓婇敭
+ if (tr.length == 0) {
+ tableElem.find('tr:first').children('td').eq(0).click();
+ } else {
+ tr['prev']().children('td').click();
+ }
+ break;
+ case "ArrowDown"://涓嬮敭
+ if (tr.length == 0) {
+ tableElem.find('tr:first').children('td').eq(0).click();
+ } else {
+ tr['next']().children('td').click();
+ }
+ break;
+ case "Enter"://鍥炶溅
+ tableBox.find('.tableSelect_btn_select').click();
+ break;
+ }
+ } else {
+ //澶氶�夋
+ var checkbox = tableElem.find('input[type="checkbox"]:checked');
+ var tr = checkbox.closest('tr');
+ switch (event.key) {
+ case "ArrowUp"://涓婇敭
+ if (tr.length == 0) {
+ tableElem.find('tr:first').children('td').eq(0).click();
+ } else {
+ tr.children('td').click();
+ tr['prev']().children('td').click();
+ }
+ break;
+ case "ArrowDown"://涓嬮敭
+ if (tr.length == 0) {
+ tr = tableElem.find('tr:first').children('td').eq(0).click();
+ } else {
+ tr.children('td').click();
+ tr['next']().children('td').click();
+ }
+ break;
+ case "Enter"://鍥炶溅
+ tableBox.find('.tableSelect_btn_select').click();
+ break;
+ }
+ }
+
+ })
+ //杈撳叆妗嗚緭鍏ユ墽琛�
+ elem.off('input').on('input', function (e) {
+ // 闃绘琛ㄥ崟鎻愪氦锛堝鏋滆緭鍏ユ鍦ㄨ〃鍗曞唴锛�
+ e.preventDefault();
+ opt.table.where['sWhere'] = opt.sWhere + " and " + opt.searchKey + " like '%" + elem.val() + "%' ";
+ tableSelect_table.reload({
+ where: opt.table.where,
+ page: {
+ curr: 1
+ }
+ });
+
+ })
+ // //鍏抽敭璇嶆悳绱�
+ // form.on('submit(tableSelect_btn_search)', function(data){
+ // // console.log(" and "+opt.searchKey +"='" + data.opt.searchKey +"'")
+ // console.log(data);
+ // opt.table.where['sWhere'] = " and "+opt.searchKey +" like '%" + data.field[opt.searchKey] +"%' ";
+ // tableSelect_table.reload({
+ // where: opt.table.where,
+ // page: {
+ // curr: 1
+ // }
+ // });
+ // return false;
+ // });
+
+ //鍙屽嚮琛岄�変腑
+ table.on('rowDouble('+tableName+')', function(obj){
+ var checkStatus = {data:[obj.data]};
+ selectDone(checkStatus);
+ })
+ //鍗曞嚮閫変腑琛�
+ table.on('row('+tableName+')', function (obj) {
+ //鍒ゆ柇鏄惁宸茬粡琚�変腑鏄惁鏄崟閫夋
+ if (obj.tr.find('.layui-form-radioed').length == 0 && opt.table.cols[0][0]["type"] == "radio") {
+ //瑙﹀彂鍗曢�夋閫変腑浜嬩欢
+ obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
+ } else if(opt.table.cols[0][0]["type"] == "checkbox") { //澶嶉�夋閫変腑
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache[tableName], function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ //鏇存柊鎸夐挳
+ updataButton(table.checkStatus(tableName).data.length)
+ }
+ })
+ //鎸夐挳閫変腑
+ tableBox.find('.tableSelect_btn_select').on('click', function() {
+ var checkStatus = table.checkStatus(tableName);
+ if(checkedData.length > 1){
+ checkStatus.data = checkedData;
+ }
+ selectDone(checkStatus);
+ })
+
+ //鍐欏�煎洖璋冨拰鍏抽棴
+ function selectDone (checkStatus){
+ if(opt.checkedKey){
+ var selected = [];
+ for(var i=0;i<checkStatus.data.length;i++){
+ selected.push(checkStatus.data[i][opt.checkedKey])
+ }
+ elem.attr("ts-selected",selected.join(","));
+ }
+ opt.done(elem, checkStatus);
+ tableBox.remove();
+ delete table.cache[tableName];
+ checkedData = [];
+ }
+
+ //鐐瑰嚮鍏朵粬鍖哄煙鍏抽棴
+ $(document).mouseup(function(e){
+ var userSet_con = $(''+opt.elem+',.tableSelect');
+ if(!userSet_con.is(e.target) && userSet_con.has(e.target).length === 0){
+ tableBox.remove();
+ delete table.cache[tableName];
+ checkedData = [];
+ }
+ });
+ })
+ }
+
+ /**
+ * 闅愯棌閫夋嫨鍣�
+ */
+ tableSelect.prototype.hide = function (opt) {
+ $('.tableSelect').remove();
+ }
+
+ //鑷姩瀹屾垚娓叉煋
+ var tableSelect = new tableSelect();
+
+ //FIX 婊氬姩鏃堕敊浣�
+ if(window.top == window.self){
+ $(window).scroll(function () {
+ tableSelect.hide();
+ });
+ }
+
+ exports(MOD_NAME, tableSelect);
+})
\ No newline at end of file
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index 6aba0d8..aceca20 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -59,9 +59,11 @@
<div class="ax-flex-row">
<div class="ax-form-con">
<div class="ax-form-input">
- <span class="ax-pos-left" style="width: 2.4rem;"><i class="ax-iconfont ax-icon-me-f"></i></span>
- <input name="LAY-user-login-username" value="" placeholder="杈撳叆鐧诲綍鍚嶇О" type="text" id="LAY-user-login-username">
- <span class="ax-pos-right"><a href="###" class="ax-iconfont ax-icon-close ax-val-none"></a></span></div>
+ <span class="ax-pos-left" style="width: 2.4rem;"><i class="ax-iconfont ax-icon-me-f"></i></span>
+ <input name="LAY-user-login-username" value="" placeholder="杈撳叆鐧诲綍鍚嶇О" type="text" id="LAY-user-login-username">
+ <span class="ax-pos-right" ><a href="###" class="ax-iconfont ax-icon-close ax-val-none"></a></span>
+ </div>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" id="LAY-user-loginICCard-submit" name="LAY-user-loginICCard-submit" lay-filter="LAY-user-loginICCard-submit" style="position: absolute;margin-top:-3.5rem;margin-left:36rem"><i class="layui-icon layui-icon-layer"></i>鍒峰崱</button>
</div>
</div>
</div>
@@ -304,6 +306,9 @@
loging();
})
+ form.on("submit(LAY-user-loginICCard-submit)", function (obj) {
+ loginICCard();
+ })
//闊抽
form.on("submit(LAY-user-login-yp)", function (obj) {
playSound();
@@ -426,6 +431,73 @@
})
}
+ //鍒峰崱鐧诲綍
+ function loginICCard() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: 'IC鍒峰崱',
+ closeBtn: 1,
+ shift: 2,
+ area: ['30%', '30%'],
+ maxmin: true,
+ content: '../user/login_ICCard.html',
+ end: function () {
+ if (LoginData.data[0].Czybm != undefined && LoginData.data[0].Czybm != "") {
+ result = LoginData;
+ sessionStorage["HCloudUserName"] = result.data[0].HCloudUserName;//閲戣澏浜戣处鍙�
+ sessionStorage["HCloudUserPsd"] = result.data[0].HCloudUserPsd;
+ sessionStorage["HMaker"] = result.data[0].Czymc;
+ sessionStorage["HUserName"] = result.data[0].Czymc;
+ sessionStorage["HBillerID"] = result.data[0].HK3UserID;
+ sessionStorage["SourceFlag"] = false;
+ sessionStorage["HKeeperID"] = result.data[0].HKeeperID;
+ sessionStorage["HKeeper"] = result.data[0].HKeeper;
+ sessionStorage["HSecManagerID"] = result.data[0].HSecManagerID;
+ sessionStorage["HSecManager"] = result.data[0].HSecManager;
+ sessionStorage["HSellManID"] = result.data[0].HSellManID;
+ sessionStorage["HSellMan"] = result.data[0].HSellMan;
+ sessionStorage["HDeptID"] = result.data[0].HDeptID;
+ sessionStorage["HDept"] = result.data[0].HDept;
+ sessionStorage["HWHID"] = result.data[0].HWhID;
+ sessionStorage["HWHName"] = result.data[0].HWHName;
+ sessionStorage["HSPID"] = result.data[0].HSPID;
+ sessionStorage["HSPName"] = result.data[0].HSPName;
+ sessionStorage["HSupID"] = result.data[0].HSupID;
+ sessionStorage["HSupName"] = result.data[0].HSupName;
+ sessionStorage["Czmm"] = result.data[0].Czmm;
+ sessionStorage["Czybm"] = result.data[0].Czybm;
+ sessionStorage["HEmpID"] = result.data[0].HEmpID;
+ sessionStorage["HEmpNumber"] = result.data[0].HEmpNumber;
+ sessionStorage["HEmpName"] = result.data[0].HEmpName;
+ sessionStorage["HGroup"] = result.data[0].HGroup;
+ sessionStorage["HGroupID"] = result.data[0].HGroupID;
+ sessionStorage["HProc"] = result.data[0].HProc;
+ sessionStorage["HProcNo"] = result.data[0].HProcNo;
+ sessionStorage["HSource"] = result.data[0].HSource;
+ sessionStorage["HSourceID"] = result.data[0].HSourceID;
+ sessionStorage["HWorkCenter"] = result.data[0].HWorkCenter;
+ sessionStorage["HWorkCenterID"] = result.data[0].HWorkCenterID;
+ sessionStorage["HProcName"] = result.data[0].HProcName;
+ sessionStorage["HProcID"] = result.data[0].HProcID;
+ sessionStorage["HCheckEmpID"] = result.data[0].HCheckEmpID;
+ sessionStorage["HCheckEmpName"] = result.data[0].HCheckEmpName;
+ sessionStorage["login"] = "login";
+ sessionStorage["OrganizationID"] = $("#Organization").val();
+ sessionStorage["Organization"] = $("#Organization option:selected").text();
+ //sessionStorage["IP"] = System.Configuration.ConfigurationSettings.AppSettings("name");
+ if (!judgeMorPCflag) {//绉诲姩绔�
+ window.location.href = '../../views/index_Mobile.html'
+ } else {//PC绔�
+ window.location.href = '../../views/indexMenu.html'
+ }
+ get_WriteConfigFile();
+ }
+ }
+ });
+ }
+
+
function playSound() {
var audio = document.getElementById("cs");
if (audio == null)
@@ -454,7 +526,11 @@
})
}
});
+ function getDataByICCard(obj) {
+ LoginData = obj;
+ }
</script>
+
</body>
</html>
\ No newline at end of file
diff --git a/WebTM/views/user/login_ICCard.html b/WebTM/views/user/login_ICCard.html
new file mode 100644
index 0000000..eb1d1f3
--- /dev/null
+++ b/WebTM/views/user/login_ICCard.html
@@ -0,0 +1,123 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鍒峰崱寮�宸�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <!--寮曠敤layui鏍峰紡鏂囦欢-->
+ <link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
+ <!--寮曠敤layui js鏂囦欢-->
+ <script src="../../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../../layuiadmin/PageTitle.js"></script>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px; height: 280px; background-image: url(../../layuiadmin/ax/images/iccard-bg.jpg); height: 240px; background-size: 100% 100%;">
+ <!--<div class="layui-row header">
+ <h1 class="layui-col-xs4 layui-col-xs-offset4" style="color: #1e9fff ">鍒峰崱鐧诲綍</h1>
+ </div>-->
+ <div style="margin-top:5px">
+ <label class="layui-form-label">
+ <i class="layui-icon layui-icon-username"></i>
+ </label>
+ <div class="layui-col-xs6">
+ <input type="text" class="layui-input" placeholder="璇峰埛IC鍗�" id="HBardCode" autocomplete="off" name="HBardCode" lay-verify="HBardCode" style="">
+ </div>
+ </div>
+ <!--<div style="background-image: url(../../layuiadmin/ax/images/iccard-bg.jpg); height: 240px; background-size: 100% 100%;margin-top:40px">
+
+ </div>-->
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+
+</body>
+</html>
+<script>
+ layui.config({
+ base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+
+ //#endregion
+
+ //#region 鍒濆鍖栫晫闈�
+ //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
+ $("#HBardCode").focus();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏉＄爜鍥炶溅
+ $('#HBardCode').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ event.preventDefault();//绂佺敤琛ㄥ崟鍥炶溅鎻愪氦鑷甫鍔熻兘
+ var HBardCode = $('#HBardCode').val();
+ if (!HBardCode) {
+ layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ return;
+ }
+ txtHBarCode_KeyDown(HBardCode);
+ }
+ });
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鏉＄爜鍥炶溅
+ function txtHBarCode_KeyDown(HBarCode) {
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetUserByICCard",
+ type: "GET",
+ data: { "HBarCode": HBarCode },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.close(index);
+ layer.msg("鐧诲綍鍖归厤鎴愬姛!", { time: 1 * 1000, icon: 1 }, function (index) {
+ parent.getDataByICCard(result);
+ setTimeout(function () {
+ var index2 = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index2);
+ }, 700);
+ })
+ }
+ else {
+ layer.close(index);
+ layer.msg("鍑虹幇闂锛�" + result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ //#endregion
+
+ //浠ヤ笂涓簂ayui妯″潡
+ });
+
+</script>
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 581b78e..a2d076e 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"
@@ -656,37 +656,37 @@
var com = "";
switch (Comparator) {
case "7":
- com = "like''%" + ColContent + "%''";
+ com = "like'%" + ColContent + "%'";
break;
case "8":
- com = "like''%" + ColContent + "''";
+ com = "like'%" + ColContent + "'";
break;
case "9":
- com = "like''" + ColContent + "%''";
+ com = "like'" + ColContent + "%'";
break;
case "10":
- com = "not like''%" + ColContent + "%''";
+ com = "not like'%" + ColContent + "%'";
break;
default:
- com = "" + Comparator + "''" + ColContent + "''";
+ com = "" + Comparator + "'" + ColContent + "'";
break;
}
sWhere += " and " + ColName + " " + com;
}
if (HNumber) {
- sWhere += " and 鐗╂枡浠ｇ爜 like ''%" + HNumber + "%''";
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HNumber + "%'";
}
if (HName) {
- sWhere += " and 鐗╂枡鍚嶇О like ''%" + HName + "%''";
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + HName + "%'";
}
if (HModel) {
- sWhere += " and 瑙勬牸鍨嬪彿 like ''%" + HModel + "%''";
+ sWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
}
if (HOrgName) {
- sWhere += " and 缁勭粐鍚嶇О like ''%" + HOrgName + "%''";
+ sWhere += " and 缁勭粐鍚嶇О like '%" + HOrgName + "%'";
}
if (HProject) {
- sWhere += " and 椤圭洰鍙� like ''%" + HProject + "%''";
+ sWhere += " and 椤圭洰鍙� like '%" + HProject + "%'";
}
if (GetDataCols != "") {
@@ -1090,7 +1090,7 @@
sql = "";
HMaterTypeID = 0;
} else {
- sql = " and HMaterTypeID=''" + data.id + "'' ";
+ sql = " and HMaterTypeID='" + data.id + "' ";
HMaterTypeID = data.id;
}
get_FastQuery()
@@ -1409,7 +1409,7 @@
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var HOrgID = params[params[1]];
if (openType == 2) {
- sWhere += " and 绂佺敤鏍囪 = '''' ";
+ sWhere += " and 绂佺敤鏍囪 = '' ";
Organ(HOrgID);
}
}
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 cbb14b7..a6737ed 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"
@@ -63,7 +63,7 @@
<button type="button" lay-submit="" class="layui-btn" lay-filter="HDepart-BT" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn " style="margin-left:-9px"></i>
</button>
- <input id="HDeptID" name="HDeptID" type="hidden" />
+ <input id="HDeptID" name="HDeptID" type="hidden" value="0"/>
</div>
</div>
<div class="layui-inline">
@@ -79,8 +79,8 @@
<button type="button" lay-submit="" class="layui-btn" lay-filter="HProc-BT" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px"></i>
</button>
- <input id="HProcID" name="HProcID" type="hidden" />
- <input id="HProcNumber" name="HProcNumber" type="hidden" />
+ <input id="HProcID" name="HProcID" type="hidden" value="0" />
+ <input id="HProcNumber" name="HProcNumber" type="hidden" />
</div>
</div>
</div>
@@ -92,7 +92,7 @@
<button type="button" lay-submit="" class="layui-btn" lay-filter="HBadType-BT" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn " style="margin-left:-9px"></i>
</button>
- <input id="HBadTypeID" name="HBadTypeID" type="hidden" />
+ <input id="HBadTypeID" name="HBadTypeID" type="hidden" value="0" />
</div>
</div>
<div class="layui-inline">
@@ -374,12 +374,12 @@
$("#HHelpCode").val(data.鍔╄浠ｇ爜);//鍔╄浠ｇ爜
$("#HDeptNumber").val(data.閮ㄩ棬浠ｇ爜);//榛樿閮ㄩ棬浠ｇ爜
$("#HDepName").val(data.閮ㄩ棬鍚嶇О);//榛樿閮ㄩ棬
- $("#HDeptID").val(data.閮ㄩ棬ID);//閮ㄩ棬id
+ $("#HDeptID").val(data.閮ㄩ棬ID == null ? '0' : data.閮ㄩ棬ID);//閮ㄩ棬id
$("#HProcName").val(data.宸ュ簭鍚嶇О);//榛樿宸ュ簭
- $("#HProcID").val(data.宸ュ簭ID);//宸ュ簭ID
+ $("#HProcID").val(data.宸ュ簭ID == null ? '0' : data.宸ュ簭ID);//宸ュ簭ID
$("#HProcNumber").val(data.宸ュ簭浠ｇ爜);//宸ュ簭浠ｇ爜
$("#HBadTypeName").val(data.涓嶈壇绫诲瀷);//榛樿涓嶈壇绫诲瀷
- $("#HBadTypeID").val(data.HBadTypeID);//涓嶈壇绫诲瀷ID
+ $("#HBadTypeID").val(data.HBadTypeID == null ? '0' : data.HBadTypeID);//涓嶈壇绫诲瀷ID
$("#HBadTypeNumber").val(data.涓嶈壇绫诲瀷浠ｇ爜);//涓嶈壇绫诲瀷浠ｇ爜
$("#HRemark").val(data.澶囨敞);//澶囨敞
$("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囪);//true:閫変腑 false:涓嶉�変腑
@@ -395,24 +395,24 @@
}
//鏁版嵁楠岃瘉
function AllowLoadData() {
- if ($("#HHelpCode").val() == '') {
- layer.msg("璇峰～鍐欏姪璁扮爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HDeptNumber").val() == '') {
- layer.msg("璇烽�夋嫨榛樿閮ㄩ棬", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
+ //if ($("#HHelpCode").val() == '') {
+ // layer.msg("璇峰～鍐欏姪璁扮爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
+ //if ($("#HDeptNumber").val() == '') {
+ // layer.msg("璇烽�夋嫨榛樿閮ㄩ棬", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
- if ($("#HProcName").val() == '') {
- layer.msg("璇烽�夋嫨榛樿宸ュ簭", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
+ //if ($("#HProcName").val() == '') {
+ // layer.msg("璇烽�夋嫨榛樿宸ュ簭", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
- if ($("#HBadTypeNumber").val() == '') {
- layer.msg("璇烽�夋嫨榛樿涓嶈壇绫诲瀷", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
+ //if ($("#HBadTypeNumber").val() == '') {
+ // layer.msg("璇烽�夋嫨榛樿涓嶈壇绫诲瀷", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
return true;
}
//
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
index bc924c9..f302b77 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
@@ -205,7 +205,6 @@
var OperationType = 1;//鎿嶄綔绫诲瀷
var closeType = 2; //鍏抽棴绫诲瀷
} else {
- debugger;
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.html"
index 72f7860..f96cd6e 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.html"
@@ -202,6 +202,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit" id="audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit" id="Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -290,6 +292,14 @@
});
//#endregion
+
+ //杈撳叆妗嗗洖杞︽柟娉�
+ $('input').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
@@ -507,6 +517,23 @@
});
})
//#endregion
+
+ //#region 鎺掑簭鍚庨�夋嫨
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+ });
+ //#endregion
+
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
@@ -580,7 +607,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
@@ -605,6 +632,14 @@
break;
//鍙嶅鏍�
case 'btn-Faudit': get_FAudit();
+ break;
+ //鍏抽棴鎸夐挳 锛�0:鍏抽棴銆�1:鍙嶅叧闂級
+ case 'btn-Close':
+ set_CloseBill(0);
+ break;
+ //鍙嶅叧闂寜閽�
+ case 'btn-DeClose':
+ set_CloseBill(1);
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
@@ -688,7 +723,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
@@ -721,7 +756,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
@@ -737,6 +772,42 @@
}
}
+ //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+ function set_CloseBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MouldProdBackBill/CloseSc_MouldProdBackBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹叧闂紒');
+ }
+ }
+ //#endregion
+
//#region 蹇�熻繃婊�
function get_FastQuery(table, option) {
var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
index 5df1f37..0aa97a3 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
@@ -14,39 +14,40 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
+
<style type="text/css">
/*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
- .layui-form-item .layui-inline {
+ /*.layui-form-item .layui-inline {
margin-top: 5px;
margin-bottom: 5px;
margin-right: 0px;
- }
+ }*/
/*end*/
/*椤甸潰杈撳叆妗嗛棿璺濅紭鍖�*/
- .layui-card .layui-tab-brief .layui-tab-content {
+ /*.layui-card .layui-tab-brief .layui-tab-content {
padding: 10px;
- }
+ }*/
/*琛ㄥ崟鍏冪礌灞呬笅澶氬皯鍍忕礌*/
- .layui-form-item {
+ /*.layui-form-item {
margin-bottom: 0px;
- }
+ }*/
/* 琛ㄥ崟妗嗛珮搴�*/
- .layui-input, .layui-select, .layui-textarea {
+ /*.layui-input, .layui-select, .layui-textarea {
height: 32px;
- }
+ }*/
/*琛ㄥ崟鎸夐挳楂樺害銆佽楂�*/
- .layui-btn {
+ /*.layui-btn {
height: 31px;
line-height: 31px;
- }
+ }*/
/*琛ㄥ崟鏍囩鍚嶅唴闂磋窛(涓婁笅闂磋窛銆佸乏鍙抽棿璺�)*/
- .layui-form-label {
+ /*.layui-form-label {
padding: 6px 15px;
- }
+ }*/
/*鏁翠釜椤甸潰鎵�鏈夎緭鍏ユ銆侀潰鏉跨瓑杈规棰滆壊*/
- .layui-badge-rim, .layui-border, .layui-colla-content, .layui-colla-item, .layui-collapse, .layui-elem-field, .layui-form-pane .layui-form-item[pane], .layui-form-pane .layui-form-label, .layui-input, .layui-layedit, .layui-layedit-tool, .layui-panel, .layui-quote-nm, .layui-select, .layui-tab-bar, .layui-tab-card, .layui-tab-title, .layui-tab-title .layui-this:after, .layui-textarea {
+ /*.layui-badge-rim, .layui-border, .layui-colla-content, .layui-colla-item, .layui-collapse, .layui-elem-field, .layui-form-pane .layui-form-item[pane], .layui-form-pane .layui-form-label, .layui-input, .layui-layedit, .layui-layedit-tool, .layui-panel, .layui-quote-nm, .layui-select, .layui-tab-bar, .layui-tab-card, .layui-tab-title, .layui-tab-title .layui-this:after, .layui-textarea {
border-color: #dbd8d8;
- }
+ }*/
</style>
</head>
<body>
@@ -235,7 +236,6 @@
var OperationType = 1;//鎿嶄綔绫诲瀷
var closeType = 2; //鍏抽棴绫诲瀷
} else {
- debugger;
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
@@ -595,6 +595,40 @@
Pub_Close(1);
}
});
+ //澶嶅埗
+ form.on('submit(Copy)', function (data) {
+ set_Copy();
+ });
+ //鏂板
+ form.on('submit(Add)', function (data) {
+ //鍒跺崟浜�
+ //$("#HMaker").val(sessionStorage["HUserName"]);
+ //$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鑾峰彇鏈�澶у崟鎹彿
+ get_MAXNum();
+ linterid = "";
+ option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
+ table.render(option);
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HInnerBillNo": ""
+ , "HWHID": 0 //浠撳簱ID
+ , "HWHName": "" //浠撳簱鍚嶇О
+ , "HSecManagerID": 0 //楠屾敹鍛業D
+ , "HSecManagerName": "" //楠屾敹鍛樺悕绉�
+ , "HKeeperID": 0 //淇濈鍛業D
+ , "HKeeperName": "" //淇濈鍛樺悕绉�
+ , "HDeptID": 0 //閮ㄩ棬ID
+ , "HDeptName": "" //閮ㄩ棬鍚嶇О
+ , "HSourceBillType": "" //婧愬崟绫诲瀷
+ , "XDH": "" //閫夊崟鍙�
+ , "HExplanation": "" //鎽樿
+ , "HRemark": "" //澶囨敞
+ , "HSupTypeID": "" //閫夊崟鍙�
+ , "HSupName": "" //鎽樿
+ , "HSupID": 0 //澶囨敞
+ });
+
+ });
//棰勮
form.on("submit(planview)", function (data) {
if (linterid != "" || linterid != null) {
@@ -891,6 +925,16 @@
}
});
}
+ //#region 澶嶅埗
+ function set_Copy() {
+ //鍒跺崟浜�
+ //$("#HMaker").val(sessionStorage["HUserName"]);
+ //$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鑾峰彇鏈�澶у崟鎹彿
+ get_MAXNum();
+ linterid = "";
+ }
+ //#endregion
//鏃ユ湡鏍煎紡鍖�
function formatDate(date) {
var d = new Date(date),
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.html"
index 5736e56..e4c14ae 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.html"
@@ -209,6 +209,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit" id="audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit" id="Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -311,6 +313,14 @@
//鍙嶅鏍�
case 'btn-Faudit': get_FAudit();
break;
+ //鍏抽棴鎸夐挳 锛�0:鍏抽棴銆�1:鍙嶅叧闂級
+ case 'btn-Close':
+ set_CloseBill(0);
+ break;
+ //鍙嶅叧闂寜閽�
+ case 'btn-DeClose':
+ set_CloseBill(1);
+ break;
//鍒锋柊
case 'get_Refresh': set_Refresh();
break;
@@ -347,6 +357,12 @@
optionPage.curr = 1;
get_FastQuery(table, option);
+ });
+ //杈撳叆妗嗗洖杞︽柟娉�
+ $('input').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
});
//#endregion
@@ -433,17 +449,6 @@
soulTable.render(this);
}
};
- //璁剧疆鍒楀
- var colWidth = getColumnsWidth();
- if (colWidth == "" || colWidth == []) {
-
- }
- else {
- $.each(columns, function (x, m) {
- m["width"] = colWidth[x];
- });
- }
-
optionPage = {
@@ -630,7 +635,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").click();
});
} else {
@@ -708,7 +713,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").click();
});
} else {
@@ -741,7 +746,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").click();
});
} else {
@@ -756,128 +761,45 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
}
}
-
- //鑾峰彇鍒楀
- function getColumnsWidth() {
- var result = [];
- var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
- //鑾峰彇鍒楀
- $.ajax({
- url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
- async: false,
- type: "Get",
- dataType: "json",
- data: { "colNum": colNum, "Name": Name },
- success: function (data1) {
- if (data1.code == 1) {
- result = data1.data;
- }
- else if (data1.code == -1) {
- }
- else {
- layer.alert(data1.Message, { icon: 5 });
- }
- }, error: function (e) {
- layer.alert(e.Message, { icon: 5 });
- }
- });
+ //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+ function set_CloseBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MouldProdInBill/CloseSc_MouldProdInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
- return result;
- }
- //淇濆瓨鍒楀
- function set_SaveGridColWidth() {
- var arr = [];
- // 鍒楁暟
- var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
- for (var i = 0; i <= colNum; i++) {
- var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
- var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
- if (colName != "" && colName != null) {
- arr.push(colWidth == -1 ? 200 : colWidth);
- }
- }
- arr.unshift(40); //棣栦綅杩藉姞
- $.ajax({
- url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
- async: false,
- type: "POST",
- dataType: "json",
- data: { "myMap": JSON.stringify(arr), "Name": Name },
- success: function (data1) {
- if (data1.count == 1) {
- layer.alert(data1.Message, { icon: 1 });
- } else {
- layer.alert(data1.Message, { icon: 5 });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- }, error: function (e) {
- layer.alert(e.Message, { icon: 5 });
- }
- });
- //璁剧疆璧嬪�煎垪瀹�
- var colWidth = getColumnsWidth();
- if (colWidth == "" || colWidth == []) {
-
- }
- else {
- $.each(columns, function (x, m) {
- m["width"] = colWidth[x];
});
}
- get_FastQuery(table, option);
- }
- //榛樿鍒楀
- function set_DefaultGridColWidth() {
- var arr = [];
- // 鍒楁暟
- var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
- for (var i = 0; i <= colNum; i++) {
- var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
- if (colName != "" && colName != null) {
- arr.push(200); //榛樿瀹藉害200
- }
- }
- arr.unshift(40); //棣栦綅杩藉姞
- $.ajax({
- url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
- async: false,
- type: "POST",
- dataType: "json",
- data: { "myMap": JSON.stringify(arr), "Name": Name },
- success: function (data1) {
- if (data1.count == 1) {
- layer.alert(data1.Message, { icon: 1 });
-
- } else {
- layer.alert(data1.Message, { icon: 5 });
- }
- }, error: function (e) {
- layer.alert(e.Message, { icon: 5 });
- }
- });
- //璁剧疆璧嬪�煎垪瀹�
- var colWidth = getColumnsWidth();
- if (colWidth == "" || colWidth == []) {
-
- }
else {
- $.each(columns, function (x, m) {
- m["width"] = colWidth[x];
- });
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹叧闂紒');
}
- get_FastQuery(table, option);
}
+ //#endregion
//澶嶅埗鍗曟嵁
function set_CopyBill() {
-
- }
- //鍏抽棴鍗曟嵁
- function set_CloseBill() {
-
- }
- //鍙嶅叧闂崟鎹�
- function set_CancelCloseBill() {
}
//浣滃簾鍗曟嵁
@@ -911,6 +833,23 @@
})
//#endregion
+ //#region 鎺掑簭鍚庨�夋嫨
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+ });
+ //#endregion
+
+
//蹇�熻繃婊�
function get_FastQuery(table, option) {
var HStatus = $("select[name='HStatus']").val();//鐘舵��
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBillList.html"
index c01eb38..513c03d 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBillList.html"
@@ -121,6 +121,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit" id="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit" id="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -214,6 +216,14 @@
get_FastQuery(table, option);
});
//#endregion
+
+ //杈撳叆妗嗗洖杞︽柟娉�
+ $('input').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
@@ -462,7 +472,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
@@ -487,6 +497,14 @@
break;
//鍙嶅鏍�
case 'btn-Faudit': get_FAudit();
+ break;
+ //鍏抽棴鎸夐挳 锛�0:鍏抽棴銆�1:鍙嶅叧闂級
+ case 'btn-Close':
+ set_CloseBill(0);
+ break;
+ //鍙嶅叧闂寜閽�
+ case 'btn-DeClose':
+ set_CloseBill(1);
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
@@ -527,7 +545,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
@@ -582,7 +600,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
@@ -597,7 +615,41 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
}
}
+ //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+ function set_CloseBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MouldProdMoveBill/CloseSc_MouldProdMoveBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹叧闂紒');
+ }
+ }
+ //#endregion
//棰勮
function get_ViewReport() {
var checkStatus = table.checkStatus('mainTable')
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillList.html"
index 0d22213..e89e07c 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillList.html"
@@ -120,6 +120,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit" id="audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit" id="Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -207,6 +209,13 @@
});
//#endregion
+
+ //杈撳叆妗嗗洖杞︽柟娉�
+ $('input').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
@@ -368,7 +377,7 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
- if (data1.count != 0) {
+ if (data1.code == 1) {
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
laypage.render(optionPage);
@@ -393,7 +402,7 @@
option.data = [];
ins = table.render(option);
layer.close(ajaxLoad);
- /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
layer.close(ajaxLoad);
@@ -476,7 +485,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
@@ -501,6 +510,14 @@
break;
//鍙嶅鏍�
case 'btn-Faudit': get_FAudit();
+ break;
+ //鍏抽棴鎸夐挳 锛�0:鍏抽棴銆�1:鍙嶅叧闂級
+ case 'btn-Close':
+ set_CloseBill(0);
+ break;
+ //鍙嶅叧闂寜閽�
+ case 'btn-DeClose':
+ set_CloseBill(1);
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
@@ -585,7 +602,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
@@ -623,6 +640,21 @@
})
//#endregion
+ //#region 鎺掑簭鍚庨�夋嫨
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+ });
+ //#endregion
//鍙嶅鏍�
function get_FAudit() {
var checkStatus = table.checkStatus('mainTable')
@@ -640,7 +672,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
@@ -655,6 +687,42 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
}
}
+
+ //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+ function set_CloseBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MouldProdOutBill/CloseSc_MouldProdOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹叧闂紒');
+ }
+ }
+ //#endregion
//#region 蹇�熻繃婊�
function get_FastQuery(table, option) {
@@ -713,14 +781,14 @@
$("#HSupName").val("");
$("#HStockOrgName").val("");
sWhere = "";
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
}
//#endregion
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
}
//#endregion
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBillList.html"
index 13389a3..fb9657f 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBillList.html"
@@ -197,7 +197,7 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<div id="page" style="position: relative; bottom: 0;"></div>
<script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+ <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view" id="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
@@ -205,6 +205,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit" id="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit" id="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
@@ -306,6 +308,14 @@
//鍙嶅鏍�
case 'btn-Faudit': get_FAudit();
break;
+ //鍏抽棴鎸夐挳 锛�0:鍏抽棴銆�1:鍙嶅叧闂級
+ case 'btn-Close':
+ set_CloseBill(0);
+ break;
+ //鍙嶅叧闂寜閽�
+ case 'btn-DeClose':
+ set_CloseBill(1);
+ break;
//鍒犻櫎鎸夐挳
case 'btn-Delete':set_DeleteBill();
break;
@@ -359,6 +369,14 @@
optionPage.curr = 1;
get_FastQuery(table, option);
});
+
+ //杈撳叆妗嗗洖杞︽柟娉�
+ $('input').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
//#endregion
@@ -655,7 +673,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
@@ -687,7 +705,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
@@ -746,7 +764,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
@@ -764,6 +782,43 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
}
+
+ //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+ function set_CloseBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MouldScrapInBill/CloseSc_MouldScrapInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹叧闂紒');
+ }
+ }
+ //#endregion
+
//鍒锋柊
function set_Refresh() {
$("#btnSearch").click();
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBillList.html"
index 7897733..5d7beab 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBillList.html"
@@ -202,6 +202,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit" id="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit" id="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
@@ -307,6 +309,14 @@
//鍒犻櫎
case 'btn-Delete': set_DeleteBill();
break;
+ //鍏抽棴鎸夐挳 锛�0:鍏抽棴銆�1:鍙嶅叧闂級
+ case 'btn-Close':
+ set_CloseBill(0);
+ break;
+ //鍙嶅叧闂寜閽�
+ case 'btn-DeClose':
+ set_CloseBill(1);
+ break;
//鍒锋柊
case 'get_Refresh': set_Refresh();
break;
@@ -376,7 +386,12 @@
optionPage.curr = 1;
get_FastQuery();
});
-
+ //杈撳叆妗嗗洖杞︽柟娉�
+ $('input').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
//#endregion
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
@@ -826,7 +841,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
@@ -858,7 +873,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
@@ -898,7 +913,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
@@ -920,7 +935,41 @@
$("#btnSearch").click();
}
-
+ //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+ function set_CloseBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MouldScrapOutHouseBill/CloseSc_MouldScrapOutHouseBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹叧闂紒');
+ }
+ }
+ //#endregion
////瀹℃牳
//function set_CheckBill() {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index 5303753..41317ca 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -80,7 +80,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
<div class="layui-input-inline" style="width:440px">
- <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;" autocomplete="off">
<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -356,11 +356,6 @@
</script>
<script>
- //#region 鏂囨湰妗嗚緭鍏ユ悳绱㈢浉鍏虫暟鎹�-鍙橀噺
- var childPage = null; //鑾峰彇瀛愮獥鍙ｅ璞★紝鐢ㄤ簬鎿嶄綔瀛愮獥鍙ｇ殑鍙橀噺鍜屾柟娉�
- var currRowIndex = 0; //鐢ㄤ簬瀹氫綅瀛愮獥鍙ｅ綋鍓嶉�変腑鐨勮
- var childData = null; //鐢ㄤ簬鑾峰彇瀛愮獥鍙ｈ繑鍥炵殑鏁版嵁
- //#endregion
//#region 鎶樺彔娉ㄩ噴
//#endregion
@@ -368,7 +363,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ }).use(['index', 'form', 'laydate', 'table', 'element','tableSelect'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
@@ -377,7 +372,8 @@
, table = layui.table
, laydate = layui.laydate
, form = layui.form
- , element = layui.element;
+ , element = layui.element
+ , tableSelect = layui.tableSelect;
var sWhere = "";
var date = new Date();
var day = date.getDate();
@@ -385,6 +381,10 @@
var year = date.getFullYear();
var shijian = year + "-" + month + "-" + day;
var allVal;
+
+
+
+
//#endregion
//璁板綍缁勭粐鐨勫��
@@ -1011,6 +1011,32 @@
//#endregion
function set_InitGrid() {
+ //渚涘簲鍟嗚緭鍏ユ
+ tableSelect.render({
+ elem: '#HSupName',//杈撳叆妗哾om閫夋嫨
+ checkedKey: 'HItemID',//鏌ヨ鍒楄〃涓婚敭鐢ㄤ簬鑾峰彇鍘嗗彶
+ searchKey: '渚涘簲鍟嗗悕绉�',//鏌ヨ鐨勫垪鍚�
+ sWhere: '',//table鎼滅储sWhere鏉′欢 //榛樿绛涢�夐」
+ table: {
+ url: GetWEBURL() + 'Gy_Supplier/page',
+ where: { user: '缈佹稕娑�', Organization: '娴欐睙鏅轰簯杩堟��' },
+ cols: [[
+ { type: 'radio' },
+ { field: 'HItemID', title: 'HItemID' },
+ { field: '渚涘簲鍟嗗悕绉�', title: '渚涘簲鍟嗗悕绉�' },
+ ]],
+ page: true,
+ limit: 5,
+ limits:[5]
+ },
+ done: function (elem, data) {
+ if (data != []) {
+ $("#HSupName").val(data.data[0]['渚涘簲鍟嗗悕绉�']);
+ $("#HSupID").val(data.data[0]['HItemID']);
+ }
+
+ }
+ })
option = {
elem: '#mainTable' // 浣跨敤#mainTable浣滀负琛ㄦ牸鐨凞OM鍏冪礌
, toolbar: '#toolbarDemo' //鍔犺浇tolbardemo杩欎釜琛ㄦ牸
@@ -1327,232 +1353,6 @@
function set_GridCellCheck(obj) { //瀹氫箟浜嗕竴涓悕涓簊et_GridCellCheck鐨勫嚱鏁帮紝瀹冩帴鍙椾竴涓弬鏁皁bj
//浣跨敤$(document).off('keydown', ".layui-table-edit")鏉ョЩ闄わ紙濡傛灉瀛樺湪鐨勮瘽锛変箣鍓嶇粦瀹氬埌鏂囨。涓墍鏈�.layui-table-edit绫诲厓绱犱笂鐨刱eydown浜嬩欢鐩戝惉鍣�
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
- //#region 瀛愯〃鏂囨湰妗嗚緭鍏ュ悗妫�绱㈡暟鎹�
- if (event.key != "F7") {
- var errKeys = ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Enter"];
- //鏍规嵁瀛愯〃璁剧疆鐨別vent锛岃Е鍙戠浉搴斿脊绐�=================================================================================================
- if (obj.event == "HMaterID") { //瀹氫綅褰撳墠姝ｅ湪杈撳叆鐨勬枃鏈鐨勫垪鍚�
- //==========================================================================================================
- if ($.inArray(event.key, errKeys) == -1) { //濡傛灉鎸変笅鐨勯敭浣嶄笉鏄� 鏂瑰悜閿紝鍒欏埛鏂板脊绐椾腑鐨勬暟鎹�
- if (childPage == null) { //鍒ゆ柇褰撳墠瀛愮獥鍙ｆ槸鍚﹀凡缁忔墦寮�锛岃嫢鏈墦鍗★紝鍒欐墦寮�椤甸潰锛屽苟鑾峰彇瀛愮獥鍙ｇ殑瀵硅薄
- var offset = $(this).offset(); //鑾峰彇瑙﹀彂浜嬩欢鐨勫厓绱犵殑浣嶇疆锛岀敤浜庡畾浣嶅瓙绐楀彛鎵撳紑鐨勪綅缃�
- var innerHeight = window.innerHeight;
- var top = offset.top + 0.05 * innerHeight;
- var left = offset.left;
- if (top + 0.05 * innerHeight + 0.3 * innerHeight > innerHeight) {
- top = top - 0.3 * innerHeight - 0.05 * innerHeight;
- }
- layer.open({
- type: 2 //寮圭獥绫诲瀷
- , skin: 'layui-layer-rim' //鍔犱笂杈规
- , area: ['25%', '30%'] //澶у皬
- , shadeClose: true //鐐瑰嚮閬僵鏃跺叧闂脊绐�
- , offset: [top, left]
- , title: false //涓嶆樉绀烘爣棰樻爮
- //, title: '椤圭洰璐圭敤鍒楄〃' //鏍囬
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , closeBtn: 0 //绂佺敤鍏抽棴鎸夐挳
- , content: ["../../鍩虹璧勬枡/閫氱敤鍩虹璧勬枡/Gy_CommonBaseData.html?OperationType=2", "yes"]
- , success: function (layero, index) {
- setTimeout(function () {
- //淇敼锛屾牴鎹枃鏈鏁版嵁锛岀紪鍐欐煡璇㈣鍙�=========================================================================================================
- var value = $(e.currentTarget).val().replace(/'/g, ""); //鑾峰彇鏂囨湰妗嗘渶鏂板��
- currRowIndex = 0;
- var tableView = "h_v_Gy_MaterialList";
- var childSWhere = "select top(10) HItemID,鐗╂枡浠ｇ爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,HUnitID,璁￠噺鍗曚綅鍚嶇О from " + tableView + " where 1=1 and 缁勭粐鍚嶇О = '" + sessionStorage["Organization"] + "' and (鐗╂枡浠ｇ爜 like '%" + value + "%' or 鐗╂枡鍚嶇О like '%" + value + "%') order by 鐗╂枡浠ｇ爜 desc";
- childPage.getData(childSWhere, tableView);
- //====================================================================================================================================
- }, 200);
- }
- , end: function () {
- obj.event = "";
- childPage = null;
- currRowIndex = 0;
- //===========================================================================================================================
- if (childData != null) {
- OptionData = childData; //鎶婇�変腑鏁版嵁璧嬪�肩粰OptionData鍙橀噺
- //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
- var HSupID = $("#HSupID").val();
- if (HSupID != 0 && typeof (OptionData.HItemID) != "undefined") {
- var Dec = getDecByMaterID(OptionData.HItemID) //鑾峰彇绮惧害
- var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //鏁伴噺绮惧害
- var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //鍗曚环绮惧害
- var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //閲戦绮惧害
- $.ajax({
- url: GetWEBURL() + "/Gy_Supplier/xg",
- //url: "http://localhost:12761/Gy_Supplier/xg",
- type: "GET",
- data: {
- "HInterID": HSupID
- },
- success: function (d) {
- var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
- var HExRate = $("#HExRate").val(); //姹囩巼
- //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
- var HQty = obj.data.HQty * 1; //鏁伴噺
- var HPrice = obj.data.HPrice * 1; //鍗曚环
- var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
- var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
- var HTaxPrice = Number((HPrice * (1 + HTaxRate))); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
- var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�
- var HRelTaxPrice = Number((HTaxPrice * HDiscountRate)); //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�
- var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
- //鏁板瓧绮惧害
- HQty = Number(HQty.toFixed(HQtyDec));
- HPrice = Number(HPrice.toFixed(HPriceDec));
- HMoney = Number(HMoney.toFixed(HMoneyDec));
- HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
- HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
- HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
- HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
- HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
- obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
- "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
- , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
- , "HUnitID": OptionData.HUnitID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- , "HTaxRate": HTaxRate * 100
- , "HQty": HQty //鏇存柊HQty瀛楁锛孒Qty
- , "HPrice": HPrice //鏇存柊HPrice瀛楁锛孒Price
- , "HMoney": HMoney //鏇存柊HMoney瀛楁锛孒Money
- , "HTaxMoney": HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
- , "HlineTotal": HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
- , "HTaxPrice": HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
- , "HRelTaxPrice": HRelTaxPrice //鏇存柊HRelTaxPrice瀛楁锛屽叾鍊兼潵鑷彉閲廐RelTaxPrice
- , "HlineTotalBB": HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
- })
- }
- });
- } else {
- obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
- "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
- , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
- , "HUnitID": OptionData.HUnitID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- })
- }
-
- OptionData = {};
- childData = null;
- }
- //============================================================================================================================
- }
- });
- } else {
- setTimeout(function () {
- //淇敼锛屾牴鎹枃鏈鏁版嵁锛岀紪鍐欐煡璇㈣鍙�=========================================================================================================
- var value = $(e.currentTarget).val().replace(/'/g, ""); //鑾峰彇鏂囨湰妗嗘渶鏂板��
- currRowIndex = 0;
- var tableView = "h_v_Gy_MaterialList";
- var childSWhere = "select top(10) HItemID,鐗╂枡浠ｇ爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,HUnitID,璁￠噺鍗曚綅鍚嶇О from " + tableView + " where 1=1 and 缁勭粐鍚嶇О = '" + sessionStorage["Organization"] + "' and (鐗╂枡浠ｇ爜 like '%" + value + "%' or 鐗╂枡鍚嶇О like '%" + value + "%') order by 鐗╂枡浠ｇ爜 desc";
- childPage.getData(childSWhere, tableView);
- //=============================================================================================================================================
- }, 200);
- }
- } else { //濡傛灉鎸変笅鐨勯敭浣嶆槸 鏂瑰悜閿紝鍒欒皟鏁寸獥鍙ｄ腑 閫変腑琛� 鐨勪綅缃�
- if (event.key == "ArrowUp") {
- currRowIndex--;
- childPage.setSelectedRow(currRowIndex);
- } else if (event.key == "ArrowDown") {
- currRowIndex++;
- childPage.setSelectedRow(currRowIndex);
- } else if (event.key == "Enter") {
- //鎵嬪姩澶辩劍
- var element = document.getElementById("HBillNo");
- element.focus();
-
- childPage.getSelectedData(currRowIndex);
-
- //=============================================================================================================
- if (childData != null) {
- OptionData = childData; //鎶婇�変腑鏁版嵁璧嬪�肩粰OptionData鍙橀噺
- //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
- var HSupID = $("#HSupID").val();
- if (HSupID != 0 && typeof (OptionData.HItemID) != "undefined") {
- var Dec = getDecByMaterID(OptionData.HItemID) //鑾峰彇绮惧害
- var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //鏁伴噺绮惧害
- var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //鍗曚环绮惧害
- var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //閲戦绮惧害
- $.ajax({
- url: GetWEBURL() + "/Gy_Supplier/xg",
- //url: "http://localhost:12761/Gy_Supplier/xg",
- type: "GET",
- data: {
- "HInterID": HSupID
- },
- success: function (d) {
- var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
- var HExRate = $("#HExRate").val(); //姹囩巼
- //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
- var HQty = obj.data.HQty * 1; //鏁伴噺
- var HPrice = obj.data.HPrice * 1; //鍗曚环
- var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
- var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
- var HTaxPrice = Number((HPrice * (1 + HTaxRate))); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
- var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�
- var HRelTaxPrice = Number((HTaxPrice * HDiscountRate)); //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�
- var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
- //鏁板瓧绮惧害
- HQty = Number(HQty.toFixed(HQtyDec));
- HPrice = Number(HPrice.toFixed(HPriceDec));
- HMoney = Number(HMoney.toFixed(HMoneyDec));
- HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
- HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
- HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
- HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
- HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
- obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
- "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
- , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
- , "HUnitID": OptionData.HUnitID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- , "HTaxRate": HTaxRate * 100
- , "HQty": HQty //鏇存柊HQty瀛楁锛孒Qty
- , "HPrice": HPrice //鏇存柊HPrice瀛楁锛孒Price
- , "HMoney": HMoney //鏇存柊HMoney瀛楁锛孒Money
- , "HTaxMoney": HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
- , "HlineTotal": HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
- , "HTaxPrice": HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
- , "HRelTaxPrice": HRelTaxPrice //鏇存柊HRelTaxPrice瀛楁锛屽叾鍊兼潵鑷彉閲廐RelTaxPrice
- , "HlineTotalBB": HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
- })
- }
- });
- } else {
- obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
- "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
- , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
- , "HUnitID": OptionData.HUnitID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- })
- }
-
- OptionData = {};
- childData = null;
- }
- //=========================================================================================================================================
-
- childPage = null;
- currRowIndex = 0;
- childData = null;
- obj.event = "";
- }
- }
- }
-
- }
- //#endregion
-
if (event.key == "F7") {//妫�鏌ヨЕ鍙戜簨浠剁殑閿洏鎸夐敭鏄惁鏄疐7閿�
//鐗╂枡
@@ -1756,140 +1556,101 @@
obj.event = ""; //鎶奲oj.event灞炴�� 鍒濆鍖栦负绌�
return false;
}
-
})
- //鍙屽嚮
- $('.layui-table-box tbody td[data-field="鐗╂枡浠ｇ爜"]').off('dblclick').on('dblclick', function () {
- //鎵嬪姩澶辩劍
- var element = document.getElementById("HBillNo");
- element.focus();
+ //鐗╂枡琛ㄦ牸涓嬫媺鎼滅储妗�
+ tableSelect.render({
+ elem: 'td[data-field="鐗╂枡浠ｇ爜"] .layui-table-edit',
+ checkedKey: 'HItemID',
+ searchKey: '鐗╂枡浠ｇ爜',
+ sWhere: '',//table鎼滅储sWhere鏉′欢
+ table: {
+ url: GetWEBURL() + 'Gy_Material/page',
+ where: { user: '缈佹稕娑�', Organization: '娴欐睙鏅轰簯杩堟��' },
+ cols: [[
+ { type: 'checkbox',fixed:'left' },
+ { field: 'HItemID', title: 'HItemID' },
+ { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜' },
+ { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' },
+ ]],
+ page: true,
+ limit: 5,
+ limits: [5]
+ },
+ done: function (elem, data) {
+ $(".layui-table-edit").blur();//鍗曞厓鏍煎け鍘荤劍鐐�
+ setTableByHMater(obj, data);
+ }
+ })
+ }
+ //閫夋嫨鐗╂枡鍗曢�夋垨澶氶�夋敼鍙樿〃鏍间俊鎭�
+ function setTableByHMater(obj, data) {
+ if (data != []) {
+ checkStatus = data;
+ var TaxRate = getHTaxRateByHSupID();
+ //濉叆鐗╂枡鍜岃閲忓崟浣嶄俊鎭�
+ var rowIndex = $(obj.tr).attr("data-index") * 1; //attr("data-index")鐢ㄤ簬鑾峰彇璇r鍏冪礌涓奷ata-index灞炴�х殑鍊�*1杞崲绫诲瀷鐒跺悗璧嬪�肩粰rowIndex
+ for (var i = 0; i < checkStatus.data.length; i++) { //鍒ゆ柇閫変腑鐨勬暟鎹殑闀垮害 鐢ㄤ簬閬嶅巻checkStatus.data鏁扮粍涓殑姣忎釜鍏冪礌
+ if (rowIndex + i >= option.data.length) { //鍒ゆ柇rowIndex + i鐨勭储寮曡秴鍑轰簡option.data鏁扮粍鐨勯暱搴︼紝璇存槑option.data鏁扮粍闇�瑕佹墿灞曚互鍖呭惈鏇村琛�
+ var NewRow = {
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "HQty": 1, "HRemark": ""
+ , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "1", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0", "HDate": Format(new Date, "yyyy- MM - dd")
+ }; // 鍒涘缓涓�涓柊鐨勫寘鍚暟缁� 鍏跺垵濮嬪�间负绌烘垨鑰�0 鎴栬�呮槸鏃堕棿鏍煎紡
- var HOrgID = $("#HOrgID").val(); //鑾峰彇id="HOrgID"鐨勫厓绱犱腑鑾峰彇鍏跺�硷紝骞跺皢璇ュ�煎瓨鍌ㄥ湪鍙橀噺HOrgID涓�
- layer.open({ //鎵撳紑灞�
- type: 2 // //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe 绫诲瀷涓�2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "鐗╂枡鍒楄〃" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["90%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes'] //椤甸潰鍔犺浇
- , btn: ["纭畾", "鍙栨秷"] //灞炴�у畾涔変簡寮瑰嚭灞備笂鐨勬寜閽暟鈥滅‘瀹氣�濆拰鈥滃彇娑�
- , btn1: function (index, laero) { //褰撶偣鍑烩�滅‘瀹氣�濇寜閽椂浼氳璋冪敤
- //鎸夐挳涓� 鐨勫洖璋�
- var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
- OptionData = checkStatus.data[0]; //鎶婇�変腑鏁版嵁鐨勭涓�鏉¤祴鍊肩粰OptionData鍙橀噺
- var TaxRate = getHTaxRateByHSupID();
- //閫変腑澶氳鏃�
- if (checkStatus.data.length > 1) {
- var rowIndex = $(obj.tr).attr("data-index") * 1; //attr("data-index")鐢ㄤ簬鑾峰彇璇r鍏冪礌涓奷ata-index灞炴�х殑鍊�*1杞崲绫诲瀷鐒跺悗璧嬪�肩粰rowIndex
- for (var i = 0; i < checkStatus.data.length; i++) { //鍒ゆ柇閫変腑鐨勬暟鎹殑闀垮害 鐢ㄤ簬閬嶅巻checkStatus.data鏁扮粍涓殑姣忎釜鍏冪礌
- if (rowIndex + i >= option.data.length) { //鍒ゆ柇rowIndex + i鐨勭储寮曡秴鍑轰簡option.data鏁扮粍鐨勯暱搴︼紝璇存槑option.data鏁扮粍闇�瑕佹墿灞曚互鍖呭惈鏇村琛�
- var NewRow = {
- "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "HQty": 1, "HRemark": ""
- , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "1", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0", "HDate": Format(new Date, "yyyy- MM - dd")
- }; // 鍒涘缓涓�涓柊鐨勫寘鍚暟缁� 鍏跺垵濮嬪�间负绌烘垨鑰�0 鎴栬�呮槸鏃堕棿鏍煎紡
+ table.cache["mainTable"].push(NewRow); //鍒涘缓鏂扮殑鍖呭惈鏁扮粍 浼犲叆table.cache["mainTable"]鏁扮粍
+ option.data = table.cache["mainTable"]; //鎶婁紶鍏� table.cache["mainTable"]鏁扮粍鐨勫�艰祴鍊肩粰option.data 鐨勫睘鎬�
- table.cache["mainTable"].push(NewRow); //鍒涘缓鏂扮殑鍖呭惈鏁扮粍 浼犲叆table.cache["mainTable"]鏁扮粍
- option.data = table.cache["mainTable"]; //鎶婁紶鍏� table.cache["mainTable"]鏁扮粍鐨勫�艰祴鍊肩粰option.data 鐨勫睘鎬�
-
- table.render(option);//娓叉煋鐣岄潰
- }
- var HMaterID = checkStatus.data[i].HItemID; //checkStatus.data鏁扮粍涓殑褰撳墠鍏冪礌锛堢储寮曚负i锛変腑鑾峰彇HItemID灞炴�х殑鍊� 骞惰祴鍊肩粰HMaterID
- var resultData = getMaterialByMaterID(HMaterID); //浣跨敤HMaterID浣滀负鍙傛暟鏉ヨ皟鐢╣etMaterialByMaterID鍑芥暟鏉ヨ幏鍙栬鐗╂枡鐨勮缁嗕俊鎭�
- option.data[rowIndex + i].HMaterID = resultData.HMaterID; //灏唎ption.data鏁扮粍涓搴旇鐨凥MaterID灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
- option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber; //灏唎ption.data鏁扮粍涓搴旇鐨� 鐗╂枡浠ｇ爜 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
- option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName; //灏唎ption.data鏁扮粍涓搴旇鐨� 鐗╂枡鍚嶇О 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
- option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel; //灏唎ption.data鏁扮粍涓搴旇鐨� 瑙勬牸鍨嬪彿 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
- option.data[rowIndex + i].HUnitID = resultData.HUnitID; //灏唎ption.data鏁扮粍涓搴旇鐨� HUnitID 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
- option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName; //灏唎ption.data鏁扮粍涓搴旇鐨� 璁￠噺鍗曚綅 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID 鏇存柊璁￠噺鍗曚綅灞炴��
- option.data[rowIndex + i].HQty = 1; //灏嗗搴旇鐨凥Qty灞炴�э紙鍙兘浠ｈ〃鏁伴噺锛夎缃负1銆傝繖琛ㄧず瀵逛簬姣忎釜閫変腑鐨勭墿鏂欙紝鍏堕粯璁ゆ暟閲忚璁剧疆涓�1
- option.data[rowIndex + i].HTaxRate = TaxRate;
- }
- table.render(option); //閲嶆柊娓叉煋琛ㄦ牸浠ユ樉绀烘洿鏂板悗鐨勬暟鎹�
- }
-
- layer.closeAll(); //鍏抽棴鎵�鏈夐�氳繃layer
- //layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ table.render(option);//娓叉煋鐣岄潰
}
- , btn2: function (index, layero) { //褰撶偣鍑烩�滃彇娑堚�濇寜閽椂浼氳璋冪敤
- //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
- //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- },
- end: function () {
- //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
- var HSupID = $("#HSupID").val();
- if (HSupID != 0 && typeof (OptionData.HItemID) != "undefined") {
- var Dec = getDecByMaterID(obj.data.HMaterID) //鑾峰彇绮惧害
- var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //鏁伴噺绮惧害
- var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //鍗曚环绮惧害
- var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //閲戦绮惧害
- $.ajax({
- url: GetWEBURL() + "/Gy_Supplier/xg",
- //url: "http://localhost:12761/Gy_Supplier/xg",
- type: "GET",
- data: {
- "HInterID": HSupID
- },
- success: function (d) {
- var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
- var HExRate = $("#HExRate").val(); //姹囩巼
- //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
- var HQty = obj.data.HQty * 1; //鏁伴噺
- var HPrice = obj.data.HPrice * 1; //鍗曚环
- var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
- var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
- var HTaxPrice = Number((HPrice * (1 + HTaxRate))); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
- var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�
- var HRelTaxPrice = Number((HTaxPrice * HDiscountRate)); //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�
- var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
- //鏁板瓧绮惧害
- HQty = Number(HQty.toFixed(HQtyDec));
- HPrice = Number(HPrice.toFixed(HPriceDec));
- HMoney = Number(HMoney.toFixed(HMoneyDec));
- HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
- HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
- HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
- HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
- HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
- obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
- "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
- , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
- , "HUnitID": OptionData.HUnitID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- , "HTaxRate": HTaxRate * 100
- , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
- , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
- , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
- , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
- , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
- , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
- , HRelTaxPrice: HRelTaxPrice //鏇存柊HRelTaxPrice瀛楁锛屽叾鍊兼潵鑷彉閲廐RelTaxPrice
- , HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
- })
- }
- });
- } else {
- obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
- "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
- , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
- , "HUnitID": OptionData.HUnitID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- })
- }
- }
- });
-
- obj.event = "";
+ var HMaterID = checkStatus.data[i].HItemID; //checkStatus.data鏁扮粍涓殑褰撳墠鍏冪礌锛堢储寮曚负i锛変腑鑾峰彇HItemID灞炴�х殑鍊� 骞惰祴鍊肩粰HMaterID
+ var resultData = getMaterialByMaterID(HMaterID); //浣跨敤HMaterID浣滀负鍙傛暟鏉ヨ皟鐢╣etMaterialByMaterID鍑芥暟鏉ヨ幏鍙栬鐗╂枡鐨勮缁嗕俊鎭�
+ option.data[rowIndex + i].HMaterID = resultData.HMaterID; //灏唎ption.data鏁扮粍涓搴旇鐨凥MaterID灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+ option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber; //灏唎ption.data鏁扮粍涓搴旇鐨� 鐗╂枡浠ｇ爜 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+ option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName; //灏唎ption.data鏁扮粍涓搴旇鐨� 鐗╂枡鍚嶇О 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+ option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel; //灏唎ption.data鏁扮粍涓搴旇鐨� 瑙勬牸鍨嬪彿 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+ option.data[rowIndex + i].HUnitID = resultData.HUnitID; //灏唎ption.data鏁扮粍涓搴旇鐨� HUnitID 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+ option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName; //灏唎ption.data鏁扮粍涓搴旇鐨� 璁￠噺鍗曚綅 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID 鏇存柊璁￠噺鍗曚綅灞炴��
+ option.data[rowIndex + i].HQty = 1; //灏嗗搴旇鐨凥Qty灞炴�э紙鍙兘浠ｈ〃鏁伴噺锛夎缃负1銆傝繖琛ㄧず瀵逛簬姣忎釜閫変腑鐨勭墿鏂欙紝鍏堕粯璁ゆ暟閲忚璁剧疆涓�1
+ option.data[rowIndex + i].HTaxRate = TaxRate;
+ }
+ table.render(option); //閲嶆柊娓叉煋琛ㄦ牸浠ユ樉绀烘洿鏂板悗鐨勬暟鎹�
+ setTableNumber();
+ }
+
+ }
+ //璁剧疆鐗╂枡閲戦绛夊弬鏁�
+ function setTableNumber() {
+ var Dec = getDecByMaterID(OptionData.HItemID) //鑾峰彇绮惧害
+ var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //鏁伴噺绮惧害
+ var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //鍗曚环绮惧害
+ var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //閲戦绮惧害
+ //閬嶅巻鍒楄〃
+ layui.each(table.cache.mainTable, function (i, item) {
+ var HTaxRate = parseInt(item.HTaxRate) * 0.01;
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = item.HQty * 1; //鏁伴噺
+ var HPrice = item.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate))); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ var HDiscountRate = item.HDiscountRate * 1; //鎶樻墸鐜�
+ var HRelTaxPrice = Number((HTaxPrice * HDiscountRate)); //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+ //鏁板瓧绮惧害
+ item.HQty = Number(HQty.toFixed(HQtyDec));
+ item.HPrice = Number(HPrice.toFixed(HPriceDec));
+ item.HMoney = Number(HMoney.toFixed(HMoneyDec));
+ item.HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+ item.HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+ item.HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+ item.HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
+ item.HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
});
+ table.render(option);
+ }
- }
+
//琛屽唴鍒犻櫎
function set_GridDelete(obj) {
--
Gitblit v1.9.1