Browse Source

添加除仓库外前端的shiro标签。此时数据库权限进度相同

erp、
RonNurKe 2 years ago
parent
commit
783d706506
  1. 886
      ruoyi-admin/src/main/resources/templates/finance/customer/customer.html
  2. 1
      ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html
  3. 9
      ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/purchaseOrder.html
  4. 2
      ruoyi-admin/src/main/resources/templates/system/bom/bom.html
  5. 6
      ruoyi-admin/src/main/resources/templates/system/customer/customer.html
  6. 6
      ruoyi-admin/src/main/resources/templates/system/qutsourcingquotation/qutsourcingquotation.html
  7. 6
      ruoyi-admin/src/main/resources/templates/system/supplierquotation/supplierquotation.html
  8. BIN
      ruoyi-admin/target/classes/com/ruoyi/RuoYiApplication.class
  9. 1
      ruoyi-admin/target/classes/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html
  10. 8
      ruoyi-admin/target/classes/templates/system/salesOrder/salesOrder.html

886
ruoyi-admin/src/main/resources/templates/finance/customer/customer.html

@ -1,461 +1,461 @@
<!DOCTYPE html> <!--<!DOCTYPE html>-->
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <!--<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">-->
<head> <!--<head>-->
<th:block th:include="include :: header('客户资料列表')"/> <!-- <th:block th:include="include :: header('客户资料列表')"/>-->
</head> <!--</head>-->
<body class="gray-bg"> <!--<body class="gray-bg">-->
<div class="container-div"> <!--<div class="container-div">-->
<div class="row"> <!-- <div class="row">-->
<div class="col-sm-12 search-collapse"> <!-- <div class="col-sm-12 search-collapse">-->
<form id="formId"> <!-- <form id="formId">-->
<div class="select-list"> <!-- <div class="select-list">-->
<ul> <!-- <ul>-->
<li> <!-- <li>-->
<label>企业代码:</label> <!-- <label>企业代码:</label>-->
<input type="text" name="pCode"/> <!-- <input type="text" name="pCode"/>-->
</li> <!-- </li>-->
<li> <!-- <li>-->
<label>企业名称:</label> <!-- <label>企业名称:</label>-->
<input type="text" name="pName"/> <!-- <input type="text" name="pName"/>-->
</li> <!-- </li>-->
<li> <!-- <li>-->
<label>内外销:</label><select name="NWX" th:with="type=${@dict.getType('sys_NWX_class')}"> <!-- <label>内外销:</label><select name="NWX" th:with="type=${@dict.getType('sys_NWX_class')}">-->
<option value="">所有</option> <!-- <option value="">所有</option>-->
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" <!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}"-->
th:value="${dict.dictValue}"></option> <!-- th:value="${dict.dictValue}"></option>-->
</select> <!-- </select>-->
</li> <!-- </li>-->
<li> <!-- <li>-->
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i <!-- <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i-->
class="fa fa-search"></i>&nbsp;搜索</a> <!-- class="fa fa-search"></i>&nbsp;搜索</a>-->
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i <!-- <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i-->
class="fa fa-refresh"></i>&nbsp;重置</a> <!-- class="fa fa-refresh"></i>&nbsp;重置</a>-->
</li> <!-- </li>-->
</ul> <!-- </ul>-->
</div> <!-- </div>-->
</form> <!-- </form>-->
</div> <!-- </div>-->
<div class="btn-group-sm" id="toolbar" role="group"> <!-- <div class="btn-group-sm" id="toolbar" role="group">-->
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="finance:customer:add"> <!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="finance:customer:add">-->
<i class="fa fa-plus"></i> 添加 <!-- <i class="fa fa-plus"></i> 添加-->
</a> <!-- </a>-->
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" <!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()"-->
shiro:hasPermission="finance:customer:edit"> <!-- shiro:hasPermission="finance:customer:edit">-->
<i class="fa fa-edit"></i> 修改 <!-- <i class="fa fa-edit"></i> 修改-->
</a> <!-- </a>-->
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" <!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"-->
shiro:hasPermission="finance:customer:remove"> <!-- shiro:hasPermission="finance:customer:remove">-->
<i class="fa fa-remove"></i> 删除 <!-- <i class="fa fa-remove"></i> 删除-->
</a> <!-- </a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="finance:customer:export"> <!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="finance:customer:export">-->
<i class="fa fa-download"></i> 导出 <!-- <i class="fa fa-download"></i> 导出-->
</a> <!-- </a>-->
<a class="btn btn-success single disabled" onclick="comfirm()" <!-- <a class="btn btn-success single disabled" onclick="comfirm()"-->
shiro:hasPermission="finance:customer:export"> <!-- shiro:hasPermission="finance:customer:export">-->
<i class="glyphicon glyphicon-ok"></i> 确认 <!-- <i class="glyphicon glyphicon-ok"></i> 确认-->
</a> <!-- </a>-->
</div> <!-- </div>-->
<div class="col-sm-12 select-table table-striped table-single"> <!-- <div class="col-sm-12 select-table table-striped table-single">-->
<table id="bootstrap-table"></table> <!-- <table id="bootstrap-table"></table>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!--</div>-->
<th:block th:include="include :: footer"/> <!--<th:block th:include="include :: footer"/>-->
<script th:inline="javascript"> <!--<script th:inline="javascript">-->
var editFlag = [[${@permission.hasPermi('finance:customer:edit')}]]; <!-- var editFlag = [[${@permission.hasPermi('finance:customer:edit')}]];-->
var removeFlag = [[${@permission.hasPermi('finance:customer:remove')}]]; <!-- var removeFlag = [[${@permission.hasPermi('finance:customer:remove')}]];-->
var prefix = ctx + "finance/customer"; <!-- var prefix = ctx + "finance/customer";-->
$(function () { <!-- $(function () {-->
var options = { <!-- var options = {-->
url: prefix + "/list", <!-- url: prefix + "/list",-->
createUrl: prefix + "/add", <!-- createUrl: prefix + "/add",-->
updateUrl: prefix + "/edit/{id}", <!-- updateUrl: prefix + "/edit/{id}",-->
removeUrl: prefix + "/remove", <!-- removeUrl: prefix + "/remove",-->
exportUrl: prefix + "/export", <!-- exportUrl: prefix + "/export",-->
onClickRow: onClickRow,//行点击事件 <!-- onClickRow: onClickRow,//行点击事件-->
modalName: "客户资料", <!-- modalName: "客户资料",-->
columns: [{ <!-- columns: [{-->
checkbox: true <!-- checkbox: true-->
}, <!-- },-->
{ <!-- {-->
field: 'pCode', <!-- field: 'pCode',-->
title: '企业代码' <!-- title: '企业代码'-->
}, <!-- },-->
{ <!-- {-->
field: 'pName', <!-- field: 'pName',-->
title: '企业名称' <!-- title: '企业名称'-->
}, <!-- },-->
{ <!-- {-->
field: 'pEnName', <!-- field: 'pEnName',-->
title: '企业英文名称', <!-- title: '企业英文名称',-->
formatter: function (value, row, index) { <!-- formatter: function (value, row, index) {-->
return $.table.tooltip(value); <!-- return $.table.tooltip(value);-->
}, <!-- },-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'pAddress', <!-- field: 'pAddress',-->
title: '地址', <!-- title: '地址',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'pPost', <!-- field: 'pPost',-->
title: '邮编', <!-- title: '邮编',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'pCountry', <!-- field: 'pCountry',-->
title: '国家地区', <!-- title: '国家地区',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'pCeo', <!-- field: 'pCeo',-->
title: '法人代表', <!-- title: '法人代表',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'pLinkman', <!-- field: 'pLinkman',-->
title: '联系人' <!-- title: '联系人'-->
}, <!-- },-->
{ <!-- {-->
field: 'pTel', <!-- field: 'pTel',-->
title: '联系电话', <!-- title: '联系电话',-->
formatter: function (value, row, index) { <!-- formatter: function (value, row, index) {-->
return $.table.tooltip(value); <!-- return $.table.tooltip(value);-->
} <!-- }-->
}, <!-- },-->
{ <!-- {-->
field: 'pFax', <!-- field: 'pFax',-->
title: '传真', <!-- title: '传真',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'pEmail', <!-- field: 'pEmail',-->
title: 'EMAIL', <!-- title: 'EMAIL',-->
formatter: function (value, row, index) { <!-- formatter: function (value, row, index) {-->
return $.table.tooltip(value); <!-- return $.table.tooltip(value);-->
} <!-- }-->
}, <!-- },-->
{ <!-- {-->
field: 'pHttp', <!-- field: 'pHttp',-->
title: '客户简称', <!-- title: '客户简称',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'pCiqCode', <!-- field: 'pCiqCode',-->
title: '', <!-- title: '',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'pComCode', <!-- field: 'pComCode',-->
title: '付款条件', <!-- title: '付款条件',-->
formatter: function (value, row, index) { <!-- formatter: function (value, row, index) {-->
return $.table.tooltip(value); <!-- return $.table.tooltip(value);-->
} <!-- }-->
}, <!-- },-->
{ <!-- {-->
field: 'pHyCode', <!-- field: 'pHyCode',-->
title: '发票代码', <!-- title: '发票代码',-->
formatter: function (value, row, index) { <!-- formatter: function (value, row, index) {-->
return $.table.tooltip(value); <!-- return $.table.tooltip(value);-->
} <!-- }-->
}, <!-- },-->
{ <!-- {-->
field: 'pCreatDate', <!-- field: 'pCreatDate',-->
title: '成立时间', <!-- title: '成立时间',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'pJhbank', <!-- field: 'pJhbank',-->
title: '结汇银行', <!-- title: '结汇银行',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'pJhbankCode', <!-- field: 'pJhbankCode',-->
title: '结汇账号', <!-- title: '结汇账号',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'pBank', <!-- field: 'pBank',-->
title: '开户银行', <!-- title: '开户银行',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'pBankCode', <!-- field: 'pBankCode',-->
title: '开户银行账号', <!-- title: '开户银行账号',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'pRmbMoney', <!-- field: 'pRmbMoney',-->
title: '人民币注册资金', <!-- title: '人民币注册资金',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'pWbType', <!-- field: 'pWbType',-->
title: '送货地址', <!-- title: '送货地址',-->
formatter: function (value, row, index) { <!-- formatter: function (value, row, index) {-->
return $.table.tooltip(value); <!-- return $.table.tooltip(value);-->
} <!-- }-->
}, <!-- },-->
{ <!-- {-->
field: 'pWbMoney', <!-- field: 'pWbMoney',-->
title: '外币注册资金', <!-- title: '外币注册资金',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'memoText', <!-- field: 'memoText',-->
title: '备注内容', <!-- title: '备注内容',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'moral', <!-- field: 'moral',-->
title: '诚信评级', <!-- title: '诚信评级',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'comfirmDate', <!-- field: 'comfirmDate',-->
title: '确认时间', <!-- title: '确认时间',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'writeMan', <!-- field: 'writeMan',-->
title: '制单人名', <!-- title: '制单人名',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'writeDate', <!-- field: 'writeDate',-->
title: '', <!-- title: '',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'creditAmt', <!-- field: 'creditAmt',-->
title: '信用额度', <!-- title: '信用额度',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'NWX', <!-- field: 'NWX',-->
title: '内外销', <!-- title: '内外销',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'ordernoLen', <!-- field: 'ordernoLen',-->
title: '订单号长度' <!-- title: '订单号长度'-->
}, <!-- },-->
{ <!-- {-->
field: 'sendcpReportname', <!-- field: 'sendcpReportname',-->
title: '出货单格式名称', <!-- title: '出货单格式名称',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'saler', <!-- field: 'saler',-->
title: '业务员' <!-- title: '业务员'-->
}, <!-- },-->
{ <!-- {-->
field: 'dWaterNo', <!-- field: 'dWaterNo',-->
title: '目的地港代号', <!-- title: '目的地港代号',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'sWaterName', <!-- field: 'sWaterName',-->
title: '起运港名', <!-- title: '起运港名',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'crlName', <!-- field: 'crlName',-->
title: '币别', <!-- title: '币别',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'pCountryCode', <!-- field: 'pCountryCode',-->
title: '国家地区编号' <!-- title: '国家地区编号'-->
}, <!-- },-->
{ <!-- {-->
field: 'senduseConfirm', <!-- field: 'senduseConfirm',-->
title: '出货需录入使用量', <!-- title: '出货需录入使用量',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'taxPercent', <!-- field: 'taxPercent',-->
title: '税率', <!-- title: '税率',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'senddw', <!-- field: 'senddw',-->
title: '', <!-- title: '',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'taxFlag', <!-- field: 'taxFlag',-->
title: '含税否', <!-- title: '含税否',-->
visible: false <!-- visible: false-->
}, <!-- },-->
{ <!-- {-->
field: 'comfirmFlag', <!-- field: 'comfirmFlag',-->
title: '确认否', <!-- title: '确认否',-->
formatter: function (value, row, index) { <!-- formatter: function (value, row, index) {-->
if (value == 1){ <!-- if (value == 1){-->
value = "是" <!-- value = "是"-->
return value <!-- return value-->
} else { <!-- } else {-->
value = "否" <!-- value = "否"-->
return value <!-- return value-->
} <!-- }-->
} <!-- }-->
}, <!-- },-->
{ <!-- {-->
field: 'comfirmMan', <!-- field: 'comfirmMan',-->
title: '确认人', <!-- title: '确认人',-->
}, <!-- },-->
{ <!-- {-->
title: '操作', <!-- title: '操作',-->
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.pCode + '\')"><i class="fa fa-edit"></i>编辑</a> '); <!-- actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.pCode + '\')"><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.pCode + '\')"><i class="fa fa-remove"></i>删除</a>'); <!-- actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.pCode + '\')"><i class="fa fa-remove"></i>删除</a>');-->
return actions.join(''); <!-- return actions.join('');-->
} <!-- }-->
}] <!-- }]-->
}; <!-- };-->
$.table.init(options); <!-- $.table.init(options);-->
}); <!-- });-->
// 获取记录总数 <!-- // 获取记录总数-->
// $("#bootstrap-table").on("load-success.bs.table", function () { <!-- // $("#bootstrap-table").on("load-success.bs.table", function () {-->
// var total_row_num1 = $('#bootstrap-table').bootstrapTable('getOptions').totalRows; <!-- // var total_row_num1 = $('#bootstrap-table').bootstrapTable('getOptions').totalRows;-->
// console.log(total_row_num1) <!-- // console.log(total_row_num1)-->
// }); <!-- // });-->
Date.prototype.Format = function (fmt) { <!-- Date.prototype.Format = function (fmt) {-->
var o = { <!-- var o = {-->
"M+": this.getMonth() + 1, //月份 <!-- "M+": this.getMonth() + 1, //月份-->
"d+": this.getDate(), //日 <!-- "d+": this.getDate(), //日-->
"H+": this.getHours(), //小时 <!-- "H+": this.getHours(), //小时-->
"m+": this.getMinutes(), //分 <!-- "m+": this.getMinutes(), //分-->
"s+": this.getSeconds(), //秒 <!-- "s+": this.getSeconds(), //秒-->
"q+": Math.floor((this.getMonth() + 3) / 3), //季度 <!-- "q+": Math.floor((this.getMonth() + 3) / 3), //季度-->
"S": this.getMilliseconds() //毫秒 <!-- "S": this.getMilliseconds() //毫秒-->
}; <!-- };-->
if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length)); <!-- if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));-->
for (var k in o) <!-- for (var k in o)-->
if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length))); <!-- if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));-->
return fmt; <!-- return fmt;-->
} <!-- }-->
function comfirm() { <!-- function comfirm() {-->
table.set(); <!-- table.set();-->
$.modal.confirm("你确定数据正确,决定要确认吗?确认的记录不能删或修改 ", function () { <!-- $.modal.confirm("你确定数据正确,决定要确认吗?确认的记录不能删或修改 ", function () {-->
var P_Code = $.table.selectFirstColumns(); <!-- var P_Code = $.table.selectFirstColumns();-->
var userName = [[${@permission.getPrincipalProperty('userName')}]]; <!-- var userName = [[${@permission.getPrincipalProperty('userName')}]];-->
var date = new Date().Format("yyyy-MM-dd HH:mm:ss"); <!-- var date = new Date().Format("yyyy-MM-dd HH:mm:ss");-->
var editList = {"Id": P_Code.join(), "Name": userName, "Date": date} <!-- var editList = {"Id": P_Code.join(), "Name": userName, "Date": date}-->
var key = "comfirm"; <!-- var key = "comfirm";-->
var value = "comfirm"; <!-- var value = "comfirm";-->
var url = prefix + "/edit/comfirm"; <!-- var url = prefix + "/edit/comfirm";-->
editList[key] = value <!-- editList[key] = value-->
$.operate.submit(url, "post", "json", editList); <!-- $.operate.submit(url, "post", "json", editList);-->
}); <!-- });-->
} <!-- }-->
function onClickRow(row) { <!-- function onClickRow(row) {-->
// console.log("row"+JSON.stringify(row)) <!-- // console.log("row"+JSON.stringify(row))-->
// $("#pCode").val(row.pCode); <!-- // $("#pCode").val(row.pCode);-->
// $("#pName").val(row.pName); <!-- // $("#pName").val(row.pName);-->
// $("#pEnName").val(row.pEnName); <!-- // $("#pEnName").val(row.pEnName);-->
// $("#pAddress").val(row.pAddress); <!-- // $("#pAddress").val(row.pAddress);-->
// $("#pWbType").val(row.pWbType); <!-- // $("#pWbType").val(row.pWbType);-->
// $("#pPost").val(row.pPost); <!-- // $("#pPost").val(row.pPost);-->
// $("#pCeo").val(row.pCeo); <!-- // $("#pCeo").val(row.pCeo);-->
// <!-- //-->
// $("#memoText").val(row.memoText); <!-- // $("#memoText").val(row.memoText);-->
// $("#writeMan").val(row.writeMan); <!-- // $("#writeMan").val(row.writeMan);-->
// $("#comfirmMan").val(row.comfirmMan); <!-- // $("#comfirmMan").val(row.comfirmMan);-->
// <!-- //-->
// $("#pLinkman").val(row.pLinkman); <!-- // $("#pLinkman").val(row.pLinkman);-->
// $("#pTel").val(row.pTel); <!-- // $("#pTel").val(row.pTel);-->
// $("#pFax").val(row.pFax); <!-- // $("#pFax").val(row.pFax);-->
// $("#pEmail").val(row.pEmail); <!-- // $("#pEmail").val(row.pEmail);-->
// $("#pHttp").val(row.pHttp); <!-- // $("#pHttp").val(row.pHttp);-->
// $("#pCiqCode").val(row.pCiqCode); <!-- // $("#pCiqCode").val(row.pCiqCode);-->
// $("#pComCode").val(row.pComCode); <!-- // $("#pComCode").val(row.pComCode);-->
// $("#pHyCode").val(row.pHyCode); <!-- // $("#pHyCode").val(row.pHyCode);-->
// <!-- //-->
// $("#pType").val(row.pType); <!-- // $("#pType").val(row.pType);-->
// // $("#pCreatDate").val(row.pCreatDate); <!-- // // $("#pCreatDate").val(row.pCreatDate);-->
// $("#pJhbank").val(row.pJhbank); <!-- // $("#pJhbank").val(row.pJhbank);-->
// $("#pJhbankCode").val(row.pJhbankCode); <!-- // $("#pJhbankCode").val(row.pJhbankCode);-->
// $("#pBank").val(row.pBank); <!-- // $("#pBank").val(row.pBank);-->
// $("#pBankCode").val(row.pBankCode); <!-- // $("#pBankCode").val(row.pBankCode);-->
// $("#pRmbMoney").val(row.pRmbMoney); <!-- // $("#pRmbMoney").val(row.pRmbMoney);-->
// $("#pWbMoney").val(row.pWbMoney); <!-- // $("#pWbMoney").val(row.pWbMoney);-->
// $("#ordernoLen").val(row.ordernoLen); <!-- // $("#ordernoLen").val(row.ordernoLen);-->
// // $("#saler").val(row.saler); <!-- // // $("#saler").val(row.saler);-->
// $("#sendcpReportname").val(row.sendcpReportname); <!-- // $("#sendcpReportname").val(row.sendcpReportname);-->
// <!-- //-->
// $("#dWaterNo").val(row.dWaterNo); <!-- // $("#dWaterNo").val(row.dWaterNo);-->
// $("#sWaterName").val(row.sWaterName); <!-- // $("#sWaterName").val(row.sWaterName);-->
// $("#sWaterNo").val(row.sWaterNo); <!-- // $("#sWaterNo").val(row.sWaterNo);-->
// $("#comCode").val(row.comCode); <!-- // $("#comCode").val(row.comCode);-->
// $("#crlName").val(row.crlName); <!-- // $("#crlName").val(row.crlName);-->
// $("#creditAmt").val(row.creditAmt); <!-- // $("#creditAmt").val(row.creditAmt);-->
// $("#ordernoLen").val(row.ordernoLen); <!-- // $("#ordernoLen").val(row.ordernoLen);-->
// $("#moral").val(row.moral); <!-- // $("#moral").val(row.moral);-->
// $("#senduseConfirm").val(row.senduseConfirm); <!-- // $("#senduseConfirm").val(row.senduseConfirm);-->
// $("#pCountry").val(row.pCountry); <!-- // $("#pCountry").val(row.pCountry);-->
// $("#pCountryCode").val(row.pCountryCode); <!-- // $("#pCountryCode").val(row.pCountryCode);-->
} <!-- }-->
</script> <!--</script>-->
</body> <!--</body>-->
<style> <!--<style>-->
.label-100px li label:not(.radio-box) { <!-- .label-100px li label:not(.radio-box) {-->
width: 110px; <!-- width: 110px;-->
} <!-- }-->
.parallel { <!-- .parallel {-->
width: 50%; <!-- width: 50%;-->
height: 30px; <!-- height: 30px;-->
float: left <!-- float: left-->
} <!-- }-->
#ordernoLen { <!-- #ordernoLen {-->
width: 50px; <!-- width: 50px;-->
} <!-- }-->
#saler { <!-- #saler {-->
width: 86px; <!-- width: 86px;-->
} <!-- }-->
#parallel-r { <!-- #parallel-r {-->
width: 108px; <!-- width: 108px;-->
} <!-- }-->
#parallel-r { <!-- #parallel-r {-->
text-align: left; <!-- text-align: left;-->
width: 55px; <!-- width: 55px;-->
} <!-- }-->
#memoText { <!-- #memoText {-->
width: 570px; <!-- width: 570px;-->
height: 66px; <!-- height: 66px;-->
display: inline; <!-- display: inline;-->
} <!-- }-->
.nema { <!-- .nema {-->
width: 200px; <!-- width: 200px;-->
float: left; <!-- float: left;-->
} <!-- }-->
#writeMan { <!-- #writeMan {-->
width: 120px; <!-- width: 120px;-->
} <!-- }-->
#comfirmMan { <!-- #comfirmMan {-->
width: 120px; <!-- width: 120px;-->
} <!-- }-->
</style> <!--</style>-->
</html> <!--</html>-->

