Commit 47b0a72b authored by yff's avatar yff

Merge branch 'master' of gitlab.gavelinfo.com:gavelinfo/kwell-mes

parents 60db7963 0ad867b8
package com.gavel.kwell.config;
import java.util.Arrays;
import com.gavel.framework.filter.RequestWrapperFilter;
import com.gavel.framework.filter.ThreadContextFilter;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.filter.CharacterEncodingFilter;
import com.gavel.framework.filter.AuthenticationFilter;
import com.gavel.framework.filter.RequestWrapperFilter;
import com.gavel.framework.filter.ThreadContextFilter;
import java.util.Arrays;
@Configuration
public class FilterConfig {
......@@ -22,21 +22,21 @@ public class FilterConfig {
return filter;
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@Bean
public FilterRegistrationBean authenticationFilter() {
// 用户认证
AuthenticationFilter authenticationFilter = new AuthenticationFilter();
FilterRegistrationBean registrationBean = new FilterRegistrationBean();
registrationBean.setName("authenticationFilter"); // 过滤器名称
registrationBean.setFilter(authenticationFilter); // 注入过滤器
registrationBean.setOrder(10);
registrationBean.addInitParameter("prefix", "/css,/js,/images,/lib,/fonts,/mock");
registrationBean.setUrlPatterns(Arrays.asList("/*")); //拦截规则
return registrationBean;
}
@SuppressWarnings({ "rawtypes", "unchecked" })
// @Bean
// public FilterRegistrationBean authenticationFilter() {
// // 用户认证
// AuthenticationFilter authenticationFilter = new AuthenticationFilter();
// FilterRegistrationBean registrationBean = new FilterRegistrationBean();
// registrationBean.setName("authenticationFilter"); // 过滤器名称
// registrationBean.setFilter(authenticationFilter); // 注入过滤器
// registrationBean.setOrder(10);
// registrationBean.addInitParameter("prefix", "/css,/js,/images,/lib,/fonts,/mock");
// registrationBean.setUrlPatterns(Arrays.asList("/*")); //拦截规则
// return registrationBean;
// }
@Bean
public FilterRegistrationBean requestWrapperFilter() {
RequestWrapperFilter requestWrapperFilter = new RequestWrapperFilter();
......
.n-item {background:rgb(57, 52, 86);}
.null-item {background:#FFFFFF;}
.ok-item {background:-webkit-gradient(linear, left top, right top, from(#42d79b), to(#a6e25f));background:linear-gradient(90deg, #42d79b, #a6e25f);}
.nok-item {background:-webkit-gradient(linear, left top, right top, from(#ff0000), to(#ff007f));background:linear-gradient(90deg, #ff0000, #ff007f);}
#gzfk01 div{
font-size: 14px;
}
#gzfk01 li{
font-size: 14px;
}
#gzfk02 div{
font-size: 14px;
}
#gzfk02 li{
font-size: 14px;
}
#gzfk03 div{
font-size: 14px;
}
#gzfk03 li{
font-size: 14px;
}
#gzfk01{
height: 100%;
width: 100%;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
align-items:stretch
}
#gzfk01 div {
box-sizing:border-box;
}
#gzfk01 .toptitle{
height: 50px;
width: 100%;
background-color: #00aaff;
color: #FFFFFF;text-align: center;line-height: 50px;
}
#gzfk01 .left{
height: calc(100% - 60px);
width: 40%;
}
#gzfk01 .right{
height: calc(100% - 60px);
width: calc(60% - 10px);
border: #EEEEEE 1px solid;
}
#gzfk01 .rightPdf{
height: 100%;
width: 100%;
}
#gzfk01 .cbinfor{
width: 100%;
height: 60%;
}
#gzfk01 .tab{
width: 100%;
height: 40%;
padding-top: 10px;
}
#gzfk01 .cpif{
width: 100%;
height: 40%;
border: 1px solid #EEEEEE;
}
#gzfk01 .cprz{
width: 100%;
height: 60%;
border: 1px solid #EEEEEE;
}
#gzfk01 .cpiftop{
width: 100%;
height: 40px;
border-bottom: 1px solid #EEEEEE;
line-height: 40px;
display: flex;
justify-content: center;
}
#gzfk01 .cpifbot{
height: calc(100% - 40px);
}
#gzfk01 .ery{
width: 50%;
height: 50%;
display: flex;
align-items: center;
}
#gzfk01 .ery span {
padding-left: 20px;
display: inline-block;
width: 70px;
}
#gzfk01 .tipul>li{
width: 150px;
padding-left: 20px;
float: left;
line-height: 50px;
}
#gzfk01 .tipuli2{
float: right!important;
}
#gzfk01 .maintab{
height: 100%;
width: 100%;
overflow: auto;
border: 0.5px solid #EEEEEE;
}
#gzfk01 .showtab{
height: 100%;
width: 100%;
}
.easyuitext{
padding-left: 10px;
height: 30px;
border: 0.5px solid #D3D3D3;
}
#gzfk01 .wid70{
width: 70%;
}
#gzfk01 .cardList-wrapper .card-item:nth-child(1){background:-webkit-gradient(linear, left top, right top, from(#5171fd), to(#c97afd));background:linear-gradient(90deg, #5171fd, #c97afd);-webkit-box-shadow:0 5px 10px #c97afd;box-shadow:0 5px 10px #c97afd;}
#gzfk01 .cardList-wrapper .card-item:nth-child(2){background:-webkit-gradient(linear, left top, right top, from(#3dadf6), to(#737bfc));background:linear-gradient(90deg, #3dadf6, #737bfc);-webkit-box-shadow:0 5px 10px #737bfc;box-shadow:0 5px 10px #737bfc;}
#gzfk01 .cardList-wrappers {background:-webkit-gradient(linear, left top, right top, from(#ea677c), to(#ef9b5f));background:linear-gradient(90deg, #ea677c, #ef9b5f);-webkit-box-shadow:0 5px 10px #ef9b5f;box-shadow:0 5px 10px #ef9b5f;}
#gzfk01 .cardList-wrapper .card-item:nth-child(3){background:-webkit-gradient(linear, left top, right top, from(#42d79b), to(#a6e25f));background:linear-gradient(90deg, #42d79b, #a6e25f);-webkit-box-shadow:0 5px 10px #a6e25f;box-shadow:0 5px 10px #a6e25f;}
/* 界面5css */
#gzfk02{
height: 100%;
width: 100%;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
align-items:stretch
}
#gzfk02 div {
box-sizing:border-box;
}
#gzfk02 .toptitle{
height: 50px;
width: 100%;
background-color: #00aaff;
color: #FFFFFF;text-align: center;line-height: 50px;
}
#gzfk02 .left{
height: calc(100% - 60px);
width: 40%;
}
#gzfk02 .right{
height: calc(100% - 60px);
width: calc(60% - 10px);
border: #EEEEEE 1px solid;
}
#gzfk02 .rightPdf{
height: 100%;
width: 100%;
}
#gzfk02 .cbinfor{
width: 100%;
height: 50%;
}
#gzfk02 .tab{
width: 100%;
height: 50%;
padding-top: 10px;
}
#gzfk02 .cpif{
width: 100%;
height: 100%;
border: 1px solid #EEEEEE;
}
/* .cprz{
width: 100%;
height: 60%;
border: 1px solid #EEEEEE;
} */
#gzfk02 .cpiftop{
width: 100%;
height: 40px;
border-bottom: 1px solid #EEEEEE;
line-height: 40px;
display: flex;
justify-content: center;
}
#gzfk02 .cpifbot{
height: calc(100% - 40px);
}
#gzfk02 .ery{
width: 100%;
height: 20%;
display: flex;
align-items: center;
}
#gzfk02 .ery span {
padding-left: 20px;
display: inline-block;
width: 70px;
}
#gzfk02 .tipul>li{
width: 150px;
padding-left: 20px;
float: left;
line-height: 50px;
}
#gzfk02 .tipuli2{
float: right!important;
}
#gzfk02 .maintab{
height: 100%;
width: 100%;
overflow: auto;
border: 0.5px solid #EEEEEE;
}
#gzfk02 .showtab{
height: 100%;
width: 100%;
}
/* 看板6样式 */
#gzfk03{
height: 100%;
width: 100%;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
align-items:stretch
}
#gzfk03 div {
box-sizing:border-box;
}
#gzfk03 .toptitle{
height: 50px;
width: 100%;
background-color: #00aaff;
color: #FFFFFF;text-align: center;line-height: 50px;
}
#gzfk03 .left{
height: calc(100% - 60px);
width: 40%;
}
#gzfk03 .right{
height: calc(100% - 60px);
width: calc(60% - 10px);
border: #EEEEEE 1px solid;
}
#gzfk03 .rightPdf{
height: 100%;
width: 100%;
}
#gzfk03 .cbinfor{
width: 100%;
height: 45%;
}
#gzfk03 .tab{
width: 100%;
height: 55%;
padding-top: 10px;
}
#gzfk03 .cpif{
width: 100%;
height: 100%;
border: 1px solid #EEEEEE;
}
/* .cprz{
width: 100%;
height: 60%;
border: 1px solid #EEEEEE;
} */
#gzfk03 .cpiftop{
width: 100%;
height: 40px;
border-bottom: 1px solid #EEEEEE;
line-height: 40px;
display: flex;
justify-content: center;
}
#gzfk03 .cpifbot{
height: calc(100% - 40px);
}
#gzfk03 .ery{
width: 100%;
height: 20%;
display: flex;
align-items: center;
}
#gzfk03 .ery span {
padding-left: 20px;
display: inline-block;
width: 70px;
}
#gzfk03 .tipul>li{
width: 150px;
padding-left: 20px;
float: left;
line-height: 50px;
}
#gzfk03 .tipuli2{
float: right!important;
}
#gzfk03 .maintab{
height: 50%;
width: 100%;
overflow: auto;
border: 0.5px solid #EEEEEE;
}
#gzfk03 .mainsp{
height: 50%;
width: 100%;
}
#gzfk03 .showtab{
height: 100%;
width: 100%;
}
\ No newline at end of file
......@@ -19,7 +19,7 @@
HTTP.post("querySafeDays", {}, function(result) {
if (result['success']) {
let data=result.data.records
dom.text("安全生产天数: "+data||'0'+"天")
dom.html("安全生产天数: "+"<span>"+data+"</span>"+"天")
} else {
console.log("请求失败")
}
......
......@@ -7,6 +7,14 @@
<link rel="stylesheet" href="../../css/dashboard/index.css">
<link rel="stylesheet" href="../../css/dashboard/public.css">
<style type="text/css">
#aqscts{
box-sizing: border-box;
cursor: url(../../images/dashboard/pointer.png) 8 3,auto;
font-family: 微软雅黑;
text-shadow: #00d8ff 0 0 20.9455px;
width: 100%;
}
.allnav-circle li{
width: 32%!important;
}
......@@ -43,9 +51,9 @@
<div style="width: 100%;height: 50%;">
数字化柔性自动生产车间看板
</div>
<div id="aqscts" style="width: 100%;font-size: .2rem;height: .3rem;line-height: .3rem;margin-top: -0.2rem;">
<!-- <div id="aqscts" style="width: 100%;font-size: .2rem;height: .3rem;line-height: .3rem;margin-top: -0.2rem;">
安全生产天数:0
</div>
</div> -->
</div>
<div class="header-img"></div>
</div>
......@@ -72,16 +80,17 @@
<div class="listTxt">
<p><label for="">应到人数:</label><span id="ydrs">20</span></p>
<p><label for="">实际人数:</label><span id="sdrs">20</span></p>
<p><label for="">休假人数:</label><span id="xjrs">0</span> </p>
<p><label for="">总生产量:</label><span id="zscl">0</span></p>
<p></p>
<p id="aqscts" style="font-size: 18px;"></p>
</div>
</div>
</div>
</div>
</div>
<div class="left-bottom rightTop border">
<div class="left-bottom rightTop border" style="height: 3.8rem;">
<div class="title">静电手环</div>
<div class="bottom-b">
<div class="bottom-b" style="height: 3.1rem;">
<div id="chartJdsh" class="allnav">
<div class="allnav-left">
<div class="circle " id="chartJdshCirle" ></div>
......@@ -132,9 +141,9 @@
<video width="100%" height="100%" controls id="firstVideo" muted autoplay="autoplay" loop="loop">
</video>
</div>
<div class="cen-bottom rightTop border">
<div class="cen-bottom rightTop border" style="height: 3.8rem;">
<div class="title">生产进度跟踪</div>
<div class="bottom-b">
<div class="bottom-b" style="height: 3.1rem;">
<div id="chartScjdgz" class="allnav">
<div class="echart wenzi">
<div class="gun">
......@@ -284,13 +293,13 @@
</div>
<div class="center-right fr" style="padding-top: 0;">
<div class="right-top rightTop border" style="height: 3.175rem;margin-bottom: .2rem;">
<div class="title">周计划/月计划达成</div>
<div class="title">月计划达成</div>
<div class="chart" style="width: calc(100% - 0.2rem);
height: 2.6rem;
margin-left: 0.1rem;
margin-top: 0.1rem;">
<ul style="width: 100%;height: 100%">
<li style="float: left;width: 50%;height: 100%;position: relative;overflow:hidden;">
<!-- <li style="float: left;width: 50%;height: 100%;position: relative;overflow:hidden;">
<div style="position: absolute;top: 0;bottom: 0.4rem;left: 0;right: 0">
<div id="chartRjh" class="allnav"></div>
</div>
......@@ -298,8 +307,8 @@
<div>周计划数:<span id="rjhs">100</span></div>
<div>周完工数:<span id="rwgs">80</span></div>
</div>
</li>
<li style="float: left;width: 50%;height: 100%;position: relative;overflow:hidden;">
</li> -->
<li style="float: left;width: 100%;height: 100%;position: relative;overflow:hidden;">
<div style="position: absolute;top: 0;bottom: 0.4rem;left: 0;right: 0">
<div id="chartYjh" class="allnav"></div>
</div>
......@@ -324,9 +333,9 @@
</div>
</div>
<div class="right-bottom rightTop border">
<div class="right-bottom rightTop border" style="height: 3.8rem;">
<div class="title">日产量&合格率</div>
<div class="chat">
<div class="chat" style="height: 3.1rem;">
<div id="chartRpcdcsj" class="allnav"></div>
</div>
<!-- <div class="title">OA考勤</div>
......@@ -368,7 +377,7 @@
// var myChartSdcl = echarts.init(document.getElementById('chartSdcl'));
var chartRpcdcsj=echarts.init(document.getElementById("chartRpcdcsj"),null, {renderer: 'svg'});
var chartHgl=echarts.init(document.getElementById("chartHgl"),null, {renderer: 'svg'});
var chartRjh=echarts.init(document.getElementById("chartRjh"),null, {renderer: 'svg'});
// var chartRjh=echarts.init(document.getElementById("chartRjh"),null, {renderer: 'svg'});
var chartYjh=echarts.init(document.getElementById("chartYjh"),null, {renderer: 'svg'});
var chartJdshCirle=echarts.init(document.getElementById("chartJdshCirle"),null, {renderer: 'svg'});
var chartTzzp=echarts.init(document.getElementById("chartzzp"),null, {renderer: 'svg'});
......@@ -376,7 +385,7 @@
// oaechart(myChartSdcl); /*oa*/
setRclHglEchart(chartRpcdcsj); /*日排产达成数据*/
// setHglEchart(chartHgl);/*合格率*/
setPieDailyChart(chartRjh,80);/*日计划*/
// setPieDailyChart(chartRjh,80);
setPieDailyChart(chartYjh,80);
setproduceEchart(chartTzzp)
$('.myscroll').myScroll({
......@@ -388,7 +397,7 @@
// myChartSdcl.resize()
chartRpcdcsj.resize()
chartHgl.resize()
chartRjh.resize()
// chartRjh.resize()
chartYjh.resize()
chartJdshCirle.resize()
}
......@@ -400,7 +409,7 @@
apisetRpcHglEchart(chartRpcdcsj,'rcl')
// apisetTimeProductionEchart(myChartSdcl)
// apisetDailyDataEchart(chartRpcdcsj)
apisetPieDailyChart(chartRjh)
// apisetPieDailyChart(chartRjh)
apisetPieDailyCharty(chartYjh)
apisetHglEchart(chartHgl)
apiqueryWo()
......
<div class="e-dialog-container" data-options="width:480,height:260" id="gpwxGx">
<div class="gui-fluid editTable">
<input type="hidden" name="gxName">
<input type="hidden" name="gzzxid">
<input type="hidden" name="gzzxname">
<div class="gui-row">
<div class="gui-col-sm12">
<label class="gui-form-label">工序:</label>
<div class="gui-input-block">
<input type="text" name="gxid" data-toggle="gui-combobox">
</div>
</div>
</div>
<!--<div class="gui-row">
<div class="gui-col-sm12">
<label class="gui-form-label">班型:</label>
<div class="gui-input-block">
<input type="text" name="bxid" style="width: 100%;" data-options="required:true">
</div>
</div>
</div>-->
</div>
</div>
<script>
$(function () {
var $dialog=$("#gpwxGx");
var $inputGxid=$dialog.find("input[name='gxid']");
var $inputBx=$dialog.find("input[name='bxid']");
function paramInit(ops){
}
function pageInit() {
$inputGxid.iCombobox({valueField: "id", textField: "name", allowNull:false,required:true, allowEdit:false, url: 'gygl/bzgx/queryWxBzgx',onSelect:function (a) {
$dialog.find("input[name='gxName']").val(a.name)
$dialog.find("input[name='gzzxid']").val(a.gzzxid||'')
$dialog.find("input[name='gzzxname']").val(a.gzzxname||'')
},
loadFilter: function (a) {
var datas=a["data"]["records"]
$.each(datas,function (i,item) {
item["name"]=item["gzzxname"]+"-"+item["name"]
});
return datas
}});
$inputBx.iCombobox({valueField: "id", textField:"name", allowNull:false, allowEdit:false, url: 'hzmes/bx/query',onSelect:function (a) {
}});
}
/*数据初始化*/
function dataInit(obj){
}
function run(res){
}
gas.load(paramInit,pageInit,dataInit,run);
})
</script>
\ No newline at end of file
<div id="kmesGpgzindex" class="gui-div">
<table class="toolbar-table" data-options="id: 'kmesGpgzindexTable',herf:'kzzx/gridset/query'"></table>
<!-- 表格工具栏开始 -->
<div id="kmesGpgzindexTable-toolbar" class="gui-toolbar" data-options="grid:{type:'datagrid',id:'kmesGpgzindexTable'}">
<div class="navbar-toolbar">
<a class="toolbar-print toolbar" href="javascript:void(0)"></a>
<a class="toolbar-export toolbar" href="javascript:void(0)"></a>
<a class="toolbar-reload toolbar" href="javascript:void(0)"></a>
<a class="toolbar-cancelgz toolbar" href="javascript:void(0)"></a>
<!-- <a class="toolbar-reviewBhg toolbar" href="javascript:void(0)"></a>-->
</div>
<div class="form-sub">
<form class="query-criteria">
<ul>
<li class="gui-form-row" >
<div class="gui-col-sm2">
<label class="gui-form-label">产品条码:</label>
<div class="gui-input-block">
<input type="text" name="wosnid" style="width: 100%" ></div>
</div>
<div class="gui-col-sm4">
<div class="gui-col-sm6">
<label class="gui-form-label">加工日期:</label>
<div class="gui-input-date-start">
<input type="text" name="start" style="width: 100%">
</div>
</div>
<div class="gui-col-sm6">
<div class="gui-input-date-end">
<input type="text" name="end" 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="wodjid" style="width: 100%" ></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="fkrid"/>
<input type="hidden" name="bzbzgxid"/>
</li>
</ul>
<span class="toolbar-search-span"><a class="toolbar-search1" style="color: white" href="javascript:void(0)"></a></span>
</form>
</div>
</div>
</div>
<!-- 表格工具栏结束 -->
<script>
/*js初始化*/
$(function () {
var $div=$('#kmesGpgzindex');
var $datagrid=$div.find(".toolbar-table");
var $datStart=$div.find("input[name='start']");
var $datEnd=$div.find("input[name='end']");
var $txtScgd=$div.find('input[name="wodjid"]');
var $txtWosnid=$div.find('input[name="wosnid"]');
var $bzgxid=$div.find('input[name="bzgxid"]');
var gxName='';var gzzxid="";
var gzzxname="";var fkrName="";
function paramsInit() {
}
function pageInit() {
$datStart.iDatetimebox();
$datEnd.iDatetimebox();
$txtScgd.iTextbox();
$txtWosnid.iTextbox();
var options = {
url: 'kmes/gpgz',
noRequest: true,
columns: [[
{title: "产品条码", field: "wosnid", fieldType: "ftString",width:160},
//{title: "工序编码", field: "bzgxCode", fieldType: "ftString",width:100},
{title: "标准工序", field: "bzgxName", fieldType: "ftString",width:100},
{title: "反馈工序", field: "fkgx", fieldType: "ftString",width:100,hidden:true},
//{title: "规格型号", field: "wlxxGg", fieldType: "ftString",width:200},
{title: "合格", field: "hgbz",align:"center", fieldType: "ftString",width:100,formatter:function(value,index,row){
var map={Y:"合格",N:"不合格"};
if(value=="Y"){
return "<span style='color: #216d4c'>"+map[value]+"</span>";
}else if(value=="N"){
return "<span style='color: indianred'>"+map[value]+"</span>";
}else{
return ''
}
}
},
{title: "合格数量", field: "hgsl",fieldType: "int",width:100},
{title: "不合格数量", field: "bhgsl", fieldType: "int",width:100},
{title: "反馈数量", field: "fksl", fieldType: "int",width:100},
{title: "反馈人", field: "fkr", fieldType: "ftString"},
{title: "反馈时间", field: "fksj", fieldType: "ftDateTime"},
{title: "生产工单", field: "woDjid", fieldType: "ftString",width:140},
{title: "物料编码", field: "wlxxCode", fieldType: "ftString",width:120},
{title: "物料名称", field: "wlxxName", fieldType: "ftString",width:160}
]],
dialog: {
footerIn: true,
maximized:true,
modal: true,
width:960,height:640,
href: 'kmes/gpgz/edit',
draggable:false,
onSaveCallback: function (opt, data) {
},
onBeforeLoad:function () {
$(this).dialog("options").queryParams=$.extend({},DataBind.collectData($div),{
gxName:gxName,
gzzxid:gzzxid,
gzzxname:gzzxname,
fkrName:fkrName
})
},
messager:function () {
var flag=true;
if($div.find("input[name='bzgxid']").val()==""){
gas.confirm("您尚未选择工序,无法进行反馈操作。是否重新选择工序?",function () {
run();
flag=false;
},function () {
flag=true
});
}else{
flag=false
}
return flag
},
onDestroy:function () {
$datagrid.datagrid("load",DataBind.collectData($div));
}
}
};
$div.Holder(options);
/*取消改制*/
$("#kmesGpgzindexTable-toolbar").find(".toolbar-cancelgz").iMenubutton({
event:'doAjax',
text:'取消改制',
onClick:function () {
var selectedRow=$div.find('.toolbar-table').datagrid('getSelected');
if(selectedRow==null){
$.messager.alert('提示','请选中一条数据进行操作');
return false;
}
gas.confirm("是否执行该操作",function () {
HTTP.post('kmes/gpgz/delGpgz',{gpfkid:selectedRow.id},function (result) {
if(result['success']){
var index=$div.find('.toolbar-table').datagrid("getRowIndex",selectedRow);
$div.find('.toolbar-table').datagrid("deleteRow",index);
$.messager.alert('提示','取消改制成功!');
}else{
$.messager.alert('提示',result['message']||'取消改制失败,请重新操作!');
}
})})
}
});
$("#kmesGpgzindexTable-toolbar").find(".toolbar-search1").iMenubutton({
text:'搜索',
iconCls:"fa fa-search",
btnCls:"",
onClick:function () {
if($div.find("input[name='bzgxid']").val()==""){
gas.confirm("您尚未选择工序,是否重新选择工序?",function () {
run();
});
}else{
$datagrid.datagrid("load",DataBind.collectData($div));
}
}
});
}
/*数据初始化*/
function dataInit(obj){
}
/*数据初始化*/
function dataInit(obj){
}
/*用户操作*/
function run(res){
$bzgxid.iCombobox({valueField: "id", textField: "name", allowNull:false,required:true, allowEdit:false, url: 'gygl/bzgx/queryGzBzgx',onSelect:function (a) {
// $dialog.find("input[name='gxName']").val(a.name)
// $dialog.find("input[name='gzzxid']").val(a.gzzxid||'')
// $dialog.find("input[name='gzzxname']").val(a.gzzxname||'')
gxName=a.name
gzzxid=a.gzzxid
gzzxname=a.gzzxname
},
loadFilter: function (a) {
var datas=a["data"]["records"]
$.each(datas,function (i,item) {
item["name"]=item["gzzxname"]+"-"+item["name"]
});
return datas
}});
// gas.Dialog({
// title:"选择工序",
// width:480,
// height:280,
// minimizable:false,
// maximizable:false,
// href:"kmes/gpgz/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);
});
</script>
This diff is collapsed.
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