Skip to content

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

加工反馈

parent 3e6c80e9
Expand all Show whitespace changes
Inline Side-by-side
Showing with 227 additions and 440 deletions
gavel/src/main/resources/static/css/zpfk.css
View file @ dac1e258
......@@ -12,6 +12,12 @@
#kwrkb01 li{
font-size: 14px;
}
#jgfkkb div{
font-size: 14px;
}
#jgfkkb li{
font-size: 14px;
}
#kwrkb02 div{
font-size: 14px;
}
......@@ -383,3 +389,124 @@
width: 25%;
height: 100%;
}
#jgfkkb {
height: 100%;
width: 100%;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
align-items: stretch
}
#jgfkkb div {
box-sizing: border-box;
}
#jgfkkb .toptitle {
height: 50px;
width: 100%;
background-color: #00aaff;
color: #FFFFFF;
text-align: center;
line-height: 50px;
}
#jgfkkb .left {
height: calc(100% - 60px);
width: 40%;
}
#jgfkkb .right {
height: calc(100% - 60px);
width: calc(60% - 10px);
border: #EEEEEE 1px solid;
}
#jgfkkb .rightPdf {
height: 100%;
width: 100%;
}
#jgfkkb .cbinfor {
width: 100%;
height: 40%;
}
#jgfkkb .tab {
width: 100%;
height: 60%;
padding-top: 10px;
}
#jgfkkb .cpif {
width: 100%;
height: 50%;
border: 1px solid #EEEEEE;
}
#jgfkkb .cprz {
width: 100%;
height: 50%;
border: 1px solid #EEEEEE;
}
#jgfkkb .cpiftop {
width: 100%;
height: 40px;
border-bottom: 1px solid #EEEEEE;
line-height: 40px;
display: flex;
justify-content: center;
}
#jgfkkb .cpifbot {
height: calc(100% - 40px);
}
#jgfkkb .ery {
width: 50%;
height: 50%;
display: flex;
align-items: center;
}
#jgfkkb .ery span {
padding-left: 20px;
display: inline-block;
width: 70px;
}
#jgfkkb .tipul>li {
width: 150px;
padding-left: 20px;
float: left;
line-height: 50px;
}
#jgfkkb .tipuli2 {
float: right !important;
}
#jgfkkb .maintab {
height: 100%;
width: 100%;
overflow: hidden;
border: 0.5px solid #EEEEEE;
}
#jgfkkb .showtab {
height: 100%;
width: 100%;
}
.easyuitext{
padding-left: 10px;
height: 30px;
border: 0.5px solid #D3D3D3;
}
#jgfkkb .wid70{
width: 70%;
}
#jgfkkb .n-item {background:rgb(57, 52, 86);}
#jgfkkb .ok-item {background:-webkit-gradient(linear, left top, right top, from(#42d79b), to(#a6e25f));background:linear-gradient(90deg, #42d79b, #a6e25f);}
#jgfkkb .nok-item {background:-webkit-gradient(linear, left top, right top, from(#ff0000), to(#ff007f));background:linear-gradient(90deg, #ff0000, #ff007f);}
\ No newline at end of file
gavel/src/main/resources/templates/views/kmes/gpjy/index.html
View file @ dac1e258
......@@ -182,16 +182,7 @@
function jyfk_pdfshow(e,woid){
let that=e
let newpdfurl=pdfUr+"/"+woid+"/"+window.bzlx
// that.pdf=""
// if (newpdfurl!=that.pdfurl){
// that.pdfurl=newpdfurl
// if(that.sivpdf){
// clearInterval(that.sivpdf)
// }
// pdfshow(that.pdfurl, that.pdfdom, 10000).then(e => {
// that.sivpdf = e
// })
// }
/* 作废 */
}
</script>
......
gavel/src/main/resources/templates/views/kmes/jgfk/zpindex.html
View file @ dac1e258
<div id="kmesGpfkindex" class="gui-div">
<table class="toolbar-table" data-options="id: 'kmesGpfkindexTable',herf:'kzzx/gridset/query'"></table>
<div id="kmesJgfkindex" class="gui-div">
<table class="toolbar-table" data-options="id: 'kmesJgfkindexTable',herf:'kzzx/gridset/query'"></table>
<!-- 表格工具栏开始 -->
<div id="kmesGpfkindexTable-toolbar" class="gui-toolbar" data-options="grid:{type:'datagrid',id:'kmesGpfkindexTable'}">
<div id="kmesJgfkindexTable-toolbar" class="gui-toolbar" data-options="grid:{type:'datagrid',id:'kmesJgfkindexTable'}">
<div class="navbar-toolbar">
<a class="toolbar-print toolbar" href="javascript:void(0)"></a>
<a class="toolbar-export toolbar" href="javascript:void(0)"></a>
......@@ -57,7 +57,7 @@
<script>
$(function () {
/*js初始化*/
var $div=$('#kmesGpfkindex');
var $div=$('#kmesJgfkindex');
var $datagrid=$div.find(".toolbar-table");
var $datStart=$div.find("input[name='start']");
var $datEnd=$div.find("input[name='end']");
......@@ -77,7 +77,7 @@
$txtScgd.iTextbox();
$txtWosnid.iTextbox();
var options = {
url: 'kmes/gpfk',
url: 'kmes/jgfk',
noRequest: true,
columns: [[
{title: "产品条码", field: "wosnid", fieldType: "ftString",width:160},
......@@ -109,7 +109,7 @@
]],
dialog: {
footerIn: true,
href: 'kmes/gpfk/edit',
href: 'kmes/jgfk/edit',
maximized:true,
width:1080,
height:640,
......@@ -146,7 +146,7 @@
};
$div.Holder(options);
$("#kmesGpfkindexTable-toolbar").find(".toolbar-cancelzp").iMenubutton({
$("#kmesJgfkindexTable-toolbar").find(".toolbar-cancelzp").iMenubutton({
event:'doAjax',
text:'取消装配',
onClick:function () {
......@@ -157,7 +157,7 @@
}
gas.confirm("是否执行该操作",function () {
var index=$div.find('.toolbar-table').datagrid("getRowIndex",selectedRow);
HTTP.post('kmes/gphy/delGpzp',{gpfkid:selectedRow.id},function (result) {
HTTP.post('kmes/gphy/delGpzp',{jgfkid:selectedRow.id},function (result) {
if(result['success']){
$div.find('.toolbar-table').datagrid("deleteRow",index);
$.messager.alert('提示','取消装配成功！');
......@@ -170,7 +170,7 @@
}
});
$("#kmesGpfkindexTable-toolbar").find(".toolbar-search1").iMenubutton({
$("#kmesJgfkindexTable-toolbar").find(".toolbar-search1").iMenubutton({
text:'搜索',
iconCls:"fa fa-search",
btnCls:"",
......@@ -192,10 +192,7 @@
}
/*用户操作*/
function run(res){
$bzgxid.iCombobox({valueField: "id", textField: "name", allowNull:false,required:true,allowEdit:false, url: 'gygl/bzgx/queryZpBzgx',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||'')
$bzgxid.iCombobox({valueField: "id", textField: "name", allowNull:false,required:true,allowEdit:false, url: 'gygl/bzgx/queryJgBzgx',onSelect:function (a) {
gxName=a.name||""
gzzxid=a.gzzxid||""
gzzxname=a.gzzxname||""
......@@ -208,31 +205,6 @@
return datas
}
})
// 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);
......
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