Merge remote-tracking branch 'origin/bjcz_his_scrm' into bjcz_his_scrm

src/views/fastGpt/readPackage/index.vue

@@ -27,7 +27,7 @@
     </el-form>
 
     <!-- 企业转账充值弹窗 -->
-    <el-dialog
+    <!-- <el-dialog
       title="企业转账充值"
       :visible.sync="rechargeVisible"
       width="480px"
@@ -61,7 +61,7 @@
         <el-button @click="rechargeVisible = false">取消</el-button>
         <el-button type="primary" :loading="rechargeSubmitLoading" @click="submitRecharge">确定充值</el-button>
       </span>
-    </el-dialog>
+    </el-dialog> -->
 
 <!--    <el-row :gutter="10" class="mb8">-->
 <!--      <el-col :span="1.5">-->
@@ -81,6 +81,7 @@
               @selection-change="handleSelectionChange" :max-height="600">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="公司名称" align="center" prop="companyName" />
+      <el-table-column v-if="showDeptColumn" label="部门" align="center" prop="deptName" />
       <el-table-column label="耗费金额(元)" align="center" prop="amount" />
       <el-table-column label="时间" align="center" prop="createDate" />
     </el-table>
@@ -213,6 +214,10 @@ export default {
       const n = this.redPackageMoney
       if (n === null || n === undefined || n === '') return '--'
       return Number(n).toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })
+    },
+    /** 选中部门时展示部门列 */
+    showDeptColumn() {
+      return this.queryParams.deptId != null && this.queryParams.deptId !== ''
     }
   },