baogq
/
ATJ_MES_WEB_ZY
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
dep_wangsr
baogq 4 years ago
parent 8ab435fc36 ffd15c2273
commit fc56af258c
5 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File

4
ruoyi-admin/src/main/resources/templates/nanjing/ProRpList/SelectProRpList.html
Unescape Escape View File

@ -44,7 +44,7 @@
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<!-- <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;查询全部</a>-->
<a class="btn btn-info btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="nanjing:ProRpList:export"><i class="fa fa-download"></i> 导出</a>
<!-- <a class="btn btn-info btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="nanjing:ProRpList:export"><i class="fa fa-download"></i> 导出</a>-->
</li>
</ul>
</div>
@ -65,7 +65,7 @@
exportUrl: prefix + "/export",
modalName: "ProRpList",
pagination:false,
showExport: false,//工具栏上显示导出按钮
showExport: true,//工具栏上显示导出按钮
exportOptions: {
ignoreColumn: false //忽略第一列和最后一列
},

10
ruoyi-admin/src/main/resources/templates/nanjing/ProductChangeInfo/SelectProductChangeInfo.html
Unescape Escape View File

@ -26,7 +26,7 @@
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;查询全部</a>
<a class="btn btn-info btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="nanjingProductChangeInfo:export"><i class="fa fa-download"></i> 导出</a>
<!-- <a class="btn btn-info btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="nanjingProductChangeInfo:export"><i class="fa fa-download"></i> 导出</a>-->
</li>
</ul>
</div>
@ -46,10 +46,10 @@
url: prefix + "/list",
exportUrl: prefix + "/export",
modalName: "机种更换信息查询",
// showExport: true,//工具栏上显示导出按钮
// exportOptions: {
// ignoreColumn: false //忽略第一列和最后一列
// },
showExport: true,//工具栏上显示导出按钮
exportOptions: {
ignoreColumn: false //忽略第一列和最后一列
},
columns: [
{
field: 'id',

4
ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html
Unescape Escape View File

@ -63,7 +63,8 @@
for (var i = 0; i < (Object.keys(json.rows[0])).length; i++) {//Object.keys(obj) 获取key名称
var property = (Object.keys(json.rows[0]))[i];
console.log(property)
if(property!='Barcode'){
if(property!='Barcode' && property!="ProductBarcode"){
columnsArray.push({
"title": property,
"field": property,
@ -73,6 +74,7 @@
);
}
}
}
// coulmnsData.push(columnsArray);

7
ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayHistoryInfo/WorkTrayHistoryInfo.html
Unescape Escape View File

@ -33,7 +33,7 @@
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;查询全部</a>
<a class="btn btn-info btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="nanjing:WorkTrayHistoryInfo:export"><i class="fa fa-download"></i> 导出</a>
<!-- <a class="btn btn-info btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="nanjing:WorkTrayHistoryInfo:export"><i class="fa fa-download"></i> 导出</a>-->
</li>
</ul>
</div>
@ -59,6 +59,7 @@
</div>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: bootstrap-table-export-js" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('nanjing:WorkTrayHistoryInfo:edit')}]];
var removeFlag = [[${@permission.hasPermi('nanjing:WorkTrayHistoryInfo:remove')}]];
@ -70,6 +71,10 @@
exportUrl: prefix + "/export",
modalName: "工位历史生产信息",
// datas:formData,
showExport: true,//工具栏上显示导出按钮
exportOptions: {
ignoreColumn: false //忽略第一列和最后一列
},
columns: [
{
field: 'substation.stationCode',

7
ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/SelectWorkTrayRealTimeInfo.html
Unescape Escape View File

@ -24,7 +24,7 @@
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;查询全部</a>
<a class="btn btn-info btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="nanjing:WorkTrayRealTimeInfo:export"><i class="fa fa-download"></i> 导出</a>
<!-- <a class="btn btn-info btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="nanjing:WorkTrayRealTimeInfo:export"><i class="fa fa-download"></i> 导出</a>-->
</li>
</ul>
</div>
@ -36,6 +36,7 @@
</div>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: bootstrap-table-export-js" />
<script th:inline="javascript">
var prefix = ctx + "nanjing/selectWorkTrayRealTimeInfo";
var datas = [[${@dict.getType('proState')}]];
@ -44,6 +45,10 @@
url: prefix + "/list",
exportUrl: prefix + "/export",
modalName: "托盘实时信息查询",
showExport: true,//工具栏上显示导出按钮
exportOptions: {
ignoreColumn: false //忽略第一列和最后一列
},
columns: [
{
field: 'rfidNum',

Write Preview
Loading…
Cancel
Save