|
|
@ -7,49 +7,6 @@ |
|
|
<script type="text/javascript" th:src="@{/js/axios.min.js}"></script> |
|
|
<script type="text/javascript" th:src="@{/js/axios.min.js}"></script> |
|
|
</head> |
|
|
</head> |
|
|
|
|
|
|
|
|
<style> |
|
|
|
|
|
.form-horizontal .form-group { |
|
|
|
|
|
width: 50%; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
.base-customer { |
|
|
|
|
|
display: flex; |
|
|
|
|
|
flex-wrap: wrap; |
|
|
|
|
|
justify-content: space-between; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
.base-customer .form-group { |
|
|
|
|
|
width: 30%; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
.details-title { |
|
|
|
|
|
width: 100%; |
|
|
|
|
|
position: fixed; |
|
|
|
|
|
font-size: 20px; |
|
|
|
|
|
padding: 10px 0; |
|
|
|
|
|
text-align: center; |
|
|
|
|
|
background-color: #a7b1c2; |
|
|
|
|
|
color: #FFFFFF; |
|
|
|
|
|
z-index: 9999; |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
.details-body { |
|
|
|
|
|
padding-top: 80px; |
|
|
|
|
|
overflow-y: auto; |
|
|
|
|
|
max-height: 750px; |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
.hiddenDetailInfo { |
|
|
|
|
|
display: none; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
.search-collapse, .select-table { |
|
|
|
|
|
box-shadow: none; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
</style> |
|
|
|
|
|
<body class="gray-bg"> |
|
|
<body class="gray-bg"> |
|
|
<div class="container-div"> |
|
|
<div class="container-div"> |
|
|
<div class="row"> |
|
|
<div class="row"> |
|
|
@ -142,7 +99,7 @@ |
|
|
|
|
|
|
|
|
</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> |
|
|
@ -455,8 +412,18 @@ |
|
|
restoreUrl: prefix + "/restore/{id}", |
|
|
restoreUrl: prefix + "/restore/{id}", |
|
|
modalName: "客户基本信息", |
|
|
modalName: "客户基本信息", |
|
|
fixedColumns:true, |
|
|
fixedColumns:true, |
|
|
sortable: true,//开启排序 |
|
|
showFooter: true, |
|
|
fixedRightNumber:1, |
|
|
fixedRightNumber:1, |
|
|
|
|
|
sortable: true, // 是否启用排序 |
|
|
|
|
|
sortStable: true, // 设置为 true 将获得稳定的排序 |
|
|
|
|
|
onDblClickCell: function (field,value,row, $element){ |
|
|
|
|
|
var businessId = row.id; |
|
|
|
|
|
var businessKey = "3"; |
|
|
|
|
|
if (field == 'updateTime'){ |
|
|
|
|
|
var url = ctx + "system/diffLog/getDiffDataList/" + businessId + "/" + businessKey; |
|
|
|
|
|
$.modal.open("数据修改记录",url); |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
columns: [ |
|
|
columns: [ |
|
|
{checkbox: true}, |
|
|
{checkbox: true}, |
|
|
{title: '主键ID',field: 'id',visible: false}, |
|
|
{title: '主键ID',field: 'id',visible: false}, |
|
|
@ -473,6 +440,7 @@ |
|
|
return '<span class="badge badge-primary">' + value + '</span>'; |
|
|
return '<span class="badge badge-primary">' + value + '</span>'; |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
{title: '业务员',field: 'businessMembers',visible: false}, |
|
|
{ title: '审核状态',field: 'auditStatus', visible: false, |
|
|
{ title: '审核状态',field: 'auditStatus', visible: false, |
|
|
formatter: function (value, row, index) { return $.table.selectDictLabel(auditStatusDatas, value);} |
|
|
formatter: function (value, row, index) { return $.table.selectDictLabel(auditStatusDatas, value);} |
|
|
}, |
|
|
}, |
|
|
@ -487,96 +455,88 @@ |
|
|
return '<span class="badge badge-primary">' + value + '</span>';} |
|
|
return '<span class="badge badge-primary">' + value + '</span>';} |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
{field: 'applyUserName', title: '<span style="color: red;">申请人</span>', |
|
|
{field: 'applyUserName', title: '<span style="color: red;">申请人</span>',align: 'center', |
|
|
formatter: function(value, row, index) { |
|
|
formatter: function(value, row, index) { |
|
|
return '<span style="color: red;">' + (value ? value : "-") + '</span>'; |
|
|
return '<span style="color: red;">' + (value ? value : "-") + '</span>'; |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
{title: '客户ID',field: 'enterpriseCode',align: 'center',}, |
|
|
{title: '客户ID',field: 'enterpriseCode' }, |
|
|
{title: '客户公司名称',field: 'enterpriseName',align: 'center',}, |
|
|
{title: '客户公司名称',field: 'enterpriseName'}, |
|
|
{title: '客户公司简称',field: 'customerAbbreviation',align: 'center',}, |
|
|
{title: '客户公司简称',field: 'customerAbbreviation'}, |
|
|
{title: '英文名称',field: 'englishName',align: 'center',}, |
|
|
{title: '英文名称',field: 'englishName'}, |
|
|
{title: '公司地址',field: 'customerAddress',align: 'center', |
|
|
{title: '公司地址',field: 'customerAddress'}, |
|
|
formatter: function(value, row, index) { |
|
|
{title: '送货地址',field: 'deliveryAddress'}, |
|
|
return $.table.tooltip(value,5,"open"); |
|
|
{title: '使用状态',field: 'useStatus', |
|
|
} |
|
|
|
|
|
}, |
|
|
|
|
|
{title: '送货地址',field: 'deliveryAddress',align: 'center', |
|
|
|
|
|
formatter: function(value, row, index) { |
|
|
|
|
|
return $.table.tooltip(value,5,"open"); |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
|
|
|
{title: '使用状态',field: 'useStatus',align: 'center', |
|
|
formatter: function (value, row, index) {return $.table.selectDictLabel(useStatusDatas, value);}, |
|
|
formatter: function (value, row, index) {return $.table.selectDictLabel(useStatusDatas, value);}, |
|
|
}, |
|
|
}, |
|
|
{field: 'applyTime',title: '申请时间'}, |
|
|
{field: 'applyTime',title: '申请时间',align: 'center',}, |
|
|
{title: '业务员',field: 'businessMembers',visible: false}, |
|
|
|
|
|
|
|
|
|
|
|
{title: '事业部',field: 'customerPurser'}, |
|
|
|
|
|
|
|
|
|
|
|
{title: '内外销',field: 'exportSales',visible: false, |
|
|
{title: '事业部',field: 'customerPurser',align: 'center',}, |
|
|
formatter: function (value, row, index) {return $.table.selectDictLabel(exportSalesDatas, value);}, |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
{title: '邮编',field: 'postalCode',visible: false}, |
|
|
{title: '第一联系人',field: 'customerContact',align: 'center',}, |
|
|
{title: '国家地区',field: 'customerCountry',visible: false, |
|
|
{title: '第一联系人电话',field: 'contactNumber',align: 'center',}, |
|
|
formatter: function (value, row, index) {return $.table.selectDictLabel(customerCountryDatas, value);}, |
|
|
|
|
|
}, |
|
|
{title: '第一联系人传真',field: 'customerFax',align: 'center',}, |
|
|
{title: '国家/地区编号',field: 'countryNumber',visible: false, |
|
|
{title: '第一联系人邮箱',field: 'customerEmail',align: 'center',}, |
|
|
formatter: function (value, row, index) {return $.table.selectDictLabel(countryNumberDatas, value); }, |
|
|
|
|
|
}, |
|
|
{title: '付款条件',field: 'paymentTerms',align: 'center', |
|
|
{title: '币种',field: 'commonCurrency',visible: false, |
|
|
formatter: function(value, row, index) { |
|
|
formatter: function (value, row, index) {return $.table.selectDictLabel(commonCurrencyDatas, value);}, |
|
|
return $.table.tooltip(value,5,"open"); |
|
|
}, |
|
|
} |
|
|
{title: '备注内容',field: 'customerRemarks',visible: false}, |
|
|
|
|
|
{title: '法人代表',field: 'legalRepresentative',visible: false}, |
|
|
|
|
|
{title: '开票客户名称',field: 'invoicingCustomerName',visible: false}, |
|
|
|
|
|
{title: '开票公司名称',field: 'invoicingCompanyName',visible: false}, |
|
|
|
|
|
{title: '诚信评级',field: 'integrityRating',visible: false, |
|
|
|
|
|
formatter: function (value, row, index) {return $.table.selectDictLabel(integrityRatingDatas, value);}, |
|
|
|
|
|
}, |
|
|
}, |
|
|
{title: '第一联系人id',field: 'customerContactId',visible: false}, |
|
|
|
|
|
{title: '第一联系人',field: 'customerContact'}, |
|
|
{title: '成立日期',field: 'establishedTime',align: 'center',}, |
|
|
{title: '第一联系人电话',field: 'contactNumber'}, |
|
|
{title: '开户银行',field: 'depositBank',align: 'center',}, |
|
|
{title: '第一联系人职务',field: 'customerOffice',visible: false}, |
|
|
{title: '开户银行账号',field: 'bankAccount',align: 'center',}, |
|
|
{title: '第一联系人传真',field: 'customerFax'}, |
|
|
|
|
|
{title: '第一联系人邮箱',field: 'customerEmail'}, |
|
|
{title: '是否含税',field: 'confirmTax',align: 'center', |
|
|
{title: '海关代码',field: 'customsCode',visible: false}, |
|
|
|
|
|
{title: '付款条件',field: 'paymentTerms'}, |
|
|
|
|
|
{title: '公司税号',field: 'invoiceCode',visible: false}, |
|
|
|
|
|
{title: '成立日期',field: 'establishedTime'}, |
|
|
|
|
|
{title: '开户银行',field: 'depositBank'}, |
|
|
|
|
|
{title: '开户银行账号',field: 'bankAccount'}, |
|
|
|
|
|
{title: 'RMB注册资金',field: 'rmbRegisteredCapital',visible: false}, |
|
|
|
|
|
{title: '外币注册资金',field: 'registeredCapital',visible: false}, |
|
|
|
|
|
{title: '是否含税',field: 'confirmTax', |
|
|
|
|
|
formatter: function (value, row, index) { |
|
|
formatter: function (value, row, index) { |
|
|
return $.table.selectDictLabel(confirmTaxDatas, value); |
|
|
return $.table.selectDictLabel(confirmTaxDatas, value); |
|
|
}, |
|
|
}, |
|
|
}, |
|
|
}, |
|
|
{title: '税率',field: 'taxRate'}, |
|
|
{title: '税率',field: 'taxRate',align: 'center',}, |
|
|
{title: '第一收货人Id',field:'deliveryAddressId',visible: false}, |
|
|
|
|
|
{title: '第一收货人',field:'deliveryCustomerPerson',visible: false}, |
|
|
{title: '客户标识',field:'customerSign',align: 'center', |
|
|
{title: '第一收货人地址',field: 'deliveryAddress',visible: false}, |
|
|
|
|
|
{title: '第一收货人电话',field: 'deliveryCustomerPhone',visible: false}, |
|
|
|
|
|
{title: '第一收货人邮编',field: 'deliveryCustomerPostal',visible:false}, |
|
|
|
|
|
{title: '第一收货人传真',field: 'deliveryCustomerFax',visible: false}, |
|
|
|
|
|
{title: '客户标识',field:'customerSign', |
|
|
|
|
|
formatter: function (value, row, index) {return $.table.selectDictLabel(customerSignDatas, value);} |
|
|
formatter: function (value, row, index) {return $.table.selectDictLabel(customerSignDatas, value);} |
|
|
}, |
|
|
}, |
|
|
{title: '录入时间',field: 'createTime', |
|
|
{title: '录入时间',field: 'createTime',align: 'center', |
|
|
sortable: true, |
|
|
sortable: true, |
|
|
}, |
|
|
}, |
|
|
{title: '上次修改时间',field: 'updateTime',}, |
|
|
{title: '上次修改时间',field: 'updateTime',align: 'center', |
|
|
|
|
|
|
|
|
|
|
|
formatter: function(value, row, index) { |
|
|
|
|
|
if (value) { |
|
|
|
|
|
return '<span style="color:#337ab7; cursor: pointer;">' + value + '</span>'; |
|
|
|
|
|
} else { |
|
|
|
|
|
return value; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
{title: '操作',align: 'center', |
|
|
{title: '操作',align: 'center', |
|
|
formatter: function(value, row, index) { |
|
|
formatter: function(value, row, index) { |
|
|
var actions = []; |
|
|
var actions = []; |
|
|
// 审核状态-审核通过 使用状态-是 未发起作废流程 |
|
|
// 审核状态-审核通过 使用状态-是 未发起作废流程 |
|
|
if((row.auditStatus=="1" || row.auditStatus=="2") && !row.cancelInstanceId){ |
|
|
if((row.auditStatus=="1" || row.auditStatus=="2") && !row.cancelInstanceId){ |
|
|
// 作废 |
|
|
// 作废 |
|
|
actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i> 作废</a>'); |
|
|
actions.push('<a href="javascript:void(0)" onclick="cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i> 作废</a>'); |
|
|
// 编辑 |
|
|
// 编辑 |
|
|
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i> 编辑</a> '); |
|
|
actions.push('<a href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i> 编辑</a> '); |
|
|
}else{ |
|
|
}else{ |
|
|
actions.push('<a class="btn btn-default btn-xs" href="javascript:void(0)" disabled ><i class="fa fa-edit"></i> 编辑</a> '); |
|
|
actions.push('<a href="javascript:void(0)" disabled ><i class="fa fa-edit"></i> 编辑</a> '); |
|
|
} |
|
|
} |
|
|
// 已作废 |
|
|
// 已作废 |
|
|
if(row.useStatus=="2" && !row.restoreInstanceId){ |
|
|
if(row.useStatus=="2" && !row.restoreInstanceId){ |
|
|
// 恢复 |
|
|
// 恢复 |
|
|
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i> 恢复</a> '); |
|
|
actions.push('<a href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i> 恢复</a> '); |
|
|
} |
|
|
} |
|
|
//有流程实例id |
|
|
//有流程实例id |
|
|
if (row.instanceId) { |
|
|
if (row.instanceId) { |
|
|
@ -585,17 +545,18 @@ |
|
|
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+"-"+row.instanceTypeName+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> '); |
|
|
actions.push('<a 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 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 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> '); |
|
|
actions.push('<a href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-eye"></i> 详情</a> '); |
|
|
return actions.join(''); |
|
|
var actionLinks = actions.join(''); |
|
|
|
|
|
return $.table.dropdownToggle(actionLinks); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
], |
|
|
], |
|
|
|
