root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/dev' into dev

dev
王晓迪 3 months ago
parent
a94949ee3e da769542ae
commit
a7a956ba6e
5 changed files with 19 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html
  2. 2
      ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html
  3. 10
      ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html
  4. 9
      ruoyi-admin/src/main/resources/templates/system/invoice/invoice.html
  5. 11
      ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html

2
ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html
View File

@ -200,7 +200,7 @@
var todoUserIdList = row.todoUserId.split(","); var todoUserIdList = row.todoUserId.split(",");
if(todoUserIdList.includes(loginName) || loginName == 'admin'){ if(todoUserIdList.includes(loginName) || loginName == 'admin'){
var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批'; var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> '); actions.push('<a href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
} }
} }
// 审批历史 // 审批历史

2
ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html
View File

@ -225,7 +225,7 @@
align: 'center', align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.companyId + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class="' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.companyId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
var actionLinks = actions.join(''); var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks); return $.table.dropdownToggle(actionLinks);
} }

10
ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html
View File

@ -40,7 +40,7 @@
<i class="fa fa-plus"></i> 添加 <i class="fa fa-plus"></i> 添加
</a> </a>
</div> </div>
<div class="col-sm-12 select-table table-striped" style="white-space: nowrap"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div> </div>
</div> </div>
@ -67,6 +67,7 @@
{ {
field: 'contactid', field: 'contactid',
title: '联系人id', title: '联系人id',
visible: false
}, },
{ {
field: 'enterpriseCode', field: 'enterpriseCode',
@ -133,9 +134,10 @@
align: 'center', align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.contactid + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.contactid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.contactid + '\')"><i class="fa fa-remove"></i>删除</a>'); actions.push('<a class=" ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.contactid + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join(''); var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks);
} }
} }
] ]

9
ruoyi-admin/src/main/resources/templates/system/invoice/invoice.html
View File

@ -110,10 +110,11 @@
align: 'center', align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> '); actions.push('<a class=" ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
actions.push('<a class="btn btn-primary btn-xs ' + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-edge"></i>详情</a> '); actions.push('<a class=" ' + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-edge"></i>详情</a> ');
return actions.join(''); var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks);
} }
}] }]
}; };

11
ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html
View File

@ -47,7 +47,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" style="white-space:nowrap"></table> <table id="bootstrap-table" ></table>
</div> </div>
</div> </div>
</div> </div>
@ -70,7 +70,7 @@
modalName: "送货地址", modalName: "送货地址",
columns: [ columns: [
{checkbox: true}, {checkbox: true},
{title: '送货id',field: 'deliveryId'}, {title: '送货id',field: 'deliveryId', visible: false},
{title: '客户/企业代码',field: 'enterpriseCode'}, {title: '客户/企业代码',field: 'enterpriseCode'},
{title: '客户/企业名称',field: 'enterpriseName'}, {title: '客户/企业名称',field: 'enterpriseName'},
{title: '联系人电话',field: 'customerPhone'}, {title: '联系人电话',field: 'customerPhone'},
@ -90,9 +90,10 @@
align: 'center', align: 'center',
formatter: function (value, row, index) { formatter: function (value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.deliveryId + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.deliveryId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.deliveryId + '\')"><i class="fa fa-remove"></i>删除</a>'); actions.push('<a class=" ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.deliveryId + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join(''); var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks);
} }
} }
] ]

Write Preview
Loading…
Cancel
Save