提交 440b4b96 编写于 作者: W weizhiqiang

动态表单,系统订单,工作流使用的key统一修改

上级 535f86c0
......@@ -19,6 +19,7 @@ layui.config({
laydate = layui.laydate,
form = layui.form,
textool = layui.textool;
var serviceClassName = sysServiceMation["crmOpportUnity"]["key"];
var selOption = getFileContent('tpl/template/select-option.tpl');
showGrid({
......@@ -155,7 +156,7 @@ layui.config({
// 提交审批
form.on('submit(formSubBean)', function(data) {
if(winui.verifyForm(data.elem)) {
activitiUtil.startProcess(sysActivitiModel["crmOpportUnity"]["key"], null, function (approvalId) {
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
saveData("2", approvalId);
});
}
......
......@@ -18,16 +18,16 @@ layui.config({
var $ = layui.$,
laydate = layui.laydate,
textool = layui.textool;
layedit = layui.layedit,
form = layui.form;
var serviceClassName = sysServiceMation["outIsOthers"]["key"];
var selOption = getFileContent('tpl/template/select-option.tpl');
// 已经选择的商品集合key:表格的行trId,value:商品信息
var allChooseProduct = {};
// 获取单据提交类型
var submitType = erpOrderUtil.getSubmitTypeByKey(systemOrderType["outIsOthers"]["key"]);
var submitType = erpOrderUtil.getSubmitTypeByKey(serviceClassName);
// 单据时间
laydate.render({elem: '#operTime', type: 'datetime', value: getFormatDate(), trigger: 'click'});
......@@ -74,7 +74,7 @@ layui.config({
});
// 加载动态表单
dsFormUtil.loadPageByCode("dsFormShow", sysDsFormWithCodeType["outIsOthers"]["key"], null);
dsFormUtil.loadPageByCode("dsFormShow", serviceClassName, null);
matchingLanguage();
......@@ -97,7 +97,7 @@ layui.config({
// 走工作流的提交审批
form.on('submit(formSubOneBean)', function(data) {
if(winui.verifyForm(data.elem)) {
activitiUtil.startProcess(sysActivitiModel["outIsOthers"]["key"], null, function (approvalId) {
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
saveData("2", approvalId);
});
}
......
......@@ -14,6 +14,7 @@ layui.config({
table = layui.table;
authBtn('1571812346209');//新增
authBtn('1571988086763');//导出
var serviceClassName = sysServiceMation["outIsOthers"]["key"];
laydate.render({elem: '#operTime', range: '~'});
......@@ -70,7 +71,7 @@ layui.config({
} else if (layEvent === 'activitiProcessDetails') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') { //撤销
erpOrderUtil.revokeOrderMation(data.processInstanceId, systemOrderType["outIsOthers"]["key"], function() {
erpOrderUtil.revokeOrderMation(data.processInstanceId, serviceClassName, function() {
loadTable();
});
}
......@@ -78,7 +79,7 @@ layui.config({
// 提交数据
function subExamine(data) {
erpOrderUtil.submitOrderMation(data.id, systemOrderType["outIsOthers"]["key"], data.submitType, sysActivitiModel["outIsOthers"]["key"], function() {
erpOrderUtil.submitOrderMation(data.id, serviceClassName, data.submitType, serviceClassName, function() {
loadTable();
});
}
......@@ -99,7 +100,7 @@ layui.config({
// 删除
function deletemember(data) {
erpOrderUtil.deleteOrderMation(data.id, systemOrderType["outIsOthers"]["key"], function() {
erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() {
loadTable();
});
}
......
......@@ -16,16 +16,16 @@ layui.config({
var $ = layui.$,
laydate = layui.laydate,
textool = layui.textool;
layedit = layui.layedit,
form = layui.form;
var serviceClassName = sysServiceMation["putIsOthers"]["key"];
var selOption = getFileContent('tpl/template/select-option.tpl');
// 已经选择的商品集合key:表格的行trId,value:商品信息
var allChooseProduct = {};
// 获取单据提交类型
var submitType = erpOrderUtil.getSubmitTypeByKey(systemOrderType["putIsOthers"]["key"]);
var submitType = erpOrderUtil.getSubmitTypeByKey(serviceClassName);
// 单据时间
laydate.render({elem: '#operTime', type: 'datetime', value: getFormatDate(), trigger: 'click'});
......@@ -74,7 +74,7 @@ layui.config({
});
// 加载动态表单
dsFormUtil.loadPageByCode("dsFormShow", sysDsFormWithCodeType["putIsOthers"]["key"], null);
dsFormUtil.loadPageByCode("dsFormShow", serviceClassName, null);
matchingLanguage();
......@@ -97,7 +97,7 @@ layui.config({
// 走工作流的提交审批
form.on('submit(formSubOneBean)', function(data) {
if(winui.verifyForm(data.elem)) {
activitiUtil.startProcess(sysActivitiModel["putIsOthers"]["key"], null, function (approvalId) {
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
saveData("2", approvalId);
});
}
......
......@@ -12,6 +12,7 @@ layui.config({
form = layui.form,
laydate = layui.laydate,
table = layui.table;
var serviceClassName = sysServiceMation["putIsOthers"]["key"];
authBtn('1570958309701');//添加
authBtn('1571987485364');//导出
......@@ -70,7 +71,7 @@ layui.config({
} else if (layEvent === 'activitiProcessDetails') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') { //撤销
erpOrderUtil.revokeOrderMation(data.processInstanceId, systemOrderType["putIsOthers"]["key"], function() {
erpOrderUtil.revokeOrderMation(data.processInstanceId, serviceClassName, function() {
loadTable();
});
}
......@@ -78,7 +79,7 @@ layui.config({
// 提交数据
function subExamine(data) {
erpOrderUtil.submitOrderMation(data.id, systemOrderType["putIsOthers"]["key"], data.submitType, sysActivitiModel["putIsOthers"]["key"], function() {
erpOrderUtil.submitOrderMation(data.id, serviceClassName, data.submitType, serviceClassName, function() {
loadTable();
});
}
......@@ -99,7 +100,7 @@ layui.config({
// 删除
function deletemember(data) {
erpOrderUtil.deleteOrderMation(data.id, systemOrderType["putIsOthers"]["key"], function() {
erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() {
loadTable();
});
}
......
......@@ -22,13 +22,14 @@ layui.config({
textool = layui.textool;
layedit = layui.layedit,
form = layui.form;
var serviceClassName = sysServiceMation["purchaseOrder"]["key"];
var selOption = getFileContent('tpl/template/select-option.tpl');
// 已经选择的商品集合key:表格的行trId,value:商品信息
var allChooseProduct = {};
// 获取单据提交类型
var submitType = erpOrderUtil.getSubmitTypeByKey(systemOrderType["purchaseOrder"]["key"]);
var submitType = erpOrderUtil.getSubmitTypeByKey(serviceClassName);
// 单据时间
laydate.render({elem: '#operTime', type: 'datetime', value: getFormatDate(), trigger: 'click'});
......@@ -73,7 +74,7 @@ layui.config({
});
// 加载动态表单
dsFormUtil.loadPageByCode("dsFormShow", sysDsFormWithCodeType["purchaseOrder"]["key"], null);
dsFormUtil.loadPageByCode("dsFormShow", serviceClassName, null);
matchingLanguage();
......@@ -91,7 +92,7 @@ layui.config({
// 走工作流的提交审批
form.on('submit(formSubOneBean)', function(data) {
if(winui.verifyForm(data.elem)) {
activitiUtil.startProcess(sysActivitiModel["purchaseOrder"]["key"], null, function (approvalId) {
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
saveData("2", approvalId);
});
}
......
......@@ -20,9 +20,9 @@ layui.config({
var $ = layui.$,
laydate = layui.laydate,
textool = layui.textool;
layedit = layui.layedit,
form = layui.form;
var serviceClassName = sysServiceMation["purchaseOrder"]["key"];
var selOption = getFileContent('tpl/template/select-option.tpl');
//已经选择的商品集合key:表格的行trId,value:商品信息
......@@ -156,7 +156,7 @@ layui.config({
// 走工作流的提交审批
form.on('submit(formSubOneBean)', function(data) {
if(winui.verifyForm(data.elem)) {
activitiUtil.startProcess(sysActivitiModel["purchaseOrder"]["key"], null, function (approvalId) {
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
saveData("2", approvalId);
});
}
......
......@@ -13,7 +13,7 @@ layui.config({
laydate = layui.laydate,
soulTable = layui.soulTable,
table = layui.table;
var serviceClassName = sysServiceMation["purchaseOrder"]["key"];
authBtn('1571812723211');//新增
authBtn('1571986566776');//导出
......@@ -81,7 +81,7 @@ layui.config({
} else if (layEvent === 'activitiProcessDetails') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') { //撤销
erpOrderUtil.revokeOrderMation(data.processInstanceId, systemOrderType["purchaseOrder"]["key"], function() {
erpOrderUtil.revokeOrderMation(data.processInstanceId, serviceClassName, function() {
loadTable();
});
}
......@@ -103,7 +103,7 @@ layui.config({
// 删除
function deleteOrder(data) {
erpOrderUtil.deleteOrderMation(data.id, systemOrderType["purchaseOrder"]["key"], function() {
erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() {
loadTable();
});
}
......@@ -122,7 +122,7 @@ layui.config({
// 提交数据
function subExamine(data) {
erpOrderUtil.submitOrderMation(data.id, systemOrderType["purchaseOrder"]["key"], data.submitType, sysActivitiModel["purchaseOrder"]["key"], function() {
erpOrderUtil.submitOrderMation(data.id, serviceClassName, data.submitType, serviceClassName, function() {
loadTable();
});
}
......
......@@ -18,6 +18,7 @@ layui.config({
textool = layui.textool;
layedit = layui.layedit,
form = layui.form;
var serviceClassName = sysServiceMation["putIsPurchase"]["key"];
var inoutitemHtml = "";//支出项目
......@@ -28,13 +29,13 @@ layui.config({
var allChooseProduct = {};
// 获取单据提交类型
var submitType = erpOrderUtil.getSubmitTypeByKey(systemOrderType["putIsPurchase"]["key"]);
var submitType = erpOrderUtil.getSubmitTypeByKey(serviceClassName);
// 单据时间
laydate.render({elem: '#operTime', type: 'datetime', value: getFormatDate(), trigger: 'click'});
// 加载动态表单
dsFormUtil.loadPageByCode("dsFormShow", sysDsFormWithCodeType["putIsPurchase"]["key"], null);
dsFormUtil.loadPageByCode("dsFormShow", serviceClassName, null);
// 初始化账户
systemCommonUtil.getSysAccountListByType(function (json) {
......@@ -201,7 +202,7 @@ layui.config({
// 走工作流的提交审批
form.on('submit(formSubOneBean)', function(data) {
if(winui.verifyForm(data.elem)) {
activitiUtil.startProcess(sysActivitiModel["putIsPurchase"]["key"], null, function (approvalId) {
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
saveData("2", approvalId);
});
}
......
......@@ -16,6 +16,7 @@ layui.config({
var $ = layui.$,
laydate = layui.laydate,
textool = layui.textool;
var serviceClassName = sysServiceMation["putIsPurchase"]["key"];
layedit = layui.layedit,
form = layui.form;
......@@ -27,7 +28,7 @@ layui.config({
var allChooseProduct = {};
// 获取单据提交类型
var submitType = erpOrderUtil.getSubmitTypeByKey(systemOrderType["putIsPurchase"]["key"]);
var submitType = erpOrderUtil.getSubmitTypeByKey(serviceClassName);
// 单据时间
laydate.render({elem: '#operTime', type: 'datetime', value: getFormatDate(), trigger: 'click'});
......@@ -95,7 +96,7 @@ layui.config({
});
// 加载动态表单
dsFormUtil.loadPageByCode("dsFormShow", sysDsFormWithCodeType["putIsPurchase"]["key"], null);
dsFormUtil.loadPageByCode("dsFormShow", serviceClassName, null);
matchingLanguage();
......@@ -118,7 +119,7 @@ layui.config({
// 走工作流的提交审批
form.on('submit(formSubOneBean)', function(data) {
if(winui.verifyForm(data.elem)) {
activitiUtil.startProcess(sysActivitiModel["putIsPurchase"]["key"], null, function (approvalId) {
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
saveData("2", approvalId);
});
}
......
......@@ -16,6 +16,7 @@ layui.config({
var $ = layui.$,
laydate = layui.laydate,
textool = layui.textool;
var serviceClassName = sysServiceMation["putIsPurchase"]["key"];
layedit = layui.layedit,
form = layui.form;
......@@ -193,7 +194,7 @@ layui.config({
// 走工作流的提交审批
form.on('submit(formSubOneBean)', function(data) {
if(winui.verifyForm(data.elem)) {
activitiUtil.startProcess(sysActivitiModel["putIsPurchase"]["key"], null, function (approvalId) {
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
saveData("2", approvalId);
});
}
......
......@@ -13,6 +13,7 @@ layui.config({
laydate = layui.laydate,
soulTable = layui.soulTable,
table = layui.table;
var serviceClassName = sysServiceMation["putIsPurchase"]["key"];
authBtn('1571813042536');//新增
authBtn('1571988895735');//导出
......@@ -85,7 +86,7 @@ layui.config({
} else if (layEvent === 'activitiProcessDetails') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') { //撤销
erpOrderUtil.revokeOrderMation(data.processInstanceId, systemOrderType["putIsPurchase"]["key"], function() {
erpOrderUtil.revokeOrderMation(data.processInstanceId, serviceClassName, function() {
loadTable();
});
}
......@@ -101,14 +102,14 @@ layui.config({
// 删除
function deleteOrder(data) {
erpOrderUtil.deleteOrderMation(data.id, systemOrderType["putIsPurchase"]["key"], function() {
erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() {
loadTable();
});
}
// 提交数据
function subExamine(data) {
erpOrderUtil.submitOrderMation(data.id, systemOrderType["putIsPurchase"]["key"], data.submitType, sysActivitiModel["putIsPurchase"]["key"], function() {
erpOrderUtil.submitOrderMation(data.id, serviceClassName, data.submitType, serviceClassName, function() {
loadTable();
});
}
......
......@@ -17,9 +17,9 @@ layui.config({
var $ = layui.$,
laydate = layui.laydate,
textool = layui.textool;
layedit = layui.layedit,
form = layui.form;
var serviceClassName = sysServiceMation["outIsPurchaseReturns"]["key"];
var inoutitemHtml = "";//支出项目
......@@ -28,7 +28,7 @@ layui.config({
var allChooseProduct = {};
// 获取单据提交类型
var submitType = erpOrderUtil.getSubmitTypeByKey(systemOrderType["outIsPurchaseReturns"]["key"]);
var submitType = erpOrderUtil.getSubmitTypeByKey(serviceClassName);
// 单据时间
laydate.render({elem: '#operTime', type: 'datetime', value: getFormatDate(), trigger: 'click'});
......@@ -99,7 +99,7 @@ layui.config({
});
// 加载动态表单
dsFormUtil.loadPageByCode("dsFormShow", sysDsFormWithCodeType["outIsPurchaseReturns"]["key"], null);
dsFormUtil.loadPageByCode("dsFormShow", serviceClassName, null);
matchingLanguage();
......@@ -122,7 +122,7 @@ layui.config({
// 走工作流的提交审批
form.on('submit(formSubOneBean)', function(data) {
if(winui.verifyForm(data.elem)) {
activitiUtil.startProcess(sysActivitiModel["outIsPurchaseReturns"]["key"], null, function (approvalId) {
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
saveData("2", approvalId);
});
}
......
......@@ -12,6 +12,7 @@ layui.config({
form = layui.form,
laydate = layui.laydate,
table = layui.table;
var serviceClassName = sysServiceMation["outIsPurchaseReturns"]["key"];
authBtn('1571813191033');//新增
authBtn('1571990052878');//导出
......@@ -74,7 +75,7 @@ layui.config({
} else if (layEvent === 'activitiProcessDetails') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') { //撤销
erpOrderUtil.revokeOrderMation(data.processInstanceId, systemOrderType["outIsPurchaseReturns"]["key"], function() {
erpOrderUtil.revokeOrderMation(data.processInstanceId, serviceClassName, function() {
loadTable();
});
}
......@@ -90,14 +91,14 @@ layui.config({
// 删除
function deletemember(data) {
erpOrderUtil.deleteOrderMation(data.id, systemOrderType["outIsPurchaseReturns"]["key"], function() {
erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() {
loadTable();
});
}
// 提交数据
function subExamine(data) {
erpOrderUtil.submitOrderMation(data.id, systemOrderType["outIsPurchaseReturns"]["key"], data.submitType, sysActivitiModel["outIsPurchaseReturns"]["key"], function() {
erpOrderUtil.submitOrderMation(data.id, serviceClassName, data.submitType, serviceClassName, function() {
loadTable();
});
}
......
......@@ -14,16 +14,16 @@ layui.config({
var $ = layui.$,
laydate = layui.laydate,
textool = layui.textool;
layedit = layui.layedit,
form = layui.form;
var serviceClassName = sysServiceMation["outIsRetail"]["key"];
var selOption = getFileContent('tpl/template/select-option.tpl');
// 已经选择的商品集合key:表格的行trId,value:商品信息
var allChooseProduct = {};
// 获取单据提交类型
var submitType = erpOrderUtil.getSubmitTypeByKey(systemOrderType["outIsRetail"]["key"]);
var submitType = erpOrderUtil.getSubmitTypeByKey(serviceClassName);
// 单据时间
laydate.render({elem: '#operTime', type: 'datetime', value: getFormatDate(), trigger: 'click'});
......@@ -66,7 +66,7 @@ layui.config({
});
// 加载动态表单
dsFormUtil.loadPageByCode("dsFormShow", sysDsFormWithCodeType["outIsRetail"]["key"], null);
dsFormUtil.loadPageByCode("dsFormShow", serviceClassName, null);
matchingLanguage();
......@@ -146,7 +146,7 @@ layui.config({
// 走工作流的提交审批
form.on('submit(formSubOneBean)', function(data) {
if(winui.verifyForm(data.elem)) {
activitiUtil.startProcess(sysActivitiModel["outIsRetail"]["key"], null, function (approvalId) {
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
saveData("2", approvalId);
});
}
......
......@@ -12,9 +12,10 @@ layui.config({
form = layui.form,
laydate = layui.laydate,
table = layui.table;
var serviceClassName = sysServiceMation["outIsRetail"]["key"];
authBtn('1571813947377');//新增
authBtn('1572233728210');//导出
laydate.render({elem: '#operTime', range: '~'});
table.render({
......@@ -71,7 +72,7 @@ layui.config({
} else if (layEvent === 'activitiProcessDetails') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') { //撤销
erpOrderUtil.revokeOrderMation(data.processInstanceId, systemOrderType["outIsRetail"]["key"], function() {
erpOrderUtil.revokeOrderMation(data.processInstanceId, serviceClassName, function() {
loadTable();
});
}
......@@ -79,14 +80,14 @@ layui.config({
// 删除
function deletemember(data) {
erpOrderUtil.deleteOrderMation(data.id, systemOrderType["outIsRetail"]["key"], function() {
erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() {
loadTable();
});
}
// 提交数据
function subExamine(data) {
erpOrderUtil.submitOrderMation(data.id, systemOrderType["outIsRetail"]["key"], data.submitType, sysActivitiModel["outIsRetail"]["key"], function() {
erpOrderUtil.submitOrderMation(data.id, serviceClassName, data.submitType, serviceClassName, function() {
loadTable();
});
}
......
......@@ -14,16 +14,16 @@ layui.config({
var $ = layui.$,
laydate = layui.laydate,
textool = layui.textool;
layedit = layui.layedit,
form = layui.form;
var serviceClassName = sysServiceMation["putIsRetailReturns"]["key"];
var selOption = getFileContent('tpl/template/select-option.tpl');
// 已经选择的商品集合key:表格的行trId,value:商品信息
var allChooseProduct = {};
// 获取单据提交类型
var submitType = erpOrderUtil.getSubmitTypeByKey(systemOrderType["putIsRetailReturns"]["key"]);
var submitType = erpOrderUtil.getSubmitTypeByKey(serviceClassName);
// 单据时间
laydate.render({elem: '#operTime', type: 'datetime', value: getFormatDate(), trigger: 'click'});
......@@ -66,7 +66,7 @@ layui.config({
});
// 加载动态表单
dsFormUtil.loadPageByCode("dsFormShow", sysDsFormWithCodeType["putIsRetailReturns"]["key"], null);
dsFormUtil.loadPageByCode("dsFormShow", serviceClassName, null);
matchingLanguage();
......@@ -146,7 +146,7 @@ layui.config({
// 走工作流的提交审批
form.on('submit(formSubOneBean)', function(data) {
if(winui.verifyForm(data.elem)) {
activitiUtil.startProcess(sysActivitiModel["putIsRetailReturns"]["key"], null, function (approvalId) {
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
saveData("2", approvalId);
});
}
......
......@@ -12,6 +12,7 @@ layui.config({
form = layui.form,
laydate = layui.laydate,
table = layui.table;
var serviceClassName = sysServiceMation["putIsRetailReturns"]["key"];
authBtn('1571814098548');//新增
authBtn('1572242758657');//导出
......@@ -71,7 +72,7 @@ layui.config({
} else if (layEvent === 'activitiProcessDetails') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') { //撤销
erpOrderUtil.revokeOrderMation(data.processInstanceId, systemOrderType["putIsRetailReturns"]["key"], function() {
erpOrderUtil.revokeOrderMation(data.processInstanceId, serviceClassName, function() {
loadTable();
});
}
......@@ -79,14 +80,14 @@ layui.config({
// 删除
function deletemember(data) {
erpOrderUtil.deleteOrderMation(data.id, systemOrderType["putIsRetailReturns"]["key"], function() {
erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() {
loadTable();
});
}
// 提交数据
function subExamine(data) {
erpOrderUtil.submitOrderMation(data.id, systemOrderType["putIsRetailReturns"]["key"], data.submitType, sysActivitiModel["putIsRetailReturns"]["key"], function() {
erpOrderUtil.submitOrderMation(data.id, serviceClassName, data.submitType, serviceClassName, function() {
loadTable();
});
}
......
......@@ -20,9 +20,9 @@ layui.config({
var $ = layui.$,
laydate = layui.laydate,
textool = layui.textool;
layedit = layui.layedit,
form = layui.form;
var serviceClassName = sysServiceMation["outchaseOrder"]["key"];
var inoutitemHtml = "";//支出项目
var salesManList = new Array();//销售人员
......@@ -32,7 +32,7 @@ layui.config({
var allChooseProduct = {};
// 获取单据提交类型
var submitType = erpOrderUtil.getSubmitTypeByKey(systemOrderType["outchaseOrder"]["key"]);
var submitType = erpOrderUtil.getSubmitTypeByKey(serviceClassName);
// 单据时间
laydate.render({elem: '#operTime', type: 'datetime', value: getFormatDate(), trigger: 'click'});
......@@ -50,7 +50,7 @@ layui.config({
});
// 加载动态表单
dsFormUtil.loadPageByCode("dsFormShow", sysDsFormWithCodeType["outchaseOrder"]["key"], null);
dsFormUtil.loadPageByCode("dsFormShow", serviceClassName, null);
// 商品
initTableChooseUtil.initTable({
......@@ -113,7 +113,7 @@ layui.config({
// 走工作流的提交审批
form.on('submit(formSubOneBean)', function(data) {
if(winui.verifyForm(data.elem)) {
activitiUtil.startProcess(sysActivitiModel["outchaseOrder"]["key"], null, function (approvalId) {
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
saveData("2", approvalId);
});
}
......
......@@ -12,9 +12,10 @@ layui.config({
form = layui.form,
laydate = layui.laydate,
table = layui.table;
var serviceClassName = sysServiceMation["outchaseOrder"]["key"];
authBtn('1571813326930');//新增
authBtn('1571991191343');//导出
laydate.render({elem: '#operTime', range: '~'});
table.render({
......@@ -33,14 +34,14 @@ layui.config({
return '<a lay-event="details" class="notice-title-click">' + d.defaultNumber + '</a>';
}},
{ field: 'supplierName', title: '客户', rowspan: '2', align: 'left', width: 150 },
{ title: '审批模式', align: 'center', colspan: '2'},
{ title: '审批模式', align: 'center', colspan: '2' },
{ field: 'state', title: '状态', align: 'left', rowspan: '2', width: 80, templet: function (d) {
return activitiUtil.showStateName(d.state, d.submitType);
}},
{ field: 'totalPrice', title: '合计金额', align: 'left', rowspan: '2', width: 120},
{ field: 'operPersonName', title: '操作人', align: 'left', rowspan: '2', width: 100},
{ field: 'totalPrice', title: '合计金额', align: 'left', rowspan: '2', width: 120 },
{ field: 'operPersonName', title: '操作人', align: 'left', rowspan: '2', width: 100 },
{ field: 'operTime', title: '单据日期', align: 'center', rowspan: '2', width: 140 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', rowspan: '2', width: 200, toolbar: '#tableBar'}
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', rowspan: '2', width: 200, toolbar: '#tableBar' }
],[
{ field: 'submitType', title: '提交模式', align: 'left', width: 120, templet: function (d) {
return erpOrderUtil.getSubmitTypeName(d);
......@@ -72,7 +73,7 @@ layui.config({
} else if (layEvent === 'activitiProcessDetails') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') { //撤销
erpOrderUtil.revokeOrderMation(data.processInstanceId, systemOrderType["outchaseOrder"]["key"], function() {
erpOrderUtil.revokeOrderMation(data.processInstanceId, serviceClassName, function() {
loadTable();
});
}
......@@ -94,7 +95,7 @@ layui.config({
// 删除
function deletemember(data) {
erpOrderUtil.deleteOrderMation(data.id, systemOrderType["outchaseOrder"]["key"], function() {
erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() {
loadTable();
});
}
......@@ -113,7 +114,7 @@ layui.config({
// 提交数据
function subExamine(data) {
erpOrderUtil.submitOrderMation(data.id, systemOrderType["outchaseOrder"]["key"], data.submitType, sysActivitiModel["outchaseOrder"]["key"], function() {
erpOrderUtil.submitOrderMation(data.id, serviceClassName, data.submitType, serviceClassName, function() {
loadTable();
});
}
......
......@@ -19,9 +19,9 @@ layui.config({
var $ = layui.$,
laydate = layui.laydate,
textool = layui.textool;
layedit = layui.layedit,
form = layui.form;
var serviceClassName = sysServiceMation["outIsSalesOutlet"]["key"];
var inoutitemHtml = "";//支出项目
var salesManList = new Array();//销售人员
......@@ -33,7 +33,7 @@ layui.config({
var allChooseProduct = {};
// 获取单据提交类型
var submitType = erpOrderUtil.getSubmitTypeByKey(systemOrderType["outIsSalesOutlet"]["key"]);
var submitType = erpOrderUtil.getSubmitTypeByKey(serviceClassName);
// 事故时间
laydate.render({elem: '#operTime', type: 'datetime', value: getFormatDate(), trigger: 'click'});
......@@ -59,7 +59,7 @@ layui.config({
});
// 加载动态表单
dsFormUtil.loadPageByCode("dsFormShow", sysDsFormWithCodeType["outIsSalesOutlet"]["key"], null);
dsFormUtil.loadPageByCode("dsFormShow", serviceClassName, null);
//初始化回显数据
function initDataShow(){
......@@ -221,7 +221,7 @@ layui.config({
// 走工作流的提交审批
form.on('submit(formSubOneBean)', function(data) {
if(winui.verifyForm(data.elem)) {
activitiUtil.startProcess(sysActivitiModel["outIsSalesOutlet"]["key"], null, function (approvalId) {
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
saveData("2", approvalId);
});
}
......
......@@ -20,9 +20,9 @@ layui.config({
var $ = layui.$,
laydate = layui.laydate,
textool = layui.textool;
layedit = layui.layedit,
form = layui.form;
var serviceClassName = sysServiceMation["outIsSalesOutlet"]["key"];
var inoutitemHtml = "";//支出项目
var salesManList = new Array();//销售人员
......@@ -32,7 +32,7 @@ layui.config({
var allChooseProduct = {};
// 获取单据提交类型
var submitType = erpOrderUtil.getSubmitTypeByKey(systemOrderType["outIsSalesOutlet"]["key"]);
var submitType = erpOrderUtil.getSubmitTypeByKey(serviceClassName);
// 单据时间
laydate.render({elem: '#operTime', type: 'datetime', value: getFormatDate(), trigger: 'click'});
......@@ -103,7 +103,7 @@ layui.config({
});
// 加载动态表单
dsFormUtil.loadPageByCode("dsFormShow", sysDsFormWithCodeType["outIsSalesOutlet"]["key"], null);
dsFormUtil.loadPageByCode("dsFormShow", serviceClassName, null);
matchingLanguage();
......@@ -126,7 +126,7 @@ layui.config({
// 走工作流的提交审批
form.on('submit(formSubOneBean)', function(data) {
if(winui.verifyForm(data.elem)) {
activitiUtil.startProcess(sysActivitiModel["outIsSalesOutlet"]["key"], null, function (approvalId) {
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
saveData("2", approvalId);
});
}
......
......@@ -12,6 +12,7 @@ layui.config({
form = layui.form,
laydate = layui.laydate,
table = layui.table;
var serviceClassName = sysServiceMation["outIsSalesOutlet"]["key"];
authBtn('1571813632546');//添加
authBtn('1572231503534');//导出
......@@ -77,7 +78,7 @@ layui.config({
} else if (layEvent === 'activitiProcessDetails') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') { //撤销
erpOrderUtil.revokeOrderMation(data.processInstanceId, systemOrderType["outIsSalesOutlet"]["key"], function() {
erpOrderUtil.revokeOrderMation(data.processInstanceId, serviceClassName, function() {
loadTable();
});
}
......@@ -93,14 +94,14 @@ layui.config({
// 删除
function deletemember(data) {
erpOrderUtil.deleteOrderMation(data.id, systemOrderType["outIsSalesOutlet"]["key"], function() {
erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() {
loadTable();
});
}
// 提交数据
function subExamine(data) {
erpOrderUtil.submitOrderMation(data.id, systemOrderType["outIsSalesOutlet"]["key"], data.submitType, sysActivitiModel["outIsSalesOutlet"]["key"], function() {
erpOrderUtil.submitOrderMation(data.id, serviceClassName, data.submitType, serviceClassName, function() {
loadTable();
});
}
......
......@@ -20,9 +20,9 @@ layui.config({
var $ = layui.$,
laydate = layui.laydate,
textool = layui.textool;
layedit = layui.layedit,
form = layui.form;
var serviceClassName = sysServiceMation["putIsSalesReturns"]["key"];
var inoutitemHtml = "";//支出项目
var salesManList = new Array();//销售人员
......@@ -32,7 +32,7 @@ layui.config({
var allChooseProduct = {};
// 获取单据提交类型
var submitType = erpOrderUtil.getSubmitTypeByKey(systemOrderType["putIsSalesReturns"]["key"]);
var submitType = erpOrderUtil.getSubmitTypeByKey(serviceClassName);
// 单据时间
laydate.render({elem: '#operTime', type: 'datetime', value: getFormatDate(), trigger: 'click'});
......@@ -105,7 +105,7 @@ layui.config({
});
// 加载动态表单
dsFormUtil.loadPageByCode("dsFormShow", sysDsFormWithCodeType["putIsSalesReturns"]["key"], null);
dsFormUtil.loadPageByCode("dsFormShow", serviceClassName, null);
matchingLanguage();
......@@ -128,7 +128,7 @@ layui.config({
// 走工作流的提交审批
form.on('submit(formSubOneBean)', function(data) {
if(winui.verifyForm(data.elem)) {
activitiUtil.startProcess(sysActivitiModel["putIsSalesReturns"]["key"], null, function (approvalId) {
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
saveData("2", approvalId);
});
}
......
......@@ -12,6 +12,7 @@ layui.config({
form = layui.form,
laydate = layui.laydate,
table = layui.table;
var serviceClassName = sysServiceMation["putIsSalesReturns"]["key"];
authBtn('1571813781842');//添加
authBtn('1571991191343');//导出
......@@ -82,7 +83,7 @@ layui.config({
} else if (layEvent === 'activitiProcessDetails') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') { //撤销
erpOrderUtil.revokeOrderMation(data.processInstanceId, systemOrderType["putIsSalesReturns"]["key"], function() {
erpOrderUtil.revokeOrderMation(data.processInstanceId, serviceClassName, function() {
loadTable();
});
}
......@@ -90,14 +91,14 @@ layui.config({
// 删除
function deletemember(data) {
erpOrderUtil.deleteOrderMation(data.id, systemOrderType["putIsSalesReturns"]["key"], function() {
erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() {
loadTable();
});
}
// 提交数据
function subExamine(data) {
erpOrderUtil.submitOrderMation(data.id, systemOrderType["putIsSalesReturns"]["key"], data.submitType, sysActivitiModel["putIsSalesReturns"]["key"], function() {
erpOrderUtil.submitOrderMation(data.id, serviceClassName, data.submitType, serviceClassName, function() {
loadTable();
});
}
......
......@@ -14,9 +14,10 @@ layui.config({
laydate = layui.laydate;
layedit = layui.layedit,
form = layui.form;
var serviceClassName = sysServiceMation["incomeOrder"]["key"];
// 获取单据提交类型
var submitType = erpOrderUtil.getSubmitTypeByKey(systemOrderType["incomeOrder"]["key"]);
var submitType = erpOrderUtil.getSubmitTypeByKey(serviceClassName);
var selOption = getFileContent('tpl/template/select-option.tpl');
var handsPersonList = new Array();//经手人员
......@@ -26,7 +27,6 @@ layui.config({
// 初始化账户
systemCommonUtil.getSysAccountListByType(function (json) {
// 加载账户数据
$("#accountId").html(getDataUseHandlebars(selOption, json));
});
......@@ -46,7 +46,7 @@ layui.config({
// 走工作流的提交审批
form.on('submit(formSubOneBean)', function(data) {
if(winui.verifyForm(data.elem)) {
activitiUtil.startProcess(sysActivitiModel["incomeOrder"]["key"], null, function (approvalId) {
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
saveData("2", approvalId);
});
}
......
......@@ -13,6 +13,7 @@ layui.config({
var $ = layui.$,
form = layui.form,
laydate = layui.laydate;
var serviceClassName = sysServiceMation["proTask"]["key"];
var selOption = getFileContent('tpl/template/select-option.tpl');
var ue = ueEditorUtil.initEditor('taskInstructions');
......@@ -79,7 +80,7 @@ layui.config({
// 提交审批
form.on('submit(formSubBean)', function(data) {
if(winui.verifyForm(data.elem)) {
activitiUtil.startProcess(sysActivitiModel["proTask"]["key"], null, function (approvalId) {
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
saveData("2", approvalId);
});
}
......
......@@ -15,6 +15,7 @@ layui.config({
form = layui.form,
laydate = layui.laydate,
tableTree = layui.tableTreeDj;
var serviceClassName = sysServiceMation["proTask"]["key"];
authBtn('1574644930825');
......@@ -188,7 +189,7 @@ layui.config({
function subApproval(data, obj){
layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
layer.close(index);
activitiUtil.startProcess(sysActivitiModel["proTask"]["key"], null, function (approvalId) {
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
var params = {
rowId: data.id,
approvalId: approvalId
......
......@@ -22,7 +22,7 @@ var activitiUtil = {
chooseApprovalPersonMation: {},
/**
* 该地址为activitiNameKey.json的key,因为刚启动流程,还没有流程id和任务id,所以只能用这种方式
* 该地址为 sysServiceMation.json的key,因为刚启动流程,还没有流程id和任务id,所以只能用这种方式
*/
actKey: "",
......@@ -122,7 +122,7 @@ var activitiUtil = {
/**
* 启动流程时选择审批人
*
* @param actKey 该地址为activitiNameKey.json的key
* @param actKey 该地址为 sysServiceMation.json的key
* @param businessData 业务数据的对象,不支持集合
* @param callback 回调函数
*/
......
......@@ -116,7 +116,7 @@ var erpOrderUtil = {
* @param id 订单id
* @param serviceClassName 单据类型
* @param submitType 单据提交类型 1.走工作流提交 2.直接提交
* @param actKey 该地址为activitiNameKey.json的key
* @param actKey 该地址为 sysServiceMation.json的key
*/
submitOrderMation: function (id, serviceClassName, submitType, actKey, callback) {
layer.confirm('确认要提交吗?', { icon: 3, title: '提交操作' }, function (index) {
......
......@@ -80,9 +80,7 @@ MiniSite.JsLoader={
var lacolMap = {
"systemLanguage": "../../json/language.json",
"systemOrderType": "../../json/sysOrderType.json",
"sysDsFormWithCodeType": "../../json/sysDsFormWithCodeType.json",
"sysActivitiModel": "../../json/activitiNameKey.json",
"sysServiceMation": "../../json/sysServiceMation.json",
"sysDictData": "../../json/sysDictData.json",
"skyeyeClassEnum": "../../json/skyeyeClassEnum.json",
};
......@@ -92,12 +90,9 @@ var languageType = isNull(getCookie("languageType")) ? "zh" : getCookie("languag
// 系统中英文
var systemLanguage = getAndWriteLocal('systemLanguage');
// 系统单据类型
var systemOrderType = getAndWriteLocal('systemOrderType');
// 动态表单关联json文件
var sysDsFormWithCodeType = getAndWriteLocal('sysDsFormWithCodeType');
// 工作流流程模型关联json文件
var sysActivitiModel = getAndWriteLocal('sysActivitiModel');
// 系统模型关联json文件加载
var sysServiceMation = getAndWriteLocal('sysServiceMation');
// 数据字典关联json文件
var sysDictData = getAndWriteLocal('sysDictData');
// 枚举类关联json文件
......
......@@ -22,22 +22,10 @@ layui.config({
localStorage.setItem("systemLanguage", JSON.stringify(data));
});
// 系统单据类型文件加载
jsGetJsonFile("../../json/sysOrderType.json", function(data) {
systemOrderType = data;
localStorage.setItem("systemOrderType", JSON.stringify(data));
});
// 动态表单关联json文件加载
jsGetJsonFile("../../json/sysDsFormWithCodeType.json", function(data) {
sysDsFormWithCodeType = data;
localStorage.setItem("sysDsFormWithCodeType", JSON.stringify(data));
});
// 工作流流程模型关联json文件加载
jsGetJsonFile("../../json/activitiNameKey.json", function(data) {
sysActivitiModel = data;
localStorage.setItem("sysActivitiModel", JSON.stringify(data));
// 系统模型关联json文件加载
jsGetJsonFile("../../json/sysServiceMation.json", function(data) {
sysServiceMation = data;
localStorage.setItem("sysServiceMation", JSON.stringify(data));
});
// 数据字典关联json文件加载
......
{
"putIsPurchase": {"title": "采购入库单", "key": "com.skyeye.service.impl.PurchasePutServiceImpl", "modelName": "ERP模块"},
"putIsSalesReturns": {"title": "销售退货单", "key": "com.skyeye.service.impl.SalesReturnsServiceImpl", "modelName": "ERP模块"},
"putIsRetailReturns": {"title": "零售退货单", "key": "com.skyeye.service.impl.RetailReturnsServiceImpl", "modelName": "ERP模块"},
"putIsOthers": {"title": "其他入库单", "key": "com.skyeye.service.impl.OtherWareHousServiceImpl", "modelName": "ERP模块"},
"outIsSalesOutlet": {"title": "销售出库单", "key": "com.skyeye.service.impl.SalesOutLetServiceImpl", "modelName": "ERP模块"},
"outIsPurchaseReturns": {"title": "采购退货单", "key": "com.skyeye.service.impl.PurchaseReturnsServiceImpl", "modelName": "ERP模块"},
"outIsRetail": {"title": "零售出库单", "key": "com.skyeye.service.impl.RetailOutLetServiceImpl", "modelName": "ERP模块"},
"outIsOthers": {"title": "其他出库单", "key": "com.skyeye.service.impl.OtherOutLetsServiceImpl", "modelName": "ERP模块"},
"purchaseOrder": {"title": "采购订单", "key": "com.skyeye.service.impl.PurchaseOrderServiceImpl", "modelName": "ERP模块"},
"outchaseOrder": {"title": "销售订单", "key": "com.skyeye.service.impl.SalesOrderServiceImpl", "modelName": "ERP模块"}
}
\ No newline at end of file
{
"putIsPurchase": {"title": "采购入库单", "key": "com.skyeye.service.impl.PurchasePutServiceImpl"},
"putIsSalesReturns": {"title": "销售退货单", "key": "com.skyeye.service.impl.SalesReturnsServiceImpl"},
"putIsRetailReturns": {"title": "零售退货单", "key": "com.skyeye.service.impl.RetailReturnsServiceImpl"},
"putIsOthers": {"title": "其他入库单", "key": "com.skyeye.service.impl.OtherWareHousServiceImpl"},
"outIsSalesOutlet": {"title": "销售出库单", "key": "com.skyeye.service.impl.SalesOutLetServiceImpl"},
"outIsPurchaseReturns": {"title": "采购退货单", "key": "com.skyeye.service.impl.PurchaseReturnsServiceImpl"},
"outIsRetail": {"title": "零售出库单", "key": "com.skyeye.service.impl.RetailOutLetServiceImpl"},
"outIsOthers": {"title": "其他出库单", "key": "com.skyeye.service.impl.OtherOutLetsServiceImpl"},
"purchaseOrder": {"title": "采购订单", "key": "com.skyeye.service.impl.PurchaseOrderServiceImpl"},
"outchaseOrder": {"title": "销售订单", "key": "com.skyeye.service.impl.SalesOrderServiceImpl"},
"splitListOrder": {"title": "拆分订单", "key": "com.skyeye.service.impl.SplitListServiceImpl"},
"assemblySheetOrder": {"title": "组装订单", "key": "com.skyeye.service.impl.AssemblySheetServiceImpl"},
"allocationFormOrder": {"title": "调拨订单", "key": "com.skyeye.service.impl.AllocationServiceImpl"},
"putAcceptanceWarehousing": {"title": "验收入库单", "key": "com.skyeye.service.impl.AcceptanceReceiptServiceImpl"},
"machinHeader": {"title": "加工单", "key": "com.skyeye.service.impl.ErpMachinServiceImpl"},
"machinChild": {"title": "工序验收单", "key": "com.skyeye.service.impl.ErpProcessAcceptanceSheetServiceImpl"},
"productionHead": {"title": "生产计划单", "key": "com.skyeye.service.impl.ErpProductionServiceImpl"},
"pickPicking": {"title": "领料单", "key": "com.skyeye.pick.service.impl.RequisitionMaterialServiceImpl"},
"pickReplenishment": {"title": "补料单", "key": "com.skyeye.pick.service.impl.PatchMaterialServiceImpl"},
"pickReturn": {"title": "退料单", "key": "com.skyeye.pick.service.impl.ReturnMaterialServiceImpl"},
"incomeOrder": {"title": "财务明细账", "key": "com.skyeye.service.impl.IncomeServiceImpl"}
}
\ No newline at end of file
......@@ -44,6 +44,17 @@
"assetArticlesUse": {"name": "用品领用", "key": "com.skyeye.eve.articles.service.impl.AssetArticlesApplyUseServiceImpl"},
"assetArticlesPurchase": {"name": "用品采购", "key": "com.skyeye.eve.articles.service.impl.AssetArticlesApplyPurchaseServiceImpl"},
"splitListOrder": {"name": "拆分订单", "key": "com.skyeye.service.impl.SplitListServiceImpl"},
"assemblySheetOrder": {"name": "组装订单", "key": "com.skyeye.service.impl.AssemblySheetServiceImpl"},
"allocationFormOrder": {"name": "调拨订单", "key": "com.skyeye.service.impl.AllocationServiceImpl"},
"putAcceptanceWarehousing": {"name": "验收入库单", "key": "com.skyeye.service.impl.AcceptanceReceiptServiceImpl"},
"machinHeader": {"name": "加工单", "key": "com.skyeye.service.impl.ErpMachinServiceImpl"},
"machinChild": {"name": "工序验收单", "key": "com.skyeye.service.impl.ErpProcessAcceptanceSheetServiceImpl"},
"productionHead": {"name": "生产计划单", "key": "com.skyeye.service.impl.ErpProductionServiceImpl"},
"pickPicking": {"name": "领料单", "key": "com.skyeye.pick.service.impl.RequisitionMaterialServiceImpl"},
"pickReplenishment": {"name": "补料单", "key": "com.skyeye.pick.service.impl.PatchMaterialServiceImpl"},
"pickReturn": {"name": "退料单", "key": "com.skyeye.pick.service.impl.ReturnMaterialServiceImpl"},
"incomeOrder": {"name": "财务明细账", "key": "com.skyeye.service.impl.IncomeServiceImpl"},
"bossPersonRequire": {"name": "人员需求申请", "key": "com.skyeye.service.impl.BossPersonRequireServiceImpl"},
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册