Skip to content

S
Skyeye

Skyeye云 / Skyeye

通知 1440
Star 162
Fork 130
S
Skyeye
提交 eee51e66 编写于 作者: Skyeye云's avatar Skyeye云
浏览文件
操作

明细账列表修改

上级 fa9d318b
隐藏空白更改
内联 并排
Showing with 278 addition and 118 deletion
README.md
浏览文件 @ eee51e66
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
智能办公OA系统[SpringBoot2-快速开发平台]，适用于医院，学校，中小型企业等机构的管理。包含文件在线操作、工作日志、多班次考勤、CRM、ERP进销存、项目管理、EHR、拖拽式生成问卷、日程、笔记、工作计划、行政办公、薪资模块、动态表单、知识库、公告模块、企业论坛、云售后模块、生产模块、系统模块化同步模块等多种复杂业务功能。 智能办公OA系统[SpringBoot2-快速开发平台]，适用于医院，学校，中小型企业等机构的管理。包含文件在线操作、工作日志、多班次考勤、CRM、ERP进销存、项目管理、EHR、拖拽式生成问卷、日程、笔记、工作计划、行政办公、薪资模块、动态表单、知识库、公告模块、企业论坛、云售后模块、生产模块、系统模块化同步模块等多种复杂业务功能。
[近期更新内容](https://mp.weixin.qq.com/s/vdh7-hTAST0IefZdxBEozA) - [近期更新内容](https://mp.weixin.qq.com/s/MrA4tX-5wtn4-mB_RZWbxw)
- [上期更新内容](https://mp.weixin.qq.com/s/vdh7-hTAST0IefZdxBEozA)
# 开源版请下载`master`分支 # 开源版请下载`master`分支
# 开源版请下载`master`分支 # 开源版请下载`master`分支
......
admin-assistant/src/main/resources/template/js/assetArticlesPurchase/assetArticlesPurchaseList.js
浏览文件 @ eee51e66
...@@ -42,19 +42,7 @@ layui.config({ ...@@ -42,19 +42,7 @@ layui.config({
return '<a lay-event="caigouProcessDetails" class="notice-title-click">' + d.processInstanceId + '</a>'; return '<a lay-event="caigouProcessDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
}}, }},
{ field: 'stateName', title: '状态', width: 90, templet: function(d){ { field: 'stateName', title: '状态', width: 90, templet: function(d){
if(d.state == '0'){ return activitiUtil.showStateName2(d.state, 1);
return "<span>" + d.stateName + "</span>";
}else if(d.state == '1'){
return "<span class='state-new'>" + d.stateName + "</span>";
}else if(d.state == '2'){
return "<span class='state-up'>" + d.stateName + "</span>";
}else if(d.state == '3'){
return "<span class='state-down'>" + d.stateName + "</span>";
}else if(d.state == '4'){
return "<span class='state-down'>" + d.stateName + "</span>";
}else if(d.state == '5'){
return "<span class='state-error'>" + d.stateName + "</span>";
}
}}, }},
{ field: 'createTime', title: '创建时间', width: 150}, { field: 'createTime', title: '创建时间', width: 150},
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#caigouTableBar'} { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#caigouTableBar'}
......
erp/src/main/resources/template/js/otheroutlets/otheroutletsdetails.js
浏览文件 @ eee51e66
...@@ -25,7 +25,7 @@ layui.config({ ...@@ -25,7 +25,7 @@ layui.config({
winui.window.msg(data.returnMessage, {icon: 2, time: 2000}); winui.window.msg(data.returnMessage, {icon: 2, time: 2000});
} }
}, async: false}); }, async: false});
$("#statusName").html(erpOrderUtil.showStateName(json.bean.state, json.bean.submitType)); $("#statusName").html(activitiUtil.showStateName(json.bean.state, json.bean.submitType));
// 加载动态表单 // 加载动态表单
dsFormUtil.loadPageShowDetailsByObjectId("dsFormShow", json.bean.id); dsFormUtil.loadPageShowDetailsByObjectId("dsFormShow", json.bean.id);
......
erp/src/main/resources/template/js/otheroutlets/otheroutletslist.js
浏览文件 @ eee51e66
...@@ -38,7 +38,7 @@ layui.config({ ...@@ -38,7 +38,7 @@ layui.config({
{ field: 'supplierName', title: '客户', align: 'left', rowspan: '2', width: 150}, { field: 'supplierName', title: '客户', align: 'left', rowspan: '2', width: 150},
{ title: '审批模式', align: 'center', colspan: '2'}, { title: '审批模式', align: 'center', colspan: '2'},
{ field: 'state', title: '状态', align: 'left', rowspan: '2', width: 80, templet: function(d){ { field: 'state', title: '状态', align: 'left', rowspan: '2', width: 80, templet: function(d){
return erpOrderUtil.showStateName(d.state, d.submitType); return activitiUtil.showStateName(d.state, d.submitType);
}}, }},
{ field: 'totalPrice', title: '合计金额', align: 'left', rowspan: '2', width: 120}, { field: 'totalPrice', title: '合计金额', align: 'left', rowspan: '2', width: 120},
{ field: 'operPersonName', title: '操作人', align: 'left', rowspan: '2', width: 100}, { field: 'operPersonName', title: '操作人', align: 'left', rowspan: '2', width: 100},
......
erp/src/main/resources/template/js/otherwarehous/otherwarehousdetails.js
浏览文件 @ eee51e66
...@@ -25,7 +25,7 @@ layui.config({ ...@@ -25,7 +25,7 @@ layui.config({
winui.window.msg(data.returnMessage, {icon: 2, time: 2000}); winui.window.msg(data.returnMessage, {icon: 2, time: 2000});
} }
}, async: false}); }, async: false});
$("#statusName").html(erpOrderUtil.showStateName(json.bean.state, json.bean.submitType)); $("#statusName").html(activitiUtil.showStateName(json.bean.state, json.bean.submitType));
// 加载动态表单 // 加载动态表单
dsFormUtil.loadPageShowDetailsByObjectId("dsFormShow", json.bean.id); dsFormUtil.loadPageShowDetailsByObjectId("dsFormShow", json.bean.id);
......
erp/src/main/resources/template/js/otherwarehous/otherwarehouslist.js
浏览文件 @ eee51e66
...@@ -38,7 +38,7 @@ layui.config({ ...@@ -38,7 +38,7 @@ layui.config({
{ field: 'supplierName', title: '供应商', align: 'left', rowspan: '2', width: 150}, { field: 'supplierName', title: '供应商', align: 'left', rowspan: '2', width: 150},
{ title: '审批模式', align: 'center', colspan: '2'}, { title: '审批模式', align: 'center', colspan: '2'},
{ field: 'state', title: '状态', align: 'left', rowspan: '2', width: 80, templet: function(d){ { field: 'state', title: '状态', align: 'left', rowspan: '2', width: 80, templet: function(d){
return erpOrderUtil.showStateName(d.state, d.submitType); return activitiUtil.showStateName(d.state, d.submitType);
}}, }},
{ field: 'totalPrice', title: '合计金额', align: 'left', rowspan: '2', width: 120}, { field: 'totalPrice', title: '合计金额', align: 'left', rowspan: '2', width: 120},
{ field: 'operPersonName', title: '操作人', align: 'left', rowspan: '2', width: 100}, { field: 'operPersonName', title: '操作人', align: 'left', rowspan: '2', width: 100},
......
erp/src/main/resources/template/js/purchaseorder/purchaseOrderDetails.js
浏览文件 @ eee51e66
...@@ -24,7 +24,7 @@ layui.config({ ...@@ -24,7 +24,7 @@ layui.config({
winui.window.msg(data.returnMessage, {icon: 2, time: 2000}); winui.window.msg(data.returnMessage, {icon: 2, time: 2000});
} }
}, async: false}); }, async: false});
$("#statusName").html(erpOrderUtil.showStateName(json.bean.state, json.bean.submitType)); $("#statusName").html(activitiUtil.showStateName(json.bean.state, json.bean.submitType));
$("#contentIframe").attr("src", "../../tpl/erpcommon/erpOrderFlowLine.html?rowId=" + json.bean.id + "&type=4"); $("#contentIframe").attr("src", "../../tpl/erpcommon/erpOrderFlowLine.html?rowId=" + json.bean.id + "&type=4");
......
erp/src/main/resources/template/js/purchaseorder/purchaseorderlist.js
浏览文件 @ eee51e66
...@@ -46,7 +46,7 @@ layui.config({ ...@@ -46,7 +46,7 @@ layui.config({
{ field: 'supplierName', title: '供应商', rowspan: '2', align: 'left', width: 150}, { field: 'supplierName', title: '供应商', rowspan: '2', align: 'left', width: 150},
{ title: '审批模式', align: 'center', colspan: '2'}, { title: '审批模式', align: 'center', colspan: '2'},
{ field: 'state', title: '状态', rowspan: '2', align: 'left', width: 80, templet: function(d){ { field: 'state', title: '状态', rowspan: '2', align: 'left', width: 80, templet: function(d){
return erpOrderUtil.showStateName(d.state, d.submitType); return activitiUtil.showStateName(d.state, d.submitType);
}}, }},
{ field: 'totalPrice', title: '合计金额', rowspan: '2', align: 'left', width: 120}, { field: 'totalPrice', title: '合计金额', rowspan: '2', align: 'left', width: 120},
{ field: 'operPersonName', title: '操作人', rowspan: '2', align: 'left', width: 100}, { field: 'operPersonName', title: '操作人', rowspan: '2', align: 'left', width: 100},
......
erp/src/main/resources/template/js/purchaseput/purchaseputdetails.js
浏览文件 @ eee51e66
...@@ -25,7 +25,7 @@ layui.config({ ...@@ -25,7 +25,7 @@ layui.config({
} }
}, async: false}); }, async: false});
$("#statusName").html(erpOrderUtil.showStateName(json.bean.state, json.bean.submitType)); $("#statusName").html(activitiUtil.showStateName(json.bean.state, json.bean.submitType));
var str = '无'; var str = '无';
var defaultNumber = json.bean.defaultNumber; var defaultNumber = json.bean.defaultNumber;
......
erp/src/main/resources/template/js/purchaseput/purchaseputlist.js
浏览文件 @ eee51e66
...@@ -49,7 +49,7 @@ layui.config({ ...@@ -49,7 +49,7 @@ layui.config({
{ field: 'supplierName', title: '供应商', align: 'left', rowspan: '2', width: 150}, { field: 'supplierName', title: '供应商', align: 'left', rowspan: '2', width: 150},
{ title: '审批模式', align: 'center', colspan: '2'}, { title: '审批模式', align: 'center', colspan: '2'},
{ field: 'state', title: '状态', align: 'left', rowspan: '2', width: 80, templet: function(d){ { field: 'state', title: '状态', align: 'left', rowspan: '2', width: 80, templet: function(d){
return erpOrderUtil.showStateName(d.state, d.submitType); return activitiUtil.showStateName(d.state, d.submitType);
}}, }},
{ field: 'totalPrice', title: '合计金额', align: 'left', rowspan: '2', width: 120}, { field: 'totalPrice', title: '合计金额', align: 'left', rowspan: '2', width: 120},
{ field: 'taxMoney', title: '含税合计', align: 'left', rowspan: '2', width: 120 }, { field: 'taxMoney', title: '含税合计', align: 'left', rowspan: '2', width: 120 },
......
erp/src/main/resources/template/js/purchasereturns/purchasereturnsdetails.js
浏览文件 @ eee51e66
...@@ -25,7 +25,7 @@ layui.config({ ...@@ -25,7 +25,7 @@ layui.config({
winui.window.msg(data.returnMessage, {icon: 2, time: 2000}); winui.window.msg(data.returnMessage, {icon: 2, time: 2000});
} }
}, async: false}); }, async: false});
$("#statusName").html(erpOrderUtil.showStateName(json.bean.state, json.bean.submitType)); $("#statusName").html(activitiUtil.showStateName(json.bean.state, json.bean.submitType));
// 加载动态表单 // 加载动态表单
dsFormUtil.loadPageShowDetailsByObjectId("dsFormShow", json.bean.id); dsFormUtil.loadPageShowDetailsByObjectId("dsFormShow", json.bean.id);
......
erp/src/main/resources/template/js/purchasereturns/purchasereturnslist.js
浏览文件 @ eee51e66
...@@ -39,7 +39,7 @@ layui.config({ ...@@ -39,7 +39,7 @@ layui.config({
{ field: 'supplierName', title: '供应商', rowspan: '2', align: 'left', width: 150}, { 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){ { field: 'state', title: '状态', align: 'left', rowspan: '2', width: 80, templet: function(d){
return erpOrderUtil.showStateName(d.state, d.submitType); return activitiUtil.showStateName(d.state, d.submitType);
}}, }},
{ field: 'totalPrice', title: '合计金额', align: 'left', rowspan: '2', width: 120}, { field: 'totalPrice', title: '合计金额', align: 'left', rowspan: '2', width: 120},
{ field: 'taxMoney', title: '含税合计', align: 'left', rowspan: '2', width: 120 }, { field: 'taxMoney', title: '含税合计', align: 'left', rowspan: '2', width: 120 },
......
erp/src/main/resources/template/js/retailoutlet/retailoutletdetails.js
浏览文件 @ eee51e66
...@@ -25,7 +25,7 @@ layui.config({ ...@@ -25,7 +25,7 @@ layui.config({
winui.window.msg(data.returnMessage, {icon: 2, time: 2000}); winui.window.msg(data.returnMessage, {icon: 2, time: 2000});
} }
}, async: false}); }, async: false});
$("#statusName").html(erpOrderUtil.showStateName(json.bean.state, json.bean.submitType)); $("#statusName").html(activitiUtil.showStateName(json.bean.state, json.bean.submitType));
// 加载动态表单 // 加载动态表单
dsFormUtil.loadPageShowDetailsByObjectId("dsFormShow", json.bean.id); dsFormUtil.loadPageShowDetailsByObjectId("dsFormShow", json.bean.id);
......
erp/src/main/resources/template/js/retailoutlet/retailoutletlist.js
浏览文件 @ eee51e66
...@@ -38,7 +38,7 @@ layui.config({ ...@@ -38,7 +38,7 @@ layui.config({
{ field: 'supplierName', title: '会员', align: 'left', rowspan: '2', width: 150}, { field: 'supplierName', title: '会员', align: 'left', rowspan: '2', width: 150},
{ title: '审批模式', align: 'center', colspan: '2'}, { title: '审批模式', align: 'center', colspan: '2'},
{ field: 'state', title: '状态', align: 'left', rowspan: '2', width: 80, templet: function(d){ { field: 'state', title: '状态', align: 'left', rowspan: '2', width: 80, templet: function(d){
return erpOrderUtil.showStateName(d.state, d.submitType); return activitiUtil.showStateName(d.state, d.submitType);
}}, }},
{ field: 'totalPrice', title: '合计金额', align: 'left', rowspan: '2', width: 120}, { field: 'totalPrice', title: '合计金额', align: 'left', rowspan: '2', width: 120},
{ field: 'changeAmount', title: '收款', align: 'left', rowspan: '2', width: 120 }, { field: 'changeAmount', title: '收款', align: 'left', rowspan: '2', width: 120 },
......
erp/src/main/resources/template/js/retailreturns/retailReturnsDetails.js
浏览文件 @ eee51e66
...@@ -24,7 +24,7 @@ layui.config({ ...@@ -24,7 +24,7 @@ layui.config({
winui.window.msg(data.returnMessage, {icon: 2, time: 2000}); winui.window.msg(data.returnMessage, {icon: 2, time: 2000});
} }
}, async: false}); }, async: false});
$("#statusName").html(erpOrderUtil.showStateName(json.bean.state, json.bean.submitType)); $("#statusName").html(activitiUtil.showStateName(json.bean.state, json.bean.submitType));
// 加载动态表单 // 加载动态表单
dsFormUtil.loadPageShowDetailsByObjectId("dsFormShow", json.bean.id); dsFormUtil.loadPageShowDetailsByObjectId("dsFormShow", json.bean.id);
......
erp/src/main/resources/template/js/retailreturns/retailreturnslist.js
浏览文件 @ eee51e66
...@@ -38,7 +38,7 @@ layui.config({ ...@@ -38,7 +38,7 @@ layui.config({
{ field: 'supplierName', title: '会员', align: 'left', rowspan: '2', width: 150}, { field: 'supplierName', title: '会员', align: 'left', rowspan: '2', width: 150},
{ title: '审批模式', align: 'center', colspan: '2'}, { title: '审批模式', align: 'center', colspan: '2'},
{ field: 'state', title: '状态', align: 'left', rowspan: '2', width: 80, templet: function(d){ { field: 'state', title: '状态', align: 'left', rowspan: '2', width: 80, templet: function(d){
return erpOrderUtil.showStateName(d.state, d.submitType); return activitiUtil.showStateName(d.state, d.submitType);
}}, }},
{ field: 'totalPrice', title: '合计金额', align: 'left', rowspan: '2', width: 120}, { field: 'totalPrice', title: '合计金额', align: 'left', rowspan: '2', width: 120},
{ field: 'changeAmount', title: '退款', align: 'left', rowspan: '2', width: 120 }, { field: 'changeAmount', title: '退款', align: 'left', rowspan: '2', width: 120 },
......
erp/src/main/resources/template/js/salesorder/salesorderdetails.js
浏览文件 @ eee51e66
...@@ -28,7 +28,7 @@ layui.config({ ...@@ -28,7 +28,7 @@ layui.config({
winui.window.msg(data.returnMessage, {icon: 2, time: 2000}); winui.window.msg(data.returnMessage, {icon: 2, time: 2000});
} }
}, async: false}); }, async: false});
$("#statusName").html(erpOrderUtil.showStateName(json.bean.state, json.bean.submitType)); $("#statusName").html(activitiUtil.showStateName(json.bean.state, json.bean.submitType));
$("#contentIframe").attr("src", "../../tpl/erpcommon/erpOrderFlowLine.html?rowId=" + json.bean.id + "&type=1"); $("#contentIframe").attr("src", "../../tpl/erpcommon/erpOrderFlowLine.html?rowId=" + json.bean.id + "&type=1");
......
erp/src/main/resources/template/js/salesorder/salesorderlist.js
浏览文件 @ eee51e66
...@@ -38,7 +38,7 @@ layui.config({ ...@@ -38,7 +38,7 @@ layui.config({
{ field: 'supplierName', title: '客户', rowspan: '2', align: 'left', width: 150}, { 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){ { field: 'state', title: '状态', align: 'left', rowspan: '2', width: 80, templet: function(d){
return erpOrderUtil.showStateName(d.state, d.submitType); return activitiUtil.showStateName(d.state, d.submitType);
}}, }},
{ field: 'totalPrice', title: '合计金额', align: 'left', rowspan: '2', width: 120}, { field: 'totalPrice', title: '合计金额', align: 'left', rowspan: '2', width: 120},
{ field: 'operPersonName', title: '操作人', align: 'left', rowspan: '2', width: 100}, { field: 'operPersonName', title: '操作人', align: 'left', rowspan: '2', width: 100},
......
erp/src/main/resources/template/js/salesoutlet/salesoutletdetails.js
浏览文件 @ eee51e66
...@@ -24,7 +24,7 @@ layui.config({ ...@@ -24,7 +24,7 @@ layui.config({
winui.window.msg(data.returnMessage, {icon: 2, time: 2000}); winui.window.msg(data.returnMessage, {icon: 2, time: 2000});
} }
}, async: false}); }, async: false});
$("#statusName").html(erpOrderUtil.showStateName(json.bean.state, json.bean.submitType)); $("#statusName").html(activitiUtil.showStateName(json.bean.state, json.bean.submitType));
var str = '无'; var str = '无';
var defaultNumber = json.bean.defaultNumber; var defaultNumber = json.bean.defaultNumber;
......
erp/src/main/resources/template/js/salesoutlet/salesoutletlist.js
浏览文件 @ eee51e66
...@@ -42,7 +42,7 @@ layui.config({ ...@@ -42,7 +42,7 @@ layui.config({
{ field: 'supplierName', title: '客户', align: 'left', rowspan: '2', width: 150}, { field: 'supplierName', title: '客户', align: 'left', rowspan: '2', width: 150},
{ title: '审批模式', align: 'center', colspan: '2'}, { title: '审批模式', align: 'center', colspan: '2'},
{ field: 'state', title: '状态', align: 'left', rowspan: '2', width: 80, templet: function(d){ { field: 'state', title: '状态', align: 'left', rowspan: '2', width: 80, templet: function(d){
return erpOrderUtil.showStateName(d.state, d.submitType); return activitiUtil.showStateName(d.state, d.submitType);
}}, }},
{ field: 'totalPrice', title: '合计金额', align: 'left', rowspan: '2', width: 120}, { field: 'totalPrice', title: '合计金额', align: 'left', rowspan: '2', width: 120},
{ field: 'taxMoney', title: '含税合计', align: 'left', rowspan: '2', width: 120 }, { field: 'taxMoney', title: '含税合计', align: 'left', rowspan: '2', width: 120 },
......
erp/src/main/resources/template/js/salesreturns/salesReturnsDetails.js
浏览文件 @ eee51e66
...@@ -25,7 +25,7 @@ layui.config({ ...@@ -25,7 +25,7 @@ layui.config({
winui.window.msg(data.returnMessage, {icon: 2, time: 2000}); winui.window.msg(data.returnMessage, {icon: 2, time: 2000});
} }
}, async: false}); }, async: false});
$("#statusName").html(erpOrderUtil.showStateName(json.bean.state, json.bean.submitType)); $("#statusName").html(activitiUtil.showStateName(json.bean.state, json.bean.submitType));
// 加载动态表单 // 加载动态表单
dsFormUtil.loadPageShowDetailsByObjectId("dsFormShow", json.bean.id); dsFormUtil.loadPageShowDetailsByObjectId("dsFormShow", json.bean.id);
......
erp/src/main/resources/template/js/salesreturns/salesreturnslist.js
浏览文件 @ eee51e66
...@@ -47,7 +47,7 @@ layui.config({ ...@@ -47,7 +47,7 @@ layui.config({
{ field: 'supplierName', title: '客户', align: 'left', rowspan: '2', width: 150}, { field: 'supplierName', title: '客户', align: 'left', rowspan: '2', width: 150},
{ title: '审批模式', align: 'center', colspan: '2'}, { title: '审批模式', align: 'center', colspan: '2'},
{ field: 'state', title: '状态', align: 'left', rowspan: '2', width: 80, templet: function(d){ { field: 'state', title: '状态', align: 'left', rowspan: '2', width: 80, templet: function(d){
return erpOrderUtil.showStateName(d.state, d.submitType); return activitiUtil.showStateName(d.state, d.submitType);
}}, }},
{ field: 'totalPrice', title: '合计金额', align: 'left', rowspan: '2', width: 120}, { field: 'totalPrice', title: '合计金额', align: 'left', rowspan: '2', width: 120},
{ field: 'taxMoney', title: '含税合计', align: 'left', rowspan: '2', width: 120 }, { field: 'taxMoney', title: '含税合计', align: 'left', rowspan: '2', width: 120 },
......
ifs/src/main/resources/template/js/income/incomeAdd.js
浏览文件 @ eee51e66
...@@ -12,10 +12,12 @@ layui.config({ ...@@ -12,10 +12,12 @@ layui.config({
var index = parent.layer.getFrameIndex(window.name); var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$, var $ = layui.$,
laydate = layui.laydate; laydate = layui.laydate;
layedit = layui.layedit, layedit = layui.layedit,
form = layui.form; form = layui.form;
// 获取单据提交类型
var submitType = erpOrderUtil.getSubmitTypeByOrderType(systemOrderType["incomeOrder"]["orderType"]);
var selOption = getFileContent('tpl/template/select-option.tpl'); var selOption = getFileContent('tpl/template/select-option.tpl');
var handsPersonList = new Array();//经手人员 var handsPersonList = new Array();//经手人员
...@@ -38,35 +40,73 @@ layui.config({ ...@@ -38,35 +40,73 @@ layui.config({
matchingLanguage(); matchingLanguage();
form.render(); form.render();
// 保存为草稿
form.on('submit(formAddBean)', function(data) { form.on('submit(formAddBean)', function(data) {
if(winui.verifyForm(data.elem)) { if(winui.verifyForm(data.elem)) {
var result = voucherUtil.getData(); saveData("1", "");
console.log(result);
if(result.length < 2){
return false;
}
var params = {
organId: sysCustomerUtil.customerMation.id,
handsPersonId: handsPersonList[0].id,
operTime: $("#operTime").val(),
accountId: $("#accountId").val(),
remark: $("#remark").val(),
changeAmount: $("#changeAmount").val(),
initemStr: JSON.stringify(result)
};
AjaxPostUtil.request({url: reqBasePath + "income002", params: params, type: 'json', method: "POST", callback: function(json) {
if(json.returnCode == 0) {
dsFormUtil.savePageData("dsFormShow", json.bean.id);
parent.layer.close(index);
parent.refreshCode = '0';
} else {
winui.window.msg(json.returnMessage, {icon: 2, time: 2000});
}
}});
} }
return false; return false;
}); });
// 走工作流的提交审批
form.on('submit(formSubOneBean)', function(data) {
if(winui.verifyForm(data.elem)) {
activitiUtil.startProcess(sysActivitiModel["incomeOrder"]["key"], function (approvalId) {
saveData("2", approvalId);
});
}
return false;
});
// 不走工作流的提交
form.on('submit(formSubTwoBean)', function(data) {
if(winui.verifyForm(data.elem)) {
saveData("2", "");
}
return false;
});
function saveData(subType, approvalId){
var result = voucherUtil.getData();
if(result.length < 2){
return false;
}
var params = {
organType: $("#correspondentUnitType").val(),
organId: getOrganId(),
type: dsFormUtil.dsFormObjectRelationChoose.id,
handsPersonId: handsPersonList[0].id,
operTime: $("#operTime").val(),
accountId: $("#accountId").val(),
remark: $("#remark").val(),
setOfBooksId: sysIfsUtil.ifsSetOfBooksMation.id,
initemStr: JSON.stringify(result),
submitType: submitType,
subType: subType,
approvalId: approvalId
};
AjaxPostUtil.request({url: reqBasePath + "income002", params: params, type: 'json', method: "POST", callback: function(json) {
if(json.returnCode == 0) {
dsFormUtil.savePageData("dsFormShow", json.bean.id);
parent.layer.close(index);
parent.refreshCode = '0';
} else {
winui.window.msg(json.returnMessage, {icon: 2, time: 2000});
}
}});
}
function getOrganId(){
var correspondentUnitType = $("#correspondentUnitType").val();
if(correspondentUnitType == 1){
// 供应商
return sysSupplierUtil.supplierMation.id;
} else if (correspondentUnitType == 2){
// 客户
return sysCustomerUtilcustomerMation;
}
}
// 往来单位变化监听 // 往来单位变化监听
form.on('select(correspondentUnitType)', function(data){ form.on('select(correspondentUnitType)', function(data){
$("#customName").val(""); $("#customName").val("");
......
ifs/src/main/resources/template/js/income/incomeList.js
浏览文件 @ eee51e66
...@@ -34,15 +34,29 @@ layui.config({ ...@@ -34,15 +34,29 @@ layui.config({
limits: getLimits(), limits: getLimits(),
limit: getLimit(), limit: getLimit(),
cols: [[ cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers'}, { title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '2', type: 'numbers'},
{ field: 'billNo', title: '单据编号', align: 'left', width: 200, templet: function(d){ { field: 'billNo', title: '单据编号', align: 'left', rowspan: '2', width: 200, templet: function(d){
return '<a lay-event="details" class="notice-title-click">' + d.billNo + '</a>'; return '<a lay-event="details" class="notice-title-click">' + d.billNo + '</a>';
}}, }},
{ field: 'customerName', title: '往来单位', align: 'left', width: 150}, { title: '审批模式', align: 'center', colspan: '2'},
{ field: 'totalPrice', title: '合计金额', align: 'left', width: 120}, { field: 'state', title: '状态', align: 'left', rowspan: '2', width: 80, templet: function(d){
{ field: 'hansPersonName', title: '经手人', align: 'left', width: 100}, return activitiUtil.showStateName2(d.state, d.submitType);
{ field: 'billTime', title: '单据日期', align: 'center', width: 140 }, }},
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'} { field: 'organTypeName', title: '往来单类型', rowspan: '2', align: 'left', width: 100},
{ field: 'supplierName', title: '往来单位', rowspan: '2', align: 'left', width: 150},
{ field: 'totalPrice', title: '合计金额', rowspan: '2', align: 'left', width: 120},
{ field: 'handsPersonName', title: '经手人', rowspan: '2', align: 'left', width: 120},
{ field: 'operTime', title: '单据日期', rowspan: '2', align: 'center', width: 140 },
{ field: 'userName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', width: 110 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', rowspan: '2', align: 'center', width: 200, toolbar: '#tableBar'}
],[
{ field: 'submitType', title: '提交模式', align: 'left', width: 120, templet: function(d){
return erpOrderUtil.getSubmitTypeName(d);
}},
{ field: 'processInstanceId', title: '流程实例id', align: 'left', width: 120, templet: function(d){
return erpOrderUtil.getProcessInstanceIdBySubmitType(d);
}}
]], ]],
done: function(){ done: function(){
matchingLanguage(); matchingLanguage();
...@@ -59,6 +73,14 @@ layui.config({ ...@@ -59,6 +73,14 @@ layui.config({
details(data); details(data);
}else if (layEvent === 'edit') { //编辑 }else if (layEvent === 'edit') { //编辑
edit(data); edit(data);
}else if (layEvent === 'submitToSave') { //提交
subExamine(data, 'submitToSave');
}else if (layEvent === 'subExamine') { //提交审核
subExamine(data, 'subExamine');
}else if (layEvent === 'activitiProcessDetails') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
}else if (layEvent === 'revoke') { //撤销
revorke(data);
} }
}); });
...@@ -80,13 +102,13 @@ layui.config({ ...@@ -80,13 +102,13 @@ layui.config({
if(treeNode == undefined) { if(treeNode == undefined) {
orderType = ""; orderType = "";
} else { } else {
if(treeNode.isParent != 0){ if(treeNode.id != 0 && treeNode.isParent != 0){
return; return;
} }
// 订单类型 // 订单类型
orderType = treeNode.id; orderType = treeNode.id == 0 ? "" : treeNode.id;
} }
loadTable(); refreshTable();
} }
/********* tree 处理 end *************/ /********* tree 处理 end *************/
...@@ -134,6 +156,55 @@ layui.config({ ...@@ -134,6 +156,55 @@ layui.config({
}}); }});
} }
// 撤销用品采购
function revorke(data){
layer.confirm('确认撤销该申请吗？', { icon: 3, title: '撤销操作' }, function (index) {
layer.close(index);
AjaxPostUtil.request({url: reqBasePath + "", params: {processInstanceId: data.processInstanceId}, type: 'json', callback: function(json){
if(json.returnCode == 0){
winui.window.msg("提交成功", {icon: 1, time: 2000});
loadCaigouTable();
}else{
winui.window.msg(json.returnMessage, {icon: 2, time: 2000});
}
}});
});
}
// 提交数据
function subExamine(data, type){
layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
layer.close(index);
if(type == 'submitToSave'){
// 直接提交
var params = {
rowId: data.id,
approvalId: ""
};
subToData(params);
}else{
// 工作流提交
activitiUtil.startProcess(sysActivitiModel["incomeOrder"]["key"], function (approvalId) {
var params = {
rowId: data.id,
approvalId: approvalId
};
subToData(params);
});
}
});
}
function subToData(params){
AjaxPostUtil.request({url: reqBasePath + "", params: params, type: 'json', callback: function(json){
if(json.returnCode == 0){
winui.window.msg("提交成功", {icon: 1, time: 2000});
loadCaigouTable();
}else{
winui.window.msg(json.returnMessage, {icon: 2, time: 2000});
}
}});
}
// 添加 // 添加
$("body").on("click", "#addBean", function(){ $("body").on("click", "#addBean", function(){
_openNewWindows({ _openNewWindows({
...@@ -191,7 +262,7 @@ layui.config({ ...@@ -191,7 +262,7 @@ layui.config({
} }
return { return {
billNo: $("#billNo").val(), billNo: $("#billNo").val(),
orderType: orderType, type: orderType,
startTime: startTime, startTime: startTime,
endTime: endTime endTime: endTime
}; };
......
ifs/src/main/resources/template/tpl/income/incomeAdd.html
浏览文件 @ eee51e66
...@@ -83,8 +83,10 @@ ...@@ -83,8 +83,10 @@
</div> </div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<div class="layui-input-block"> <div class="layui-input-block">
<button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button> <button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
<button class="winui-btn" lay-submit lay-filter="formAddBean"><language showName="com.skyeye.save"></language></button> <button class="winui-btn" lay-submit lay-filter="formAddBean">保存为草稿</button>
<button class="winui-btn submitTypeIsOne" lay-submit lay-filter="formSubOneBean">提交审批</button>
<button class="winui-btn submitTypeIsTwo" lay-submit lay-filter="formSubTwoBean">提交</button>
</div> </div>
</div> </div>
</form> </form>
......
ifs/src/main/resources/template/tpl/income/incomeList.html
浏览文件 @ eee51e66
...@@ -46,11 +46,38 @@ ...@@ -46,11 +46,38 @@
</div> </div>
<script type="text/html" id="tableBar"> <script type="text/html" id="tableBar">
{{# if(auth('1571638030608')){ }} <!-- 单据提交类型 1.走工作流提交 2.直接提交-->
<a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a> {{# if(d.submitType == 1){ }}
{{# } }} {{# if(d.editRow == '1'){ }}
{{# if(auth('1571638039187')){ }} {{# if(auth('')){ }}
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a> <a class="layui-btn layui-btn-xs" lay-event="subExamine">提交审核</a>
{{# } }}
{{# if(auth('1571638039187')){ }}
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
{{# } }}
{{# } }}
{{# if(d.editRow == '1' || d.editRow == '2'){ }}
{{# if(auth('1571638030608')){ }}
<a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# } }}
{{# if(d.editRow == '2'){ }}
{{# if(auth('')){ }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
{{# } }}
{{# } }}
{{# } else if(d.submitType == 2) { }}
{{# if(d.state == 0){ }}
{{# if(auth('1571638030608')){ }}
<a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# if(auth('1571638039187')){ }}
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
{{# } }}
{{# if(auth('')){ }}
<a class="layui-btn layui-btn-xs" lay-event="submitToSave">提交</a>
{{# } }}
{{# } }}
{{# } }} {{# } }}
</script> </script>
......
web/src/main/resources/template/assets/lib/layui/customer/activitiUtil.js
浏览文件 @ eee51e66
...@@ -312,6 +312,66 @@ var activitiUtil = { ...@@ -312,6 +312,66 @@ var activitiUtil = {
}); });
}); });
} },
showStateName: function (state, submitType){
if(submitType == 1){
if(state == '0'){
return "<span class='state-down'>未审核</span>";
}else if(state == '1'){
return "<span class='state-up'>审核中</span>";
}else if(state == '2'){
return "<span class='state-new'>审核通过</span>";
}else if(state == '3'){
return "<span class='state-down'>拒绝通过</span>";
}else if(state == '4'){
return "<span class='state-new'>已完成</span>";
}else if(state == '5'){
return "<span class='state-error'>撤销</span>";
}else{
return "参数错误";
}
} else if(submitType == 2){
if(state == '0'){
return "<span class='state-down'>未提交</span>";
}else if(state == '2'){
return "<span class='state-new'>已提交</span>";
}else if(state == '4'){
return "<span class='state-new'>已完成</span>";
}else{
return "参数错误";
}
}
},
showStateName2: function (state, submitType){
if(submitType == 1){
if(state == '0'){
return "<span>草稿</span>";
}else if(state == '1'){
return "<span class='state-up'>审核中</span>";
}else if(state == '2'){
return "<span class='state-new'>审核通过</span>";
}else if(state == '3'){
return "<span class='state-down'>拒绝通过</span>";
}else if(state == '4'){
return "<span class='state-down'>作废</span>";
}else if(state == '5'){
return "<span class='state-error'>撤销</span>";
}else{
return "参数错误";
}
} else if(submitType == 2){
if(state == '0'){
return "<span>草稿</span>";
}else if(state == '2'){
return "<span class='state-new'>已提交</span>";
}else if(state == '4'){
return "<span class='state-new'>作废</span>";
}else{
return "参数错误";
}
}
},
}; };
\ No newline at end of file
web/src/main/resources/template/assets/lib/layui/customer/erpOrderUtil.js
浏览文件 @ eee51e66
...@@ -201,36 +201,6 @@ var erpOrderUtil = { ...@@ -201,36 +201,6 @@ var erpOrderUtil = {
return ''; return '';
}, },
showStateName: function (state, submitType){
if(submitType == 1){
if(state == '0'){
return "<span class='state-down'>未审核</span>";
}else if(state == '1'){
return "<span class='state-up'>审核中</span>";
}else if(state == '2'){
return "<span class='state-new'>审核通过</span>";
}else if(state == '3'){
return "<span class='state-down'>拒绝通过</span>";
}else if(state == '4'){
return "<span class='state-new'>已完成</span>";
}else if(state == '5'){
return "<span class='state-error'>撤销</span>";
}else{
return "参数错误";
}
} else if(submitType == 2){
if(state == '0'){
return "<span class='state-down'>未提交</span>";
}else if(state == '2'){
return "<span class='state-new'>已提交</span>";
}else if(state == '4'){
return "<span class='state-new'>已完成</span>";
}else{
return "参数错误";
}
}
},
/** /**
* 获取所有仓库信息 * 获取所有仓库信息
* *
......
web/src/main/resources/template/assets/lib/layui/customer/voucher/voucherUtil.js
浏览文件 @ eee51e66
...@@ -194,12 +194,14 @@ var voucherUtil = { ...@@ -194,12 +194,14 @@ var voucherUtil = {
winui.window.msg("借方金额和贷方金额最少填写一项.", {icon: 2, time: 2000}); winui.window.msg("借方金额和贷方金额最少填写一项.", {icon: 2, time: 2000});
return false; return false;
} }
var eachAmount = isNull(debiteMoney) ? creditMoney : debiteMoney;
var directionType = isNull(debiteMoney) ? 2 : 1;
result.push({ result.push({
remark: _this.find(".col_summary").find("textarea").val(), remark: _this.find(".col_summary").find("textarea").val(),
voucherId: _this.find(".col_voucher").find(".cell_val").attr("dataId"), voucherId: _this.find(".col_voucher").find(".cell_val").attr("dataId"),
subjectId: subjectId, subjectId: subjectId,
debiteMoney: debiteMoney, eachAmount: eachAmount,
creditMoney: creditMoney directionType: directionType
}); });
}); });
return result; return result;
......
web/src/main/resources/template/json/activitiNameKey.json
浏览文件 @ eee51e66
...@@ -30,5 +30,7 @@ ...@@ -30,5 +30,7 @@
"assetManageReturn": {"name": "资产归还", "key": "../../tpl/assetManageReturn/assetManageReturnAdd.html", "complate": true}, "assetManageReturn": {"name": "资产归还", "key": "../../tpl/assetManageReturn/assetManageReturnAdd.html", "complate": true},
"assetManagePurchase": {"name": "资产采购", "key": "../../tpl/assetManagePurchase/assetManagePurchaseAdd.html", "complate": true}, "assetManagePurchase": {"name": "资产采购", "key": "../../tpl/assetManagePurchase/assetManagePurchaseAdd.html", "complate": true},
"assetArticlesUse": {"name": "用品领用", "key": "../../tpl/assetArticlesUse/assetArticlesUseAdd.html", "complate": true}, "assetArticlesUse": {"name": "用品领用", "key": "../../tpl/assetArticlesUse/assetArticlesUseAdd.html", "complate": true},
"assetArticlesPurchase": {"name": "用品采购", "key": "../../tpl/assetArticlesPurchase/assetArticlesPurchaseAdd.html", "complate": true} "assetArticlesPurchase": {"name": "用品采购", "key": "../../tpl/assetArticlesPurchase/assetArticlesPurchaseAdd.html", "complate": true},
"incomeOrder": {"name": "财务明细账", "key": "../../tpl/income/incomeAdd.html", "complate": true}
} }
\ No newline at end of file
web/src/main/resources/template/json/sysOrderType.json
浏览文件 @ eee51e66
...@@ -20,10 +20,7 @@ ...@@ -20,10 +20,7 @@
"pickPicking": {"title": "领料单", "code": "LLDD", "orderType": 19}, "pickPicking": {"title": "领料单", "code": "LLDD", "orderType": 19},
"pickReplenishment": {"title": "补料单", "code": "BLDD", "orderType": 20}, "pickReplenishment": {"title": "补料单", "code": "BLDD", "orderType": 20},
"pickReturn": {"title": "退料单", "code": "TLDD", "orderType": 21}, "pickReturn": {"title": "退料单", "code": "TLDD", "orderType": 21},
"expenditureOrder": {"title": "支出订单", "code": "CWZCDD", "orderType": 22},
"incomeOrder": {"title": "收入订单", "code": "CWSRDD", "orderType": 23}, "incomeOrder": {"title": "财务明细账", "code": "CWMXZ", "orderType": 22}
"receivablesOrder": {"title": "收款订单", "code": "CWSKDD", "orderType": 24},
"paymentOrder": {"title": "付款订单", "code": "CWFKDD", "orderType": 25},
"transferOrder": {"title": "转账订单", "code": "CWZZDD", "orderType": 26},
"advanceOrder": {"title": "收预付款", "code": "CWYFDD", "orderType": 27}
} }
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或