feat: 团队相关调整

src/api/checker.js

@@ -136,6 +136,26 @@ export function updateSubProject (params) {
   return http.post('/admin/subProject/update', { data: params })
 }
 
+// 团队充值
+export function teamRecharge (params) {
+  return http.post('/admin/team/recharge', { data: params })
+}
+
+// 团队扣款
+export function teamDeduct (params) {
+  return http.post('/admin/team/deduct', { data: params })
+}
+
+// 调整授信额度
+export function teamAdjust (params) {
+  return http.post('/admin/team/adjust', { data: params })
+}
+
+// 团队账户记录
+export function getTeamAccountFlow (params) {
+  return http.post('/admin/team/teamAccountFlow', { data: params })
+}
+
 // 查询某个统计的配置字段
 export function getFiledByStatKey (params) {
   return http.post('/admin/statFieldConfig/getFiledByStatKey', { data: params })

src/pages/checkerManage/TeamAccountFlow.vue

@@ -0,0 +1,250 @@
+<template>
+  <div class="form-wrap">
+    <el-form
+      class="search-box"
+      ref="form"
+      :model="form"
+      :inline="true"
+    >
+      <div class="block-title">
+        查询条件
+      </div>
+      <el-form-item
+        label="团队名称"
+        prop="teamName">
+        <el-input v-model="form.teamName" clearable></el-input>
+      </el-form-item>
+      <el-form-item
+        label="交易类型"
+        prop="transactionType">
+        <el-select v-model="form.transactionType" clearable placeholder="请选择">
+          <el-option label="充值" value="RECHARGE"></el-option>
+          <el-option label="扣款" value="DEDUCT"></el-option>
+          <el-option label="消费" value="CONSUME"></el-option>
+          <el-option label="退款" value="REFUND"></el-option>
+          <el-option label="调整授信额度" value="ADJUST"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="操作时间起"
+        prop="operateTimeBegin">
+        <el-date-picker
+          v-model="form.operateTimeBegin"
+          type="datetime"
+          placeholder="选择开始时间"
+          value-format="yyyy-MM-dd HH:mm:ss"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item
+        label="操作时间止"
+        prop="operateTimeEnd">
+        <el-date-picker
+          v-model="form.operateTimeEnd"
+          type="datetime"
+          placeholder="选择结束时间"
+          value-format="yyyy-MM-dd HH:mm:ss"
+        ></el-date-picker>
+      </el-form-item>
+      <div class="btn-wrap">
+        <el-button
+          @click="reset">
+          重置
+        </el-button>
+        <el-button
+          type="primary"
+          @click="getList(true)">
+          搜索
+        </el-button>
+        <el-button
+          type="primary"
+          @click="reportExport">
+          导出
+        </el-button>
+      </div>
+    </el-form>
+
+    <div class="table-box">
+      <el-table
+        border
+        v-loading="loading"
+        :data="tableData">
+        <el-table-column
+          prop="createTime"
+          label="创建时间"
+          width="180">
+        </el-table-column>
+        <el-table-column
+          prop="teamName"
+          label="团队名称">
+        </el-table-column>
+        <el-table-column
+          prop="transactionType"
+          label="交易类型"
+          width="120">
+          <template slot-scope="scope">
+            {{ transactionTypeMap[scope.row.transactionType] || scope.row.transactionType }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="amount"
+          label="金额"
+          width="100">
+        </el-table-column>
+        <el-table-column
+          prop="balanceBefore"
+          label="变动前余额"
+          width="120">
+        </el-table-column>
+        <el-table-column
+          prop="balanceAfter"
+          label="变动后余额"
+          width="120">
+        </el-table-column>
+        <el-table-column
+          prop="creditLimitBefore"
+          label="变动前授信额度"
+          width="130">
+        </el-table-column>
+        <el-table-column
+          prop="creditLimitAfter"
+          label="变动后授信额度"
+          width="130">
+        </el-table-column>
+        <el-table-column
+          prop="operatorName"
+          label="操作人"
+          width="100">
+        </el-table-column>
+        <el-table-column
+          prop="operateTime"
+          label="操作时间"
+          width="180">
+        </el-table-column>
+        <el-table-column
+          prop="remark"
+          label="备注">
+        </el-table-column>
+        <el-table-column
+          prop="linkOrderId"
+          label="关联订单"
+          width="120">
+          <template slot-scope="scope">
+            <el-link
+              v-if="scope.row.linkOrderId"
+              type="primary"
+              @click="showOrderDetail(scope.row.linkOrderId)"
+            >
+              查看
+            </el-link>
+            <span v-else>-</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        background
+        layout="total, sizes, prev, pager, next, jumper"
+        :current-page.sync="form.pageNum"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="form.pageSize"
+        @size-change="handleSizeChange"
+        @current-change="getList()"
+        :total="total"
+      >
+      </el-pagination>
+    </div>
+
+    <OrderDetail ref="orderDetail"></OrderDetail>
+  </div>
+</template>
+
+<script>
+import { getTeamAccountFlow } from '@/api/checker'
+
+export default {
+  name: 'TeamAccountFlow',
+  props: {
+    teamId: { type: [Number, String], default: null },
+    teamName: { type: String, default: '' }
+  },
+  watch: {
+    teamName (val) {
+      this.form.teamName = val
+      this.getList(true)
+    },
+    teamId (val) {
+      this.form.teamId = val
+      this.getList(true)
+    }
+  },
+  data () {
+    return {
+      form: {
+        teamId: this.teamId,
+        teamName: this.teamName,
+        transactionType: '',
+        operateTimeBegin: '',
+        operateTimeEnd: '',
+        pageNum: 1,
+        pageSize: 10
+      },
+      loading: false,
+      tableData: [],
+      total: 0,
+      transactionTypeMap: {
+        RECHARGE: '充值',
+        DEDUCT: '扣款',
+        CONSUME: '消费',
+        REFUND: '退款',
+        ADJUST: '调整授信额度'
+      }
+    }
+  },
+  mounted () {
+    this.getList()
+  },
+  methods: {
+    reset () {
+      this.$refs.form.resetFields()
+      this.form.operateTimeBegin = ''
+      this.form.operateTimeEnd = ''
+    },
+    handleSizeChange (size) {
+      this.form.pageSize = size
+      this.getList()
+    },
+    getList (goFirst) {
+      let params = { ...this.form }
+      goFirst && (params.pageNum = 1)
+      this.loading = true
+      getTeamAccountFlow(params).then(res => {
+        const data = res.data || {}
+        this.tableData = data.records || []
+        this.total = data.total || 0
+        this.loading = false
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+    reportExport () {
+      const params = {
+        ...this.form,
+        export: true
+      }
+      getTeamAccountFlow(params).then(() => {
+        this.$message.success('导出成功。')
+        this.goToDownload()
+      }).catch(() => {
+        this.$message.error('导出失败。')
+      })
+    },
+    async showOrderDetail (orderId) {
+      const { getSingleOrder } = await import('@/api/order')
+      const res = await getSingleOrder(orderId)
+      this.$refs.orderDetail.show(res.data)
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

src/pages/checkerManage/teamManage.vue

@@ -1,109 +1,157 @@
 <template>
   <div class="form-wrap">
-    <el-form
-      class="search-box"
-      ref="form"
-      :model="form"
-      :inline="true"
-    >
-      <div class="block-title">
-        查询条件
-      </div>
-      <el-form-item
-        label="团队名称"
-        prop="name">
-        <el-input v-model="form.name" clearable></el-input>
-      </el-form-item>
-      <el-form-item
-        label="联系人"
-        prop="contactName">
-        <el-input v-model="form.contactName" clearable></el-input>
-      </el-form-item>
-      <el-form-item
-        label="联系方式"
-        prop="contactPhone">
-        <el-input v-model="form.contactPhone" clearable></el-input>
-      </el-form-item>
-      <el-form-item
-        label="备注"
-        prop="remark">
-        <el-input v-model="form.remark" clearable></el-input>
-      </el-form-item>
-      <div class="btn-wrap">
-        <el-button
-          @click="reset">
-          重置
-        </el-button>
-        <el-button
-          type="primary"
-          @click="getList(true)">
-          搜索
-        </el-button>
-        <el-button
-          type="primary"
-          @click="openAddDialog(true)">
-          新增团队
-        </el-button>
-      </div>
-    </el-form>
-
-    <div class="table-box">
-      <!-- <div class="block-title">
-        团队列表
-      </div> -->
-      <el-table
-        border
-        v-loading="loading"
-        :data="tableData">
-        <el-table-column
-          prop="name"
-          label="团队名称">
-        </el-table-column>
-        <el-table-column
-          prop="contactName"
-          label="联系人">
-        </el-table-column>
-        <el-table-column
-          prop="contactPhone"
-          label="联系方式">
-        </el-table-column>
-        <el-table-column
-          prop="remark"
-          label="备注">
-        </el-table-column>
-        <el-table-column
-          width="150px"
-          label="操作">
-          <template slot-scope="scope">
-            <el-link
+    <el-tabs v-model="activeTab">
+      <el-tab-pane label="团队管理" name="teamManage">
+        <el-form
+          class="search-box"
+          ref="form"
+          :model="form"
+          :inline="true"
+        >
+          <div class="block-title">
+            查询条件
+          </div>
+          <el-form-item
+            label="团队名称"
+            prop="name">
+            <el-input v-model="form.name" clearable></el-input>
+          </el-form-item>
+          <el-form-item
+            label="联系人"
+            prop="contactName">
+            <el-input v-model="form.contactName" clearable></el-input>
+          </el-form-item>
+          <el-form-item
+            label="联系方式"
+            prop="contactPhone">
+            <el-input v-model="form.contactPhone" clearable></el-input>
+          </el-form-item>
+          <el-form-item
+            label="备注"
+            prop="remark">
+            <el-input v-model="form.remark" clearable></el-input>
+          </el-form-item>
+          <div class="btn-wrap">
+            <el-button
+              @click="reset">
+              重置
+            </el-button>
+            <el-button
               type="primary"
-              @click="openEditDialog(scope.row)"
-            >
-              编辑
-            </el-link>
-
-            <el-link
+              @click="getList(true)">
+              搜索
+            </el-button>
+            <el-button
+              type="primary"
+              @click="openAddDialog">
+              新增团队
+            </el-button>
+            <el-button
               type="primary"
-              @click="deleteGroup(scope.row)">
-              删除
-            </el-link>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        background
-        layout="total, sizes, prev, pager, next, jumper"
-        :current-page.sync="form.pageNum"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="form.pageSize"
-        @size-change="handleSizeChange"
-        @current-change="getList()"
-        :total="total"
-      >
-      </el-pagination>
-    </div>
-    <!-- 弹框 -->
+              @click="reportExport">
+              导出
+            </el-button>
+          </div>
+        </el-form>
+
+        <div class="table-box">
+          <el-table
+            border
+            v-loading="loading"
+            :data="tableData">
+            <el-table-column
+              prop="name"
+              label="团队名称">
+            </el-table-column>
+            <el-table-column
+              prop="contactName"
+              label="联系人">
+            </el-table-column>
+            <el-table-column
+              prop="contactPhone"
+              label="联系方式">
+            </el-table-column>
+            <el-table-column
+              prop="balance"
+              label="余额">
+            </el-table-column>
+            <el-table-column
+              prop="creditLimit"
+              label="授信额度">
+            </el-table-column>
+            <el-table-column
+              prop="remark"
+              label="备注">
+            </el-table-column>
+            <el-table-column
+              width="350px"
+              label="操作">
+              <template slot-scope="scope">
+                <el-link
+                  type="primary"
+                  @click="openEditDialog(scope.row)"
+                >
+                  编辑
+                </el-link>
 
+                <el-link
+                  type="primary"
+                  @click="deleteGroup(scope.row)"
+                >
+                  删除
+                </el-link>
+
+                <el-link
+                  type="primary"
+                  v-if="hasPermission('team-money-manage')"
+                  @click="openRechargeDialog(scope.row)"
+                >
+                  充值
+                </el-link>
+
+                <el-link
+                  type="primary"
+                  v-if="hasPermission('team-money-manage')"
+                  @click="openDeductDialog(scope.row)"
+                >
+                  扣款
+                </el-link>
+
+                <el-link
+                  type="primary"
+                  v-if="hasPermission('team-money-manage')"
+                  @click="openAdjustDialog(scope.row)"
+                >
+                  调整授信额度
+                </el-link>
+                <el-link
+                  type="primary"
+                  @click="gotoRecord(scope.row)"
+                >
+                  账户记录
+                </el-link>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-pagination
+            background
+            layout="total, sizes, prev, pager, next, jumper"
+            :current-page.sync="form.pageNum"
+            :page-sizes="[10, 20, 50, 100]"
+            :page-size="form.pageSize"
+            @size-change="handleSizeChange"
+            @current-change="getList()"
+            :total="total"
+          >
+          </el-pagination>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="账户记录" name="accountFlow">
+        <TeamAccountFlow v-if="activeTab === 'accountFlow'" :teamId="selectedTeamId" :teamName="selectedTeamName" />
+      </el-tab-pane>
+    </el-tabs>
+
+    <!-- 新增/编辑团队弹框 -->
     <ElDialog
       :title="`${currentItem.id ? '编辑' : '新增'}团队`"
       width="500px"
@@ -112,7 +160,7 @@
       <el-form
         inline
         :model="currentItem"
-        ref="form"
+        ref="editForm"
         class="form-wrap"
         label-width="150px"
         style="margin-top: 20px">
@@ -132,6 +180,18 @@
           prop="contactPhone">
           <el-input v-model="currentItem.contactPhone"></el-input>
         </el-form-item>
+        <el-form-item
+          v-if="!currentItem.id"
+          label="余额"
+          prop="balance">
+          <el-input-number v-model="currentItem.balance" :precision="2" :step="1" :controls="false" style="width: 200px"></el-input-number>
+        </el-form-item>
+        <el-form-item
+          v-if="!currentItem.id"
+          label="授信额度"
+          prop="creditLimit">
+          <el-input-number v-model="currentItem.creditLimit" :min="0" :precision="2" :step="100" :controls="false" style="width: 200px"></el-input-number>
+        </el-form-item>
         <el-form-item
           label="备注"
           prop="remark">
@@ -143,45 +203,161 @@
         <el-button type="primary" @click="confirmOptGroup">确定</el-button>
       </div>
     </ElDialog>
+
+    <!-- 充值弹框 -->
+    <ElDialog
+      title="充值"
+      width="500px"
+      v-model="rechargeDialogVisible"
+    >
+      <el-form
+        inline
+        :model="moneyForm"
+        ref="moneyForm"
+        class="form-wrap"
+        label-width="150px"
+        style="margin-top: 20px">
+        <el-form-item
+          label="充值金额"
+          verify
+          prop="amount">
+          <el-input-number v-model="moneyForm.amount" :min="0.01" :precision="2" :step="1"></el-input-number>
+        </el-form-item>
+        <el-form-item
+          label="备注"
+          prop="remark">
+          <el-input v-model="moneyForm.remark"></el-input>
+        </el-form-item>
+      </el-form>
+      <div style="margin: 20px; float: right;">
+        <el-button @click="rechargeDialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="confirmRecharge">确定</el-button>
+      </div>
+    </ElDialog>
+
+    <!-- 扣款弹框 -->
+    <ElDialog
+      title="扣款"
+      width="500px"
+      v-model="deductDialogVisible"
+    >
+      <el-form
+        inline
+        :model="moneyForm"
+        ref="deductForm"
+        class="form-wrap"
+        label-width="150px"
+        style="margin-top: 20px">
+        <el-form-item
+          label="扣款金额"
+          verify
+          prop="amount">
+          <el-input-number v-model="moneyForm.amount" :min="0.01" :precision="2" :step="1"></el-input-number>
+        </el-form-item>
+        <el-form-item
+          label="备注"
+          prop="remark">
+          <el-input v-model="moneyForm.remark"></el-input>
+        </el-form-item>
+      </el-form>
+      <div style="margin: 20px; float: right;">
+        <el-button @click="deductDialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="confirmDeduct">确定</el-button>
+      </div>
+    </ElDialog>
+
+    <!-- 调整授信额度弹框 -->
+    <ElDialog
+      title="调整授信额度"
+      width="500px"
+      v-model="adjustDialogVisible"
+    >
+      <el-form
+        inline
+        :model="adjustForm"
+        ref="adjustForm"
+        class="form-wrap"
+        label-width="150px"
+        style="margin-top: 20px">
+        <el-form-item
+          label="调整后额度"
+          verify
+          prop="amount">
+          <el-input-number v-model="adjustForm.amount" :min="0" :precision="2" :step="100"></el-input-number>
+        </el-form-item>
+        <el-form-item
+          label="备注"
+          prop="remark">
+          <el-input v-model="adjustForm.remark"></el-input>
+        </el-form-item>
+      </el-form>
+      <div style="margin: 20px; float: right;">
+        <el-button @click="adjustDialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="confirmAdjust">确定</el-button>
+      </div>
+    </ElDialog>
   </div>
 </template>
 
 <script>
-import { getTeamList, addTeam, updateTeam, deleteTeam } from '@/api/checker'
+import { getTeamList, addTeam, updateTeam, deleteTeam, teamRecharge, teamDeduct, teamAdjust } from '@/api/checker'
 import ElDialog from '@/components/Dialog'
 
-// import ConfigSetting from './deviceManage/ConfigSetting'
+const TeamAccountFlow = () => import('./TeamAccountFlow.vue')
+
 export default {
   data () {
     return {
+      activeTab: 'teamManage',
       form: {
-        name: '', // 名称
+        name: '',
         pageNum: 1,
         pageSize: 10,
-        contactName: '', // 联系人
-        contactPhone: '', // 联系电话
-        remark: '' // 备注
+        contactName: '',
+        contactPhone: '',
+        remark: ''
       },
       loading: false,
+      selectedTeamId: null,
+      selectedTeamName: '',
       tableData: [],
       total: 0,
       dialogVisible: false,
-      configDialogVisible: false,
-      currentItem: {}
+      currentItem: {},
+      rechargeDialogVisible: false,
+      moneyForm: {
+        teamId: null,
+        amount: 0,
+        remark: ''
+      },
+      deductDialogVisible: false,
+      adjustDialogVisible: false,
+      adjustForm: {
+        teamId: null,
+        amount: 0,
+        remark: ''
+      }
     }
   },
   computed: {
     scenicList () {
       return this.$store.state.app.scenicList
+    },
+    permissionList () {
+      return this.$store.state.user.menuList || []
     }
   },
   created () {
     this.getList()
   },
   components: {
-    ElDialog
+    ElDialog,
+    TeamAccountFlow
   },
   methods: {
+    hasPermission (key) {
+      return !!this.permissionList.some(item => item.code === key)
+    },
     reset () {
       this.$refs.form.resetFields()
     },
@@ -189,7 +365,6 @@ export default {
       this.form.pageSize = size
       this.getList()
     },
-    // 获取通道列表
     getList (goFirst) {
       let params = { ...this.form }
 
@@ -202,13 +377,14 @@ export default {
         this.loading = false
       })
     },
-    // 打开弹框
     openAddDialog () {
       this.currentItem = {
         id: '',
         name: '',
         contactName: '',
         contactPhone: '',
+        balance: 0,
+        creditLimit: 0,
         remark: ''
       }
       this.dialogVisible = true
@@ -236,11 +412,72 @@ export default {
         this.dialogVisible = false
         this.getList()
       })
+    },
+    openRechargeDialog (row) {
+      Object.assign(this.moneyForm, {
+        teamId: row.id,
+        amount: 0,
+        remark: ''
+      })
+      this.rechargeDialogVisible = true
+    },
+    confirmRecharge () {
+      teamRecharge(this.moneyForm).then(() => {
+        this.$message.success('充值成功')
+        this.rechargeDialogVisible = false
+        this.getList()
+      })
+    },
+    openDeductDialog (row) {
+      Object.assign(this.moneyForm, {
+        teamId: row.id,
+        amount: 0,
+        remark: ''
+      })
+      this.deductDialogVisible = true
+    },
+    confirmDeduct () {
+      teamDeduct(this.moneyForm).then(() => {
+        this.$message.success('扣款成功')
+        this.deductDialogVisible = false
+        this.getList()
+      })
+    },
+    openAdjustDialog (row) {
+      Object.assign(this.adjustForm, {
+        teamId: row.id,
+        amount: row.creditLimit || 0,
+        remark: ''
+      })
+      this.adjustDialogVisible = true
+    },
+    confirmAdjust () {
+      teamAdjust(this.adjustForm).then(() => {
+        this.$message.success('调整授信额度成功')
+        this.adjustDialogVisible = false
+        this.getList()
+      })
+    },
+    gotoRecord (row) {
+      this.selectedTeamId = row.id
+      this.selectedTeamName = row.name
+      this.activeTab = 'accountFlow'
+    },
+    reportExport () {
+      const params = {
+        ...this.form,
+        export: true
+      }
+      getTeamList(params).then(() => {
+        this.$message.success('导出成功。')
+        this.goToDownload()
+      }).catch(() => {
+        this.$message.error('导出失败。')
+      })
     }
   }
 }
 </script>
 
 <style scoped>
-
 </style>

src/pages/queryReport/salesQuery.vue

@@ -449,6 +449,19 @@
           prop="ticketNum"
           label="所含票数"
         >
+          <template slot-scope="scope">
+            <div class="order-info-item">
+              <div class="label">
+                总张数：{{ scope.row.ticketNum }}
+              </div>
+            </div>
+            <div
+              class="order-info-item">
+              <div class="label">
+                总人数：{{ scope.row.ticketCheckNum }}
+              </div>
+            </div>
+          </template>
         </el-table-column>
         <!-- <el-table-column
           width="80"

src/pages/sellManage/retail/FormInfo.vue

@@ -36,7 +36,7 @@
             <el-option
               v-for="item in teamList"
               :key="item.id"
-              :label="item.name"
+              :label="`${item.name}-余额￥${item.balance}-信用额度￥${item.creditLimit}`"
               :value="item.id">
             </el-option>
           </el-select>
@@ -383,9 +383,7 @@ export default {
   },
   created () {
     if (this.isTeam) {
-      getTeamList({ pageSize: -1, pageNum: 1 }).then(res => {
-        this.teamList = res.data.records || []
-      })
+      this.getTeams()
       getGuideList({ pageSize: -1, pageNum: 1 }).then(res => {
         this.guideList = res.data.records || []
       })
@@ -395,6 +393,11 @@ export default {
     verifyId,
     verifyPhone,
     randomString,
+    getTeams () {
+      getTeamList({ pageSize: -1, pageNum: 1 }).then(res => {
+        this.teamList = res.data.records || []
+      })
+    },
     setFocus () {
       this.$refs.ticketCount.focus()
       this.$refs.ticketCount.select()
@@ -646,6 +649,12 @@ export default {
       }, 600)
     })
 
+    EventBus.$on('orderCreated', () => {
+      if (this.isTeam) {
+        this.getTeams()
+      }
+    })
+
     if (this.retailLockCheckStyle) {
       this.form.checkWay = this.$localStore.get(`${this.saleType}_checkWay`) || (this.isTeam ? 2 : 1)
     } else {
@@ -654,6 +663,7 @@ export default {
   },
   beforeDestroy () {
     EventBus.$off('ticketChanged')
+    EventBus.$off('orderCreated')
   },
 
   watch: {

src/pages/sellManage/retail/mixin.js

@@ -1,7 +1,14 @@
 export default {
   computed: {
     payChannelOptions () {
-      return this.$store.state.app.payChannelOptions.filter(i => i.indexOf('旅行社') < 0)
+      const options = this.$store.state.app.payChannelOptions.filter(i => i.indexOf('旅行社') < 0) || []
+      const type = this.$route.meta.type
+
+      if (type === 'team') {
+        return options
+      }
+
+      return options.filter(i => i !== '团队授信')
     }
   }
 }