From 9f2bb1162672232fbe850591a3dee66ecd6eb12c Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期六, 11 十月 2025 08:41:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/隐藏列设置/Gy_GridView_Hide_New.html | 70
WebTM/layuiadmin/HideButton_New.js | 6
WebTM/views/基础资料/生产基础资料/Gy_Process.html | 5
WebTM/views/基础资料/生产基础资料/Gy_Source.html | 4
WebTM/views/index_Mobile.html | 2
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter_Add_Edit.html | 4
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 15
WebTM/layuiadmin/SetColumn.js | 15
WebTM/views/WMS扫码模块/生产管理/生产组托单/Sc_PackUnionBill_PDA.html | 964 ++++++++++++++++----------
WebTM/views/基础资料/生产基础资料/Gy_ShiftsList.html | 27
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 2
WebTM/views/WMS扫码模块/生产管理/删托单/Sc_DeletePackUnionBill_PDA.html | 538 +++++++++-----
WebTM/layuiadmin/dayjs.min.js | 1
WebTM/views/home/console_Mobile.html | 18
WebTM/views/基础资料/生产基础资料/Gy_ShiftsEdit.html | 124 ++
WebTM/views/WMS扫码模块/生产管理/生产组托单/Sc_PackUnionBillList_PDA.html | 328 ++++++---
16 files changed, 1,341 insertions(+), 782 deletions(-)
diff --git a/WebTM/layuiadmin/HideButton_New.js b/WebTM/layuiadmin/HideButton_New.js
index 917d923..781e409 100644
--- a/WebTM/layuiadmin/HideButton_New.js
+++ b/WebTM/layuiadmin/HideButton_New.js
@@ -22,8 +22,12 @@
//鑾峰彇鎸夐挳闅愯棌璁剧疆绐楀彛鏂囦欢璺緞
var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+
+ var viewsLocation = urlStr.indexOf('views')
+ var viewsLocation = urlStr.indexOf('views')
+ urlStr = urlStr.substring(viewsLocation + 6, urlStr.length)
var urlLen = urlStr.split('/');
- for (var i = 0; i < urlLen.length - 4; i++) {
+ for (var i = 0; i < urlLen.length - 1; i++) {
contentUrl += "../";
}
contentUrl += '绯荤粺绠＄悊/鎸夐挳璁剧疆/Xt_ModuleButtonSet.html?HModName=' + HModName + '&HBillType=' + HBillType + "&btnIdList=" + btnIdList + "&btnNameList=" + btnNameList + "&btnOrderList=" + btnOrderList + "&HUserName=" + HUserName;
diff --git a/WebTM/layuiadmin/SetColumn.js b/WebTM/layuiadmin/SetColumn.js
index 2ca97ef..006e9c6 100644
--- a/WebTM/layuiadmin/SetColumn.js
+++ b/WebTM/layuiadmin/SetColumn.js
@@ -11,8 +11,10 @@
var contentUrl = "";
var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var viewsLocation = urlStr.indexOf('views')
+ urlStr = urlStr.substring(viewsLocation + 6, urlStr.length)
var urlLen = urlStr.split('/');
- for (var i = 0; i < urlLen.length - 4; i++) {
+ for (var i = 0; i < urlLen.length - 1; i++) {
contentUrl += "../";
}
contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;
@@ -49,12 +51,13 @@
var contentUrl = "";
var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var viewsLocation = urlStr.indexOf('views')
+ urlStr = urlStr.substring(viewsLocation + 6, urlStr.length)
var urlLen = urlStr.split('/');
- for (var i = 0; i < urlLen.length - 4; i++) {
+ for (var i = 0; i < urlLen.length - 1; i++) {
contentUrl += "../";
}
contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;
-
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -128,11 +131,11 @@
if (dataCols[3] > 0) {
option.cols[0][i + 1]["width"] = dataCols[3];
}
- //璁剧疆鍐呭瀛椾綋澶у皬
+ //璁剧疆鍐呭瀛椾綋澶у皬 鐩存帴瑕嗙洊鐨勮瘽浼氬鑷村師鏈夌殑鏍峰紡娑堝け锛屾晠浣跨敤鍦╯tyle涓缃甶mportant寮哄埗鍚敤鐨勬柟寮�
if (data1.data[0].HFontSize != 0) {
- option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ option.cols[0][i + 1]["style"]+="font-size:" + data1.data[0].HFontSize + " !important px;";
} else {
- option.cols[0][i + 1]["style"] = "font-size:100%";
+ option.cols[0][i + 1]["style"]+= "font-size:100% !important;";
}
//鏄剧ず鍒�
if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
diff --git a/WebTM/layuiadmin/dayjs.min.js b/WebTM/layuiadmin/dayjs.min.js
new file mode 100644
index 0000000..61916d8
--- /dev/null
+++ b/WebTM/layuiadmin/dayjs.min.js
@@ -0,0 +1 @@
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).dayjs=e()}(this,(function(){"use strict";var t=1e3,e=6e4,n=36e5,r="millisecond",i="second",s="minute",u="hour",a="day",o="week",c="month",f="quarter",h="year",d="date",l="Invalid Date",$=/^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/,y=/\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,M={name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),ordinal:function(t){var e=["th","st","nd","rd"],n=t%100;return"["+t+(e[(n-20)%10]||e[n]||e[0])+"]"}},m=function(t,e,n){var r=String(t);return!r||r.length>=e?t:""+Array(e+1-r.length).join(n)+t},v={s:m,z:function(t){var e=-t.utcOffset(),n=Math.abs(e),r=Math.floor(n/60),i=n%60;return(e<=0?"+":"-")+m(r,2,"0")+":"+m(i,2,"0")},m:function t(e,n){if(e.date()<n.date())return-t(n,e);var r=12*(n.year()-e.year())+(n.month()-e.month()),i=e.clone().add(r,c),s=n-i<0,u=e.clone().add(r+(s?-1:1),c);return+(-(r+(n-i)/(s?i-u:u-i))||0)},a:function(t){return t<0?Math.ceil(t)||0:Math.floor(t)},p:function(t){return{M:c,y:h,w:o,d:a,D:d,h:u,m:s,s:i,ms:r,Q:f}[t]||String(t||"").toLowerCase().replace(/s$/,"")},u:function(t){return void 0===t}},g="en",D={};D[g]=M;var p="$isDayjsObject",S=function(t){return t instanceof _||!(!t||!t[p])},w=function t(e,n,r){var i;if(!e)return g;if("string"==typeof e){var s=e.toLowerCase();D[s]&&(i=s),n&&(D[s]=n,i=s);var u=e.split("-");if(!i&&u.length>1)return t(u[0])}else{var a=e.name;D[a]=e,i=a}return!r&&i&&(g=i),i||!r&&g},O=function(t,e){if(S(t))return t.clone();var n="object"==typeof e?e:{};return n.date=t,n.args=arguments,new _(n)},b=v;b.l=w,b.i=S,b.w=function(t,e){return O(t,{locale:e.$L,utc:e.$u,x:e.$x,$offset:e.$offset})};var _=function(){function M(t){this.$L=w(t.locale,null,!0),this.parse(t),this.$x=this.$x||t.x||{},this[p]=!0}var m=M.prototype;return m.parse=function(t){this.$d=function(t){var e=t.date,n=t.utc;if(null===e)return new Date(NaN);if(b.u(e))return new Date;if(e instanceof Date)return new Date(e);if("string"==typeof e&&!/Z$/i.test(e)){var r=e.match($);if(r){var i=r[2]-1||0,s=(r[7]||"0").substring(0,3);return n?new Date(Date.UTC(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)):new Date(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)}}return new Date(e)}(t),this.init()},m.init=function(){var t=this.$d;this.$y=t.getFullYear(),this.$M=t.getMonth(),this.$D=t.getDate(),this.$W=t.getDay(),this.$H=t.getHours(),this.$m=t.getMinutes(),this.$s=t.getSeconds(),this.$ms=t.getMilliseconds()},m.$utils=function(){return b},m.isValid=function(){return!(this.$d.toString()===l)},m.isSame=function(t,e){var n=O(t);return this.startOf(e)<=n&&n<=this.endOf(e)},m.isAfter=function(t,e){return O(t)<this.startOf(e)},m.isBefore=function(t,e){return this.endOf(e)<O(t)},m.$g=function(t,e,n){return b.u(t)?this[e]:this.set(n,t)},m.unix=function(){return Math.floor(this.valueOf()/1e3)},m.valueOf=function(){return this.$d.getTime()},m.startOf=function(t,e){var n=this,r=!!b.u(e)||e,f=b.p(t),l=function(t,e){var i=b.w(n.$u?Date.UTC(n.$y,e,t):new Date(n.$y,e,t),n);return r?i:i.endOf(a)},$=function(t,e){return b.w(n.toDate()[t].apply(n.toDate("s"),(r?[0,0,0,0]:[23,59,59,999]).slice(e)),n)},y=this.$W,M=this.$M,m=this.$D,v="set"+(this.$u?"UTC":"");switch(f){case h:return r?l(1,0):l(31,11);case c:return r?l(1,M):l(0,M+1);case o:var g=this.$locale().weekStart||0,D=(y<g?y+7:y)-g;return l(r?m-D:m+(6-D),M);case a:case d:return $(v+"Hours",0);case u:return $(v+"Minutes",1);case s:return $(v+"Seconds",2);case i:return $(v+"Milliseconds",3);default:return this.clone()}},m.endOf=function(t){return this.startOf(t,!1)},m.$set=function(t,e){var n,o=b.p(t),f="set"+(this.$u?"UTC":""),l=(n={},n[a]=f+"Date",n[d]=f+"Date",n[c]=f+"Month",n[h]=f+"FullYear",n[u]=f+"Hours",n[s]=f+"Minutes",n[i]=f+"Seconds",n[r]=f+"Milliseconds",n)[o],$=o===a?this.$D+(e-this.$W):e;if(o===c||o===h){var y=this.clone().set(d,1);y.$d[l]($),y.init(),this.$d=y.set(d,Math.min(this.$D,y.daysInMonth())).$d}else l&&this.$d[l]($);return this.init(),this},m.set=function(t,e){return this.clone().$set(t,e)},m.get=function(t){return this[b.p(t)]()},m.add=function(r,f){var d,l=this;r=Number(r);var $=b.p(f),y=function(t){var e=O(l);return b.w(e.date(e.date()+Math.round(t*r)),l)};if($===c)return this.set(c,this.$M+r);if($===h)return this.set(h,this.$y+r);if($===a)return y(1);if($===o)return y(7);var M=(d={},d[s]=e,d[u]=n,d[i]=t,d)[$]||1,m=this.$d.getTime()+r*M;return b.w(m,this)},m.subtract=function(t,e){return this.add(-1*t,e)},m.format=function(t){var e=this,n=this.$locale();if(!this.isValid())return n.invalidDate||l;var r=t||"YYYY-MM-DDTHH:mm:ssZ",i=b.z(this),s=this.$H,u=this.$m,a=this.$M,o=n.weekdays,c=n.months,f=n.meridiem,h=function(t,n,i,s){return t&&(t[n]||t(e,r))||i[n].slice(0,s)},d=function(t){return b.s(s%12||12,t,"0")},$=f||function(t,e,n){var r=t<12?"AM":"PM";return n?r.toLowerCase():r};return r.replace(y,(function(t,r){return r||function(t){switch(t){case"YY":return String(e.$y).slice(-2);case"YYYY":return b.s(e.$y,4,"0");case"M":return a+1;case"MM":return b.s(a+1,2,"0");case"MMM":return h(n.monthsShort,a,c,3);case"MMMM":return h(c,a);case"D":return e.$D;case"DD":return b.s(e.$D,2,"0");case"d":return String(e.$W);case"dd":return h(n.weekdaysMin,e.$W,o,2);case"ddd":return h(n.weekdaysShort,e.$W,o,3);case"dddd":return o[e.$W];case"H":return String(s);case"HH":return b.s(s,2,"0");case"h":return d(1);case"hh":return d(2);case"a":return $(s,u,!0);case"A":return $(s,u,!1);case"m":return String(u);case"mm":return b.s(u,2,"0");case"s":return String(e.$s);case"ss":return b.s(e.$s,2,"0");case"SSS":return b.s(e.$ms,3,"0");case"Z":return i}return null}(t)||i.replace(":","")}))},m.utcOffset=function(){return 15*-Math.round(this.$d.getTimezoneOffset()/15)},m.diff=function(r,d,l){var $,y=this,M=b.p(d),m=O(r),v=(m.utcOffset()-this.utcOffset())*e,g=this-m,D=function(){return b.m(y,m)};switch(M){case h:$=D()/12;break;case c:$=D();break;case f:$=D()/3;break;case o:$=(g-v)/6048e5;break;case a:$=(g-v)/864e5;break;case u:$=g/n;break;case s:$=g/e;break;case i:$=g/t;break;default:$=g}return l?$:b.a($)},m.daysInMonth=function(){return this.endOf(c).$D},m.$locale=function(){return D[this.$L]},m.locale=function(t,e){if(!t)return this.$L;var n=this.clone(),r=w(t,e,!0);return r&&(n.$L=r),n},m.clone=function(){return b.w(this.$d,this)},m.toDate=function(){return new Date(this.valueOf())},m.toJSON=function(){return this.isValid()?this.toISOString():null},m.toISOString=function(){return this.$d.toISOString()},m.toString=function(){return this.$d.toUTCString()},M}(),k=_.prototype;return O.prototype=k,[["$ms",r],["$s",i],["$m",s],["$H",u],["$W",a],["$M",c],["$y",h],["$D",d]].forEach((function(t){k[t[1]]=function(e){return this.$g(e,t[0],t[1])}})),O.extend=function(t,e){return t.$i||(t(e,_,O),t.$i=!0),O},O.locale=w,O.isDayjs=S,O.unix=function(t){return O(1e3*t)},O.en=D[g],O.Ls=D,O.p={},O}));
\ No newline at end of file
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\240\346\211\230\345\215\225/Sc_DeletePackUnionBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\240\346\211\230\345\215\225/Sc_DeletePackUnionBill_PDA.html"
index 17a9120..aa08354 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\240\346\211\230\345\215\225/Sc_DeletePackUnionBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\240\346\211\230\345\215\225/Sc_DeletePackUnionBill_PDA.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>鍒犳墭鍗�</title>
+ <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, maximum-scale=1">
@@ -14,91 +14,94 @@
<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>
<style>
- .layui-col-xs4 {
- width: 12.333333%
- }
-
.layui-col-xs8 {
width: 55.666667%;
}
</style>
</head>
<body>
- <div class="layui-fluid" style="padding: 0px">
- <div class="layui-card">
+ <div class="layui-fluid" style="padding:0">
+ <div class="layui-card" style="padding: 1px">
<div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="background-color:#0085E8;">
- <span style="color: white;"><i class="layui-icon layui-icon-form"></i>鍒犳墭鍗�</span>
+ <span style="color: white;"><i class="layui-icon layui-icon-form"></i>鐢熶骇鎷嗘墭鍗�</span>
</div>
- <div class="layui-form-item" style="padding:10px;margin:0px">
+ <div class="layui-form-item" style="padding:15px;margin:0px">
<div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label" style="width:50px;padding-left:0px;">鎵樻潯鐮�</label>
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width: 45px;padding-left: 0px;">鎵樻潯鐮�</label>
</div>
<div class="layui-col-xs8">
- <input type="text" name="HBarCode_Pack" id="HBarCode_Pack" lay-verify="HBarCode_Pack" autocomplete="off" class="layui-input">
+ <input type="text" name="HBarCode_Pack" id="HBarCode_Pack" lay-verify="HBarCode_Pack" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
<div class="layui-col-xs2">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdHBarCode_Pack" id="cmdHBarCode_Pack">纭畾</button>
+ <button type="button" lay-submit="" lay-filter="HBarCode_Pack-BT" class="layui-btn" id="HBarCode_Pack-BT" style="width: 45px; margin-left: 8px;padding-left:12px">OK</button>
</div>
</div>
- </div>
- <div class="layui-tab" lay-filter="tab-Sc_DeletePackUnionBill_PDA">
- <ul class="layui-tab-title" lay-filter="tab-all">
- <li lay-id="1">鏉＄爜淇℃伅</li>
- <li lay-id="2">鍗曟嵁淇℃伅</li>
- </ul>
- <div class="layui-tab-content">
- <!--鏉＄爜淇℃伅-->
- <div class="layui-tab-item">
- <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
- </div>
- <!--鍗曟嵁淇℃伅-->
- <div class="layui-tab-item">
- <div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鍒跺崟浜�</label>
- </div>
- <div class="layui-col-xs8 layui-input-inline mobile">
- <input type="text" name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input">
+ <div class="layui-tab layui-col-xs12" style="margin-top:5px;" lay-filter="tab-Sc_DeletePackUnionBill_PDA">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;">鎷嗘墭淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍗曟嵁淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--鎷嗘墭淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+ <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+ </div>
</div>
</div>
- <div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
- </div>
- <div class="layui-col-xs8 layui-input-inline mobile">
- <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁ID</label>
- </div>
- <div class="layui-col-xs8 layui-input-inline mobile">
- <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" value="0" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>
- <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
- <div class="layui-row">
- <div class="layui-col-xs3">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdLoadData" id="cmdLoadData">鎻愪氦</button>
- </div>
- <div class="layui-col-xs3">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
+ <!--鍗曟嵁淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍒跺崟浜�</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input type="text" name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁ID</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" value="0" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
</div>
</div>
</div>
</div>
+ <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+ <button type="button" lay-submit="" lay-filter="cmdSaver" class="layui-btn" id="cmdSaver">鎷嗘墭</button>
+ <button type="button" lay-submit="" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+ </div>
</div>
+
+ <!--闅愯棌瀛楁-->
+ <input type="hidden" name="HBillType" id="HBillType">
+ <!--澶辫触鎻愮ず闊�-->
<div id="" style="display:none;">
- <audio id="cs1" hidden controls>
+ <audio id="cs" hidden controls>
<source src="../../../video/jingbao.wav" type="audio/ogg">
</audio>
</div>
+ <!--鎴愬姛鎻愮ず闊�-->
<div id="" style="display:none;">
<audio id="cs2" hidden controls>
<source src="../../../video/success.wav" type="audio/ogg">
@@ -121,13 +124,18 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
+ , laydate = layui.laydate
, element = layui.element;
var HInterID = $('#HInterID').val()
var HBillNo = $('#HBillNo').val()
var HBillType = '3783'
var HMaker = sessionStorage["HUserName"]
- var HStockOrgID = sessionStorage["OrganizationID"]
- var option = [];
+ var HStockOrgID = sessionStorage["OrganizationID"] //缁勭粐ID
+ var listOption = [];
+ var columns = "";
+ var HModName = "Sc_DeletePackUnionBill_PDA";
+ var ModRightName = "CE_DeletePackUnion"; //妯″潡鏉冮檺鍙傛暟
+ var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
//#endregion
@@ -135,43 +143,40 @@
if (sessionStorage.login != "login") {
layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
- }, function () { window.location.href = "../../../user/login.html"; });
+ }, function () { window.location.href = "../../../user/login_pda.html"; });
}
- //#region 鍒濆鍖栫晫闈�
+ //#region 鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
- set_ClearBill();
+ //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+ CheckModRight();
- function set_ClearBill() {
- $("#HMaker").val(HMaker);
- $("#HMaker").attr("readonly", "readonly");
- $("#HBillNo").attr("readonly", "readonly");
- $("#HInterID").attr("readonly", "readonly");
- element.tabChange('tab-Sc_DeletePackUnionBill_PDA', '1');
- var pFocus = $("#HBarCode_Pack");
- pFocus.focus(); //鑾峰彇鍏夋爣
- pFocus.select();
- set_InitGrid(); //鍒濆鍖栬〃鏍�
+ function CheckModRight() {
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/CheckModRight_ERP_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "ModRightName": ModRightName, "HUserName": HMaker },
+ success: function (d) {
+ if (d.count == 1) {
+ }
+ else {
+ layer.msg(d.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () { parent.location.href = "../../../../views/index_Mobile.html"; });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ layer.closeAll("loading");
}
-
- //#region 鍒濆鍖栬〃鏍兼柟娉�
- function set_InitGrid() {
- option = {
- elem: '#wl-table'
- , height: 'full-50'
- //, page: true
- , cellMinWidth: 90
- , limit: 50
- //, limits: [50, 500, 5000, 20000]
- };
- }
-
//#endregion
//澶辫触鎻愮ず闊�
function playSound() {
console.log("playSound");
- var audio = document.getElementById("cs1");
+ var audio = document.getElementById("cs");
audio.play();
audio.onended = function () {
// 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
@@ -191,139 +196,114 @@
};
}
+ //#region 鍒濆鍖栫晫闈�
+
+ set_ClearBill();
+
+ function set_ClearBill() {
+ //琛ㄥご鍒濆鍖栬祴鍊�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HBillType").val(HBillType);
+ $("#HInterID").val(0);
+ $("#HBillNo").val('');
+ HInterID = $('#HInterID').val()
+ HBillNo = $('#HBillNo').val()
+
+ //榛樿鏄剧ず椤甸潰
+ element.tabChange('tab-Sc_DeletePackUnionBill_PDA', '1');
+ set_InitGrid(); //鍒濆鍖栬〃鏍�
+
+ var data = [];
+ listOption.cols = [[
+ { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', width: 100 }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ ]];
+ listOption.data = data;
+ table.render(listOption);
+
+ //鍏夋爣榛樿鍦ㄦ潯鐮佷綅缃笂
+ var pFocus = $("#HBarCode_Pack");
+ pFocus.select();
+ pFocus.focus(); //鑾峰彇鍏夋爣
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ listOption = {
+ elem: '#wl-table'
+ //, toolbar: '#toolbarDemo'
+ , totalRow: true
+ , height: 'full-60'
+ , cellMinWidth: 90
+ , limit: 200
+ };
+ }
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(wl-table)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ $(".layui-table-body tr ").attr({ "style": "background:" }); //鍏朵粬tr鎭㈠鍘熸牱
+ obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click'); //閫変腑琛屾牱寮�
+ obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click"); //閫変腑radio鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ })
//#endregion
-
- //#region 鎵弿鎵樻潯鐮�
-
- //鎸夊洖杞﹂敭杩斿洖淇℃伅
- $('#HBarCode_Pack').on('keydown', function (event) {
- if (event.keyCode == 13) {
- GetMeesageByBarCode_Pack();
- }
- });
-
- //鐐瑰嚮鎸夐挳杩斿洖淇℃伅
- form.on('submit(cmdHBarCode_Pack)', function (data) {
- GetMeesageByBarCode_Pack();
- });
-
- //鎵弿鎵樻潯鐮�
- function GetMeesageByBarCode_Pack(obj) {
- HBarCode_Pack = $('#HBarCode_Pack').val()
-
- if (HBarCode_Pack == '') {
- playSound();
- layer.msg("鎵樻潯鐮佷笉鑳戒负绌猴紝璇锋壂鎻忔墭鏉＄爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
-
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/WEBSController/Get_PackBarCode_DeletePackUnionBill_Json",
- data: { "HBarCode_Pack": HBarCode_Pack, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
- success: function (result) {
- var col = [];
- if (result.count == 1) {
- playSound_OK();
- $("#HInterID").val(result.data[0].HInterID);
- $("#HBillNo").val(result.data[0].HBillNo);
- $("#HBarCode_Pack").val(result.data[0].HBarCode_Pack);
- $("#HBarCode_Pack").attr("readonly", "readonly");
- document.getElementById("cmdHBarCode_Pack").disabled = true; //鎸夐挳鍙樹负涓嶅彲缂栬緫鐘舵��
- //鍏ㄥ眬鍙橀噺璧嬪��
- HInterID = $('#HInterID').val()
- HBillNo = $('#HBillNo').val()
- element.tabChange('tab-Sc_DeletePackUnionBill_PDA', '1');
- //鏄剧ず琛ㄤ綋鏄庣粏
- var data = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in result.list) {
- data.push({ "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
- }
- //鍒ゆ柇鏄惁鏄函鑻辨枃
- var patrn = new RegExp("[\u4E00-\u9FA5]+");
- col.push({ type: 'radio' });
- for (var i = 0; i < data.length; i++) {
- if (!patrn.test(data[i].name)) {
- col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
- }
- else {
- switch (data[i].Type) {
- case 'DateTime':
- col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
- break;
- default:
- col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true });
- }
- }
- }
- option.cols = [col];
- option.data = result.data;
- table.cache['wl-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
- table.render(option);
- layer.load(3);
- }
- else {
- playSound();
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
- $('#HBarCode_Pack').val("");
- $("#HBarCode_Pack").select();
- $("#HBarCode_Pack").focus(); //鑾峰彇鍏夋爣
- }
- layer.closeAll("loading");
- },
- complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
- });
- }
//#endregion
//#region 鍔熻兘鎺т欢
- //#region 鎻愪氦涓婁紶鍔熻兘鎺т欢
-
- form.on('submit(cmdLoadData)', function (data) {
- HBarCode_Pack = $('#HBarCode_Pack').val()
- document.getElementById("cmdLoadData").disabled = true; //鎸夐挳鍙樹负涓嶅彲缂栬緫鐘舵��
- $.ajax(
- {
- type: "GET",
- url: GetWEBURL() + "/WEBSController/GetDeletePackUnionBill_Json",
- async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBarCode_Pack": HBarCode_Pack, "HMaker": HMaker },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.confirm(data.Message, {
- icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- btn2: function () {
- parent.location.href = "../../../../views/index_Mobile.html"
- }//鍏抽棴
- }, function () {
- window.location.reload(); //鍒锋柊褰撳墠椤甸潰
- });//鏂板
- layer.load(3);
+ //#region 鎷嗘墭
+ form.on('submit(cmdSaver)', function (data) {
+ document.getElementById("cmdSaver").disabled = true; //鎸夐挳鍙樹负涓嶅彲缂栬緫鐘舵��
+ var sSubStr = table.cache['wl-table'];
+ var HBarCode_Pack = $('#HBarCode_Pack').val()
+ if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
+ {
+ layer.load(3);
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetDeletePackUnionBill_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBarCode_Pack": HBarCode_Pack, "HMaker": HMaker },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ layer.confirm(data.Message, {
+ icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板', '鍏抽棴'],
+ btn2: function () {
+ parent.location.href = "../../../../views/index_Mobile.html";
+ }//鍏抽棴
+ }
+ , function () {
+ location.replace('Sc_DeletePackUnionBill_PDA.html?HInterID=0');
+ });//鏂板
+ }
+ else {
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ document.getElementById("cmdSaver").disabled = false; //鎸夐挳鍙樹负鍙紪杈戠姸鎬�
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ document.getElementById("cmdSaver").disabled = false; //鎸夐挳鍙樹负鍙紪杈戠姸鎬�
}
- else {
- playSound();
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
- document.getElementById("cmdLoadData").disabled = false; //鎸夐挳鍙樹负鍙紪杈戠姸鎬�
- }
- layer.closeAll("loading"); //鍏抽棴鍔犺浇灞�
- },
- complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
- error: function (err) {
- layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
- document.getElementById("cmdLoadData").disabled = false;
- }
- });
+ });
+ layer.closeAll("loading");
+ return;
+ }
});
//#endregion
- //#region 閫�鍑哄姛鑳芥帶浠�
+ //#region 閫�鍑�
form.on('submit(cmdCancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
@@ -335,8 +315,154 @@
//#endregion
+
+ //#region 鎵弿鎵樻潯鐮�
+
+ //鎵弿鎵樻潯鐮�
+ $('#HBarCode_Pack').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageByBarCode_Pack();
+ }
+ });
+
+ //鎵樻潯鐮佹寜閽�
+ form.on('submit(HBarCode_Pack-BT)', function (data) {
+ GetMeesageByBarCode_Pack();
+ });
+
+ //鎵墭鏉＄爜
+ function GetMeesageByBarCode_Pack(obj) {
+ var HBarCode_Pack = $('#HBarCode_Pack').val()
+ if (HBarCode_Pack == '') {
+ playSound();
+ layer.msg("鎵樻潯鐮佷笉鑳戒负绌猴紝璇锋壂鎻忔墭鏉＄爜锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode_Pack").select();
+ $("#HBarCode_Pack").focus();
+ });
+ return;
+ }
+ layer.load(3)
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/Get_PackBarCode_DeletePackUnionBill_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode_Pack": HBarCode_Pack, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ var data = [];
+ var col = [];
+ if (result.count == 1) {
+ playSound_OK();
+ $("#HInterID").val(result.data[0].HInterID);
+ $("#HBillNo").val(result.data[0].HBillNo);
+ HInterID = $('#HInterID').val()
+ HBillNo = $('#HBillNo').val()
+
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in result.list) {
+ //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+ data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(result.list[key].ColmCols)) {
+ titleData[key] = result.list[key].ColmCols;
+ }
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'radio', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ default:
+
+ if (data[i].name == '鏁伴噺') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
+ } else if (data[i].name == '鐗╂枡浠ｇ爜') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 120 });
+ } else if (data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 220 });
+ }
+ }
+ }
+ }
+ columns = col;
+ listOption.cols = [columns];
+ listOption.data = result.data;
+ listOption.totalRow = true;
+ table.cache['wl-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.render(listOption);
+ }
+ else {
+ playSound();
+ layer.msg(result.Message, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode_Pack").select();
+ $("#HBarCode_Pack").focus();
+ listOption.cols = [[
+ { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', width: 100 }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '鏉＄爜涓暟', title: '鏉＄爜涓暟', width: 100 }
+ ]];
+ listOption.data = data;
+ table.render(listOption);
+ });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ playSound();
+ layer.msg("閿欒锛�" + err, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode_Pack").select();
+ $("#HBarCode_Pack").focus();
+ listOption.cols = [[
+ { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', width: 100 }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '鏉＄爜涓暟', title: '鏉＄爜涓暟', width: 100 }
+ ]];
+ listOption.data = data;
+ table.render(listOption);
+ });
+ }
+ });
+ layer.closeAll("loading");
+ }
+
+ //#endregion
+
});
+ //浠ヤ笂涓簂ayui妯″潡
+ //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+
+ //鍗曟嵁涓婁紶鍓嶅垽鏂�
+ function AllowLoadData(sSubStr) {
+ if (sSubStr.length == 0) {
+ layer.msg("娌℃湁鎷嗘墭淇℃伅锛岃鍏堟壂鎻忔墭鏉＄爜锛岀‘璁ゆ棤璇悗鍐嶆媶鎵橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ return true;
+ }
</script>
</body>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBillList_PDA.html"
index 1e61fcf..5e298b4 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBillList_PDA.html"
@@ -22,36 +22,48 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-tab" lay-filter="tab-Sc_PackUnionBillList_PDA">
<ul class="layui-tab-title" lay-filter="tab-all">
- <li lay-id="1">缂撳瓨鍒楄〃</li>
+ <li lay-id="1" style="padding:1px;">缂撳瓨鍒楄〃</li>
</ul>
<div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
+ <!--缂撳瓨鍒楄〃-->
+ <div class="layui-tab-item">
<div class="layui-row">
<div class="layui-col-xs12">
- <table class="layui-hide" id="Temp-table" lay-filter="Temp-table"></table>
+ <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+ <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
</div>
</div>
</div>
</div>
- <div class="layui-form-item" style="margin-bottom: 20px;">
- <div class="layui-row">
- <div class="layui-col-xs2">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
- </div>
- <div class="layui-col-xs2">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
- </div>
- <div class="layui-col-xs2">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">鍒锋柊</button>
- </div>
- <div class="layui-col-xs2">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
- </div>
- <div class="layui-col-xs2">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdAdd">鏂板</button>
- </div>
- </div>
+ </div>
+ <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+ <div class="layui-col-xs2" style="margin-left:0px">
+ <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
</div>
+ <div class="layui-col-xs2" style="margin-left:5px">
+ <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+ </div>
+ <div class="layui-col-xs2" style="margin-left:5px">
+ <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+ </div>
+ <div class="layui-col-xs2" style="margin-left:5px">
+ <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+ </div>
+ <div class="layui-col-xs2" style="margin-left:5px">
+ <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdAdd" class="layui-btn" id="cmdAdd">鏂板</button>
+ </div>
+ </div>
+ <!--澶辫触鎻愮ず闊�-->
+ <div id="" style="display:none;">
+ <audio id="cs" hidden controls>
+ <source src="../../../video/jingbao.wav" type="audio/ogg">
+ </audio>
+ </div>
+ <!--鎴愬姛鎻愮ず闊�-->
+ <div id="" style="display:none;">
+ <audio id="cs2" hidden controls>
+ <source src="../../../video/success.wav" type="audio/ogg">
+ </audio>
</div>
</form>
</div>
@@ -63,8 +75,6 @@
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
-
- //#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -73,169 +83,270 @@
, element = layui.element;
var HBillType = '3783'
var HMaker = sessionStorage["HUserName"]
- var HStockOrgID = sessionStorage["OrganizationID"]
- var option = [];
+ var HStockOrgID = sessionStorage["OrganizationID"] //缁勭粐ID
+ var listOption = []; //缂撳瓨鍒楄〃
+ var columns = "";
+ var MvarReportTitle = "鐢熶骇缁勬墭鍗曠紦瀛樺垪琛�";
+ var HModName = "Sc_PackUnionBillList_PDA";
+ var ModRightName = "CE_PackUnion"; //妯″潡鏉冮檺鍙傛暟
+ var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login_pda.html"; });
+ }
+
+ //#region 鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+
+ //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+ CheckModRight();
+
+ function CheckModRight() {
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/CheckModRight_ERP_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "ModRightName": ModRightName, "HUserName": HMaker },
+ success: function (d) {
+ if (d.count == 1) {
+ }
+ else {
+ layer.msg(d.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () { parent.location.href = "../../../../views/index_Mobile.html"; });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ layer.closeAll("loading");
+ }
+ //#endregion
+
+ //澶辫触鎻愮ず闊�
+ function playSound() {
+ console.log("playSound");
+ var audio = document.getElementById("cs");
+ audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
+ }
+ //鎴愬姛鎻愮ず闊�
+ function playSound_OK() {
+ console.log("playSound_OK");
+ var audio = document.getElementById("cs2");
+ audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
+ }
//#region 鍒濆鍖栫晫闈�
set_ClearBill();
function set_ClearBill() {
+ //榛樿鏄剧ず椤甸潰
element.tabChange('tab-Sc_PackUnionBillList_PDA', '1');
- //鍒濆鍖栬〃鏍�
- set_InitGrid();
- //璇诲彇鍗曟嵁鍒楄〃
- DisBillEntryList();
+ set_InitGrid(); //鍒濆鍖栬〃鏍�
+ //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+ DisTempEntryList();
}
- //#region 鍒濆鍖栬〃鏍兼柟娉�
+ //鍒濆鍖栬〃鏍�
function set_InitGrid() {
- option = {
- elem: '#Temp-table'
- , height: 'full-50'
- //, page: true
+ //缂撳瓨鍒楄〃
+ listOption = {
+ elem: '#dj-table'
+ , height: 'full-150'
+ , page: true //寮�鍚垎椤�
, cellMinWidth: 90
, limit: 50
- //, limits: [50, 500, 5000, 20000]
};
}
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(dj-table)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ $(".layui-table-body tr ").attr({ "style": "background:" }); //鍏朵粬tr鎭㈠鍘熸牱
+ obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click'); //閫変腑琛屾牱寮�
+ obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click"); //閫変腑radio鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ })
//#endregion
//#endregion
-
- //#region 缂撳瓨鍒楄〃鐣岄潰 鎺т欢浜嬩欢
//#region 缂栬緫鍔熻兘鎺т欢
- form.on('submit(cmdModify)', function () {
- var checkStatus = table.checkStatus('Temp-table')
- , data = checkStatus.data;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鐢熶骇缁勬墭鍗�'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../WMS鎵爜妯″潡/鐢熶骇绠＄悊/鐢熶骇缁勬墭鍗�/Sc_PackUnionBill_PDA.html?HInterID_Temp=' + data[0].HInterID + '& HBillNo_Temp=' + data[0].HBillNo + '& HBarCode_Pack_Temp=' + data[0].HBarCode_Pack, 'yes']
- , resize: false
- , cancel: function () {
- $(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
- //#endregion
- //#region 鍒犻櫎鍔熻兘鎺т欢
- form.on('submit(cmdDelete)', function () {
- var checkStatus = table.checkStatus('Temp-table')
+ form.on('submit(cmdModify)', function () {
+ var checkStatus = table.checkStatus('dj-table')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗灏嗕笉鍙仮澶嶏紒", { title: "鍒犻櫎纭" }, function (index) {
- var sInterID = data[0].HInterID;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鐢熶骇缁勬墭鍗�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../WMS鎵爜妯″潡/鐢熶骇绠＄悊/鐢熶骇缁勬墭鍗�/Sc_PackUnionBill_PDA.html?OperationType=2&HBarCode_Pack_Temp=' + data[0].HBarCode_Pack, 'yes']
+ , resize: false
+ , cancel: function () {
+ $(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ else {
+ layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+ }
+ });
+
+ //#endregion
+
+
+ //#region 鍒犻櫎鍔熻兘鎺т欢
+
+ form.on('submit(cmdDelete)', function () {
+ var checkStatus = table.checkStatus('dj-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+ layer.load(3)
$.ajax(
{
type: "GET",
url: GetWEBURL() + "/WEBSController/DeleteTemp_PackUnionBill_Json",
- async: true,
- data: { "HInterID": sInterID },
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": data[0].HInterID },
dataType: "json",
success: function (data) {
if (data.count == 1) {
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- DisBillEntryList(); //鏄剧ず琛ㄤ綋鏄庣粏
- //// 寰楀埌frame绱㈠紩
- //var index = layer.getFrameIndex(window.name);
- ////鍏抽棴褰撳墠frame
- //layer.close(index);
- ////淇敼鎴愬姛鍚庡埛鏂扮晫闈�
- //window.location.reload();
+ //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+ DisTempEntryList();
});
}
else {
- layer.msg(data.Message, { icon: 2 });
+ playSound();
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
error: function (err) {
- layer.msg('閿欒' + err, {
- icon: 5,
- time: 20000
- }, function () {
- });
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
- })
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�');
+ layer.closeAll("loading");
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
});
+
//#endregion
+
//#region 鍒锋柊鍔熻兘鎺т欢
+
form.on('submit(cmdRefresh)', function () {
- DisBillEntryList();
+ //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+ DisTempEntryList();
});
- function DisBillEntryList() {
- var ajaxLoad = layer.load();
+ //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+ function DisTempEntryList() {
+ layer.load(3)
$.ajax({
type: "GET",
url: GetWEBURL() + '/WEBSController/GetSc_PackUnionBill_TempList_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
- success: function (data1) {
+ success: function (result) {
+ var data = [];
var col = [];
- if (data1.count == 1) {
- var data = [];
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
//缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ for (var key in result.list) {
+ //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+ data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(result.list[key].ColmCols)) {
+ titleData[key] = result.list[key].ColmCols;
+ }
}
- //鍒ゆ柇鏄惁鏄函鑻辨枃
- var patrn = new RegExp("[\u4E00-\u9FA5]+");
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'radio' });
for (var i = 0; i < data.length; i++) {
- if (!patrn.test(data[i].name)) {
- col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else {
switch (data[i].Type) {
+ //int
case 'DateTime':
- col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
break;
default:
- col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true });
+
+ if (data[i].name == '鎵樻潯鐮�') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 200 });
+ } else if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 150 });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left' });
+ }
}
}
}
- option.cols = [col];
- option.data = data1.data;
- table.cache['Temp-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
- table.render(option);
- layer.close(ajaxLoad);
- } else {
- layer.close(ajaxLoad);
- layer.alert(data1.code + data1.Message, { icon: 5 });
+ columns = col;
+ listOption.cols = [columns];
+ listOption.data = result.data;
+ //listOption.totalRow = true;
+ table.cache['dj-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.render(listOption);
+ }
+ else {
+ listOption.cols = [[
+ { field: '鎵樻潯鐮�', title: '鎵樻潯鐮�', width: 100 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 100 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+ , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+ ]];
+ listOption.data = data;
+ //listOption.totalRow = true;
+ table.render(listOption);
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
- complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
- error: function () {
- layer.close(ajaxLoad);
- layer.alert("鍒锋柊缂撳瓨鍒楄〃淇℃伅锛屾帴鍙ｈ姹傚け璐�!", { icon: 5 });
- }
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
+ layer.closeAll("loading");
}
//#endregion
+
//#region 閫�鍑哄姛鑳芥帶浠�
+
form.on('submit(cmdCancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- parent.location.href = "../../../../views/index_Mobile.html"
+ parent.location.href = "../../../../views/index_Mobile.html";
});
})
+
//#endregion
//#region 鏂板鍔熻兘鎺т欢
@@ -257,10 +368,7 @@
//#endregion
- //#endregion
-
});
-
</script>
</body>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBill_PDA.html"
index 56f4990..95da515 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBill_PDA.html"
@@ -14,107 +14,126 @@
<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>
<style>
- .layui-col-xs4 {
- width: 12.333333%
- }
-
.layui-col-xs8 {
width: 55.666667%;
}
</style>
</head>
<body>
- <div class="layui-fluid" style="padding: 0px">
- <div class="layui-card">
+ <div class="layui-fluid" style="padding:0">
+ <div class="layui-card" style="padding: 1px">
<div class="layui-card-body" style="padding: 0px; height:800px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="background-color:#0085E8;">
<span style="color: white;"><i class="layui-icon layui-icon-form"></i>鐢熶骇缁勬墭鍗�</span>
</div>
- <div class="layui-form-item" style="padding:10px;margin:0px">
+ <div class="layui-form-item" style="padding:15px;margin:0px">
<div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label" style="width:50px;padding-left:0px;">鎵樻潯鐮�</label>
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width: 45px;padding-left: 0px;">鎵樻潯鐮�</label>
</div>
<div class="layui-col-xs8">
- <input type="text" name="HBarCode_Pack" id="HBarCode_Pack" lay-verify="HBarCode_Pack" autocomplete="off" class="layui-input">
+ <input type="text" name="HBarCode_Pack" id="HBarCode_Pack" lay-verify="HBarCode_Pack" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
<div class="layui-col-xs2">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdHBarCode_Pack" id="cmdHBarCode_Pack">纭畾</button>
+ <button type="button" lay-submit="" lay-filter="HBarCode_Pack-BT" class="layui-btn" id="HBarCode_Pack-BT" style="width: 45px; margin-left: 8px;padding-left:12px">OK</button>
</div>
</div>
- </div>
- <div class="layui-form-item" style="padding:10px;margin:0px">
- <div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label" style="width:50px;padding-left:0px;">鏉＄爜</label>
- </div>
- <div class="layui-col-xs8">
- <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
- </div>
- <div class="layui-col-xs2">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdHBarCode">纭畾</button>
+ <div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width: 45px;padding-left: 0px;">鏉＄爜</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="HBarCode-BT" class="layui-btn" id="HBarCode-BT" style="width: 45px; margin-left: 8px;padding-left:12px">OK</button>
+ </div>
</div>
</div>
- </div>
- <div class="layui-tab" lay-filter="tab-Sc_PackUnionBill_PDA">
- <ul class="layui-tab-title" lay-filter="tab-all">
- <li lay-id="1">缁勬墭淇℃伅</li>
- <li lay-id="2">鍗曟嵁淇℃伅</li>
- </ul>
- <div class="layui-tab-content">
- <!--缁勬墭淇℃伅-->
- <div class="layui-tab-item">
- <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
- </div>
- <!--鍗曟嵁淇℃伅-->
- <div class="layui-tab-item">
- <div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鍒跺崟浜�</label>
- </div>
- <div class="layui-col-xs8 layui-input-inline mobile">
- <input type="text" name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input">
+ <div class="layui-tab layui-col-xs12" style="margin-top:5px;" lay-filter="tab-Sc_PackUnionBill_PDA">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;">缁勬墭淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍗曟嵁淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--缁勬墭淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+ <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+ </div>
</div>
</div>
- <div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
- </div>
- <div class="layui-col-xs8 layui-input-inline mobile">
- <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁ID</label>
- </div>
- <div class="layui-col-xs8 layui-input-inline mobile">
- <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" value="0" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>
- <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
- <div class="layui-row">
- <div class="layui-col-xs3">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdLoadData" id="cmdLoadData">鎻愪氦</button>
- </div>
- <div class="layui-col-xs3">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
- </div>
- <div class="layui-col-xs3">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
+ <!--鍗曟嵁淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鏃ユ湡</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input name="HDate" id="HDate" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍒跺崟浜�</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input type="text" name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁ID</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" value="0" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">缁勭粐</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input type="text" name="HStockOrgName" id="HStockOrgName" lay-verify="HStockOrgName" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ <input type="hidden" name="HStockOrgID" id="HStockOrgID" lay-verify="HStockOrgID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ </div>
</div>
</div>
</div>
</div>
+ <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+ <button type="button" lay-submit="" lay-filter="cmdSaver" class="layui-btn" id="cmdSaver">鎻愪氦</button>
+ <button type="button" lay-submit="" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+ <button type="button" lay-submit="" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+ </div>
</div>
+
+ <!--闅愯棌瀛楁-->
+ <input type="hidden" name="HBillType" id="HBillType">
+ <input type="hidden" name="HBillSubType" id="HBillSubType">
+ <!--澶辫触鎻愮ず闊�-->
<div id="" style="display:none;">
- <audio id="cs1" hidden controls>
+ <audio id="cs" hidden controls>
<source src="../../../video/jingbao.wav" type="audio/ogg">
</audio>
</div>
+ <!--鎴愬姛鎻愮ず闊�-->
<div id="" style="display:none;">
<audio id="cs2" hidden controls>
<source src="../../../video/success.wav" type="audio/ogg">
@@ -137,15 +156,24 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
+ , laydate = layui.laydate
, element = layui.element;
var HInterID = $('#HInterID').val()
var HBillNo = $('#HBillNo').val()
var HBillType = '3783'
- var HBarCode_Pack = sessionStorage["HBarCode_Pack"]
+ var HBillSubType = '1' //瀛愮被鍨嬶紙1瑁呯銆佹爣鍑嗙粍鎵樸��2缁勬墭锛�
var HMaker = sessionStorage["HUserName"]
- var HStockOrgID = sessionStorage["OrganizationID"]
- var SourceFlag = sessionStorage["SourceFlag"]; //鎵樻潯鐮佸凡鎵爣蹇�
- var option = [];
+ var HStockOrgID = sessionStorage["OrganizationID"] //缁勭粐ID
+ var OperationType = 1 //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+ var HMaterNumber_Pack = ""; //鎵樻潯鐮佸搴旂墿鏂欎唬鐮�
+ var listOption = [];
+ var columns = "";
+ var HModName = "Sc_PackUnionBill_PDA";
+ var ModRightName = "CE_PackUnion"; //妯″潡鏉冮檺鍙傛暟
+ var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
+ var params = get_UrlVars();
+ var OperationType = params[params[0]] == null ? 1 : params[params[0]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏁版嵁绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+ var HBarCode_Pack_Temp = params[params[1]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鎵樻潯鐮�
//#endregion
@@ -153,100 +181,40 @@
if (sessionStorage.login != "login") {
layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
- }, function () { window.location.href = "../../../user/login.html"; });
+ }, function () { window.location.href = "../../../user/login_pda.html"; });
}
- //#region 鍒濆鍖栫晫闈�
+ //#region 鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
- set_ClearBill();
+ //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+ CheckModRight();
- function set_ClearBill() {
- $("#HMaker").val(HMaker);
- $("#HMaker").attr("readonly", "readonly");
- $("#HBillNo").attr("readonly", "readonly");
- $("#HInterID").attr("readonly", "readonly");
- element.tabChange('tab-Sc_PackUnionBill_PDA', '1');
- var pFocus = $("#HBarCode_Pack");
- pFocus.focus(); //鑾峰彇鍏夋爣
- pFocus.select();
- set_InitGrid(); //鍒濆鍖栬〃鏍�
- }
-
- //#region 鍒濆鍖栬〃鏍兼柟娉�
- function set_InitGrid() {
- option = {
- elem: '#wl-table'
- , height: 'full-50'
- //, page: true
- , cellMinWidth: 90
- , limit: 50
- //, limits: [50, 500, 5000, 20000]
- };
- }
-
- //#endregion
-
- //#region 浠庣紦瀛樺垪琛ㄤ腑杩斿洖淇℃伅
- function getBillTemp() {
- var vars = [], hash;
- var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
- for (var i = 0; i < hashes.length; i++) {
- hash = hashes[i].split('=');
- vars.push(hash[0]);
- vars[hash[0]] = hash[1];
- }
- return vars;
- }
- var params = getBillTemp();
- var HInterID_Temp = params[params[0]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁ID
- var HBillNo_Temp = params[params[1]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁鍙�
- var HBarCode_Pack_Temp = params[params[2]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鎵樻潯鐮�
-
- //#endregion
-
- //鍒ゆ柇鏄惁鏂板
- if (HInterID_Temp == null || HInterID_Temp == 0) {
- //鑾峰彇鏈�澶у崟鎹甀D銆佸崟鎹彿
+ function CheckModRight() {
+ layer.load(3);
$.ajax({
type: "GET",
- url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
- data: { "HBillType": HBillType },
+ url: GetWEBURL() + "/WEBSController/CheckModRight_ERP_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "ModRightName": ModRightName, "HUserName": HMaker },
success: function (d) {
if (d.count == 1) {
- $("#HInterID").val(d.data[0].HInterID);
- $("#HBillNo").val(d.data[0].HBillNo);
- HInterID = $('#HInterID').val()
- HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ layer.msg(d.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () { parent.location.href = "../../../../views/index_Mobile.html"; });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
- SourceFlag = false;
+ layer.closeAll("loading");
}
- //浠庣紦瀛樺垪琛ㄧ紪杈戝姛鑳借烦杞嚦鍗曟嵁妯″潡
- else {
- $('#HInterID').val(HInterID_Temp)
- $('#HBillNo').val(HBillNo_Temp)
- $('#HBarCode_Pack').val(HBarCode_Pack_Temp)
- $("#HBarCode_Pack").attr("readonly", "readonly");
- HInterID = $('#HInterID').val()
- HBillNo = $('#HBillNo').val()
- HBarCode_Pack = $('#HBarCode_Pack').val()
- $("#HBarCode").focus();
- element.tabChange('tab-Sc_PackUnionBill_PDA', '1');
-
- //鏄剧ず琛ㄤ綋鏄庣粏
- DisBillEntryList();
- SourceFlag = true;
- }
+ //#endregion
//澶辫触鎻愮ず闊�
function playSound() {
console.log("playSound");
- var audio = document.getElementById("cs1");
+ var audio = document.getElementById("cs");
audio.play();
audio.onended = function () {
// 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
@@ -266,174 +234,102 @@
};
}
+ //#region 鍒濆鍖栫晫闈�
+
+ set_ClearBill();
+
+ function set_ClearBill() {
+ //琛ㄥご鍒濆鍖栬祴鍊�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HStockOrgID").val(sessionStorage["OrganizationID"]);
+ $("#HStockOrgName").val(sessionStorage["Organization"]);
+ $("#HBillType").val(HBillType);
+ $("#HBillSubType").val(HBillSubType);
+
+ //榛樿鏄剧ず椤甸潰
+ element.tabChange('tab-Sc_PackUnionBill_PDA', '1');
+ set_InitDate(); //鍒濆鍖栬〃鍗曟椂闂�
+ set_InitGrid(); //鍒濆鍖栬〃鏍�
+
+ var data = [];
+ listOption.cols = [[
+ { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', width: 100 }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '鏉＄爜涓暟', title: '鏉＄爜涓暟', width: 100 }
+ ]];
+ listOption.data = data;
+ table.render(listOption);
+
+ //鍏夋爣榛樿鍦ㄦ潯鐮佷綅缃笂
+ var pFocus = $("#HBarCode_Pack");
+ pFocus.select();
+ pFocus.focus(); //鑾峰彇鍏夋爣
+ }
+
+ //鍒濆鍖栬〃鍗曟椂闂存彃浠�
+ function set_InitDate() {
+ //甯歌鐢ㄦ硶
+ laydate.render({
+ elem: '#HDate'
+ });
+ }
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ listOption = {
+ elem: '#wl-table'
+ //, toolbar: '#toolbarDemo'
+ , totalRow: true
+ , height: 'full-60'
+ , cellMinWidth: 90
+ , limit: 200
+ };
+ }
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(wl-table)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ $(".layui-table-body tr ").attr({ "style": "background:" }); //鍏朵粬tr鎭㈠鍘熸牱
+ obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click'); //閫変腑琛屾牱寮�
+ obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click"); //閫変腑radio鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ })
//#endregion
-
- //#region 鎵弿鎵樻潯鐮�
-
- //鎸夊洖杞﹂敭杩斿洖淇℃伅
- $('#HBarCode_Pack').on('keydown', function (event) {
- if (event.keyCode == 13) {
- GetMeesageByBarCode_Pack();
- }
- });
-
- //鐐瑰嚮鎸夐挳杩斿洖淇℃伅
- form.on('submit(cmdHBarCode_Pack)', function (data) {
+ //鍒ゆ柇鏄惁鏂板锛岃幏鍙栨渶澶у崟鎹彿
+ if (HInterID != 0) {
+ }
+ //浠庣紦瀛樺垪琛ㄧ紪杈戝姛鑳借烦杞嚦鍗曟嵁妯″潡
+ else if (OperationType == 2) {
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HBarCode_Pack").val(HBarCode_Pack_Temp);
GetMeesageByBarCode_Pack();
- });
-
- //鎵弿鎵樻潯鐮�
- function GetMeesageByBarCode_Pack(obj) {
- HBarCode_Pack = $('#HBarCode_Pack').val()
-
- if (HBarCode_Pack == '') {
- playSound();
- layer.msg("鎵樻潯鐮佷笉鑳戒负绌猴紝璇锋壂鎻忔墭鏉＄爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
-
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ element.tabChange('tab-Sc_PackUnionBill_PDA', '1');
+ }
+ else {
+ //鑾峰彇鏈�澶у崟鎹甀D銆佸崟鎹彿
$.ajax({
type: "GET",
- url: GetWEBURL() + "/WEBSController/Get_PackBarCode_PackUnionBill_Json",
- data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HBarCode_Pack": HBarCode_Pack, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
- success: function (result) {
- if (result.count == 1) {
- playSound_OK();
- $("#HBarCode_Pack").val(result.data.hBarCodeField);
- $("#HBarCode_Pack").attr("readonly", "readonly");
- $("#HBarCode").select();
- $("#HBarCode").focus(); //鑾峰彇鍏夋爣
- document.getElementById("cmdHBarCode_Pack").disabled = true; //鎸夐挳鍙樹负涓嶅彲缂栬緫鐘舵��
- element.tabChange('tab-Sc_PackUnionBill_PDA', '1');
- //鏄剧ず琛ㄤ綋鏄庣粏
- DisBillEntryList();
- SourceFlag = true;
- layer.load(3);
+ url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBillType": HBillType },
+ success: function (d) {
+ if (d.count == 1) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ HInterID = $('#HInterID').val()
+ HBillNo = $('#HBillNo').val()
}
else {
- playSound();
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
- $('#HBarCode_Pack').val("");
- $("#HBarCode_Pack").select();
- $("#HBarCode_Pack").focus(); //鑾峰彇鍏夋爣
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
- layer.closeAll("loading");
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
- });
- }
-
- //#endregion
-
-
- //#region 鎵弿鐗╂枡鏉＄爜
-
- //鎸夊洖杞﹂敭杩斿洖淇℃伅
- $('#HBarCode').on('keydown', function (event) {
- if (event.keyCode == 13) {
- GetMeesageByBarCode();
- }
- });
-
- //鐐瑰嚮鎸夐挳杩斿洖淇℃伅
- form.on('submit(cmdHBarCode)', function (data) {
- GetMeesageByBarCode();
- });
-
- //鎵弿鐗╂枡鏉＄爜
- function GetMeesageByBarCode(obj) {
- var sBarCode = $('#HBarCode').val()
-
- if (sBarCode == '') {
- playSound();
- layer.msg("鏉＄爜涓嶈兘涓虹┖锛岃鎵弿鏉＄爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- else if (SourceFlag == false) {
- playSound();
- layer.msg("娌℃湁鎵弿鎵樻潯鐮侊紝璇峰厛鎵弿鎵樻潯鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (sBarCode != "") {
- $('#HBarCode').val("");
- }
-
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/WEBSController/Get_BarCode_PackUnionBill_Json",
- data: { "HBarCode": sBarCode, "HInterID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HBarCode_Pack": HBarCode_Pack, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
- success: function (result) {
- if (result.count == 1) {
- playSound_OK();
- $("#HBarCode").select();
- $("#HBarCode").focus(); //鑾峰彇鍏夋爣
- element.tabChange('tab-Sc_PackUnionBill_PDA', '1');
- //鏄剧ず琛ㄤ綋鏄庣粏
- DisBillEntryList();
- layer.load(3)
- }
- else {
- playSound();
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
- }
- layer.closeAll("loading");
- },
- complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
- });
- }
-
- //#endregion
-
-
- //#region 鏄剧ず鐗╂枡鍒楄〃淇℃伅
-
- function DisBillEntryList() {
- var ajaxLoad = layer.load();
- $.ajax({
- type: "GET",
- url: GetWEBURL() + '/WEBSController/GetBillEntry_Tmp_Pack_Json',
- data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType },
- success: function (data1) {
- var col = [];
- if (data1.count == 1) {
- var data = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
- }
- //鍒ゆ柇鏄惁鏄函鑻辨枃
- var patrn = new RegExp("[\u4E00-\u9FA5]+");
- col.push({ type: 'radio' });
- for (var i = 0; i < data.length; i++) {
- if (!patrn.test(data[i].name)) {
- col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
- }
- else {
- switch (data[i].Type) {
- case 'DateTime':
- col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
- break;
- default:
- col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true });
- }
- }
- }
- option.cols = [col];
- option.data = data1.data;
- table.cache['wl-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
- table.render(option);
- layer.close(ajaxLoad);
- } else {
- layer.close(ajaxLoad);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- },
- complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
- error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
});
}
@@ -442,80 +338,86 @@
//#region 鍔熻兘鎺т欢
- //#region 鎻愪氦涓婁紶鍔熻兘鎺т欢
-
- form.on('submit(cmdLoadData)', function (data) {
- document.getElementById("cmdLoadData").disabled = true; //鎸夐挳鍙樹负涓嶅彲缂栬緫鐘舵��
- $.ajax(
- {
- type: "GET",
- url: GetWEBURL() + "/WEBSController/set_SavePackUnionBill_Json",
- async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "HInterID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HBarCode_Pack": HBarCode_Pack, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.confirm(data.Message, {
- icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- btn2: function () {
- parent.location.href = "../../../../views/index_Mobile.html"
- }//鍏抽棴
- }, function () {
- HInterID_Temp = 0;
- window.location.reload(); //鍒锋柊褰撳墠椤甸潰
- });//鏂板
- layer.load(3);
- }
- else {
- playSound();
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
- document.getElementById("cmdLoadData").disabled = false; //鎸夐挳鍙樹负鍙紪杈戠姸鎬�
- }
- layer.closeAll("loading"); //鍏抽棴鍔犺浇灞�
- },
- complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
- error: function (err) {
- layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
- document.getElementById("cmdLoadData").disabled = false;
- }
- });
- });
-
- //#endregion
-
- //#region 鍒犻櫎鍔熻兘鎺т欢
-
- form.on('submit(cmdDelete)', function () {//鍒犻櫎
- var checkStatus = table.checkStatus('wl-table')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- layer.confirm("纭畾瑕佸垹闄ゅ悧锛屽垹闄ゅ悗灏嗕笉鍙仮澶嶏紝纭畾瑕佺户缁搷浣滐紵", { title: "鍒犻櫎纭" }, function (index) {
- var HBarCode = data[0].HBarCode
+ //#region 鎻愪氦
+ form.on('submit(cmdSaver)', function (data) {
+ document.getElementById("cmdSaver").disabled = true; //鎸夐挳鍙樹负涓嶅彲缂栬緫鐘舵��
+ var sSubStr = table.cache['wl-table'];
+ var HBarCode_Pack = $('#HBarCode_Pack').val()
+ if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
+ {
+ layer.load(3);
$.ajax(
{
type: "GET",
- url: GetWEBURL() + "/WEBSController/set_DelPackUnionBill_Temp_Pack_Json",
- async: true, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "HInterID": HInterID, "HBarCode": HBarCode, "HBillType": HBillType },
+ url: GetWEBURL() + "/WEBSController/set_SavePackUnionBill_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HBarCode_Pack": HBarCode_Pack, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
dataType: "json",
success: function (data) {
- if (data.count == 1) { //鎴愬姛
- DisBillEntryList(); //鏄剧ず琛ㄤ綋鏄庣粏
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ layer.confirm(data.Message, {
+ icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板','鍏抽棴'],
+ btn2: function () {
+ parent.location.href = "../../../../views/index_Mobile.html";
+ }//鍏抽棴
+ }
+ , function () {
+ location.replace('Sc_PackUnionBill_PDA.html?OperationType=1&HInterID=0');
+ });//鏂板
}
else {
- layer.msg(data.Message, { icon: 2 });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ document.getElementById("cmdSaver").disabled = false; //鎸夐挳鍙樹负鍙紪杈戠姸鎬�
}
},
complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
error: function (err) {
- layer.msg('閿欒' + err, {
- icon: 5,
- time: 20000
- }, function () {
- });
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ document.getElementById("cmdSaver").disabled = false; //鎸夐挳鍙樹负鍙紪杈戠姸鎬�
}
});
- layer.close(index)
+ layer.closeAll("loading");
+ return;
+ }
+ });
+
+ //#endregion
+
+ //#region 鍒犻櫎
+
+ form.on('submit(cmdDelete)', function () {
+ var checkStatus = table.checkStatus('wl-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length == 1) {
+ layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+ var HBarCode = data[0].HBarCode
+
+ layer.load(3)
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_DelPackUnionBill_Temp_Pack_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBarCode": HBarCode, "HBillType": HBillType },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ });
+ }
+ else {
+ playSound();
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ layer.closeAll("loading");
})
}
else {
@@ -525,11 +427,18 @@
//#endregion
- //#region 閫�鍑哄姛鑳芥帶浠�
+ //#region 閫�鍑�
form.on('submit(cmdCancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- parent.location.href = "../../../../views/index_Mobile.html";
+ if (OperationType == 2) {
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.location.reload(); //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ }
+ else {
+ parent.location.href = "../../../../views/index_Mobile.html";
+ }
});
})
@@ -537,8 +446,325 @@
//#endregion
+
+ //#region 鎵弿鎵樻潯鐮�
+
+ //鎵弿鎵樻潯鐮�
+ $('#HBarCode_Pack').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageByBarCode_Pack();
+ }
+ });
+
+ //鎵樻潯鐮佹寜閽�
+ form.on('submit(HBarCode_Pack-BT)', function (data) {
+ GetMeesageByBarCode_Pack();
+ });
+
+ //鎵墭鏉＄爜
+ function GetMeesageByBarCode_Pack(obj) {
+ var HBarCode_Pack = $('#HBarCode_Pack').val()
+ if (HBarCode_Pack == '') {
+ playSound();
+ layer.msg("鎵樻潯鐮佷笉鑳戒负绌猴紝璇锋壂鎻忔墭鏉＄爜锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode_Pack").select();
+ $("#HBarCode_Pack").focus();
+ });
+ return;
+ }
+ layer.load(3)
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/Get_PackBarCode_PackUnionBill_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HBarCode_Pack": HBarCode_Pack, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) {
+ playSound_OK();
+ $("#HInterID").val(result.data[0].HInterID);
+ $("#HBillNo").val(result.data[0].HBillNo);
+ HInterID = $('#HInterID').val()
+ HBillNo = $('#HBillNo').val()
+ HMaterNumber_Pack = result.data[0].HMaterNumber
+
+ $("#HBarCode_Pack").attr("disabled", "disabled");
+ $('#HBarCode_Pack-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ $("#HBarCode").select();
+ $("#HBarCode").focus(); //鑾峰彇鍏夋爣
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ element.tabChange('tab-Sc_PackUnionBill_PDA', '1');
+ }
+ else {
+ playSound();
+ layer.msg(result.Message, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode_Pack").select();
+ $("#HBarCode_Pack").focus();
+ });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ playSound();
+ layer.msg("閿欒锛�" + err, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode_Pack").select();
+ $("#HBarCode_Pack").focus();
+ });
+ }
+ });
+ layer.closeAll("loading");
+ }
+
+ //#endregion
+
+
+ //#region 鎵弿寰呯粍鎵樻潯鐮�
+
+ //鎵弿寰呯粍鎵樻潯鐮�
+ $('#HBarCode').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageByBarCode();
+ }
+ });
+
+ //寰呯粍鎵樻潯鐮佹寜閽�
+ form.on('submit(HBarCode-BT)', function (data) {
+ GetMeesageByBarCode();
+ $("#HBarCode").select();
+ $("#HBarCode").focus(); //鑾峰彇鍏夋爣
+ });
+
+ //鎵緟缁勬墭鏉＄爜
+ function GetMeesageByBarCode(obj) {
+ var HBarCode_Pack = $('#HBarCode_Pack').val()
+ var sOldBarCode = $('#HBarCode').val()
+ var HDeleteFlag = sOldBarCode.substring(0, 1);
+ var sBarCode = sOldBarCode.slice(1);
+
+ if (HBarCode_Pack == '') {
+ playSound();
+ layer.msg("鎵樻潯鐮佷笉鑳戒负绌猴紝璇峰厛鎵弿鎵樻潯鐮侊紒", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode_Pack").select();
+ $("#HBarCode_Pack").focus();
+ });
+ return;
+ }
+
+ if (HDeleteFlag == "*") {
+ if (sBarCode == "") {
+ playSound();
+ layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").focus();
+ });
+ return;
+ }
+ else {
+ $('#HBarCode').val("");
+ }
+ layer.load(3)
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/set_DelPackUnionBill_Temp_Pack_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBarCode": sBarCode, "HBillType": HBillType },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ playSound_OK();
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ playSound();
+ layer.msg(data.Message, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ playSound();
+ layer.msg('閿欒' + err, {
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ }
+ });
+ layer.closeAll("loading");
+ }
+ else {
+ var sBarCode = $('#HBarCode').val()
+ if (sBarCode == '') {
+ playSound();
+ layer.msg("鏉＄爜涓嶈兘涓虹┖锛岃鎵弿鏉＄爜锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ return;
+ }
+
+ layer.load(3)
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/Get_BarCode_PackUnionBill_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": sBarCode, "HInterID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HBarCode_Pack": HBarCode_Pack, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) {
+ playSound_OK();
+ if (sBarCode != "") {
+ $('#HBarCode').val("");
+ }
+ $("#HBarCode").select();
+ $("#HBarCode").focus(); //鑾峰彇鍏夋爣
+ element.tabChange('tab-Sc_PackUnionBill_PDA', '1');
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ playSound();
+ layer.msg(result.Message, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ playSound();
+ layer.msg("閿欒锛�" + err, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ }
+ });
+ layer.closeAll("loading");
+ }
+ }
+
+ //#endregion
+
+
+ //#region 鏄剧ず鐗╂枡鍒楄〃淇℃伅
+
+ function DisBillEntryList() {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/WEBSController/GetBillEntry_Tmp_Pack_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType },
+ success: function (result) {
+ var data = [];
+ var col = [];
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in result.list) {
+ //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+ data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(result.list[key].ColmCols)) {
+ titleData[key] = result.list[key].ColmCols;
+ }
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'radio', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ default:
+
+ if (data[i].name == '鏁伴噺' || data[i].name == '鏉＄爜涓暟') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
+ } else if (data[i].name == '鐗╂枡浠ｇ爜') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 120 });
+ } else if (data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 220 });
+ }
+ }
+ }
+ }
+ columns = col;
+ listOption.cols = [columns];
+ listOption.data = result.data;
+ listOption.totalRow = true;
+ table.cache['wl-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.render(listOption);
+ }
+ else {
+ listOption.cols = [[
+ { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', width: 100 }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '鏉＄爜涓暟', title: '鏉＄爜涓暟', width: 100 }
+ ]];
+ listOption.data = data;
+ table.render(listOption);
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+
+ //#endregion
+
+
+
});
+ //浠ヤ笂涓簂ayui妯″潡
+ //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+
+ //鍗曟嵁涓婁紶鍓嶅垽鏂�
+ function AllowLoadData(sSubStr) {
+ if (HInterID == 0) {
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (HBillNo == '') {
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (sSubStr.length == 0) {
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ return true;
+ }
</script>
</body>
diff --git a/WebTM/views/home/console_Mobile.html b/WebTM/views/home/console_Mobile.html
index 2dbae17..8eedf81 100644
--- a/WebTM/views/home/console_Mobile.html
+++ b/WebTM/views/home/console_Mobile.html
@@ -118,6 +118,18 @@
</a>
</li>
<li class="layui-col-xs3">
+ <a href="../WMS鎵爜妯″潡/鐢熶骇绠＄悊/鐢熶骇缁勬墭鍗�/Sc_PackUnionBill_PDA.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-template-1"></i>
+ <cite style="white-space:pre-wrap">鐢熶骇缁勬墭鍗�</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../WMS鎵爜妯″潡/鐢熶骇绠＄悊/鍒犳墭鍗�/Sc_DeletePackUnionBill_PDA.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-app"></i>
+ <cite style="white-space:pre-wrap">鐢熶骇鎷嗘墭鍗�</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
<a href="../杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html" target="main_self_frame">
<i class="layui-icon layui-icon-auz"></i>
<cite style="white-space:pre-wrap">鍑虹珯姹囨姤</cite>
@@ -439,6 +451,12 @@
</a>
</li>
<li class="layui-col-xs3">
+ <a href="../WMS鎵爜妯″潡/鐢熶骇绠＄悊/鐢熶骇缁勬墭鍗�/Sc_PackUnionBillList_PDA.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-template-1"></i>
+ <cite style="white-space:pre-wrap">鐢熶骇缁勬墭鍗曠紦瀛�</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
<a href="../WMS鎵爜妯″潡/瀹㈡埛鏉＄爜鎵弿/Gy_getCusBarCodeBillList_PDA.html" target="main_self_frame">
<i class="layui-icon layui-icon-windows"></i>
<cite style="white-space:pre-wrap">瀹㈡埛鏉＄爜鎵爜璁板綍鍗�</cite>
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 0a92571..37987f8 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -769,7 +769,7 @@
<dd>
<a href="WMS鎵爜妯″潡/鐢熶骇绠＄悊/鍒犳墭鍗�/Sc_DeletePackUnionBill_PDA.html" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 鍒犳墭鍗�
+ 鐢熶骇鎷嗘墭鍗�
</a>
</dd>
<dd>
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_WorkCenter_Add_Edit.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_WorkCenter_Add_Edit.html"
index db023bf..872f9e4 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_WorkCenter_Add_Edit.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_WorkCenter_Add_Edit.html"
@@ -496,6 +496,9 @@
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
option.data = result.data;
+ if(!result.data.length) {
+ option.data = [{ HCenterID: $('#HItemID').val(), HCenterName: $("#HName").val(), HSourceID: 0, HSourceName: "" }]
+ }
table.render(option);
}
@@ -812,7 +815,6 @@
//琛屽唴蹇嵎閿瓫閫�
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
- debugger
if (event.key == "F7") {
if (obj.event == 'HSourceNameSelect') {
layer.open({
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_Process.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_Process.html"
index e803055..eab051f 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_Process.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_Process.html"
@@ -15,6 +15,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+
</head>
<body>
<div class="layui-fluid">
@@ -86,7 +87,7 @@
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
</div>
</div>
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-row" style=" margin-top: 10px;">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
@@ -114,7 +115,7 @@
</div>
</div>
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-row" style=" margin-top: 10px;">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
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_ShiftsEdit.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_ShiftsEdit.html"
index 144bba0..576fd2a 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_ShiftsEdit.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_ShiftsEdit.html"
@@ -1,11 +1,13 @@
锘�<!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">
+ <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">
@@ -15,6 +17,7 @@
<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/dayjs.min.js"></script>
<style>
.layui-form-item .layui-inline {
margin-top: 5px;
@@ -27,14 +30,17 @@
}
</style>
</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="component-form-group" style="background-color:white;">
<div style="padding: 10px; ">
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Save" id="btn_Save">淇濆瓨</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Cancel" id="btn_Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit=""
+ lay-filter="btn_Save" id="btn_Save">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit=""
+ lay-filter="btn_Cancel" id="btn_Cancel">閫�鍑�</button>
</div>
<div class="layui-tab" lay-filter="tab-Gy_ShiftsEdit">
<ul class="layui-tab-title" lay-filter="tab-all">
@@ -49,21 +55,30 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鐝浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HNumber" name="HNumber" id="HNumber" placeholder="璇疯緭鍏ュ唴瀹�">
+ <input type="text" class="layui-input" lay-verify="HNumber"
+ name="HNumber" id="HNumber" placeholder="璇疯緭鍏ュ唴瀹�">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鐝鍚嶇О</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HName" name="HName" id="HName" placeholder="璇疯緭鍏ュ唴瀹�">
+ <input type="text" class="layui-input" lay-verify="HName" name="HName"
+ id="HName" placeholder="璇疯緭鍏ュ唴瀹�">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">閮ㄩ棬</label>
+ <label class="layui-form-label"
+ style="width: 85px;padding: 9px 18px;">閮ㄩ棬</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" lay-verify="HDeptID" name="HDeptID" id="HDeptID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <input type="text" class="layui-input" lay-verify="HDeptName"
+ name="HDeptName" id="HDeptName"
+ style="background-color:#efefef4d;width: 60%;display: inline-block;"
+ readonly>
+ <input type="hidden" lay-verify="HDeptID" name="HDeptID" id="HDeptID"
+ value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button"
+ lay-submit="" lay-filter="btnHDept" id="btnHDept"
+ style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
@@ -73,19 +88,26 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">寮�濮嬫椂闂�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HBeginTimes" name="HBeginTimes" id="HBeginTimes" onfocus="this.select();">
+ <input type="text" class="layui-input" lay-verify="HBeginTimes"
+ name="HBeginTimes" id="HBeginTimes" placeholder="HH:MM"
+ onfocus="this.select();">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缁撴潫鏃堕棿</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HEndTimes" name="HEndTimes" id="HEndTimes" onfocus="this.select();">
+ <input type="text" class="layui-input" lay-verify="HEndTimes"
+ name="HEndTimes" id="HEndTimes" placeholder="HH:MM"
+ onfocus="this.select();">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">宸ヤ綔鏃堕棿</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" name="HWorkTimes" id="HWorkTimes" lay-verify="HWorkTimes" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="text" name="HWorkTimes" id="HWorkTimes"
+ lay-verify="HWorkTimes"
+ onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value"
+ autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
</div>
<div class="layui-inline">
@@ -96,7 +118,8 @@
<div class="layui-inline" style="width: 965px;">
<label class="layui-form-label" style="width: 85px;">澶囨敞</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark" onmouseover="this.title=this.value">
+ <input type="text" class="layui-input" lay-verify="HRemark"
+ name="HRemark" id="HRemark" onmouseover="this.title=this.value">
</div>
</div>
</div>
@@ -111,7 +134,9 @@
</div>
<div class="layui-inline">
<div class="layui-input-block" style="margin-left: 200px;">
- <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤" disabled="disabled">
+ <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag"
+ lay-skin="primary" lay-filter="checkboxHStopflag" value="true"
+ title="鏄惁绂佺敤" disabled="disabled">
<input type="hidden" value="false" name="HStopflag" id="HStopflag">
</div>
</div>
@@ -126,13 +151,15 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍒涘缓浜�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HMakeEmp" id="HMakeEmp" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HMakeEmp" id="HMakeEmp"
+ style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HCheckEmp" id="HCheckEmp" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HCheckEmp" id="HCheckEmp"
+ style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -140,13 +167,15 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍒涘缓鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HMakeTime" id="HMakeTime" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HMakeTime" id="HMakeTime"
+ style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HCheckTime" id="HCheckTime" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HCheckTime" id="HCheckTime"
+ style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -154,13 +183,15 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HModifyEmp" id="HModifyEmp" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HModifyEmp" id="HModifyEmp"
+ style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">绂佺敤浜�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HStopEmp" id="HStopEmp" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HStopEmp" id="HStopEmp"
+ style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -168,13 +199,15 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HModifyTime" id="HModifyTime" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HModifyTime"
+ id="HModifyTime" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">绂佺敤鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HStopTime" id="HStopTime" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HStopTime" id="HStopTime"
+ style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -183,7 +216,8 @@
<div class="layui-row" style="display:none;">
<div class="layui-inline">
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="hidden" lay-verify="HItemID" name="HItemID" id="HItemID" value="0">
+ <input type="hidden" lay-verify="HItemID" name="HItemID" id="HItemID"
+ value="0">
</div>
</div>
</div>
@@ -202,13 +236,15 @@
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
- //#region 鍏叡鍙橀噺
+ //#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
, table = layui.table
, form = layui.form
- , element = layui.element;
+ , element = layui.element
+ // 鏃ユ湡鎻掍欢
+ , laydate = layui.laydate;
var HItemID = $('#HItemID').val()
var HMaker = sessionStorage["HUserName"]
var HUSEORGID = sessionStorage["OrganizationID"] //缁勭粐ID
@@ -224,6 +260,8 @@
//鑾峰彇缁勭粐
Organ();
+ // 鍒濆鍖栬〃鍗�
+ Init_GridForm()
//#region 鑾峰彇缁勭粐
function Organ() {
@@ -248,6 +286,8 @@
})
}
//#endregion
+
+
//鑾峰彇椤甸潰璺宠浆鍙傛暟
var params = get_UrlVars();
@@ -287,7 +327,7 @@
if (IsHStopflag) {
$("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
}
- if (data.瀹℃牳浜�!="") {
+ if (data.瀹℃牳浜� != "") {
$('#btn_Save').addClass("layui-btn-disabled").attr("disabled", true);
}
if (data.HUSEORGID != 0) {
@@ -384,6 +424,30 @@
//#region 鍔熻兘鎺т欢
+ function Init_GridForm() {
+ laydate.render({
+ elem: '#HBeginTimes',
+ type: 'time',
+ format: 'HH:mm',
+ done: () => {
+ CalcTimesGap()
+ }
+ });
+
+ laydate.render({
+ elem: '#HEndTimes',
+ type: 'time',
+ format: 'HH:mm',
+ done: () => {
+ CalcTimesGap()
+ }
+ });
+
+ var beginTime = dayjs(Date.now()).format("HH:mm")
+ $("#HBeginTimes").val(beginTime)
+ $("#HEndTimes").val(beginTime)
+ }
+
//#region 淇濆瓨
//淇濆瓨鎸夐挳
@@ -448,10 +512,11 @@
//#endregion
+ function CalcTimesGap() {
+
+ }
+
//#endregion
-
-
-
});
//浠ヤ笂涓簂ayui妯″潡
@@ -465,4 +530,5 @@
}
</script>
</body>
+
</html>
\ No newline at end of file
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_ShiftsList.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_ShiftsList.html"
index efbedce..8e23dad 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_ShiftsList.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_ShiftsList.html"
@@ -15,7 +15,7 @@
<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/HideButton.js"></script>
+ <script src="../../../layuiadmin/HideButton_New.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<style>
.layui-form-select .layui-input {
@@ -99,7 +99,7 @@
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
+ <div class="layui-btn-container" id="btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_AddNew" id="btn_AddNew"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Modify" id="btn_Modify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
@@ -147,6 +147,7 @@
var option = [];
var columns = "";
var HModName = "Gy_ShiftsList";
+ var HBillType = "Gy_ShiftsList";
var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
var params = get_UrlVars();
var Type = params[params[0]];
@@ -342,8 +343,8 @@
}
//鍒锋柊鎸夐挳鏄剧ず
- var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- Display_HideButton(btns, HModName, HModName, HMaker);
+ // var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton('btn-container', HModName, HModName, HMaker);
},
complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
@@ -460,7 +461,7 @@
//鎸夐挳璁剧疆
case 'btn_HideButton':
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- get_HideButton(btns, HModName, HModName, HMaker);
+ get_HideButton('btn-container', HBillType, HModName, sessionStorage["HUserName"]);
break;
//閫�鍑烘寜閽�
case 'btn_Exit': Pub_Close(2);
@@ -752,14 +753,14 @@
for (var i = 1; i < option.cols[0].length - 1; i++) {
colName += option.cols[0][i]["title"] + ",";
}
- var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
- var urlLen = urlStr.split('/');
- for (var i = 0; i < urlLen.length - 4; i++) {
- contentUrl += "../";
- }
- colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ // var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ // var urlLen = urlStr.split('/');
+ // for (var i = 0; i < urlLen.length - 4; i++) {
+ // contentUrl += "../";
+ // }
+ // colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
- contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+ contentUrl += '../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;
layer.open({
type: 2
@@ -940,7 +941,7 @@
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- Display_HideButton(btns, HModName, HModName, HMaker);
+ Display_HideButton('btn-container', HModName, HModName, HMaker);
layer.close(ajaxLoad);
//鑷畾涔夎繃婊や笅鎷夋鍔犺浇
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 4e40587..35e9448 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"
@@ -360,7 +360,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- // get_FastQuery(1);
+ get_FastQuery(1);
get_DefaultModule();//鍔犺浇鏂规
@@ -1090,7 +1090,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery(1);
+ // get_FastQuery(1);
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
index 9d0eba0..b488e9f 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
@@ -12,7 +12,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
- <script src="../../../layuiadmin/zy_DragObserver.js"></script>
+ <!-- <script src="../../../layuiadmin/zy_DragObserver.js"></script> -->
<style>
/* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
/*.layui-table-cell {
@@ -379,7 +379,7 @@
form.render('checkbox');
form.render('select');
- registerDragObserver()
+ // registerDragObserver()
layer.close(ajaxLoad);
} else {
var colTitleNames = colTitleName.split(',');
@@ -535,39 +535,39 @@
}
//// 娉ㄥ唽鎷栨嫿瑙傚療鑰咃紝鐩戝惉琛ㄦ牸鎷栨嫿鍙樺寲
- function registerDragObserver() {
- // 濡傛灉涓嶆敮鎸侊紝鍒欎粈涔堥兘涓嶆墽琛�
- if (typeof window.MutationObserver === 'undefined'
- && typeof window.WebKitMutationObserver === 'undefined') {
- console.warn('observer not supported')
- return
- }
- let targetEl = $(".layui-table-box")[0];
- let config = {
- attributes: true,
- attributesOldValue: true,
- attributeFilter: ['class'],
- childList: false,
- subtree: false,
- characterData: false,
- characterDataOldValue: false
- };
- let observer = new MutationObserver(mutations => {
- mutations.forEach(function (mutation) {
- if (mutation.attributeName === 'class') {
- // 鐩戝惉class涓唴瀹圭殑鍙樺寲
- if ($(targetEl).hasClass('noselect')) {
- document.documentElement.style.userSelect = 'none';
- document.documentElement.style.webkitUserSelect = 'none';
- } else {
- document.documentElement.style.userSelect = '';
- document.documentElement.style.webkitUserSelect = '';
- }
- }
- })
- })
- observer.observe(targetEl, config);
- }
+ // function registerDragObserver() {
+ // // 濡傛灉涓嶆敮鎸侊紝鍒欎粈涔堥兘涓嶆墽琛�
+ // if (typeof window.MutationObserver === 'undefined'
+ // && typeof window.WebKitMutationObserver === 'undefined') {
+ // console.warn('observer not supported')
+ // return
+ // }
+ // let targetEl = $(".layui-table-box")[0];
+ // let config = {
+ // attributes: true,
+ // attributesOldValue: true,
+ // attributeFilter: ['class'],
+ // childList: false,
+ // subtree: false,
+ // characterData: false,
+ // characterDataOldValue: false
+ // };
+ // let observer = new MutationObserver(mutations => {
+ // mutations.forEach(function (mutation) {
+ // if (mutation.attributeName === 'class') {
+ // // 鐩戝惉class涓唴瀹圭殑鍙樺寲
+ // if ($(targetEl).hasClass('noselect')) {
+ // document.documentElement.style.userSelect = 'none';
+ // document.documentElement.style.webkitUserSelect = 'none';
+ // } else {
+ // document.documentElement.style.userSelect = '';
+ // document.documentElement.style.webkitUserSelect = '';
+ // }
+ // }
+ // })
+ // })
+ // observer.observe(targetEl, config);
+ // }
//#endregion
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index 04fb572..deceb00 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -1953,7 +1953,7 @@
$.ajax({
url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill_1',
type: "GET",
- data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"], "HBillSubType": "" },
+ data: { "HInterID": HInterID, "Type": 2, "user": sessionStorage["HUserName"], "HBillSubType": "" },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index fe33f2d..833dd3b 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -142,7 +142,7 @@
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
</div>
</div>
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-row" style=" margin-top: 10px; ">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
@@ -170,7 +170,7 @@
</div>
</div>
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-row" style=" margin-top: 10px;">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
@@ -845,7 +845,7 @@
else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
} else if (data[i].name == '鍗曟嵁鍙�') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�'});
} else {
switch (data[i].Type) {
//int
@@ -900,7 +900,7 @@
option.data = result;
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
- table.render(option);
+ table.render(option);
//鍒锋柊鎸夐挳鏄剧ず
Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
@@ -1097,7 +1097,7 @@
if ($.inArray(data[i].name, titleData) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if (data[i].name == '鍗曟嵁鍙�') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', style:"color:blue; cursor: pointer;" });
} else {
switch (data[i].Type) {
//int
@@ -1135,10 +1135,13 @@
}
}
option.data = result;
-
+ debugger
+
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
laypage.render(optionPage);
+ debugger
+
ins = table.render(option);
//鍒锋柊鎸夐挳鏄剧ず
Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
--
Gitblit v1.9.1