From 81bac3433c68967f9e1c43992faf3250d9bf3d18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 6 Jul 2021 22:26:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=9B=BE=E6=A0=87=E7=9A=84=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bill/AllocationOutList.vue      |  2 +-
 jshERP-web/src/views/bill/AssembleList.vue    |  2 +-
 jshERP-web/src/views/bill/DisassembleList.vue |  2 +-
 jshERP-web/src/views/bill/OtherInList.vue     |  2 +-
 jshERP-web/src/views/bill/OtherOutList.vue    |  2 +-
 .../src/views/bill/PurchaseBackList.vue       |  6 +--
 jshERP-web/src/views/bill/PurchaseInList.vue  |  2 +-
 .../src/views/bill/PurchaseOrderList.vue      |  2 +-
 jshERP-web/src/views/bill/RetailBackList.vue  |  2 +-
 jshERP-web/src/views/bill/RetailOutList.vue   |  2 +-
 jshERP-web/src/views/bill/SaleBackList.vue    |  6 +--
 jshERP-web/src/views/bill/SaleOrderList.vue   |  2 +-
 jshERP-web/src/views/bill/SaleOutList.vue     |  2 +-
 .../views/bill/modules/PurchaseBackModal.vue  |  2 +-
 .../src/views/bill/modules/RetailOutModal.vue | 39 +++++++++++++++++--
 .../src/views/bill/modules/SaleBackModal.vue  |  2 +-
 .../src/views/financial/AdvanceInList.vue     |  2 +-
 jshERP-web/src/views/financial/GiroList.vue   |  2 +-
 jshERP-web/src/views/financial/ItemInList.vue |  2 +-
 .../src/views/financial/ItemOutList.vue       |  2 +-
 .../src/views/financial/MoneyInList.vue       |  2 +-
 .../src/views/financial/MoneyOutList.vue      |  2 +-
 jshERP-web/src/views/system/TenantList.vue    | 22 ++++++++++-
 jshERP-web/src/views/user/Login.vue           |  4 ++
 24 files changed, 85 insertions(+), 30 deletions(-)

diff --git a/jshERP-web/src/views/bill/AllocationOutList.vue b/jshERP-web/src/views/bill/AllocationOutList.vue
index 218247576..7fa883658 100644
--- a/jshERP-web/src/views/bill/AllocationOutList.vue
+++ b/jshERP-web/src/views/bill/AllocationOutList.vue
@@ -50,7 +50,7 @@
             </a-button>
           </a-dropdown>
           <a-tooltip placement="left" title="用于两个仓库之间的商品调拨，调拨单会影响库存。" slot="action">
-            <a-icon type="info-circle" style="font-size:20px;float:right;" />
+            <a-icon v-if="btnEnableList.indexOf(1)>-1" type="info-circle" style="font-size:20px;float:right;" />
           </a-tooltip>
         </div>
         <!-- table区域-begin -->
diff --git a/jshERP-web/src/views/bill/AssembleList.vue b/jshERP-web/src/views/bill/AssembleList.vue
index 233c2a4e2..93b2d43f3 100644
--- a/jshERP-web/src/views/bill/AssembleList.vue
+++ b/jshERP-web/src/views/bill/AssembleList.vue
@@ -50,7 +50,7 @@
             </a-button>
           </a-dropdown>
           <a-tooltip placement="left" title="用于将多种商品合并成一个商品，被合并的商品库存减少，合并后的商品库存增加。" slot="action">
-            <a-icon type="info-circle" style="font-size:20px;float:right;" />
+            <a-icon v-if="btnEnableList.indexOf(1)>-1" type="info-circle" style="font-size:20px;float:right;" />
           </a-tooltip>
         </div>
         <!-- table区域-begin -->
diff --git a/jshERP-web/src/views/bill/DisassembleList.vue b/jshERP-web/src/views/bill/DisassembleList.vue
index e99348f1d..d1e47d3ee 100644
--- a/jshERP-web/src/views/bill/DisassembleList.vue
+++ b/jshERP-web/src/views/bill/DisassembleList.vue
@@ -50,7 +50,7 @@
             </a-button>
           </a-dropdown>
           <a-tooltip placement="left" title="用于将一个商品拆分成多种商品，被拆分的商品库存增加，拆分后的商品库存减少。" slot="action">
-            <a-icon type="info-circle" style="font-size:20px;float:right;" />
+            <a-icon v-if="btnEnableList.indexOf(1)>-1" type="info-circle" style="font-size:20px;float:right;" />
           </a-tooltip>
         </div>
         <!-- table区域-begin -->