1
ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html

@ -165,6 +165,7 @@
}; };
$.table.init(options); $.table.init(options);
}); });
</script> </script>
</body> </body>
</html> </html>

9
ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/purchaseOrder.html

@ -82,16 +82,17 @@
<a class="btn btn-warning" onclick="exportPurchaseOrder()" shiro:hasPermission="purchase:purchaseOrder:export"> <a class="btn btn-warning" onclick="exportPurchaseOrder()" shiro:hasPermission="purchase:purchaseOrder:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
<a class="btn btn-primary" onclick="reviewCloseCase()"> <a class="btn btn-primary" onclick="reviewCloseCase()" shiro:hasPermission="purchase:purchaseOrder:close">
<i class="fa fa-hand-grab-o"></i> 结案 <i class="fa fa-hand-grab-o"></i> 结案
</a> </a>
<a class="btn btn-primary" onclick="reviewConfirm()">
<a class="btn btn-primary" onclick="reviewConfirm()" shiro:hasPermission="purchase:purchaseOrder:confirm">
<i class="fa fa-hand-grab-o"></i> 确认 <i class="fa fa-hand-grab-o"></i> 确认
</a> </a>
<a class="btn btn-primary" onclick="reviewAudit()"> <a class="btn btn-primary" onclick="reviewAudit()" shiro:hasPermission="purchase:purchaseOrder:audit">
<i class="fa fa-hand-grab-o"></i> 审核 <i class="fa fa-hand-grab-o"></i> 审核
</a> </a>
<a class="btn btn-primary" onclick="reviewApprove()"> <a class="btn btn-primary" onclick="reviewApprove()" shiro:hasPermission="purchase:purchaseOrder:approve">
<i class="fa fa-hand-grab-o"></i> 核准 <i class="fa fa-hand-grab-o"></i> 核准
</a> </a>
</div> </div>

