@@ -140,39 +140,6 @@
columns: [
{checkbox: true},
{title: '主键ID',field: 'id',visible: false},
- {title: '当前状态',field: 'taskStatus',align: 'center',
- formatter: function(value, row, index) {
- if(row.auditStatus!="1"&&value != "未启动"){
- return '
' + value + '';
- }
- if(value === "未启动"){
- return '
' + value + '';
- }
- return '
' + value + '';}
- },
- {title: '料号',field: 'materialNo',},
- {title: '物料名称',field: 'materialName',},
- {title: '描述',field: 'describe',},
- {title: '品牌',field: 'brand',},
- {title: '加工方式',field: 'processMethod',
- formatter: function(value, row, index) {
- return $.table.selectDictLabel(processMethodDatas, value);
- }
- },
- {title: '单位',field: 'unit',},
- {title: '图片',field: 'photoUrl',
- formatter: function(value, row, index) {
- return $.table.imageView(value);
- }
- },
- {title: '使用状态',field: 'useStatus',
- formatter: function(value, row, index) {return $.table.selectDictLabel(useStatusDatas, value);}
- },
- {title: '
申请人',field: 'applyUserName',
- formatter: function(value, row, index) {return '
' + (value ? value : "-") + '';}
- },
- {title: '申请时间',field: 'applyTime',sortable: true,},
- {title: '上次更新时间',field: 'updateTime',},
{title: '当前任务名称',field: 'taskName',visible: false},
{title: '流程实例ID',field: 'instanceId',visible: false},
{title: '流程提交实例ID',field: 'submitInstanceId',visible: false},
@@ -196,45 +163,85 @@
},
{title: '技术团队id',field: 'productItem',visible: false,},
{title: '技术团队名称',field: 'itemName',visible: false},
- {title: '录入时间',field: 'createTime',sortable: true},
{title: '更新人',field: 'updateBy',visible: false},
{title: '删除标志', field: 'delFlag',visible: false},
{title: '入库部门', field: 'warehouseDept',visible: false,
formatter: function(value, row, index) {return $.table.selectDictLabel(warehouseDeptDatas, value);}
},
+
+
+ {title: '当前状态',field: 'taskStatus',align: 'center',
+ formatter: function(value, row, index) {
+ if(row.auditStatus!="1"&&value != "未启动"){
+ return '
' + value + '';
+ }
+ if(value === "未启动"){
+ return '
' + value + '';
+ }
+ return '
' + value + '';}
+ },
+ {title: '料号',field: 'materialNo',align: 'center'},
+ {title: '物料名称',field: 'materialName',align: 'center'},
+ {title: '描述',field: 'describe',align: 'center',
+ formatter: function(value, row, index) {
+ return $.table.tooltip(value, 10, "open");
+ }
+ },
+ {title: '品牌',field: 'brand',align: 'center'},
+ {title: '加工方式',field: 'processMethod',align: 'center',
+ formatter: function(value, row, index) {
+ return $.table.selectDictLabel(processMethodDatas, value);
+ }
+ },
+ {title: '单位',field: 'unit',align: 'center'},
+ {title: '图片',field: 'photoUrl',align: 'center',
+ formatter: function(value, row, index) {
+ return $.table.imageView(value);
+ }
+ },
+ {title: '使用状态',field: 'useStatus',align: 'center',
+ formatter: function(value, row, index) {return $.table.selectDictLabel(useStatusDatas, value);}
+ },
+ {title: '
申请人',field: 'applyUserName',align: 'center',
+ formatter: function(value, row, index) {return '
' + (value ? value : "-") + '';}
+ },
+ {title: '申请时间',field: 'applyTime',align: 'center',sortable: true,},
+ {title: '录入时间',field: 'createTime',align: 'center',sortable: true},
+ {title: '上次更新时间',field: 'updateTime',align: 'center'},
{title: '操作',align: 'center',
formatter: function(value, row, index) {
var actions = [];
// 审核状态-审核通过 使用状态-是 未发起作废流程
if(row.auditStatus=="1" && row.useStatus=="1" && !row.cancelInstanceId){
// 作废
- actions.push('
作废');
+ actions.push('
作废');
// 编辑
- actions.push('
编辑 ');
+ actions.push('
编辑 ');
}
// 已作废
if(row.useStatus=="2" && !row.restoreInstanceId){
// 恢复
- actions.push('
恢复 ');
+ actions.push('
恢复 ');
}
// 有流程实例id
if (row.instanceId) {
// 审批历史
- actions.push('
审批历史 ');
+ actions.push('
审批历史 ');
// 进度查看
- actions.push('
进度查看 ');
+ actions.push('
进度查看 ');
// 有待办人展示审批按钮，
if (row.todoUserId) {
var todoUserIdList = row.todoUserId.split(",");
if(todoUserIdList.includes(loginName) || todoUserIdList.includes("admin")){
var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
- actions.push('
'+nodeName+' ');
+ actions.push('
'+nodeName+' ');
}
}
}
// 详情
- actions.push('
详情 ');
- return actions.join('');
+ actions.push('
详情 ');
+ var actionLinks = actions.join('');
+ return $.table.dropdownToggle(actionLinks);
}
}
],