diff --git a/jshERP-web/src/views/bill/OtherInList.vue b/jshERP-web/src/views/bill/OtherInList.vue
index ae81fd44a..b738310ba 100644
--- a/jshERP-web/src/views/bill/OtherInList.vue
+++ b/jshERP-web/src/views/bill/OtherInList.vue
@@ -50,7 +50,7 @@
             </a-button>
           </a-dropdown>
           <a-tooltip placement="left" title="可以进行库存初始化，生产管理模块的成品入库。" slot="action">
-            <a-icon type="info-circle" style="font-size:20px;float:right;" />
+            <a-icon v-if="btnEnableList.indexOf(1)>-1" type="info-circle" style="font-size:20px;float:right;" />
           </a-tooltip>
         </div>
         <!-- table区域-begin -->
diff --git a/jshERP-web/src/views/bill/OtherOutList.vue b/jshERP-web/src/views/bill/OtherOutList.vue
index 4c6098a67..78175a20c 100644
--- a/jshERP-web/src/views/bill/OtherOutList.vue
+++ b/jshERP-web/src/views/bill/OtherOutList.vue
@@ -50,7 +50,7 @@
             </a-button>
           </a-dropdown>
           <a-tooltip placement="left" title="可以进行库存初始化，生产管理模块的领料出库。" slot="action">
-            <a-icon type="info-circle" style="font-size:20px;float:right;" />
+            <a-icon v-if="btnEnableList.indexOf(1)>-1" type="info-circle" style="font-size:20px;float:right;" />
           </a-tooltip>
         </div>
         <!-- table区域-begin -->
diff --git a/jshERP-web/src/views/bill/PurchaseBackList.vue b/jshERP-web/src/views/bill/PurchaseBackList.vue
index 967f625ca..5d3c839ca 100644
--- a/jshERP-web/src/views/bill/PurchaseBackList.vue
+++ b/jshERP-web/src/views/bill/PurchaseBackList.vue
@@ -50,7 +50,7 @@
             </a-button>
           </a-dropdown>
           <a-tooltip placement="left" title="用于采购入库单据的退货。采购退货单可以由采购出库单转过来，也可以单独创建。" slot="action">
-            <a-icon type="info-circle" style="font-size:20px;float:right;" />
+            <a-icon v-if="btnEnableList.indexOf(1)>-1" type="info-circle" style="font-size:20px;float:right;" />
           </a-tooltip>
         </div>
         <!-- table区域-begin -->
@@ -155,13 +155,13 @@
               return (record.discountMoney + record.discountLastMoney).toFixed(2);
             }
           },