2
ruoyi-admin/src/main/resources/templates/system/bom/bom.html

@ -72,7 +72,7 @@
<a class="btn btn-warning" onclick="exportBomDetail()" shiro:hasPermission="system:bom:export"> <a class="btn btn-warning" onclick="exportBomDetail()" shiro:hasPermission="system:bom:export">
<i class="fa fa-download"></i> 单个导出 <i class="fa fa-download"></i> 单个导出
</a> </a>
<a class="btn btn-success" onclick="bomConfirm()"> <a class="btn btn-success" onclick="bomConfirm()" shiro:hasPermission="system:bom:confirm">
<i class="fa fa-hand-grab-o"></i> 确认 <i class="fa fa-hand-grab-o"></i> 确认
</a> </a>

6
ruoyi-admin/src/main/resources/templates/system/customer/customer.html

@ -109,14 +109,14 @@
<!-- <a class="btn btn-danger" onclick="oneexport()" shiro:hasPermission="system:customer:export">--> <!-- <a class="btn btn-danger" onclick="oneexport()" shiro:hasPermission="system:customer:export">-->
<!-- <i class="fa fa-download"></i> 单个导出--> <!-- <i class="fa fa-download"></i> 单个导出-->
<!-- </a>--> <!-- </a>-->
<a class="btn btn-success" id="tocontacts" onclick="addContacts()"> <a class="btn btn-success" id="tocontacts" onclick="addContacts()" shiro:hasPermission="system:contacts:add">
<i class="fa fa-plus"></i> 添加联系人明细 <i class="fa fa-plus"></i> 添加联系人明细
</a> </a>
<a class="btn btn-primary" onclick="showaddress()"> <a class="btn btn-primary" onclick="showaddress()" shiro:hasPermission="system:shippingaddress:add">
<i class="fa fa-ambulance"></i> 添加送货地址 <i class="fa fa-ambulance"></i> 添加送货地址
</a> </a>
<a class="btn btn-success" onclick="showdetails()"> <a class="btn btn-success" onclick="showdetails()" >
<i class="fa fa-file-text"></i> 详情列表 <i class="fa fa-file-text"></i> 详情列表
</a> </a>

