Skip to content

S
Skyeye

doc_wei / Skyeye

通知 1173
Star 154
Fork 127
S
Skyeye
提交 30611cb4 编写于 作者: L LAPTOP-UV1MNL38\18023
浏览文件
操作

Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server

上级 d42ae8c7 a699a255
显示空白变更内容
内联 并排
Showing with 148 addition and 104 deletion
activiti/src/main/resources/template/js/activitiCommon/processInstanceDetails.js
浏览文件 @ 30611cb4
......@@ -21,6 +21,8 @@ layui.config({
AjaxPostUtil.request({url: flowableBasePath + "queryProcessInstance", params: {processInstanceId: processInstanceId}, type: 'json', method: 'POST', callback: function(data) {
// 加载业务数据
activitiUtil.loadBusiness(data.bean.objectId, data.bean.objectKey, data.bean.actFlowId, 'details');
// 当前审批人
$("#taskCurrentAssignee").html(getNotUndefinedVal(data.bean.task?.taskCurrentAssigneeMation?.name));
// 加载流程图片
$("#processInstanceIdImg").attr("src", fileBasePath + 'images/upload/activiti/' + processInstanceId + ".png?cdnversion=" + Math.ceil(new Date()/3600000));
matchingLanguage();
......
activiti/src/main/resources/template/js/approvalActiviti/approvalProcessTask.js
浏览文件 @ 30611cb4
......@@ -25,6 +25,8 @@ layui.config({
// 加载业务数据
activitiUtil.loadBusiness(data.bean.objectId, data.bean.objectKey, data.bean.actFlowId, 'edit');
// 当前审批人
$("#taskCurrentAssignee").html(getNotUndefinedVal(data.bean.task?.taskCurrentAssigneeMation?.name));
}, async: false});
AjaxPostUtil.request({url: flowableBasePath + "activitimode016", params: {taskId: taskId, processInstanceId: processInstanceId}, type: 'json', method: 'GET', callback: function(j){
......
activiti/src/main/resources/template/js/myActiviti/pendingProcess.js
浏览文件 @ 30611cb4
......@@ -44,6 +44,9 @@ layui.config({
{ field: 'createTime', title: '申请时间', align: 'center', width: 150, templet: function (d) {
return d.processMation.createTime;
}},
{ field: 'assignee', title: '当前审批人', width: 120, templet: function (d) {
return d.processMation.createName;
}},
{ field: 'name', title: '当前节点', width: 130, templet: function (d) {
return '[' + d.name + ']';
}},
......
activiti/src/main/resources/template/js/myActiviti/processedProcess.js
浏览文件 @ 30611cb4
var processInstanceId = "";//流程id
var hisTaskId = "";//历史审批任务id
// 流程id
var processInstanceId = "";
// 历史审批任务id
var hisTaskId = "";
layui.config({
base: basePath,
......@@ -14,53 +15,69 @@ layui.config({
table = layui.table,
form = layui.form;
// 我的历史任务
// 我的历史审批任务
table.render({
id: 'messageMyHistoryTaskTable',
elem: '#messageMyHistoryTaskTable',
method: 'post',
url: flowableBasePath + 'activitimode014',
where:{},
where: getTableParams(),
even: true,
page: true,
limits: getLimits(),
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'processInstanceId', title: '流程ID', width: 100 },
{ field: 'taskType', title: '类型', width: 150, templet: function (d) {
return d.processMation.title;
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '2', type: 'numbers' },
{ field: 'processInstanceId', title: '流程ID', rowspan: '2', width: 280, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + getNotUndefinedVal(d.hisTask?.processInstanceId) + '</a>';
}},
{ field: 'createName', title: '申请人', width: 120, templet: function (d) {
return d.processMation.createName;
{ field: 'taskType', title: '类型', rowspan: '2', width: 150, templet: function (d) {
return getNotUndefinedVal(d.processMation.title);
}},
{ field: 'createTime', title: '申请时间', align: 'center', width: 150, templet: function (d) {
return d.processMation.createTime;
{ field: 'createName', title: '申请人', rowspan: '2', width: 120, templet: function (d) {
return getNotUndefinedVal(d.processMation?.createName);
}},
{ field: 'name', title: '我处理的节点', width: 130, templet: function (d) {
return '[' + d.name + ']';
{ field: 'createTime', title: '申请时间', rowspan: '2', align: 'center', width: 150, templet: function (d) {
return getNotUndefinedVal(d.processMation?.createTime);
}},
{ field: 'agencyName', title: '受理人', width: 80},
{ field: 'endTime', title: '受理时间', align: 'center', width: 140, templet: function (d) {
if (!isNull(d.endTime)){
var str = d.endTime.toString();
str = str.substring(0, str.length - 3);
return date('Y-m-d H:i', str);
} else {
return "";
{ field: 'assigneeList', title: '当前审批人', align: 'left', rowspan: '2', width: 150, templet: function (d) {
if (!isNull(d.assigneeList)) {
var str = "";
$.each(d.assigneeList, function(i, item) {
str += '<span class="layui-badge layui-bg-blue">' + item.name + '</span><br>';
});
return str;
}
return '';
}},
{ field: 'weatherEnd', title: '审批进度', align: 'left', width: 80, templet: function (d) {
if(d.weatherEnd == 0){
{ title: '我处理的', colspan: '2', align: 'center' },
{ field: 'weatherEnd', title: '审批进度', align: 'left', rowspan: '2', width: 80, templet: function (d) {
if (d.weatherEnd == 0) {
return "<span class='state-down'>进行中</span>";
} else {
return "<span class='state-up'>已完成</span>";
}
}},
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#myHistoryTaskTableBar'}
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', rowspan: '2', align: 'center', width: 150, toolbar: '#myHistoryTaskTableBar'}
], [
{ field: 'hisTaskName', title: '节点', width: 130, templet: function (d) {
return '[' + getNotUndefinedVal(d.hisTask?.name) + ']';
}},
{ field: 'lastUpdateTime', title: '处理时间', width: 130, templet: function (d) {
if (!isNull(d.hisTask.endTime)) {
var str = d.hisTask.endTime.toString();
str = str.substring(0, str.length - 3);
return date('Y-m-d H:i', str);
} else {
return "";
}
}}
]],
done: function(json) {
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入流程ID", function () {
table.reloadData("messageMyHistoryTaskTable", {page: {curr: 1}, where: getTableParams()});
});
}
});
......@@ -76,11 +93,9 @@ layui.config({
}
});
//撤回
// 撤回
function withdraw(data) {
//流程id
processInstanceId = data.processInstanceId;
//历史审批任务id
hisTaskId = data.hisTaskId;
_openNewWindows({
url: "../../tpl/activitiCommon/revokeActiviti.html",
......@@ -89,12 +104,12 @@ layui.config({
area: ['70vw', '40vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
reloadMyHistoryTaskTable();
loadTable();
}
});
}
//刷新流程图
// 刷新流程图
function refreshPic(data) {
layer.confirm('确认重新生成流程图吗？', { icon: 3, title: '刷新流程图操作' }, function (i) {
layer.close(i);
......@@ -104,13 +119,17 @@ layui.config({
});
}
//刷新我的历史任务
form.render();
$("body").on("click", "#reloadMyHistoryTaskTable", function() {
reloadMyHistoryTaskTable();
loadTable();
});
function reloadMyHistoryTaskTable(){
table.reloadData("messageMyHistoryTaskTable", {where:{}});
function loadTable() {
table.reloadData("messageMyHistoryTaskTable", {where: getTableParams()});
}
function getTableParams() {
return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageMyHistoryTaskTable"));
}
exports('processedProcess', {});
......
activiti/src/main/resources/template/tpl/activitiCommon/processInstanceDetails.html
浏览文件 @ 30611cb4
......@@ -31,6 +31,15 @@
<div class="layui-tab-item layui-show">
<div id="showForm" style="height: auto; width: 100%; float: left;">
</div>
<div class="layui-form-item layui-col-xs12">
<span class="hr-title">审批信息</span><hr>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">当前审批人：</label>
<div class="layui-input-block ver-center" id="taskCurrentAssignee">
</div>
</div>
</div>
<div class="layui-tab-item">
......
activiti/src/main/resources/template/tpl/approvalActiviti/approvalProcessTask.html
浏览文件 @ 30611cb4
......@@ -42,6 +42,12 @@
<div class="layui-form-item layui-col-xs12" id="multiInstanceBox">
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">当前审批人：</label>
<div class="layui-input-block ver-center" id="taskCurrentAssignee">
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label"><span id="resultTitle">审批结果</span><i class="red">*</i></label>
<div class="layui-input-block winui-radio">
......
activiti/src/main/resources/template/tpl/myActiviti/processedProcess.html
浏览文件 @ 30611cb4
......@@ -5,28 +5,25 @@
<title></title>
<link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
<style>
.layui-table-cell {
height: auto;
text-overflow: inherit;
overflow: visible;
white-space: normal;
word-wrap: break-word;
}
</style>
</head>
<body>
<div class="txtcenter" style="margin:0 auto;padding:10px;">
<form class="layui-form layui-form-pane" action="" autocomplete="off">
<div class="layui-form-item">
<div class="layui-inline">
<!-- <button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
<button class="layui-btn list-form-search" type="button" id="formSearch"><language showName="com.skyeye.search2"></language></button> -->
</div>
</div>
</form>
</div>
<div class="winui-toolbar">
<div class="winui-tool">
<button id="reloadMyHistoryTaskTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
<button id="reloadMyHistoryTaskTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
</div>
</div>
<div style="margin:auto 10px;">
<div style="margin: auto 10px;">
<table id="messageMyHistoryTaskTable" lay-filter="messageMyHistoryTaskTable"></table>
<script type="text/html" id="myHistoryTaskTableBar">
<a class="layui-btn layui-btn-xs" lay-event="details">详情</a>
<a class="layui-btn layui-btn-xs" lay-event="refreshPic">刷新流程图</a>
{{# if(d.weatherEnd == 0){ }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="withdraw">撤回</a>
......
admin-assistant/src/main/resources/template/js/assetManage/assetManageChoose.js
浏览文件 @ 30611cb4
......@@ -125,7 +125,7 @@ layui.config({
// 保存
$("body").on("click", "#saveCheckBox", function() {
var selectedData = tableCheckBoxUtil.getValue({
var selectedData = tableCheckBoxUtil.getValueList({
gridId: 'messageTable'
});
if (selectedData.length == 0) {
......
shop/src/main/resources/template/js/storeStaff/storeStaffDistribute.js
浏览文件 @ 30611cb4
......@@ -10,30 +10,31 @@ layui.config({
var $ = layui.$,
form = layui.form,
table = layui.table;
var selTemplate = getFileContent('tpl/template/select-option.tpl');
authBtn('1643984717466');
// 加载区域
shopUtil.getShopAreaMation(function (json){
$("#areaId").html(getDataUseHandlebars($("#selectTemplate").html(), json));
loadStore("-");
$("#areaId").html(getDataUseHandlebars(selTemplate, json));
loadStore("");
});
form.on('select(areaId)', function(data) {
var thisRowValue = data.value;
thisRowValue = isNull(thisRowValue) ? "-" : thisRowValue;
thisRowValue = isNull(thisRowValue) ? "" : thisRowValue;
loadStore(thisRowValue);
});
matchingLanguage();
form.render();
var chooseStoreId = "";
function loadStore(areaId){
function loadStore(shopAreaId) {
table.render({
id: 'storeTable',
elem: '#storeTable',
method: 'get',
url: shopBasePath + 'queryStoreList',
where: {areaId: areaId, enabled: 1},
url: sysMainMation.shopBasePath + 'queryStoreListByParams',
where: {shopAreaId: shopAreaId, enabled: 1},
even: false,
page: false,
limits: getLimits(),
......@@ -46,39 +47,48 @@ layui.config({
]],
done: function(json) {
matchingLanguage();
chooseStoreId = "";
loadStaff("");
}
});
table.on('tool(storeTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if(layEvent == 'select'){
if (layEvent == 'select') {
chooseStoreId = data.id;
loadStaff(data.id);
}
});
chooseStoreId = "";
loadStaff("-");
}
function loadStaff(storeId){
function loadStaff(storeId) {
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: shopBasePath + 'storeStaff001',
where: {storeId: storeId},
url: sysMainMation.shopBasePath + 'storeStaff001',
where: {objectId: storeId},
even: true,
page: true,
limits: getLimits(),
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], fixed: 'left', type: 'numbers' },
{ field: 'jobNumber', title: '工号', align: 'left', width: 140 },
{ field: 'userName', title: '姓名', width: 120 },
{ field: 'companyName', title: '企业', width: 150 },
{ field: 'departmentName', title: '部门', width: 140 },
{ field: 'jobName', title: '职位', width: 140 },
{ field: 'jobNumber', title: '工号', align: 'left', width: 140, templet: function (d) {
return getNotUndefinedVal(d.staffMation?.jobNumber);
}},
{ field: 'userName', title: '姓名', width: 120, templet: function (d) {
return getNotUndefinedVal(d.staffMation?.userName);
}},
{ field: 'companyName', title: '企业', width: 150, templet: function (d) {
return getNotUndefinedVal(d.staffMation?.companyName);
}},
{ field: 'departmentName', title: '部门', width: 140, templet: function (d) {
return getNotUndefinedVal(d.staffMation?.departmentName);
}},
{ field: 'jobName', title: '职位', width: 140, templet: function (d) {
return getNotUndefinedVal(d.staffMation?.jobName);
}},
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
]],
done: function(json) {
......@@ -99,16 +109,16 @@ layui.config({
function delet(data) {
layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
layer.close(index);
AjaxPostUtil.request({url: shopBasePath + "storeStaff002", params: {id: data.id}, type: 'json', method: "POST", callback: function (json) {
AjaxPostUtil.request({url: sysMainMation.shopBasePath + "storeStaff002", params: {id: data.id}, type: 'json', method: "POST", callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
table.reloadData("messageTable", {page: {curr: 1}, where: {storeId: chooseStoreId}})
table.reloadData("messageTable", {page: {curr: 1}, where: {objectId: chooseStoreId}})
}});
});
}
// 添加
$("body").on("click", "#addBean", function() {
if(isNull(chooseStoreId)){
if (isNull(chooseStoreId)) {
winui.window.msg('请先选择门店信息.', {icon: 2, time: 2000});
return false;
}
......@@ -116,6 +126,7 @@ layui.config({
systemCommonUtil.checkStaffMation = []; // 选择时返回的对象
systemCommonUtil.openSysAllUserStaffChoosePage(function (checkStaffMation){
var list = new Array();
console.log(checkStaffMation)
$.each(checkStaffMation, function (i, item) {
list.push(item.id);
});
......@@ -123,7 +134,7 @@ layui.config({
storeId: chooseStoreId,
staffId: JSON.stringify(list)
};
AjaxPostUtil.request({url: shopBasePath + "storeStaff003", params: params, type: 'json', method: "POST", callback: function (json) {
AjaxPostUtil.request({url: sysMainMation.shopBasePath + "storeStaff003", params: params, type: 'json', method: "POST", callback: function (json) {
loadStaff(chooseStoreId);
}});
});
......
shop/src/main/resources/template/tpl/storeStaff/storeStaffDistribute.html
浏览文件 @ 30611cb4
......@@ -51,13 +51,6 @@
</form>
</div>
<script type="text/x-handlebars-template" id="selectTemplate">
<option value="-">默认区域</option>
{{#each rows}}
<option value="{{id}}">{{name}}</option>
{{/each}}
</script>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
......
userauth/src/main/resources/template/js/sysEveUserStaff/sysEveUserStaffChoose.js
浏览文件 @ 30611cb4
......@@ -123,7 +123,7 @@ layui.config({
// 保存
$("body").on("click", "#saveCheckBox", function() {
var selectedData = tableCheckBoxUtil.getValue({
var selectedData = tableCheckBoxUtil.getValueList({
gridId: 'messageTable'
});
if (selectedData.length == 0) {
......
web/src/main/resources/template/assets/lib/layui/custom.js
浏览文件 @ 30611cb4
......@@ -102,6 +102,7 @@ var serviceMap = [
{"id": "sysMainMation.projectBasePath", "name": "PM项目服务"},
{"id": "sysMainMation.sealServiceBasePath", "name": "售后工单服务"},
{"id": "sysMainMation.autoBasePath", "name": "自动化服务"},
{"id": "sysMainMation.wallBasePath", "name": "表白墙服务"},
]
function getRequestHeaders() {
......
web/src/main/resources/template/assets/lib/layui/customer/shopUtil.js
浏览文件 @ 30611cb4
......@@ -95,7 +95,7 @@ var shopUtil = {
* @returns {string}
*/
getKeepFitOrderStateName: function (data) {
if (data.cancleState == 1){
if (data.cancleState == 1) {
if (data.state == 1){
return "<span class='state-down'>保养中</span>";
} else if (data.state == 2){
......@@ -114,8 +114,8 @@ var shopUtil = {
* @param callback 回执函数
*/
getShopAreaMation: function (callback) {
AjaxPostUtil.request({url: shopBasePath + "queryAreaList", params: {}, type: 'json', method: "GET", callback: function(json) {
if(typeof(callback) == "function") {
AjaxPostUtil.request({url: sysMainMation.shopBasePath + "queryAllEnabledAreaList", params: {}, type: 'json', method: "GET", callback: function(json) {
if (typeof(callback) == "function") {
callback(json);
}
}, async: false});
......@@ -127,7 +127,7 @@ var shopUtil = {
* @param callback 回执函数
*/
queryStaffBelongAreaList: function (callback) {
AjaxPostUtil.request({url: shopBasePath + "storeStaff004", params: {}, type: 'json', method: "GET", callback: function(json) {
AjaxPostUtil.request({url: sysMainMation.shopBasePath + "storeStaff004", params: {}, type: 'json', method: "GET", callback: function(json) {
if(typeof(callback) == "function") {
callback(json);
}
......@@ -140,7 +140,7 @@ var shopUtil = {
* @param callback 回执函数
*/
queryStaffBelongStoreList: function (callback) {
AjaxPostUtil.request({url: shopBasePath + "storeStaff005", params: {}, type: 'json', method: "GET", callback: function(json) {
AjaxPostUtil.request({url: sysMainMation.shopBasePath + "storeStaff005", params: {}, type: 'json', method: "GET", callback: function(json) {
if(typeof(callback) == "function") {
callback(json);
}
......@@ -157,7 +157,7 @@ var shopUtil = {
if(isNull(areaId)){
return [];
}
AjaxPostUtil.request({url: shopBasePath + "queryStoreList", params: {areaId: areaId}, type: 'json', method: "GET", callback: function(json) {
AjaxPostUtil.request({url: sysMainMation.shopBasePath + "queryStoreList", params: {areaId: areaId}, type: 'json', method: "GET", callback: function(json) {
if(typeof(callback) == "function") {
callback(json);
}
......@@ -174,7 +174,7 @@ var shopUtil = {
limit: 1000,
page: 1
};
AjaxPostUtil.request({url: shopBasePath + "store001", params: params, type: 'json', method: "POST", callback: function(json) {
AjaxPostUtil.request({url: sysMainMation.shopBasePath + "store001", params: params, type: 'json', method: "POST", callback: function(json) {
if(typeof(callback) == "function") {
callback(json);
}
......
web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js
浏览文件 @ 30611cb4
......@@ -1247,16 +1247,8 @@ var dsFormColumnUtil = {
var value = d.value;
// 获取属性对应的组件编码---todo 后续根据编号加载对应的dom
var numCode = dsFormColumnUtil.getAttrKeyNumCode(attrKey);
if (isNull(numCode)) {
return `<input type="text" id="value${d.id}" placeholder="请输入值，如果有多个，请用英文逗号隔开" cus-id="${d.id}" class="layui-input tableInput" win-verify="required" ` +
`value="` + (isNull(displayValue) ? "" : displayValue) + `"/>`
} else {
if (numCode == 'enumCardSolt' || numCode == 'dictDataCardSolt') {
// 枚举卡槽/数据字典卡槽
}
}
return '暂不支持';
},
getAttrKeyNumCode: function (attrKey) {
......
web/src/main/resources/template/json/skyeyeClassEnum.json
浏览文件 @ 30611cb4
......@@ -166,5 +166,14 @@
"reportDataFromType": {"name": "报表-数据来源类型", "className": "skyeye-report#com.skyeye.datafrom.classenum.ReportDataFromType"},
"storeOnlineBookType": {"name": "商城-门店线上预约类型", "className": "skyeye-shop#com.skyeye.classenum.StoreOnlineBookType"}
"storeOnlineBookType": {"name": "商城-门店线上预约类型", "className": "skyeye-shop#com.skyeye.classenum.StoreOnlineBookType"},
"studentStateEnum": {"name": "表白墙-学生审核状态", "className": "skyeye-wall#com.skyeye.certification.classenum.StateEnum"},
"studentStateEnum2": {
"name": "表白墙-学生审核状态-审核页面",
"className": "skyeye-wall#com.skyeye.certification.classenum.StateEnum",
"filterKey": "id",
"filterValue": "3,4"
}
}
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或