diff --git a/erp-modular/src/main/java/com/skyeye/service/impl/AccountServiceImpl.java b/erp-modular/src/main/java/com/skyeye/service/impl/AccountServiceImpl.java index d837cef1..8b835e4c 100644 --- a/erp-modular/src/main/java/com/skyeye/service/impl/AccountServiceImpl.java +++ b/erp-modular/src/main/java/com/skyeye/service/impl/AccountServiceImpl.java @@ -97,6 +97,7 @@ public class AccountServiceImpl implements AccountService { * @throws Exception */ @Override + @Transactional(value="transactionManager") public void deleteAccountById(InputObject inputObject, OutputObject outputObject) throws Exception { Map params = inputObject.getParams(); params.put("userId", inputObject.getLogParams().get("id")); @@ -111,6 +112,7 @@ public class AccountServiceImpl implements AccountService { * @throws Exception */ @Override + @Transactional(value="transactionManager") public void editAccountById(InputObject inputObject, OutputObject outputObject) throws Exception { Map params = inputObject.getParams(); params.put("userId", inputObject.getLogParams().get("id")); @@ -140,6 +142,7 @@ public class AccountServiceImpl implements AccountService { * @throws Exception */ @Override + @Transactional(value="transactionManager") public void editAccountByIdAndIsDefault(InputObject inputObject, OutputObject outputObject) throws Exception { Map params = inputObject.getParams(); params.put("userId", inputObject.getLogParams().get("id")); diff --git a/erp-modular/src/main/resources/dbmapper/erp/AccountMapper.xml b/erp-modular/src/main/resources/dbmapper/erp/AccountMapper.xml index 487eded5..1398bf39 100644 --- a/erp-modular/src/main/resources/dbmapper/erp/AccountMapper.xml +++ b/erp-modular/src/main/resources/dbmapper/erp/AccountMapper.xml @@ -176,6 +176,7 @@ d.account_id = #{id} AND d.tenant_id = #{userId} AND d.delete_flag = 0 + AND d.sub_type NOT IN(10,11) \ No newline at end of file diff --git a/erp-modular/src/main/resources/template/js/account/accountitem.js b/erp-modular/src/main/resources/template/js/account/accountitem.js index 4fd0d7c3..cdb172c9 100644 --- a/erp-modular/src/main/resources/template/js/account/accountitem.js +++ b/erp-modular/src/main/resources/template/js/account/accountitem.js @@ -21,7 +21,7 @@ layui.config({ cols: [[ { title: '序号', type: 'numbers'}, { field: 'number', title: '票据号', align: 'center',width: 200}, - { field: 'type', title: '类型', align: 'center',width: 150, templet: function (d) { + { field: 'type', title: '类型', align: 'center',width: 80, templet: function (d) { if(d.type == '1'){ return "出库"; }else if(d.type == '2'){ @@ -30,7 +30,7 @@ layui.config({ return "参数错误"; } }}, - { field: 'subType', title: '出入库分类', align: 'left',width: 150, templet: function(d){ + { field: 'subType', title: '出入库分类', align: 'left',width: 100, templet: function(d){ if(d.subType == '1'){ return "入库"; }else if(d.subType == '2'){ @@ -55,7 +55,7 @@ layui.config({ return "参数错误"; } }}, - { field: 'status', title: '状态', align: 'left',width: 150, templet: function (d) { + { field: 'status', title: '状态', align: 'left',width: 120, templet: function (d) { if(d.status == '0'){ return "未审核"; }else if(d.status == '1'){ @@ -69,7 +69,7 @@ layui.config({ } }}, { field: 'totalPrice', title: '合计金额', align: 'left',width: 100}, - { field: 'payType', title: '付款类型', align: 'center',width: 100, templet: function (d) { + { field: 'payType', title: '付款类型', align: 'center',width: 80, templet: function (d) { if(d.payType == '1'){ return "现金"; }else if(d.payType == '2'){