6
ruoyi-admin/src/main/resources/templates/system/qutsourcingquotation/qutsourcingquotation.html

@ -87,15 +87,15 @@
shiro:hasPermission="system:qutsourcingquotation:export"> shiro:hasPermission="system:qutsourcingquotation:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
<a class="btn btn-info" onclick="quotationAudit()"> <a class="btn btn-info" onclick="quotationAudit()" shiro:hasPermission="system:qutsourcingquotation:audit">
<i class="fa fa-file-text"></i> 审核 <i class="fa fa-file-text"></i> 审核
</a> </a>
<a class="btn btn-success" onclick="quotationConfirm()"> <a class="btn btn-success" onclick="quotationConfirm()" shiro:hasPermission="system:qutsourcingquotation:confirm">
<i class="fa fa-hand-grab-o"></i> 确认 <i class="fa fa-hand-grab-o"></i> 确认
</a> </a>
<a class="btn btn-primary" onclick="quotationApprove()"> <a class="btn btn-primary" onclick="quotationApprove()" shiro:hasPermission="system:qutsourcingquotation:approve">
<i class="fa fa-hand-grab-o"></i> 核准 <i class="fa fa-hand-grab-o"></i> 核准
</a> </a>

6
ruoyi-admin/src/main/resources/templates/system/supplierquotation/supplierquotation.html