-          { title: '待收金额', dataIndex: 'needBackMoney',width:80,
+          { title: '待退金额', dataIndex: 'needBackMoney',width:80,
             customRender:function (text,record,index) {
               let needBackMoney = record.discountLastMoney + record.otherMoney
               return needBackMoney? needBackMoney.toFixed(2):''
             }
           },
-          { title: '收款', dataIndex: 'changeAmount',width:50},
+          { title: '退款', dataIndex: 'changeAmount',width:50},
           {
             title: '操作',
             dataIndex: 'action',
diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue
index 33a63b5ff..a3161a6c5 100644
--- a/jshERP-web/src/views/bill/PurchaseInList.vue
+++ b/jshERP-web/src/views/bill/PurchaseInList.vue
@@ -51,7 +51,7 @@
           </a-dropdown>
           <a-tooltip placement="left" title="采购入库单可以由采购订单转过来，也可以单独创建。
           采购入库单据中的仓库列表只显示当前用户有权限的仓库。采购入库单可以使用多账户付款。" slot="action">
-            <a-icon type="info-circle" style="font-size:20px;float:right;" />
+            <a-icon v-if="btnEnableList.indexOf(1)>-1" type="info-circle" style="font-size:20px;float:right;" />
           </a-tooltip>
         </div>
         <!-- table区域-begin -->
diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue
index 5805f833e..891bda33c 100644
--- a/jshERP-web/src/views/bill/PurchaseOrderList.vue
+++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue
@@ -53,7 +53,7 @@
           </a-dropdown>
           <a-tooltip placement="left" title="采购订单不涉及入库仓库和付款金额，采购订单可以转采购入库单，但需要先对采购订单进行审核。
           勾选之后可以进行批量操作（删除、审核、反审核）" slot="action">
-            <a-icon type="info-circle" style="font-size:20px;float:right;" />
+            <a-icon v-if="btnEnableList.indexOf(1)>-1" type="info-circle" style="font-size:20px;float:right;" />
           </a-tooltip>
         </div>
         <!-- table区域-begin -->
diff --git a/jshERP-web/src/views/bill/RetailBackList.vue b/jshERP-web/src/views/bill/RetailBackList.vue
index 03b96440f..dae1d89e2 100644
--- a/jshERP-web/src/views/bill/RetailBackList.vue
+++ b/jshERP-web/src/views/bill/RetailBackList.vue
@@ -50,7 +50,7 @@
             </a-button>
           </a-dropdown>
           <a-tooltip placement="left" title="用于零售出库单据的退货。零售退货单可以由零售出库单转过来，也可以单独创建。" slot="action">
-            <a-icon type="info-circle" style="font-size:20px;float:right;" />
+            <a-icon v-if="btnEnableList.indexOf(1)>-1" type="info-circle" style="font-size:20px;float:right;" />
           </a-tooltip>
         </div>
         <!-- table区域-begin -->
diff --git a/jshERP-web/src/views/bill/RetailOutList.vue b/jshERP-web/src/views/bill/RetailOutList.vue
index 2f036651a..bccbcbc29 100644
--- a/jshERP-web/src/views/bill/RetailOutList.vue
+++ b/jshERP-web/src/views/bill/RetailOutList.vue
@@ -50,7 +50,7 @@
             </a-button>
           </a-dropdown>
           <a-tooltip placement="left" title="用于非会员和会员的单据录入，主要是用于散户使用，不能欠款。" slot="action">
-            <a-icon type="info-circle" style="font-size:20px;float:right;" />
+            <a-icon v-if="btnEnableList.indexOf(1)>-1" type="info-circle" style="font-size:20px;float:right;" />
           </a-tooltip>
         </div>
         <!-- table区域-begin -->
diff --git a/jshERP-web/src/views/bill/SaleBackList.vue b/jshERP-web/src/views/bill/SaleBackList.vue
index b2422eabd..e40beeb2c 100644
--- a/jshERP-web/src/views/bill/SaleBackList.vue
+++ b/jshERP-web/src/views/bill/SaleBackList.vue
@@ -50,7 +50,7 @@
             </a-button>
           </a-dropdown>
           <a-tooltip placement="left" title="用于销售出库单据的退货。销售退货单可以由销售出库单转过来，也可以单独创建。" slot="action">
-            <a-icon type="info-circle" style="font-size:20px;float:right;" />
+            <a-icon v-if="btnEnableList.indexOf(1)>-1" type="info-circle" style="font-size:20px;float:right;" />
           </a-tooltip>
         </div>
         <!-- table区域-begin -->
@@ -155,13 +155,13 @@
               return (record.discountMoney + record.discountLastMoney).toFixed(2);
             }
           },
