|
|
|
@ -57,13 +57,6 @@ |
|
|
|
</optgroup> |
|
|
|
</select> |
|
|
|
</li> |
|
|
|
<li> |
|
|
|
<label>供应商：</label> |
|
|
|
<select name="supplierId" class="form-control m-b" th:with="supplierList=${@supplierItems.selectSysSupperWithMaterial()}"> |
|
|
|
<option value="">所有</option> |
|
|
|
<option th:each="supplier:${supplierList}" th:value="${supplier.supplierId}" th:text="${supplier.supplierName}"></option> |
|
|
|
</select> |
|
|
|
</li> |
|
|
|
<li class="select-time"> |
|
|
|
<label>录入时间：</label> |
|
|
|
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/> |
|
|
|
@ -83,7 +76,7 @@ |
|
|
|
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="erp:material:add"> |
|
|
|
<i class="fa fa-plus"></i> 添加 |
|
|
|
</a> |
|
|
|
<a class="btn btn-success" onclick="technologyTeam()" shiro:hasPermission="erp:material:item"> |
|
|
|
<a class="btn btn-success" onclick="technologyTeam()" shiro:hasRole="zjlRole"> |
|
|
|
<i class="fa fa-plus"></i> 技术团队配置 |
|
|
|
</a> |
|
|
|
<a class="btn btn-warning" onclick="exportSelect()" shiro:hasPermission="erp:material:export"> |
|
|
|
@ -105,8 +98,8 @@ |
|
|
|
var removeFlag = [[${@permission.hasPermi('erp:material:remove')}]]; |
|
|
|
var cancelFlag = [[${@permission.hasPermi('erp:material:cancel')}]]; |
|
|
|
var restoreFlag = [[${@permission.hasPermi('erp:material:restore')}]]; |
|
|
|
var roes = [[${@permission.hasRole('zjlRole')}]]; |
|
|
|
var auditStatusDatas = [[${@dict.getType('auditStatus')}]]; |
|
|
|
// var processTypeDatas = [[${@dict.getType('processType')}]]; |
|
|
|
var useStatusDatas = [[${@dict.getType('useStatus')}]]; |
|
|
|
var processMethodDatas = [[${@dict.getType('processMethod')}]]; |
|
|
|
var sysUnitClassDatas = [[${@dict.getType('sysUnitClassDatas')}]]; |
|
|
|
@ -132,6 +125,7 @@ |
|
|
|
detailUrl: prefix + "/detail/{id}", |
|
|
|
pageList: [10, 25, 50], |
|
|
|
pageSize: 10, |
|
|
|
showColumns: false, |
|
|
|
modalName: "物料信息", |
|
|
|
fixedColumns: true, // 启用冻结列 |
|
|
|
fixedRightNumber: 1, // 冻结右列个数 |
|
|
|
@ -175,13 +169,12 @@ |
|
|
|
}, |
|
|
|
{title: '品牌',field: 'brand',}, |
|
|
|
{title: '描述',field: 'describe',}, |
|
|
|
{title: '利润率',field: '',visible: false,}, |
|
|
|
{title: '利润率',field: '',hidden: roes}, |
|
|
|
{title: '是否有技术团队',field: 'havaProductTem',visible: false, |
|
|
|
formatter:function (value, row, index){return $.table.selectDictLabel(haveProductTem,value);} |
|
|
|
}, |
|
|
|
{title: '技术团队id',field: 'productItem',visible: false,}, |
|
|
|
{title: '技术团队名称',field: 'itemName',visible: false}, |
|
|
|
{title: '供应商',field: 'supplierName',}, |
|
|
|
{title: '录入时间',field: 'createTime',}, |
|
|
|
{title: '更新人',field: 'updateBy',}, |
|
|
|
{title: '上次更新时间',field: 'updateTime',}, |
|
|
|
@ -209,18 +202,18 @@ |
|
|
|
} |
|
|
|
// 有流程实例id |
|
|
|
if (row.instanceId) { |
|
|
|
// 审批历史 |
|
|
|
actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> '); |
|
|
|
// 进度查看 |
|
|
|
actions.push('<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> '); |
|
|
|
// 有待办人展示审批按钮， |
|
|
|
if (row.todoUserId) { |
|
|
|
var todoUserIdList = row.todoUserId.split(","); |
|
|
|
if(todoUserIdList.includes(loginName)){ |
|
|
|
if(todoUserIdList.includes(loginName) || todoUserIdList.includes("admin")){ |
|
|
|
var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批'; |
|
|
|
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+row.instanceTypeName+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> '); |
|
|
|
} |
|
|
|
} |
|
|
|
// 审批历史 |
|
|
|
actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> '); |
|
|
|
// 进度查看 |
|
|
|
actions.push('<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> '); |
|
|
|
} |
|
|
|
// 详情 |
|
|
|
actions.push('<a class="btn btn-primary btn-xs" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-eye"></i> 详情</a> '); |
|
|
|
@ -256,7 +249,7 @@ |
|
|
|
var usertData = res.rows; |
|
|
|
for (let i in usertData) { |
|
|
|
$("select[name='businessMembers']").append( |
|
|
|
"<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>"); |
|
|
|
"<option value='" + usertData[i].loginName + "'>" + usertData[i].userName + "</option>"); |
|
|
|
} |
|
|
|
} else { |
|
|
|
$.modal.msgError(res.msg); |
|
|
|
|
zhangsiqi
5 months ago