@ -96,15 +96,15 @@
shiro:hasPermission="system:supplierquotation:export"> shiro:hasPermission="system:supplierquotation:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
<a class="btn btn-info" onclick="quotationAudit()" shiro:hasPermission="sys:gysbj:shqr"> <a class="btn btn-info" onclick="quotationAudit()" shiro:hasPermission="system:supplierquotation:audit">
<i class="fa fa-file-text"></i> 审核 <i class="fa fa-file-text"></i> 审核
</a> </a>
<a class="btn btn-success" onclick="quotationConfirm()"shiro:hasPermission="sys:gysbj:shqr"> <a class="btn btn-success" onclick="quotationConfirm()" shiro:hasPermission="system:supplierquotation:confirm">
<i class="fa fa-hand-grab-o"></i> 确认 <i class="fa fa-hand-grab-o"></i> 确认
</a> </a>
<a class="btn btn-primary" onclick="quotationApprove()"shiro:hasPermission="sys:gysbj:hz"> <a class="btn btn-primary" onclick="quotationApprove()" shiro:hasPermission="system:supplierquotation:approved">
<i class="fa fa-hand-grab-o"></i> 核准 <i class="fa fa-hand-grab-o"></i> 核准
</a> </a>

BIN
ruoyi-admin/target/classes/com/ruoyi/RuoYiApplication.class