-          { title: '待付金额', dataIndex: 'needBackMoney',width:80,
+          { title: '待退金额', dataIndex: 'needBackMoney',width:80,
             customRender:function (text,record,index) {
               let needBackMoney = record.discountLastMoney + record.otherMoney
               return needBackMoney? needBackMoney.toFixed(2):''
             }
           },
-          { title: '付款', dataIndex: 'changeAmount',width:50},
+          { title: '退款', dataIndex: 'changeAmount',width:50},
           {
             title: '操作',
             dataIndex: 'action',
diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue
index 345b866bf..4562948fd 100644
--- a/jshERP-web/src/views/bill/SaleOrderList.vue
+++ b/jshERP-web/src/views/bill/SaleOrderList.vue
@@ -53,7 +53,7 @@
           </a-dropdown>
           <a-tooltip placement="left" title="销售订单不涉及出库仓库和收款金额，销售订单可以转销售出库单，但需要先对销售订单进行审核。
           勾选之后可以进行批量操作（删除、审核、反审核）" slot="action">
-            <a-icon type="info-circle" style="font-size:20px;float:right;" />
+            <a-icon v-if="btnEnableList.indexOf(1)>-1" type="info-circle" style="font-size:20px;float:right;" />
           </a-tooltip>
         </div>
         <!-- table区域-begin -->
diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue
index 357834c26..b55ee9332 100644
--- a/jshERP-web/src/views/bill/SaleOutList.vue
+++ b/jshERP-web/src/views/bill/SaleOutList.vue
@@ -51,7 +51,7 @@
           </a-dropdown>
           <a-tooltip placement="left" title="销售出库单可以由销售订单转过来，也可以单独创建。
           销售出库单据中的仓库列表只显示当前用户有权限的仓库。销售出库单可以使用多账户收款。" slot="action">
-            <a-icon type="info-circle" style="font-size:20px;float:right;" />
+            <a-icon v-if="btnEnableList.indexOf(1)>-1" type="info-circle" style="font-size:20px;float:right;" />
           </a-tooltip>
         </div>
         <!-- table区域-begin -->
diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
index 248b54a71..4f8c81379 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@@ -98,7 +98,7 @@
             </a-col>
             <a-col :lg="6" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次退款">
-                <a-input placeholder="请输入本次付款" v-decorator.trim="[ 'changeAmount' ]" @keyup="onKeyUpChangeAmount"/>
+                <a-input placeholder="请输入本次退款" v-decorator.trim="[ 'changeAmount' ]" @keyup="onKeyUpChangeAmount" :readOnly="true"/>
               </a-form-item>
             </a-col>
             <a-col :lg="6" :md="12" :sm="24">
diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
index 7bdeaa241..cc6a651e7 100644
--- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
@@ -17,7 +17,7 @@
         <a-row class="form-row" :gutter="24">
           <a-col :lg="6" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会员卡号">
-              <a-select placeholder="选择会员卡号" v-decorator="[ 'organId' ]" :dropdownMatchSelectWidth="false">
+              <a-select placeholder="选择会员卡号" v-decorator="[ 'organId' ]" :dropdownMatchSelectWidth="false" @change="onChangeOrgan">
                 <a-select-option v-for="(item,index) in retailList" :key="index" :value="item.id">
                   {{ item.supplier }}
                 </a-select-option>
@@ -36,9 +36,10 @@
           </a-col>
           <a-col :lg="6" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款类型">
-              <a-select placeholder="请选择付款类型" v-decorator="[ 'payType' ]">
-                <a-select-option value="现付">现付</a-select-option>
-                <a-select-option value="预付款">预付款</a-select-option>
+              <a-select placeholder="请选择付款类型" v-decorator="[ 'payType' ]" :dropdownMatchSelectWidth="false">
+                <a-select-option v-for="(item,index) in payTypeList" :key="index" :value="item.value">
+                  {{ item.text }}
+                </a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -112,6 +113,7 @@
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
   import { getMpListShort } from "@/utils/util"
+  import { getAction } from '@/api/manage'
   import JUpload from '@/components/jeecg/JUpload'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
@@ -133,6 +135,7 @@
         operTimeStr: '',
         prefixNo: 'LSCK',
         fileList:[],
+        payTypeList: [],
         model: {},
         labelCol: {
           xs: { span: 24 },
@@ -189,6 +192,7 @@
       }
     },
     created () {
+      this.initPayTypeList()
     },
     methods: {
       //调用完edit()方法之后会自动调用此方法
@@ -203,6 +207,11 @@
           this.model.operTime = this.model.operTimeStr
           this.model.getAmount = this.model.changeAmount
           this.fileList = this.model.fileName
+          if(this.model.payType === '预付款'){
+            this.payTypeList = []
+            this.payTypeList.push({"value":"预付款", "text":"预付款"})
+            this.payTypeList.push({"value":"现付", "text":"现付"})
+          }
           this.$nextTick(() => {
             this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'payType', 'remark',
               'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','getAmount'))
@@ -239,6 +248,28 @@
           rows: JSON.stringify(detailArr),
         }
       },
