Skip to content

K
kwell-mes
Commit baa416ce authored by 李苏's avatar 李苏 💬
Browse files
Options

反馈改 

日期影藏选择今日
parent 8e606cc5
Show whitespace changes
Inline Side-by-side
Showing with 152 additions and 78 deletions
gavel/src/main/resources/templates/views/kmes/gphy/zpindex.html
View file @ baa416ce
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<form class="query-criteria"> <form class="query-criteria">
<ul> <ul>
<li class="gui-form-row" > <li class="gui-form-row" >
<div class="gui-col-sm3"> <div class="gui-col-sm2">
<label class="gui-form-label">产品条码：</label> <label class="gui-form-label">产品条码：</label>
<div class="gui-input-block"> <div class="gui-input-block">
<input type="text" name="wosnid" style="width: 100%" ></div> <input type="text" name="wosnid" style="width: 100%" ></div>
...@@ -37,9 +37,15 @@ ...@@ -37,9 +37,15 @@
<input type="text" name="wodjid" style="width: 100%" > <input type="text" name="wodjid" style="width: 100%" >
</div> </div>
</div> </div>
<div class="gui-col-sm3">
<label class="gui-form-label">工序：</label>
<div class="gui-input-block">
<input type="text" name="bzgxid" style="width: 100%" >
</div>
</div>
<!--<input type="hidden" name="bxid"/>--> <!--<input type="hidden" name="bxid"/>-->
<input type="hidden" name="fkrid"/> <input type="hidden" name="fkrid"/>
<input type="hidden" name="bzgxid"/> <input type="hidden" name="bzbzgxid"/>
</li> </li>
</ul> </ul>
<span class="toolbar-search-span"><a class="toolbar-search1" style="color:white;" href="javascript:void(0)"></a></span> <span class="toolbar-search-span"><a class="toolbar-search1" style="color:white;" href="javascript:void(0)"></a></span>
...@@ -57,6 +63,7 @@ ...@@ -57,6 +63,7 @@
var $datEnd=$div.find("input[name='end']"); var $datEnd=$div.find("input[name='end']");
var $txtScgd=$div.find('input[name="wodjid"]'); var $txtScgd=$div.find('input[name="wodjid"]');
var $txtWosnid=$div.find('input[name="wosnid"]'); var $txtWosnid=$div.find('input[name="wosnid"]');
var $bzgxid=$div.find('input[name="bzgxid"]');
var gxName='';var gzzxid=""; var gxName='';var gzzxid="";
var gzzxname="";var fkrName=""; var gzzxname="";var fkrName="";
...@@ -185,31 +192,47 @@ ...@@ -185,31 +192,47 @@
} }
/*用户操作*/ /*用户操作*/
function run(res){ function run(res){
gas.Dialog({ $bzgxid.iCombobox({valueField: "id", textField: "name", allowNull:false,required:true,allowEdit:false, url: 'gygl/bzgx/queryZpBzgx',onSelect:function (a) {
title:"选择工序", // $dialog.find("input[name='gxName']").val(a.name);
width:480, // $dialog.find("input[name='gzzxid']").val(a.gzzxid||'');
height:280, // $dialog.find("input[name='gzzxname']").val(a.gzzxname||'')
minimizable:false, gxName=a.name||""
maximizable:false, gzzxid=a.gzzxid||""
href:"kmes/gphy/gx", gzzxname=a.gzzxname||""
onInit:function (element) {
}, },
regResultHandler:function (element) { loadFilter: function (a) {
if(!element.form("validate")){ var datas=a["data"]["records"];
return false $.each(datas,function (i,item) {
} item["name"]=item["gzzxname"]+"-"+item["name"]
var data=DataBind.collectData(element); });
$div.find("input[name='bxid']").val(data.bxid||""); return datas
$div.find("input[name='bzgxid']").val(data.gxid||"");
$div.find("input[name='fkrid']").val(window.sessionStorage.getItem('userId'));
fkrName=window.sessionStorage.getItem('userName');
gxName=data.gxName||"";
gzzxid=data.gzzxid||'';
gzzxname=data.gzzxname||"";
$datagrid.datagrid("options").url="kmes/gpfk/query";
$datagrid.datagrid("load",DataBind.collectData($div))
} }
}) })
// gas.Dialog({
// title:"选择工序",
// width:480,
// height:280,
// minimizable:false,
// maximizable:false,
// href:"kmes/gphy/gx",
// onInit:function (element) {
// },
// regResultHandler:function (element) {
// if(!element.form("validate")){
// return false
// }
// var data=DataBind.collectData(element);
// $div.find("input[name='bxid']").val(data.bxid||"");
// $div.find("input[name='bzgxid']").val(data.gxid||"");
// $div.find("input[name='fkrid']").val(window.sessionStorage.getItem('userId'));
// fkrName=window.sessionStorage.getItem('userName');
// gxName=data.gxName||"";
// gzzxid=data.gzzxid||'';
// gzzxname=data.gzzxname||"";
// $datagrid.datagrid("options").url="kmes/gpfk/query";
// $datagrid.datagrid("load",DataBind.collectData($div))
// }
// })
} }
gas.load(paramsInit,pageInit,dataInit,run); gas.load(paramsInit,pageInit,dataInit,run);
......
gavel/src/main/resources/templates/views/kmes/gpjy/jyindex.html
View file @ baa416ce
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<form class="query-criteria"> <form class="query-criteria">
<ul> <ul>
<li class="gui-form-row" > <li class="gui-form-row" >
<div class="gui-col-sm3"> <div class="gui-col-sm2">
<label class="gui-form-label">产品条码：</label> <label class="gui-form-label">产品条码：</label>
<div class="gui-input-block"> <div class="gui-input-block">
<input type="text" name="wosnid" style="width: 100%" ></div> <input type="text" name="wosnid" style="width: 100%" ></div>
...@@ -36,9 +36,15 @@ ...@@ -36,9 +36,15 @@
<div class="gui-input-block"> <div class="gui-input-block">
<input type="text" name="wodjid" style="width: 100%" ></div> <input type="text" name="wodjid" style="width: 100%" ></div>
</div> </div>
<div class="gui-col-sm3">
<label class="gui-form-label">工序：</label>
<div class="gui-input-block">
<input type="text" name="bzgxid" style="width: 100%" >
</div>
</div>
<!--<input type="hidden" name="bxid"/>--> <!--<input type="hidden" name="bxid"/>-->
<input type="hidden" name="fkrid"/> <input type="hidden" name="fkrid"/>
<input type="hidden" name="bzgxid"/> <input type="hidden" name="bzbzgxid"/>
</li> </li>
</ul> </ul>
<span class="toolbar-search-span"><a class="toolbar-search1" style="color: white" href="javascript:void(0)"></a></span> <span class="toolbar-search-span"><a class="toolbar-search1" style="color: white" href="javascript:void(0)"></a></span>
...@@ -56,6 +62,7 @@ ...@@ -56,6 +62,7 @@
var $datEnd=$div.find("input[name='end']"); var $datEnd=$div.find("input[name='end']");
var $txtScgd=$div.find('input[name="wodjid"]'); var $txtScgd=$div.find('input[name="wodjid"]');
var $txtWosnid=$div.find('input[name="wosnid"]'); var $txtWosnid=$div.find('input[name="wosnid"]');
var $bzgxid=$div.find('input[name="bzgxid"]');
var jzcs=0; var jzcs=0;
var gxName='';var gzzxid=""; var gxName='';var gzzxid="";
var gzzxname="";var fkrName=""; var gzzxname="";var fkrName="";
...@@ -187,31 +194,47 @@ ...@@ -187,31 +194,47 @@
} }
/*用户操作*/ /*用户操作*/
function run(res){ function run(res){
gas.Dialog({ $bzgxid.iCombobox({valueField: "id", textField: "name", allowNull:false, required:true,allowEdit:false, url: 'gygl/bzgx/queryJyBzgx',onSelect:function (a) {
title:"选择工序", // $dialog.find("input[name='gxName']").val(a.name);
width:480, // $dialog.find("input[name='gzzxid']").val(a.gzzxid||'');
height:280, // $dialog.find("input[name='gzzxname']").val(a.gzzxname||'')
minimizable:false, gxName=a.name
maximizable:false, gzzxid=a.gzzxid
href:"kmes/gpjy/gx", gzzxname=a.gzzxname
onInit:function (element) {
}, },
regResultHandler:function (element) { loadFilter: function (a) {
if(!element.form("validate")){ var datas=a["data"]["records"];
return false $.each(datas,function (i,item) {
} item["name"]=item["gzzxname"]+"-"+item["name"]
var data=DataBind.collectData(element); });
$div.find("input[name='bxid']").val(data.bxid||""); return datas
$div.find("input[name='bzgxid']").val(data.gxid||"");
$div.find("input[name='fkrid']").val(window.sessionStorage.getItem('userId'));
fkrName=window.sessionStorage.getItem('userName');
gxName=data.gxName||"";
gzzxid=data.gzzxid||'';
gzzxname=data.gzzxname||"";
$datagrid.datagrid("options").url="kmes/gpjy/query";
$datagrid.datagrid("load",DataBind.collectData($div));
} }
}) });
// gas.Dialog({
// title:"选择工序",
// width:480,
// height:280,
// minimizable:false,
// maximizable:false,
// href:"kmes/gpjy/gx",
// onInit:function (element) {
// },
// regResultHandler:function (element) {
// if(!element.form("validate")){
// return false
// }
// var data=DataBind.collectData(element);
// $div.find("input[name='bxid']").val(data.bxid||"");
// $div.find("input[name='bzgxid']").val(data.gxid||"");
// $div.find("input[name='fkrid']").val(window.sessionStorage.getItem('userId'));
// fkrName=window.sessionStorage.getItem('userName');
// gxName=data.gxName||"";
// gzzxid=data.gzzxid||'';
// gzzxname=data.gzzxname||"";
// $datagrid.datagrid("options").url="kmes/gpjy/query";
// $datagrid.datagrid("load",DataBind.collectData($div));
// }
// })
} }
gas.load(paramsInit,pageInit,dataInit,run); gas.load(paramsInit,pageInit,dataInit,run);
......
gavel/src/main/resources/templates/views/kmes/gpwx/wxindex.html
View file @ baa416ce
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<form class="query-criteria"> <form class="query-criteria">
<ul> <ul>
<li class="gui-form-row" > <li class="gui-form-row" >
<div class="gui-col-sm3"> <div class="gui-col-sm2">
<label class="gui-form-label">产品条码：</label> <label class="gui-form-label">产品条码：</label>
<div class="gui-input-block"> <div class="gui-input-block">
<input type="text" name="wosnid" style="width: 100%" ></div> <input type="text" name="wosnid" style="width: 100%" ></div>
...@@ -36,9 +36,14 @@ ...@@ -36,9 +36,14 @@
<div class="gui-input-block"> <div class="gui-input-block">
<input type="text" name="wodjid" style="width: 100%" ></div> <input type="text" name="wodjid" style="width: 100%" ></div>
</div> </div>
<div class="gui-col-sm3">
<label class="gui-form-label">工序：</label>
<div class="gui-input-block">
<input type="text" name="bzgxid" style="width: 100%" ></div>
</div>
<!-- <input type="hidden" name="bxid"/>--> <!-- <input type="hidden" name="bxid"/>-->
<input type="hidden" name="fkrid"/> <input type="hidden" name="fkrid"/>
<input type="hidden" name="bzgxid"/> <input type="hidden" name="bzbzgxid"/>
</li> </li>
</ul> </ul>
<span class="toolbar-search-span"><a class="toolbar-search1" style="color: white" href="javascript:void(0)"></a></span> <span class="toolbar-search-span"><a class="toolbar-search1" style="color: white" href="javascript:void(0)"></a></span>
...@@ -56,6 +61,7 @@ ...@@ -56,6 +61,7 @@
var $datEnd=$div.find("input[name='end']"); var $datEnd=$div.find("input[name='end']");
var $txtScgd=$div.find('input[name="wodjid"]'); var $txtScgd=$div.find('input[name="wodjid"]');
var $txtWosnid=$div.find('input[name="wosnid"]'); var $txtWosnid=$div.find('input[name="wosnid"]');
var $bzgxid=$div.find('input[name="bzgxid"]');
var gxName='';var gzzxid=""; var gxName='';var gzzxid="";
var gzzxname="";var fkrName=""; var gzzxname="";var fkrName="";
function paramsInit() { function paramsInit() {
...@@ -184,31 +190,47 @@ ...@@ -184,31 +190,47 @@
} }
/*用户操作*/ /*用户操作*/
function run(res){ function run(res){
gas.Dialog({ $bzgxid.iCombobox({valueField: "id", textField: "name", allowNull:false,required:true, allowEdit:false, url: 'gygl/bzgx/queryWxBzgx',onSelect:function (a) {
title:"选择工序", // $dialog.find("input[name='gxName']").val(a.name)
width:480, // $dialog.find("input[name='gzzxid']").val(a.gzzxid||'')
height:280, // $dialog.find("input[name='gzzxname']").val(a.gzzxname||'')
minimizable:false, gxName=a.name
maximizable:false, gzzxid=a.gzzxid
href:"kmes/gpwx/gx", gzzxname=a.gzzxname
onInit:function (element) {
}, },
regResultHandler:function (element) { loadFilter: function (a) {
if(!element.form("validate")){ var datas=a["data"]["records"]
return false $.each(datas,function (i,item) {
} item["name"]=item["gzzxname"]+"-"+item["name"]
var data=DataBind.collectData(element); });
$div.find("input[name='bxid']").val(data.bxid||""); return datas
$div.find("input[name='bzgxid']").val(data.gxid||""); }});
$div.find("input[name='fkrid']").val(window.sessionStorage.getItem('userId')); // gas.Dialog({
fkrName=window.sessionStorage.getItem('userName'); // title:"选择工序",
gxName=data.gxName||""; // width:480,
gzzxid=data.gzzxid||''; // height:280,
gzzxname=data.gzzxname||""; // minimizable:false,
$datagrid.datagrid("options").url="kmes/gpfk/query"; // maximizable:false,
$datagrid.datagrid("load",DataBind.collectData($div)); // href:"kmes/gpwx/gx",
} // onInit:function (element) {
}) // },
// regResultHandler:function (element) {
// if(!element.form("validate")){
// return false
// }
// var data=DataBind.collectData(element);
// $div.find("input[name='bxid']").val(data.bxid||"");
// $div.find("input[name='bzgxid']").val(data.gxid||"");
// $div.find("input[name='fkrid']").val(window.sessionStorage.getItem('userId'));
// fkrName=window.sessionStorage.getItem('userName');
// gxName=data.gxName||"";
// gzzxid=data.gzzxid||'';
// gzzxname=data.gzzxname||"";
// $datagrid.datagrid("options").url="kmes/gpfk/query";
// $datagrid.datagrid("load",DataBind.collectData($div));
// }
// })
} }
gas.load(paramsInit,pageInit,dataInit,run); gas.load(paramsInit,pageInit,dataInit,run);
......
gavel/src/main/resources/templates/views/wo/pcjhk/edit.html
View file @ baa416ce
<style type="text/css">
.datebox-button{
display: none!important;
}
</style>
<div id="woPcjhkEdit" class="e-dialog-container" data-options="width: 1120, height: 630"> <div id="woPcjhkEdit" class="e-dialog-container" data-options="width: 1120, height: 630">
<div class="e-dialog-body"> <div class="e-dialog-body">
<div class="e-dialog-box"> <div class="e-dialog-box">
...@@ -154,10 +159,12 @@ ...@@ -154,10 +159,12 @@
$datjsrq.datebox('setValue',new Date(weekEnd)) $datjsrq.datebox('setValue',new Date(weekEnd))
let nowdata=$datagrid.datagrid('getData').rows let nowdata=$datagrid.datagrid('getData').rows
nowdata.forEach(function(e){ nowdata.forEach(function(e){
e.jhrq=woksrq
e.ksrq=woksrq e.ksrq=woksrq
e.jsrq=wojsrq e.jsrq=wojsrq
}) })
$datagrid.datagrid("loadData",nowdata); console.log(nowdata)
$datagrid.datagrid("loadData",nowdata)
}}) }})
$xzzc.iCombobox({valueField: 'zcv', textField: 'zc', $xzzc.iCombobox({valueField: 'zcv', textField: 'zc',
data:[{zcv:0,zc:""},{zcv:1,zc:"第一周"},{zcv:0,zc:"第二周"},{zcv:0,zc:"第三周"},{zcv:0,zc:"第四周"},{zcv:0,zc:"第五周"},{zcv:0,zc:"第六周"}] data:[{zcv:0,zc:""},{zcv:1,zc:"第一周"},{zcv:0,zc:"第二周"},{zcv:0,zc:"第三周"},{zcv:0,zc:"第四周"},{zcv:0,zc:"第五周"},{zcv:0,zc:"第六周"}]
...@@ -313,7 +320,6 @@ ...@@ -313,7 +320,6 @@
let month=date.getMonth()+1 let month=date.getMonth()+1
let day=date.getDate() let day=date.getDate()
let weekday=date.getUTCDay() let weekday=date.getUTCDay()
console.log(weekday)
weekday=get17(weekday) weekday=get17(weekday)
let nowWeek = getMonthWeek(year,month,day).getWeek let nowWeek = getMonthWeek(year,month,day).getWeek
let weekStart=getBeforeDate(-(weekday-1),date)*1000 let weekStart=getBeforeDate(-(weekday-1),date)*1000
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment