From 9e99b78c227e9cc6eb76cfed99b698e911828ddb Mon Sep 17 00:00:00 2001
From: "3038696639@qq.com" <3038696639@qq.com>
Date: Wed, 16 Oct 2019 14:13:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A6=E6=88=B7=E6=B5=81?=
 =?UTF-8?q?=E6=B0=B4=E6=A0=B7=E5=BC=8F=E4=B8=8E=E6=B5=81=E6=B0=B4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2SQL=E8=AF=AD=E5=8F=A5=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/skyeye/service/impl/AccountServiceImpl.java  | 3 +++
 .../src/main/resources/dbmapper/erp/AccountMapper.xml     | 2 ++
 .../src/main/resources/template/js/account/accountitem.js | 8 ++++----
 3 files changed, 9 insertions(+), 4 deletions(-)

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<String, Object> 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<String, Object> 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<String, Object> 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)
     </select>
     
     <select id="queryAccountListToSelect" parameterType="java.util.Map" resultType="java.util.Map">
@@ -199,5 +200,6 @@
         WHERE
             d.account_id = #{id}
         AND d.tenant_id = #{userId}
+        AND d.sub_type NOT IN(10,11)
     </select>
 </mapper>
\ 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 "<span class='state-down'>出库</span>";
                 }else if(d.type == '2'){
@@ -30,7 +30,7 @@ layui.config({
                     return "<span class='state-error'>参数错误</span>";
                 }
             }},
-            { 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 "<span class='state-up'>入库</span>";
                 }else if(d.subType == '2'){
@@ -55,7 +55,7 @@ layui.config({
                     return "<span class='state-error'>参数错误</span>";
                 }
             }},
-            { 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 "<span class='state-error'>未审核</span>";
                     }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 "<span class='state-up'>现金</span>";
                 }else if(d.payType == '2'){