Binary file not shown.

1
ruoyi-admin/target/classes/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html

@ -165,6 +165,7 @@
}; };
$.table.init(options); $.table.init(options);
}); });
</script> </script>
</body> </body>
</html> </html>

8
ruoyi-admin/target/classes/templates/system/salesOrder/salesOrder.html

@ -107,7 +107,7 @@
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/> <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li> </li>
<li> <li>
<label>订单1111编号:</label> <label>订单编号:</label>
<input type="text" name="salesOrderCode"/> <input type="text" name="salesOrderCode"/>
</li> </li>
<li> <li>
@ -115,7 +115,7 @@
<input type="text" name="salesOrderNumber"/> <input type="text" name="salesOrderNumber"/>
</li> </li>
<li> <li>
<label>预约2222单号:</label> <label>预约单号:</label>
<input type="text" name="appointmentNumber"/> <input type="text" name="appointmentNumber"/>
</li> </li>
<li> <li>
@ -183,11 +183,11 @@
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
<a class="btn btn-info" onclick="reviewAudit()"> <a class="btn btn-info" onclick="reviewAudit()" shiro:hasPermission="system:salesOrder:audit">
<i class="fa fa-file-text"></i> 审核 <i class="fa fa-file-text"></i> 审核
</a> </a>
<a class="btn btn-success" onclick="reviewConfirm()"> <a class="btn btn-success" onclick="reviewConfirm()" shiro:hasPermission="system:salesOrder:confirm">
<i class="fa fa-hand-grab-o"></i> 确认 <i class="fa fa-hand-grab-o"></i> 确认
</a> </a>

Loading…
Cancel
Save