@ -12,7 +12,11 @@
< ul > < ul >
< li > < li >
< label > 开发修改单号：< / label > < label > 开发修改单号：< / label >
< input type = "text" name = "developOderCode" / > < input type = "text" name = "developOrderCode" / >
< / li >
< li >
< label > 关联生产单号：< / label >
< input type = "text" name = "makeNo" / >
< / li > < / li >
< li > < li >
< label > 料号：< / label > < label > 料号：< / label >
@ -31,7 +35,7 @@
< / li > < / li >
< li > < li >
< label > 工程员：< / label > < label > 工程员：< / label >
< select name = "userId " > < select name = "userName " >
< option value = "" > 所有< / option > < option value = "" > 所有< / option >
< / select > < / select >
< / li > < / li >
@ -42,9 +46,11 @@
< option th:each = "dict : ${type}" th:text = "${dict.dictLabel}" th:value = "${dict.dictValue}" > < / option > < option th:each = "dict : ${type}" th:text = "${dict.dictLabel}" th:value = "${dict.dictValue}" > < / option >
< / select > < / select >
< / li > < / li >
< li > < li class = "select-time" >
< label > 录入时间：< / label > < label > 录入时间：< / label >
< input type = "text" class = "time-input" placeholder = "请选择录入时间" name = "createTime" / > < input type = "text" class = "time-input" id = "startTime" placeholder = "开始时间" name = "params[beginCreateTime]" / >
< span > -< / span >
< input type = "text" class = "time-input" id = "endTime" placeholder = "结束时间" name = "params[endCreateTime]" / >
< / li > < / li >
< li > < li >
< a class = "btn btn-primary btn-rounded btn-sm" onclick = "$.table.search()" > < i class = "fa fa-search" > < / i > 搜索< / a > < a class = "btn btn-primary btn-rounded btn-sm" onclick = "$.table.search()" > < i class = "fa fa-search" > < / i > 搜索< / a >
@ -61,7 +67,7 @@
< / a > < / a >
< / div > < / div >
< div class = "col-sm-12 select-table table-striped" > < div class = "col-sm-12 select-table table-striped" >
< table id = "bootstrap-table" > < / table > < table id = "bootstrap-table" style = "white-space:nowrap" > < / table >
< / div > < / div >
< / div > < / div >
< / div > < / div >
@ -84,11 +90,12 @@
var processMethodDatas = [[${@dict.getType('processMethod')}]]; var processMethodDatas = [[${@dict.getType('processMethod')}]];
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
var userName = [[${@permission.getPrincipalProperty('userName')}]];
var loginName = [[${@permission.getPrincipalProperty('loginName')}]]; var loginName = [[${@permission.getPrincipalProperty('loginName')}]];
var prefix = ctx + "erp/developModifyOrder"; var prefix = ctx + "erp/developModifyOrder";
$(function() { $(function() {
engineer();
var options = { var options = {
url: prefix + "/list", url: prefix + "/list",
createUrl: prefix + "/add", createUrl: prefix + "/add",
@ -132,17 +139,6 @@
title: '申请人ID', title: '申请人ID',
visible: false visible: false
}, },
{
field: 'applyUserName',
title: '< span style = "color: red;" > 申请人< / span > ',
formatter: function(value, row, index) {
return '< span style = "color: red;" > ' + (value ? value : "-") + '< / span > ';
}
},
{
field: 'applyTime',
title: '申请时间'
},
{ {
field: 'taskId', field: 'taskId',
title: '当前任务ID', title: '当前任务ID',
@ -157,6 +153,7 @@
field: 'taskName', field: 'taskName',
title: '当前任务名称', title: '当前任务名称',
align: 'center', align: 'center',
visible: false,
formatter: function(value, row, index) { formatter: function(value, row, index) {
return '< span class = "badge badge-primary" > ' + value + '< / span > '; return '< span class = "badge badge-primary" > ' + value + '< / span > ';
} }
@ -164,10 +161,55 @@
{ {
title: '审核状态', title: '审核状态',
field: 'auditStatus', field: 'auditStatus',
visible: false,
formatter: function (value, row, index) { formatter: function (value, row, index) {
return $.table.selectDictLabel(auditStatusDatas, value); return $.table.selectDictLabel(auditStatusDatas, value);
} }
}, },
{title: '当前状态',field: 'taskStatus',align: 'center',
formatter: function(value, row, index) {
if(row.auditStatus!="1"& & value != "未启动"){
return '< span class = "badge badge-danger" > ' + value + '< / span > ';
}
if(value === "未启动"){
return '< span class = "badge badge-primary" > ' + value + '< / span > ';
}
return '< span class = "badge badge-primary" > ' + value + '< / span > ';}
},
{title: '开发修改单号',field: 'developOrderCode',},
{title: '关联生产单号',field: 'makeNo',},
{title: '料号',field: 'materialNo',},
{title: '图片',field: 'materialPhotoUrl',},
{title: '物料名称',field: 'materialName',},
{title: '物料类型',field: 'materialType',
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
},
{title: '单位',field: 'materialUnit',},
{title: '品牌',field: 'materialBrand',},
{title: '描述',field: 'materialDescribe',},
{title: '加工方式',
field: 'materialProcessMethod',
formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value);
}
},
{
field: 'applyUserName',
title: '< span style = "color: red;" > 申请人< / span > ',
formatter: function(value, row, index) {
return '< span style = "color: red;" > ' + (value ? value : "-") + '< / span > ';
}
},
{
field: 'applyTime',
title: '申请时间'
},
{title: '完成状态',field: 'finshStatus', {title: '完成状态',field: 'finshStatus',
formatter: function (value, row, index) { formatter: function (value, row, index) {
return $.table.selectDictLabel(finshStatusDatas, value); return $.table.selectDictLabel(finshStatusDatas, value);
@ -178,7 +220,6 @@
return $.table.selectDictLabel(completeStatusDatas, value); return $.table.selectDictLabel(completeStatusDatas, value);
} }
}, },
{title: '开发修改单号',field: 'developOrderCode',},
{title: '采购入库状态',field: 'purchaseStorageStatus', {title: '采购入库状态',field: 'purchaseStorageStatus',
formatter: function (value, row, index) { formatter: function (value, row, index) {
return $.table.selectDictLabel(purchaseStorageStatusDatas, value); return $.table.selectDictLabel(purchaseStorageStatusDatas, value);
@ -190,23 +231,6 @@
} }
}, },
{title: '工程员',field: 'userName',}, {title: '工程员',field: 'userName',},
{title: '料号',field: 'materialNo',},
{title: '图片',field: 'materialPhotoUrl',},
{title: '物料名称',field: 'materialName',},
{title: '物料类型',field: 'materialType',
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
},
{title: '单位',field: 'materialUnit',},
{title: '品牌',field: 'materialBrand',},
{title: '描述',field: 'materialDescribe',},
{title: '加工方式',
field: 'materialProcessMethod',
formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value);
}
},
{title: '录入时间',field: 'createTime',}, {title: '录入时间',field: 'createTime',},
{title: '更新人',field: 'updateBy',}, {title: '更新人',field: 'updateBy',},
{title: '上次更新时间',field: 'updateTime',}, {title: '上次更新时间',field: 'updateTime',},
@ -273,7 +297,24 @@
$.modal.open("添加领料单",url); $.modal.open("添加领料单",url);
} }
//查询工程员
function engineer(){
$.ajax({
url: prefix + '/getEngineerList',
type: 'get',
success: function (res) {
if (res.rows.length > 0) {
var usertData = res.rows;
for (let i in usertData) {
$("select[name='userName']").append(
"< option value = '" + usertData[i].loginName + "' > " + usertData[i].userName + "< / option > ");
}
} else {
$.modal.msgError(res.msg);
}
}
});
}
< / script > < / script >
< / body > < / body >
