sephiroth190326/EPCMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 新增权限“隐藏采购信息”，选中后，料单查看明细页面隐藏采购信息

Browse Source
This commit is contained in:
hwd
2025-09-27 10:45:46 +08:00
parent 8fe3ab8421
commit 27e3eb5821
5 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/webapp/WEB-INF/template/materialOrder/conduit/view.html
View File

@@ -153,7 +153,12 @@
<div id="tableHeaderWrapper">
<div id="tableHeader"></div>
</div>
<shiro:hasPermission name="materialOrder:hidePurchaseInfo">
<table id="addTable" data-columns="inside-materialOrder_view-table-hidePurchaseInfo" data-custom-header data-inside>
</shiro:hasPermission>
<shiro:lacksPermission name="materialOrder:hidePurchaseInfo">
<table id="addTable" data-columns="inside-materialOrder_view-table" data-custom-header data-inside>
</shiro:lacksPermission>
<thead>
<tr class="titleTr">
<th style="min-width: 20px" class="minimum" data-column="#"><a class="addBtn"
@@ -195,10 +200,12 @@
<th data-column="insulationCode">隔热代号</th>
<th data-column="specialRequest">特殊要求</th>
<th data-column="memo">备注</th>
<shiro:lacksPermission name="materialOrder:hidePurchaseInfo">
<th data-column="supplierIds">供应商列表</th>
<th data-column="confirmSuppliers">确认供应商列表</th>
<th data-column="supplierName">中标供应商</th>
<th data-column="price">中标价格</th>
</shiro:lacksPermission>
<th th:each="data : ${session.eField.list('materialOrderItem')}"
th:text="${data.name}" th:data-column="${data.fieldName}"></th>
<th data-column="##">操作</th>
@@ -241,14 +248,20 @@
<td><input data-code="insulationCode" placeholder="搜索"/></td>
<td><input data-code="specialRequest" placeholder="搜索"/></td>
<td><input data-code="memo" placeholder="搜索"/></td>
<shiro:lacksPermission name="materialOrder:hidePurchaseInfo">
<td><input data-code="supplierNameList" placeholder="搜索"/></td>
<td></td>
<td><input data-code="supplierName" placeholder="搜索"/></td>
<td><input data-code="price" placeholder="搜索"/></td>
</shiro:lacksPermission>
<th:block th:each="data : ${session.eField.list('materialOrderItem')}">
<td><input th:data-code="${data.fieldName}" placeholder="搜索"/></td>
</th:block>
<td><a class="confirmSupplier" onclick="batchConfirmSupplier(this)">批量确认</a></td>
<td>
<shiro:lacksPermission name="materialOrder:hidePurchaseInfo">
<a class="confirmSupplier" onclick="batchConfirmSupplier(this)">批量确认</a>
</shiro:lacksPermission>
</td>
</tr>
<!-- <tr class="dataTr" th:each="item, status : ${materialOrder.materialOrderItemList}">-->
<!-- <td data-code="id" th:text="${status.index + 1}"></td>-->
@@ -512,7 +525,14 @@
'shortDescription', 'longDescription', 'gWeight', 'totalWeight','needCount', 'count','useStockCount', 'unit', 'bigProductType',
'bigProductDes', 'smallProductType', 'smallProductDes', 'makeCode', 'makeName', 'diameterL', 'diameterS', 'jacketSpec',
'wallThicknessL', 'wallThicknessS', 'size', 'pressureLevel', 'endFace', 'material', 'materialType',
'insulationCode', 'specialRequest', 'memo', 'supplierNameList', 'confirmSuppliers', 'supplierName', 'price']
'insulationCode', 'specialRequest', 'memo']
var hasPurchaseInfo = $('#addTable').attr('data-columns').indexOf('hidePurchaseInfo') === -1;
if (hasPurchaseInfo) {
tableFieldList.push('supplierNameList');
tableFieldList.push('confirmSuppliers');
tableFieldList.push('supplierName');
tableFieldList.push('price');
}
function loadItem() {
var thisName
var thisValue
@@ -567,12 +587,14 @@
}
}
html = html +
" <td class='fixed'>\n" +
" <td class='fixed'>\n"
if (hasPurchaseInfo) {
// " <a href='javascript:Dialog.functionDialog(null, null, \"materialOrder/dialog/priceView.html?id="+item.id+"\");'>查看报价</a>\n" +
" <a href='javascript:Dialog.functionDialog(null, null, \"materialOrder/dialog/changeSupplier.html?id="+item.id+"\");'>供应商列表</a>\n";
html = html + " <a href='javascript:Dialog.functionDialog(null, null, \"materialOrder/dialog/changeSupplier.html?id="+item.id+"\");'>供应商列表</a>\n";
if (item.confirmSuppliers != null || !item.confirmSuppliers){
html = html +" <a class='confirmSupplier' onclick='confirmSupplier("+item.id+")'>确认供应商</a>\n"
}
}
html = html+" "+
" </td></tr>"
@@ -597,12 +619,14 @@
}
}
html = html +
" <td class='fixed'>\n" +
" <td class='fixed'>\n"
if (hasPurchaseInfo) {
// " <a href='javascript:Dialog.functionDialog(null, null, \"materialOrder/dialog/priceView.html?id="+item.id+"\");'>查看报价</a>\n" +
" <a href='javascript:Dialog.functionDialog(null, null, \"materialOrder/dialog/changeSupplier.html?id="+item.id+"\");'>供应商列表</a>\n" ;
html = html + " <a href='javascript:Dialog.functionDialog(null, null, \"materialOrder/dialog/changeSupplier.html?id="+item.id+"\");'>供应商列表</a>\n" ;
if (item.confirmSuppliers != null || !item.confirmSuppliers){
html = html + " <a class='confirmSupplier' onclick='confirmSupplier("+item.id+")'>确认供应商</a>\n"
}
}
html = html+" "+
" </td></tr>"
htmlAll += html;

2
src/main/webapp/WEB-INF/template/role/add.html
View File

@@ -66,7 +66,7 @@
</div>
</form>
<script src="/resources/js/permissionData.js?v=240329"></script>
<script src="/resources/js/permissionData.js?v=250927"></script>
<script>
var $authoritiesWrapper = $(".authorities-wrapper");
for (var i in permissions) {

2
src/main/webapp/WEB-INF/template/role/edit.html
View File

@@ -89,7 +89,7 @@
</div>
</form>
<script src="/resources/js/permissionData.js?v=240329"></script>
<script src="/resources/js/permissionData.js?v=250927"></script>
<script src="/resources/js/tableColumnControlPermissionData.js"></script>
<script th:inline="javascript">
var authorities = [[${authorities}]];

2
src/main/webapp/WEB-INF/template/role/view.html
View File

@@ -71,7 +71,7 @@
</div>
</form>
<script src="/resources/js/permissionData.js?v=240329"></script>
<script src="/resources/js/permissionData.js?v=250927"></script>
<script src="/resources/js/tableColumnControlPermissionData.js"></script>
<script th:inline="javascript">
var authorities = [[${authorities}]];

3
src/main/webapp/resources/js/permissionData.js
View File

@@ -198,6 +198,9 @@ var permissions = [
}, {
text: "查看",
value: "list"
}, {
text: "隐藏采购信息",
value: "hidePurchaseInfo"
}, {
text: "删除",
value: "remove"