瀏覽代碼

feat: 批量快捷出票

LaveyD 1 月之前
父節點
當前提交
9de13c7f33

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "ticket",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "private": true,
   "description": "售检票系统",
   "author": "",

+ 10 - 0
src/api/checker.js

@@ -160,3 +160,13 @@ export function getTeamAccountFlow (params) {
 export function getFiledByStatKey (params) {
   return http.post('/admin/statFieldConfig/getFiledByStatKey', { data: params })
 }
+
+// 团队账户欠款记录
+export function getDebtList (params) {
+  return http.post('/admin/team/teamAccountFlow/debtList', { data: params })
+}
+
+// 团队还款
+export function teamRepayment (params) {
+  return http.post('/admin/team/repayment', { data: params })
+}

+ 4 - 4
src/components/Dialog/index.vue

@@ -57,7 +57,7 @@ export default {
     handleClose (done) {
       console.log('调用handleClose时的submitDisable', this.submitDisable)
       // 子元素需要验证表单
-      if (this.childComponent.verify) {
+      if (this.childComponent && this.childComponent.verify) {
         this.childComponent.verify.then(val => {
           if (val) {
             this.childVisible = false
@@ -65,7 +65,7 @@ export default {
             this.$emit('close')
             // 通知slot 弹出关闭了
             this.$nextTick(() => {
-              this.childComponent.visible = false
+              this.childComponent && (this.childComponent.visible = false)
             })
           }
         }).catch(e => {
@@ -77,7 +77,7 @@ export default {
         this.$emit('close')
         // 通知slot 弹出关闭了
         this.$nextTick(() => {
-          this.childComponent.visible = false
+          this.childComponent && (this.childComponent.visible = false)
         })
       }
       if (this.submitDisable) {
@@ -103,7 +103,7 @@ export default {
     handleOpen () {
       // 通知slot 弹出打开了
       this.$nextTick(() => {
-        this.childComponent.visible = true
+        this.childComponent && (this.childComponent.visible = true)
       })
     }
   }

+ 25 - 2
src/pages/checkerManage/TeamAccountFlow.vue

@@ -20,8 +20,11 @@
         <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="PREPAY_PAY"></el-option>
+          <el-option label="预付款退款" value="PREPAY_REFUND"></el-option>
+          <el-option label="授信支付" value="CREDIT_PAY"></el-option>
+          <el-option label="授信退款" value="CREDIT_REFUND"></el-option>
+          <el-option label="还款" value="REPAYMENT"></el-option>
           <el-option label="调整授信额度" value="ADJUST"></el-option>
         </el-select>
       </el-form-item>
@@ -110,6 +113,22 @@
           label="变动后授信额度"
           width="130">
         </el-table-column>
+        <el-table-column
+          prop="debtAmount"
+          width="130">
+          <template slot="header">
+            当前总欠款
+            <Tip msg="授信支付未还总额"></Tip>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="remainingDebt"
+          width="130">
+          <template slot="header">
+            剩余应还
+            <Tip msg="剔除了退款的金额"></Tip>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="operatorName"
           label="操作人"
@@ -197,9 +216,13 @@
 
 <script>
 import { getTeamAccountFlow } from '@/api/checker'
+import Tip from '@/components/Tip'
 
 export default {
   name: 'TeamAccountFlow',
+  components: {
+    Tip
+  },
   props: {
     teamId: { type: [Number, String], default: null },
     teamName: { type: String, default: '' }

+ 342 - 40
src/pages/checkerManage/teamManage.vue

@@ -79,6 +79,22 @@
               prop="creditLimit"
               label="授信额度">
             </el-table-column>
+            <el-table-column
+              prop="debtAmount"
+              width="130">
+              <template slot="header">
+                当前总欠款
+                <Tip msg="授信支付未还总额"></Tip>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="debtNums"
+              width="130">
+              <template slot="header">
+                当前总欠款单数
+                <Tip msg="授信支付未还总数"></Tip>
+              </template>
+            </el-table-column>
             <el-table-column
               prop="remark"
               label="备注">
@@ -87,49 +103,57 @@
               width="350px"
               label="操作">
               <template slot-scope="scope">
-                <el-link
-                  type="primary"
-                  v-if="hasPermission('team-money-manage')"
-                  @click="openRechargeDialog(scope.row)"
-                >
-                  充值
-                </el-link>
+                <div v-if="hasPermission('team-money-manage')">
+                  <el-link
+                    type="primary"
+                    @click="openRechargeDialog(scope.row)"
+                  >
+                    充值
+                  </el-link>
+
+                  <el-link
+                    type="primary"
+                    @click="openDeductDialog(scope.row)"
+                  >
+                    扣款
+                  </el-link>
 
-                <el-link
-                  type="primary"
-                  v-if="hasPermission('team-money-manage')"
-                  @click="openDeductDialog(scope.row)"
-                >
-                  扣款
-                </el-link>
+                  <el-link
+                    type="primary"
+                    @click="openRepaymentDialog(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>
+                  <el-link
+                    type="primary"
+                    @click="openAdjustDialog(scope.row)"
+                  >
+                    调整授信额度
+                  </el-link>
+                </div>
+                <div>
+                  <el-link
+                    type="primary"
+                    @click="gotoRecord(scope.row)"
+                  >
+                    账户记录
+                  </el-link>
 
-                <el-link
-                  type="primary"
-                  @click="openEditDialog(scope.row)"
-                >
-                  编辑
-                </el-link>
+                  <el-link
+                    type="primary"
+                    @click="openEditDialog(scope.row)"
+                  >
+                    编辑
+                  </el-link>
 
-                <el-link
-                  type="primary"
-                  @click="deleteGroup(scope.row)"
-                >
-                  删除
-                </el-link>
+                  <el-link
+                    type="primary"
+                    @click="deleteGroup(scope.row)"
+                  >
+                    删除
+                  </el-link>
+                </div>
               </template>
             </el-table-column>
           </el-table>
@@ -296,11 +320,144 @@
         <el-button type="primary" @click="confirmAdjust">确定</el-button>
       </div>
     </ElDialog>
+
+    <!-- 还款弹框 -->
+    <ElDialog
+      title="还款"
+      width="1300px"
+      v-model="repaymentDialogVisible"
+      @close="handleRepaymentClose"
+    >
+      <div class="dialog-body-scroll">
+        <div class="transfer-container">
+          <div class="transfer-left">
+            <div class="transfer-header">
+              欠款记录
+              <el-button
+                type="primary"
+                size="small"
+                :disabled="!leftCheckedList.length"
+                @click="addToSelected"
+                style="float: right;"
+              >
+                添加至已选 &gt;&gt;
+              </el-button>
+            </div>
+            <el-table
+                border
+                ref="debtTableRef"
+                :data="debtList"
+                v-loading="debtLoading"
+                @selection-change="onDebtSelectionChange"
+                size="small"
+              >
+                <el-table-column type="selection" width="40" />
+                <el-table-column prop="createTime" label="创建时间" width="140" />
+                <el-table-column prop="teamName" label="团队名称" width="110" show-overflow-tooltip />
+                <el-table-column label="交易类型" width="120">
+                  <template slot-scope="scope">
+                    {{ formatTransactionType(scope.row.transactionType) }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="amount" label="交易金额" width="100" />
+                <el-table-column prop="remainingDebt" label="剩余欠款" width="100" />
+                <el-table-column prop="balanceBefore" label="交易前余额" width="100" />
+                <el-table-column prop="balanceAfter" label="交易后余额" width="100" />
+                <el-table-column prop="debtAmountBefore" label="欠款调整前" width="100" />
+                <el-table-column prop="debtAmountAfter" label="欠款调整后" width="100" />
+                <el-table-column prop="creditLimitBefore" label="额度调整前" width="100" />
+                <el-table-column prop="creditLimitAfter" label="额度调整后" width="100" />
+                <el-table-column prop="ticketCheckNum" label="票总人数" width="80" />
+                <el-table-column prop="price" label="订单总额" width="100" />
+                <el-table-column prop="ticketCancelCheckNum" label="退票人数" width="80" />
+                <el-table-column prop="cancelPrice" label="退票总额" width="100" />
+                <el-table-column prop="operatorName" label="操作员" width="90" />
+                <el-table-column prop="operateTime" label="操作时间" width="140" />
+                <el-table-column prop="linkOrderId" label="关联订单" width="80" />
+                <el-table-column prop="remark" label="备注" min-width="120" show-overflow-tooltip />
+              </el-table>
+            <el-pagination
+              background
+              small
+              layout="total, prev, pager, next"
+              :current-page="debtPageNum"
+              :page-size="debtPageSize"
+              @current-change="handleDebtPageChange"
+              :total="debtTotal"
+            >
+            </el-pagination>
+          </div>
+
+          <div class="transfer-right">
+            <div class="transfer-header">
+              已选记录
+              <el-button
+                size="small"
+                :disabled="!rightSelectedList.length"
+                @click="clearSelected"
+                style="float: right;"
+              >
+                清除已选
+              </el-button>
+            </div>
+            <el-table
+                border
+                :data="rightSelectedList"
+                size="small"
+              >
+                <el-table-column type="index" label="序号" width="50" />
+                <el-table-column prop="createTime" label="创建时间" width="140" />
+                <el-table-column prop="teamName" label="团队名称" width="110" show-overflow-tooltip />
+                <el-table-column label="交易类型" width="120">
+                  <template slot-scope="scope">
+                    {{ formatTransactionType(scope.row.transactionType) }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="amount" label="交易金额" width="100" />
+                <el-table-column prop="remainingDebt" label="剩余欠款" width="100" />
+                <el-table-column prop="balanceBefore" label="交易前余额" width="100" />
+                <el-table-column prop="balanceAfter" label="交易后余额" width="100" />
+                <el-table-column prop="debtAmountBefore" label="欠款调整前" width="100" />
+                <el-table-column prop="debtAmountAfter" label="欠款调整后" width="100" />
+                <el-table-column prop="creditLimitBefore" label="额度调整前" width="100" />
+                <el-table-column prop="creditLimitAfter" label="额度调整后" width="100" />
+                <el-table-column prop="ticketCheckNum" label="票总人数" width="80" />
+                <el-table-column prop="price" label="订单总额" width="100" />
+                <el-table-column prop="ticketCancelCheckNum" label="退票人数" width="80" />
+                <el-table-column prop="cancelPrice" label="退票总额" width="100" />
+                <el-table-column prop="operatorName" label="操作员" width="90" />
+                <el-table-column prop="operateTime" label="操作时间" width="140" />
+                <el-table-column prop="linkOrderId" label="关联订单" width="80" />
+                <el-table-column prop="remark" label="备注" min-width="120" show-overflow-tooltip />
+                <el-table-column label="操作" width="60" fixed="right">
+                  <template slot-scope="scope">
+                    <el-link type="danger" @click="removeSelectedItem(scope.row)">移除</el-link>
+                  </template>
+                </el-table-column>
+              </el-table>
+            <div class="transfer-total">
+              还款总额:<span class="total-amount">¥ {{ totalRepaymentAmount }}</span>
+            </div>
+          </div>
+        </div>
+
+        <el-form class="form-wrap" label-width="80px" style="margin-top: 16px;">
+          <el-form-item label="备注">
+            <el-input v-model="repaymentForm.remark" placeholder="请输入还款备注" />
+          </el-form-item>
+        </el-form>
+      </div>
+
+      <div style="margin: 16px 0 0; float: right;">
+        <el-button @click="repaymentDialogVisible = false">取消</el-button>
+        <el-button type="primary" :disabled="!rightSelectedList.length" @click="confirmRepayment">确定还款</el-button>
+      </div>
+    </ElDialog>
   </div>
 </template>
 
 <script>
-import { getTeamList, addTeam, updateTeam, deleteTeam, teamRecharge, teamDeduct, teamAdjust } from '@/api/checker'
+import { getTeamList, addTeam, updateTeam, deleteTeam, teamRecharge, teamDeduct, teamAdjust, getDebtList, teamRepayment } from '@/api/checker'
 import ElDialog from '@/components/Dialog'
 
 const TeamAccountFlow = () => import('./TeamAccountFlow.vue')
@@ -336,6 +493,18 @@ export default {
         teamId: null,
         amount: 0,
         remark: ''
+      },
+      repaymentDialogVisible: false,
+      debtList: [],
+      debtTotal: 0,
+      debtPageNum: 1,
+      debtPageSize: 10,
+      debtLoading: false,
+      leftCheckedList: [],
+      rightSelectedList: [],
+      repaymentForm: {
+        teamId: null,
+        remark: ''
       }
     }
   },
@@ -345,6 +514,9 @@ export default {
     },
     permissionList () {
       return this.$store.state.user.menuList || []
+    },
+    totalRepaymentAmount () {
+      return this.rightSelectedList.reduce((sum, item) => sum + (item.remainingDebt || 0), 0)
     }
   },
   created () {
@@ -474,10 +646,140 @@ export default {
       }).catch(() => {
         this.$message.error('导出失败。')
       })
+    },
+    openRepaymentDialog (row) {
+      this.repaymentForm = {
+        teamId: row.id,
+        remark: ''
+      }
+      this.rightSelectedList = []
+      this.leftCheckedList = []
+      this.debtPageNum = 1
+      this.debtList = []
+      this.debtTotal = 0
+      this.repaymentDialogVisible = true
+      this.loadDebtList()
+    },
+    loadDebtList () {
+      this.debtLoading = true
+      const params = {
+        id: 0,
+        teamId: this.repaymentForm.teamId,
+        pageNum: this.debtPageNum,
+        pageSize: this.debtPageSize,
+        export: false,
+        exportDetail: false,
+        removeSubtotal: false,
+        remark: ''
+      }
+      getDebtList(params).then(res => {
+        this.debtList = res.data?.records || []
+        this.debtTotal = res.data?.total || 0
+      }).finally(() => {
+        this.debtLoading = false
+      })
+    },
+    handleDebtPageChange (num) {
+      this.debtPageNum = num
+      this.loadDebtList()
+    },
+    onDebtSelectionChange (selection) {
+      this.leftCheckedList = selection
+    },
+    formatTransactionType (type) {
+      const map = {
+        'RECHARGE': '充值',
+        'DEDUCT': '扣款',
+        'PREPAY_PAY': '预付款支付',
+        'PREPAY_REFUND': '预付款退款',
+        'CREDIT_PAY': '授信支付',
+        'CREDIT_REFUND': '授信退款',
+        'REPAYMENT': '还款',
+        'ADJUST': '调整授信额度'
+      }
+      return map[type] || type || '-'
+    },
+    addToSelected () {
+      const existingIds = this.rightSelectedList.map(item => item.id)
+      const newItems = this.leftCheckedList.filter(item => !existingIds.includes(item.id))
+      this.rightSelectedList = [...this.rightSelectedList, ...newItems]
+      this.$message.success(`已添加 ${newItems.length} 条欠款记录`)
+      this.$refs.debtTableRef && this.$refs.debtTableRef.clearSelection()
+    },
+    removeSelectedItem (row) {
+      this.rightSelectedList = this.rightSelectedList.filter(item => item.id !== row.id)
+    },
+    clearSelected () {
+      this.rightSelectedList = []
+    },
+    handleRepaymentClose () {
+      this.$refs.debtTableRef && this.$refs.debtTableRef.clearSelection()
+      this.leftCheckedList = []
+    },
+    confirmRepayment () {
+      if (!this.rightSelectedList.length) {
+        this.$message.warning('请先选择欠款记录')
+        return
+      }
+      const debtList = this.rightSelectedList.map(item => ({
+        flowId: item.id,
+        amount: item.remainingDebt
+      }))
+      const params = {
+        teamId: this.repaymentForm.teamId,
+        amount: this.totalRepaymentAmount,
+        remark: this.repaymentForm.remark,
+        debtList
+      }
+      teamRepayment(params).then(() => {
+        this.$message.success('还款成功')
+        this.repaymentDialogVisible = false
+        this.getList()
+      })
     }
   }
 }
 </script>
 
 <style scoped>
+.dialog-body-scroll {
+  max-height: 60vh;
+  overflow-y: auto;
+  padding-right: 4px;
+}
+.transfer-container {
+  display: block;
+}
+.transfer-left,
+.transfer-right {
+  border: 1px solid #ebeef5;
+  border-radius: 4px;
+  padding: 12px;
+  margin-bottom: 16px;
+}
+.transfer-right {
+  margin-bottom: 0;
+}
+.transfer-header {
+  font-weight: bold;
+  margin-bottom: 10px;
+  padding-bottom: 8px;
+  border-bottom: 1px solid #ebeef5;
+  font-size: 14px;
+  color: #303133;
+  overflow: hidden;
+}
+.transfer-total {
+  margin-top: 12px;
+  text-align: right;
+  font-size: 14px;
+  font-weight: bold;
+  color: #303133;
+  padding: 8px 4px;
+  border-top: 1px solid #ebeef5;
+}
+.total-amount {
+  color: #f56c6c;
+  font-size: 18px;
+}
 </style>

+ 1 - 1
src/pages/queryReport/OrderStatistic.vue

@@ -465,7 +465,7 @@ export default {
         orderCategory: '',
         otaSourceNameList: [], // 渠道id
         payChannelList: [],
-        removeSubtotal: false,
+        removeSubtotal: true,
         adminIdList: [], // 售票员id
         scenicIdList: [], // 景点id
         groupByList: ['ticketTypeName'],

+ 5 - 9
src/pages/queryReport/salesQuery.vue

@@ -418,15 +418,11 @@
           label="购买方"
         >
           <template slot-scope="scope">
-            <div>
-              {{ scope.row.buyerName }}
-            </div>
-            <div>
-              {{ scope.row.buyerPhone }}
-            </div>
-            <div>
-              {{ scope.row.buyerIdentify }}
-            </div>
+            <div class=""><span>姓名:</span>{{ scope.row.buyerName }}</div>
+            <div class=""><span>手机号:</span>{{ scope.row.buyerPhone }}</div>
+            <div class=""><span>证件号:</span>{{ scope.row.buyerIdentify }}</div>
+            <div class=""><span>团队名称:</span>{{ scope.row.teamName }}</div>
+            <div class=""><span>导游名称:</span>{{ scope.row.guideName }}</div>
           </template>
         </el-table-column>
         <!-- <el-table-column

+ 17 - 0
src/pages/sellManage/retail/Confirm.vue

@@ -90,6 +90,15 @@
         </span>
       </el-form-item>
 
+      <el-form-item
+        v-if="['团队授信', '团队余额'].includes(currentPayChannel) && teamInfo"
+        label="团队"
+        class="warning">
+        <span>
+          {{ `${teamInfo.name} - 余额¥${teamInfo.balance} - 信用额度¥${teamInfo.creditLimit}` }}
+        </span>
+      </el-form-item>
+
       <br>
       <el-form-item
         label="下单备注">
@@ -230,6 +239,14 @@ export default {
       pageName: '散客售票'
     }
   },
+  mounted () {
+    console.log('Confirm mounted', this.formData)
+  },
+  computed: {
+    teamInfo () {
+      return this.formData.teamInfo
+    }
+  },
   methods: {
     setParams () {
       let tickets = JSON.parse(JSON.stringify(this.tickets))

+ 69 - 77
src/pages/sellManage/retail/FormInfo.vue

@@ -36,7 +36,7 @@
             <el-option
               v-for="item in teamList"
               :key="item.id"
-              :label="`${item.name}-余额¥${item.balance}-信用额度¥${item.creditLimit}`"
+              :label="`${item.name}`"
               :value="item.id">
             </el-option>
           </el-select>
@@ -55,6 +55,68 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item
+          prop="playDateBegin"
+          label="游玩日期">
+          <el-date-picker
+            :clearable="false"
+            type="date"
+            :editable="false"
+            disabled
+            :picker-options="dateOption"
+            v-model="form.playDateBegin"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item
+          prop="playDateEnd"
+          label="结束日期">
+          <el-date-picker
+            :clearable="false"
+            :editable="false"
+            disabled
+            :picker-options="dateOption"
+            v-model="form.playDateEnd"
+            type="date"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item
+          verify
+          number
+          label="购买数量"
+          prop="count"
+        >
+          <el-input-number
+            ref="ticketCount"
+            name="ticket-count"
+            v-model.number="form.count"
+            :min="1"
+            :max="10000"
+            :precision="0"
+          ></el-input-number>
+        </el-form-item>
+        <el-form-item
+          label="检票方式"
+          prop="checkWay">
+          <el-select
+            v-model="form.checkWay"
+            :disabled="retailLockCheckStyle">
+            <el-option
+              v-for="item in checkWayList"
+              :key="item.val"
+              :value="item.val"
+              :label="item.name"
+            ></el-option>
+          </el-select>
+          <el-checkbox
+            style="margin-left:10px"
+            v-model="retailLockCheckStyle">
+            锁定
+          </el-checkbox>
+        </el-form-item>
+        <el-collapse v-model="activeCollapse" style="width:100%">
+          <el-collapse-item title="顾客信息" name="customer">
         <el-form-item
           verify
           can-be-empty
@@ -91,24 +153,10 @@
             锁定
           </el-checkbox>
         </el-form-item>
-        <!-- <el-form-item
-          key="id1"
-          :verify="form.buyerIdentifyType === 0 ? verifyId : ''"
-          can-be-empty
-          v-if="form.buyerIdentifyType === 0"
-          label="证件号码"
-          prop="buyerIdentify">
-          <ReaderInput
-            type="ID"
-            @change="form.buyerName = $event.Name,Certificate=$event"
-            @input="form.buyerIdentify = $event"
-            v-model="form.buyerIdentify"></ReaderInput>
-        </el-form-item> -->
         <el-form-item
           key="id2"
           label="证件号码"
           prop="buyerIdentify">
-          <!-- <el-input v-model="form.buyerIdentify"></el-input> -->
           <ReaderInput
             type="ID"
             v-model="form.buyerIdentify"></ReaderInput>
@@ -131,67 +179,6 @@
         >
           {{ Certificate.ValidDate }}
         </el-form-item>
-        <el-form-item
-          prop="playDateBegin"
-          label="游玩日期">
-          <el-date-picker
-            :clearable="false"
-            type="date"
-            :editable="false"
-            disabled
-            :picker-options="dateOption"
-            v-model="form.playDateBegin"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item
-          prop="playDateEnd"
-          label="结束日期">
-          <el-date-picker
-            :clearable="false"
-            :editable="false"
-            disabled
-            :picker-options="dateOption"
-            v-model="form.playDateEnd"
-            type="date"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item
-          verify
-          number
-          label="购买数量"
-          prop="count"
-        >
-          <el-input-number
-            ref="ticketCount"
-            name="ticket-count"
-            v-model.number="form.count"
-            :min="1"
-            :max="10000"
-            :precision="0"
-          ></el-input-number>
-        </el-form-item>
-        <el-form-item
-          label="检票方式"
-          prop="checkWay">
-          <el-select
-            v-model="form.checkWay"
-            :disabled="retailLockCheckStyle">
-            <el-option
-              v-for="item in checkWayList"
-              :key="item.val"
-              :value="item.val"
-              :label="item.name"
-            ></el-option>
-          </el-select>
-          <el-checkbox
-            style="margin-left:10px"
-            v-model="retailLockCheckStyle">
-            锁定
-          </el-checkbox>
-        </el-form-item>
-        <!-- v-if="form.checkWay === 3 || form.checkWay === 4" -->
         <el-form-item
           label="游客信息"
         >
@@ -209,9 +196,11 @@
             </el-button>
           </div>
         </el-form-item>
+          </el-collapse-item>
+        </el-collapse>
       </el-form>
 
-      <div class="btn-wrap">
+      <div class="btn-wrap" style="margin-top: 6px;">
         <el-button
           @click="resetForm"
           style="margin-right:20px">
@@ -310,6 +299,7 @@ export default {
       category,
       isTeam: type === 'team',
       loading: false,
+      activeCollapse: [],
       keyControl: 2, // 键盘控制:1,2,3标识选中顺序
       isFocus: false, // 当前组件是否选中
       papersType: IDENTIFY_TYPES,
@@ -506,6 +496,8 @@ export default {
               this.$message.error('请选择团队')
               return
             }
+
+            this.form.teamInfo = this.teamList.find(item => item.id === this.form.teamId)
           }
 
           if (this.form.checkWay === 3) {

+ 1 - 1
src/pages/sellManage/retail/mixin.js

@@ -8,7 +8,7 @@ export default {
         return options
       }
 
-      return options.filter(i => i !== '团队授信')
+      return options.filter(i => i !== '团队授信' && i !== '团队余额')
     }
   }
 }