+      //加载收款类型
+      initPayTypeList() {
+        this.payTypeList.push({"value":"现付", "text":"现付"})
+      },
+      //选择会员的触发事件
+      onChangeOrgan(value) {
+        getAction("/supplier/info", {id: value}).then(res=>{
+          if(res && res.code === 200){
+            this.payTypeList = []
+            let info = res.data.info
+            if(info.advanceIn) {
+              this.payTypeList.push({"value":"预付款", "text":"预付款（" + info.advanceIn + "）"})
+              this.payTypeList.push({"value":"现付", "text":"现付"})
+              this.$nextTick(() => {
+                this.form.setFieldsValue({'payType': '预付款'})
+              })
+            } else {
+              this.payTypeList.push({"value":"现付", "text":"现付"})
+            }
+          }
+        })
+      },
       //改变实收金额、收款金额的值
       autoChangePrice(target) {
         let allLastMoney = target.statisticsColumns.allPrice
diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
index fc620415f..3dbe622ca 100644
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -98,7 +98,7 @@
             </a-col>
             <a-col :lg="6" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次退款">
-                <a-input placeholder="请输入本次付款" v-decorator.trim="[ 'changeAmount' ]" @keyup="onKeyUpChangeAmount"/>
+                <a-input placeholder="请输入本次退款" v-decorator.trim="[ 'changeAmount' ]" @keyup="onKeyUpChangeAmount" :readOnly="true"/>
               </a-form-item>
             </a-col>
             <a-col :lg="6" :md="12" :sm="24">
diff --git a/jshERP-web/src/views/financial/AdvanceInList.vue b/jshERP-web/src/views/financial/AdvanceInList.vue
index 3883345f2..e90c41304 100644
--- a/jshERP-web/src/views/financial/AdvanceInList.vue
+++ b/jshERP-web/src/views/financial/AdvanceInList.vue
@@ -45,7 +45,7 @@
             </a-button>
           </a-dropdown>
           <a-tooltip placement="left" title="针对会员模块，对会员收取预付款。" slot="action">
-            <a-icon type="info-circle" style="font-size:20px;float:right;" />
+            <a-icon v-if="btnEnableList.indexOf(1)>-1" type="info-circle" style="font-size:20px;float:right;" />
           </a-tooltip>
         </div>
         <!-- table区域-begin -->
diff --git a/jshERP-web/src/views/financial/GiroList.vue b/jshERP-web/src/views/financial/GiroList.vue
index c0b43f1e3..02646f154 100644
--- a/jshERP-web/src/views/financial/GiroList.vue
+++ b/jshERP-web/src/views/financial/GiroList.vue
@@ -45,7 +45,7 @@
             </a-button>
           </a-dropdown>
           <a-tooltip placement="left" title="转账：本系统的转账是指从一个银行存款账户转入到另一个银行存款账户。" slot="action">
-            <a-icon type="info-circle" style="font-size:20px;float:right;" />
+            <a-icon v-if="btnEnableList.indexOf(1)>-1" type="info-circle" style="font-size:20px;float:right;" />
           </a-tooltip>
         </div>
         <!-- table区域-begin -->
diff --git a/jshERP-web/src/views/financial/ItemInList.vue b/jshERP-web/src/views/financial/ItemInList.vue
index be5b0b228..52530c0d5 100644
--- a/jshERP-web/src/views/financial/ItemInList.vue
+++ b/jshERP-web/src/views/financial/ItemInList.vue
@@ -45,7 +45,7 @@
             </a-button>
           </a-dropdown>
           <a-tooltip placement="left" title="收入单主要处理一些销售收入以外的收入如维修服务收入、利息收入、调账收入等。" slot="action">
-            <a-icon type="info-circle" style="font-size:20px;float:right;" />
+            <a-icon v-if="btnEnableList.indexOf(1)>-1" type="info-circle" style="font-size:20px;float:right;" />
           </a-tooltip>
         </div>
         <!-- table区域-begin -->
diff --git a/jshERP-web/src/views/financial/ItemOutList.vue b/jshERP-web/src/views/financial/ItemOutList.vue
index de5240e3a..25eeb7680 100644
--- a/jshERP-web/src/views/financial/ItemOutList.vue
+++ b/jshERP-web/src/views/financial/ItemOutList.vue
@@ -45,7 +45,7 @@
             </a-button>
           </a-dropdown>
           <a-tooltip placement="left" title="支出单主要处理一些进货支出以外的支出如水电支出、房租支出等。" slot="action">
-            <a-icon type="info-circle" style="font-size:20px;float:right;" />
+            <a-icon v-if="btnEnableList.indexOf(1)>-1" type="info-circle" style="font-size:20px;float:right;" />
           </a-tooltip>
         </div>
         <!-- table区域-begin -->
diff --git a/jshERP-web/src/views/financial/MoneyInList.vue b/jshERP-web/src/views/financial/MoneyInList.vue
index e58ff51fc..d478a65a6 100644
--- a/jshERP-web/src/views/financial/MoneyInList.vue
+++ b/jshERP-web/src/views/financial/MoneyInList.vue
@@ -46,7 +46,7 @@
           </a-dropdown>
           <a-tooltip placement="left" title="收款单所收金额只对付款单位的应收应付产生影响，可以在回款统计中进行查看。
           收款单的优惠金额会对利润产生影响，但不影响付款单位的应收应付。优惠金额计入收入类的收款优惠中。" slot="action">
-            <a-icon type="info-circle" style="font-size:20px;float:right;" />
+            <a-icon v-if="btnEnableList.indexOf(1)>-1" type="info-circle" style="font-size:20px;float:right;" />
           </a-tooltip>
         </div>
         <!-- table区域-begin -->
diff --git a/jshERP-web/src/views/financial/MoneyOutList.vue b/jshERP-web/src/views/financial/MoneyOutList.vue
index cd1048b44..85ca08b34 100644
--- a/jshERP-web/src/views/financial/MoneyOutList.vue
+++ b/jshERP-web/src/views/financial/MoneyOutList.vue
@@ -46,7 +46,7 @@
           </a-dropdown>
           <a-tooltip placement="left" title="付款单的要素和录入原则与“收款单”相同。
           付款单中优惠金额计入支出类中的付款优惠中，为负值 （因优惠意味着实际少付款）。" slot="action">
-            <a-icon type="info-circle" style="font-size:20px;float:right;" />
+            <a-icon v-if="btnEnableList.indexOf(1)>-1" type="info-circle" style="font-size:20px;float:right;" />
           </a-tooltip>
         </div>
         <!-- table区域-begin -->
diff --git a/jshERP-web/src/views/system/TenantList.vue b/jshERP-web/src/views/system/TenantList.vue
index 20a6662a5..d6df2dea7 100644
--- a/jshERP-web/src/views/system/TenantList.vue
+++ b/jshERP-web/src/views/system/TenantList.vue
@@ -23,6 +23,16 @@
         <!-- 操作按钮区域 -->
         <div class="table-operator" style="border-top: 5px">
           <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+          <a-dropdown v-if="selectedRowKeys.length > 0">
+            <a-menu slot="overlay">
+              <a-menu-item key="1" @click="batchSetStatus(1)"><a-icon type="check-square"/>启用</a-menu-item>
+              <a-menu-item key="2" @click="batchSetStatus(0)"><a-icon type="close-square"/>禁用</a-menu-item>
+            </a-menu>
+            <a-button style="margin-left: 8px">
+              批量操作
+              <a-icon type="down"/>
+            </a-button>
+          </a-dropdown>
         </div>
         <!-- table区域-begin -->
         <div>
@@ -35,10 +45,16 @@
             :dataSource="dataSource"
             :pagination="ipagination"
             :loading="loading"
+            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">
             <span slot="action" slot-scope="text, record">
               <a @click="handleEdit(record)">编辑</a>
             </span>
+            <!-- 状态渲染模板 -->
+            <template slot="customRenderFlag" slot-scope="enabled">
+              <a-tag v-if="enabled" color="green">启用</a-tag>
+              <a-tag v-if="!enabled" color="orange">禁用</a-tag>
+            </template>
           </a-table>
         </div>
         <!-- table区域-end -->
@@ -78,6 +94,9 @@
           { title: '登录名称', dataIndex: 'loginName', width: 100, align: "center"},
           { title: '用户数量限制', dataIndex: 'userNumLimit', width: 100, align: "center"},
           { title: '单据数量限制', dataIndex: 'billsNumLimit', width: 100, align: "center"},
+          { title: '状态',dataIndex: 'enabled',width:70,align:"center",
+            scopedSlots: { customRender: 'customRenderFlag' }
+          },
           { title: '创建时间', dataIndex: 'createTimeStr', width: 100, align: "center"},
           {
             title: '操作',
@@ -88,7 +107,8 @@
           }
         ],
         url: {
-          list: "/tenant/list"
+          list: "/tenant/list",
+          batchSetStatusUrl: "/tenant/batchSetStatus"
         },
       }
     },
diff --git a/jshERP-web/src/views/user/Login.vue b/jshERP-web/src/views/user/Login.vue
index fcd0a5572..936d1ad3d 100644
--- a/jshERP-web/src/views/user/Login.vue
+++ b/jshERP-web/src/views/user/Login.vue
@@ -191,6 +191,10 @@
             err.message = '用户被禁用';
             this.requestFailed(err)
             this.Logout();
+          } else if(res.data.msgTip == 'tenant is black'){
+            err.message = '用户所属的租户被禁用';
+            this.requestFailed(err)
+            this.Logout();
           } else if(res.data.msgTip == 'access service error'){
             err.message = '查询服务异常';
             this.requestFailed(err)