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

src/api/his/company.js

@@ -71,3 +71,26 @@ export function exportCompany(query) {
     params: query
   })
 }
+
+export function getDivConfig(companyId) {
+  return request({
+    url: '/his/company/getDivConfig/' + companyId,
+    method: 'get'
+  })
+}
+
+// 设置分账配置
+export function setDiv(data) {
+  return request({
+    url: '/his/company/setDiv',
+    method: 'post',
+    data: data
+  })
+}
+export function exitMiniProgram(data) {
+  return request({
+    url: '/his/company/exitMiniProgram',
+    method: 'post',
+    data: data
+  })
+}

src/api/system/dept.js

@@ -77,7 +77,7 @@ export function updatePadNum(data) {
 }
 
 
-// 查询部门详细
+// 充值部门红包
 export function addRedMoney(data) {
   return request({
     url: '/system/dept/addRedMoney',
@@ -86,8 +86,17 @@ export function addRedMoney(data) {
   })
 }
 
+// 扣减部门红包
+export function deductRedMoney(data) {
+  return request({
+    url: '/system/dept/deductRedMoney',
+    method: 'get',
+    params: data
+  })
+}
 
-// 查询部门详细
+
+// 充值部门流量
 export function addFlowNum(data) {
   return request({
     url: '/system/dept/addFlowNum',
@@ -95,3 +104,50 @@ export function addFlowNum(data) {
     params: data
   })
 }
+
+// 扣减部门流量
+export function deductFlowNum(data) {
+  return request({
+    url: '/system/dept/deductFlowNum',
+    method: 'get',
+    params: data
+  })
+}
+
+// 查询部门流量明细列表
+export function flowDetailList(query) {
+  return request({
+    url: '/system/dept/flowDetailList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询部门红包明细列表
+export function redMoneyDetailList(query) {
+  return request({
+    url: '/system/dept/redMoneyDetailList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出部门红包明细
+export function exportRedMoneyDetail(deptId) {
+  return request({
+    url: '/system/dept/exportRedMoneyDetail',
+    method: 'get',
+    params: { deptId: deptId },
+    responseType: 'blob'
+  })
+}
+
+// 导出部门流量明细
+export function exportFlowDetail(deptId) {
+  return request({
+    url: '/system/dept/exportFlowDetail',
+    method: 'get',
+    params: { deptId: deptId },
+    responseType: 'blob'
+  })
+}

src/views/his/company/index.vue

@@ -134,7 +134,7 @@
       <el-table-column label="创建时间" align="center" prop="createTime" width="180"/>
       <el-table-column label="更新时间" align="center" prop="updateTime" width="180"/>
       <!--      <el-table-column label="主机重启时间" align="center" prop="restartTime" width="180" />-->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200px">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="300px">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -176,7 +176,13 @@
             v-hasPermi="['his:company:deduct']"
           >扣款
           </el-button>
-
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleRevenue(scope.row)"
+            v-hasPermi="['his:companyDivConfig:set']"
+          >分账配置</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -473,6 +479,99 @@
         <el-button @click="deduct.open=false">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :title="revenue.title" :visible.sync="revenue.open" width="800px" append-to-body>
+      <el-form ref="revenueForm"  :model="revenueForm" label-width="150px">
+        <el-form-item label="公司">
+          <el-input v-model="revenueForm.companyName" disabled/>
+        </el-form-item>
+
+        <el-form-item label="开启分账">
+          <el-switch
+            v-model="revenueForm.divFlag"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            active-value="1"
+            inactive-value="0"
+          >
+          </el-switch>
+        </el-form-item>
+
+        <el-form-item label="分账模式" v-if="revenueForm.divFlag == 1">
+          <el-radio v-model="revenueForm.delayAcctFlag" label="N">实时分账</el-radio>
+          <el-radio v-model="revenueForm.delayAcctFlag" label="Y">延时分账</el-radio>
+        </el-form-item>
+        <el-form-item label="是否使用百分比分账" v-if="revenueForm.divFlag == 1">
+          <el-switch
+            v-model="revenueForm.percentageFlag"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            active-value="Y"
+            inactive-value="N"
+          >
+          </el-switch>
+        </el-form-item>
+        <el-form-item label="是否净值分账" v-if="revenueForm.percentageFlag == 'Y'">
+          <el-switch
+            v-model="revenueForm.iscCleanSplit"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            active-value="Y"
+            inactive-value="N"
+          >
+          </el-switch>
+        </el-form-item>
+        <div v-if="revenueForm.divFlag == 1">
+          <el-form-item label="分账接收方配置">
+            <el-tooltip content="批量设置分账接收账户" placement="top">
+              <el-button type="primary" icon="el-icon-plus" @click="addAcctInfo" style="margin-bottom: 5px;">
+                添加新接收方
+              </el-button>
+            </el-tooltip>
+
+          </el-form-item>
+
+          <div v-for="(account, index) in revenueForm.acctInfos" :key="index"
+               style="border: 1px solid #dcdfe6; padding: 20px; margin-bottom: 20px; border-radius: 4px;"
+          >
+            <div style="display: flex; justify-content: between; align-items: center; margin-bottom: 15px;">
+              <div style="margin: 0; color: #409eff;">账户 {{ index + 1 }}</div>
+              <el-button
+                type="danger"
+                icon="el-icon-delete"
+                size="mini"
+                @click="removeAcctInfo(index)"
+                v-if="revenueForm.acctInfos.length > 0"
+              >
+                删除账户
+              </el-button>
+            </div>
+
+            <el-form-item label="分账接收方ID" :prop="`acctInfos.${index}.huifuId`">
+              <el-input v-model="account.huifuId"   placeholder="斗拱开户时生成；示例值：6666000123120001"></el-input>
+            </el-form-item>
+            <el-form-item label="账户号" :prop="`acctInfos.${index}.acctId`" >
+              <el-input v-model="account.acctId"  placeholder="可指定账户号，仅支持基本户、现金户，不填默认为基本户；示例值：F00598600"></el-input>
+            </el-form-item>
+
+            <el-form-item label="分账百分比%" v-if="revenueForm.percentageFlag == 'Y'" :prop="`acctInfos.${index}.percentageDiv`"  >
+              <el-input-number v-model="account.percentageDiv" :precision="2" :step="0.1" :min="0" :max="100" placeholder="示例值：23.50，表示23.50%。acct_infos中全部分账百分比之和必须为100.00%。"></el-input-number>
+            </el-form-item>
+            <el-form-item label="分账金额" v-if="revenueForm.percentageFlag == 'N'" :prop="`acctInfos.${index}.divAmt`"  >
+              <el-input-number v-model="account.divAmt" :precision="2" :step="1" :min="0.01" placeholder="单位元，需保留小数点后两位，示例值：1.00 ，最低传入0.01"></el-input-number>
+            </el-form-item>
+
+          </div>
+        </div>
+
+
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitRevenueForm">确 定</el-button>
+        <el-button @click="revenue.open=false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -486,7 +585,10 @@ import {
   recharge,
   deduct,
   exportCompany,
-  resetPwd
+  resetPwd,
+  getDivConfig,
+  setDiv,
+  exitMiniProgram
 } from '@/api/his/company'
 import { getFollowDoctorList } from '@/api/his/doctor'
 import { docList } from '@/api/his/doctor'
@@ -501,6 +603,23 @@ export default {
   name: 'Company',
   data() {
     return {
+      signProjectName:"",
+      redSubmit: false,
+      //分账参数
+      revenue:{
+        open: false,
+        title: '分账配置'
+      },
+      revenueForm:{
+        companyId: null,
+        companyName: '',
+        divFlag: '0',
+        delayAcctFlag: 'N',
+        percentageFlag: 'N',
+        iscCleanSplit: 'N',
+        acctInfos: [],
+        isAdd: 1
+      },
       // 表单参数
       deductForm: {
         money: 0
@@ -669,6 +788,70 @@ export default {
     })
   },
   methods: {
+    // 添加分账账户
+    addAcctInfo() {
+      this.revenueForm.acctInfos.push({
+        huifuId: '',
+        acctId: '',
+        percentageDiv: null,
+        divAmt: null
+      })
+    },
+    // 删除接收方账户
+    removeAcctInfo(index) {
+      this.$confirm('确认删除该接收方账户?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.revenueForm.acctInfos.splice(index, 1)
+        this.$message.success('删除成功')
+      }).catch(() => {
+      })
+    },
+    handleRevenue(row){
+      const companyId = row.companyId
+      // 重置表单数据,避免保留上次的数据
+      this.revenueForm = {
+        companyId: companyId,
+        companyName: row.companyName,
+        divFlag: '0',
+        delayAcctFlag: 'N',
+        percentageFlag: 'N',
+        iscCleanSplit: 'N',
+        acctInfos: [],
+        isAdd: 1
+      }
+
+      //查询配置
+      getDivConfig(companyId).then(response => {
+        if(response.data){
+          this.revenueForm = {
+            ...response.data,
+            companyId: companyId,
+            companyName: row.companyName,
+            isAdd: 0  // 已有配置,设置为更新操作
+          }
+          if(response.data.acctInfos == null){
+            this.revenueForm.acctInfos = []
+          }
+          if(response.data.divFlag != null){
+            this.revenueForm.divFlag = String(response.data.divFlag)
+          }
+          if(!response.data.delayAcctFlag){
+            this.revenueForm.delayAcctFlag = 'N'
+          }
+          if(!response.data.percentageFlag){
+            this.revenueForm.percentageFlag = 'N'
+          }
+          if(!response.data.iscCleanSplit){
+            this.revenueForm.iscCleanSplit = 'N'
+          }
+        }
+      })
+
+      this.revenue.open = true
+    },
     handleRecharge(row) {
       const companyId = row.companyId
       this.rechargeForm.companyId = row.companyId
@@ -685,6 +868,22 @@ export default {
       this.deductForm.money = null
       this.deduct.open = true
     },
+    submitRevenueForm(){
+      // 使用深拷贝,避免影响其他数据
+      var param = JSON.parse(JSON.stringify(this.revenueForm));
+      console.log("--------------提交的分账配置参数",param)
+      if(param.companyId && param.divFlag != null){
+        setDiv(param).then(response => {
+          if (response.code === 200) {
+            this.msgSuccess(response.msg)
+            this.revenue.open = false
+            this.getList()
+          }
+        })
+      } else {
+        this.$message.error('请填写完整的分账配置信息')
+      }
+    },
     /** 提交按钮 */
     submitRechargeForm() {
       this.$refs['rechargeForm'].validate(valid => {

src/views/hisStore/storeProductAudit/index.vue

@@ -845,7 +845,7 @@ export default {
   data() {
     return {
       isAuditMode: false, // 添加此标志位控制是否为审核模式
-      activeValue: '0',
+      activeValue: '1',
       gmpAuthValue:false,
       certificateValue:false,
       licenseValue:false,

src/views/system/config/config.vue

@@ -1505,6 +1505,14 @@
              </el-switch>
            </el-form-item>
 
+          <el-form-item label="是否开启企微二维码" prop="showQwCode">
+            <el-switch
+              v-model="form18.showQwCode"
+              active-color="#13ce66"
+              inactive-color="#ff4949">
+            </el-switch>
+          </el-form-item>
+
           <el-form-item label="登录小程序appId" prop="loginMiniAppId">
             <el-input style="width: 300px" v-model="form18.loginMiniAppId" label="登录小程序appId"></el-input>
           </el-form-item>

src/views/system/dept/index.vue

@@ -125,12 +125,36 @@
             @click="handleUpdateFlow(scope.row)"
             v-if="scope.row.deptId !== 1 && deptLimit"
           >充值流量</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleDeductFlow(scope.row)"
+            v-if="scope.row.deptId !== 1 && deptLimit"
+          >扣减流量</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleFlowDetail(scope.row)"
+            v-if="scope.row.deptId !== 1 && deptLimit"
+          >流量明细</el-button>
           <el-button
             size="mini"
             type="text"
             @click="handleUpdateRedPackage(scope.row)"
             v-if="scope.row.deptId !== 1 && deptLimit"
           >充值红包</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleDeductRedPackage(scope.row)"
+            v-if="scope.row.deptId !== 1 && deptLimit"
+          >扣减红包</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleRedMoneyDetail(scope.row)"
+            v-if="scope.row.deptId !== 1 && deptLimit"
+          >红包明细</el-button>
           <el-button
             size="mini"
             type="text"
@@ -167,11 +191,39 @@
             style="width: 100%;"
           />
         </el-form-item>
-        <el-form-item label="充值金额" prop="pad" v-if="resourceForm.type != 0">
+        <el-form-item label="充值金额" prop="pad" v-if="resourceForm.type == 2">
+          <el-input type="number" v-model="resourceForm.money" :min=0>
+            <template slot="append">元</template>
+          </el-input>
+          <span style="color: #fb1c1c;display: inline-block">{{flowPrice}}元 / GB</span>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark" v-if="resourceForm.type == 2">
+          <el-input type="textarea" v-model="resourceForm.remark" placeholder="请输入备注信息" :rows="3" maxlength="200" show-word-limit />
+        </el-form-item>
+        <el-form-item label="扣减金额" prop="pad" v-if="resourceForm.type == 3">
+          <el-input type="number" v-model="resourceForm.money" :min=0>
+            <template slot="append">元</template>
+          </el-input>
+          <span style="color: #fb1c1c;display: inline-block">{{flowPrice}}元 / GB</span>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark" v-if="resourceForm.type == 3">
+          <el-input type="textarea" v-model="resourceForm.remark" placeholder="请输入备注信息" :rows="3" maxlength="200" show-word-limit />
+        </el-form-item>
+        <el-form-item label="充值金额" prop="pad" v-if="resourceForm.type == 1">
           <el-input type="number" v-model="resourceForm.money" :min=0>
             <template slot="append">元</template>
           </el-input>
-          <span style="color: #fb1c1c;display: inline-block" v-if="resourceForm.type == 2">{{flowPrice}}元 / GB</span>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark" v-if="resourceForm.type == 1">
+          <el-input type="textarea" v-model="resourceForm.remark" placeholder="请输入备注信息" :rows="3" maxlength="200" show-word-limit />
+        </el-form-item>
+        <el-form-item label="扣减金额" prop="pad" v-if="resourceForm.type == 4">
+          <el-input type="number" v-model="resourceForm.money" :min=0>
+            <template slot="append">元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark" v-if="resourceForm.type == 4">
+          <el-input type="textarea" v-model="resourceForm.remark" placeholder="请输入备注信息" :rows="3" maxlength="200" show-word-limit />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -232,11 +284,101 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 流量明细对话框 -->
+    <el-dialog title="部门流量明细" :visible.sync="openFlowDetail" width="1200px" append-to-body>
+      <div style="margin-bottom: 10px;">
+        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExportFlowDetail">导出</el-button>
+      </div>
+      <el-table v-loading="flowDetailLoading" :data="flowDetailList">
+        <el-table-column label="操作时间" align="center" prop="createTime" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作类型" align="center" prop="operateType" width="120">
+          <template slot-scope="scope">
+            <el-tag :type="scope.row.operateType === 0 ? 'success' : 'danger'">
+              {{ scope.row.operateType === 0 ? '充值' : '扣减' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作数量" align="center" prop="num" width="150">
+          <template slot-scope="scope">
+            <span>{{ formatBalance(scope.row.num) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作前余额" align="center" prop="firstNum" width="150">
+          <template slot-scope="scope">
+            <span>{{ formatBalance(scope.row.firstNum) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作后余额" align="center" prop="lastNum" width="150">
+          <template slot-scope="scope">
+            <span>{{ formatBalance(scope.row.lastNum) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作人" align="center" prop="createBy" width="120" />
+        <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
+      </el-table>
+      <pagination
+        v-show="flowDetailTotal>0"
+        :total="flowDetailTotal"
+        :page.sync="flowDetailQuery.pageNum"
+        :limit.sync="flowDetailQuery.pageSize"
+        @pagination="getFlowDetailList"
+      />
+    </el-dialog>
+
+    <!-- 红包明细对话框 -->
+    <el-dialog title="部门红包明细" :visible.sync="openRedMoneyDetail" width="1200px" append-to-body>
+      <div style="margin-bottom: 10px;">
+        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExportRedMoneyDetail">导出</el-button>
+      </div>
+      <el-table v-loading="redMoneyDetailLoading" :data="redMoneyDetailList">
+        <el-table-column label="操作时间" align="center" prop="createTime" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作类型" align="center" prop="operateType" width="120">
+          <template slot-scope="scope">
+            <el-tag :type="scope.row.operateType === 0 ? 'success' : 'danger'">
+              {{ scope.row.operateType === 0 ? '充值' : '扣减' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作金额（元）" align="center" prop="num" width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.num }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作前余额（元）" align="center" prop="firstNum" width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.firstNum }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作后余额（元）" align="center" prop="lastNum" width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.lastNum }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作人" align="center" prop="createBy" width="120" />
+        <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
+      </el-table>
+      <pagination
+        v-show="redMoneyDetailTotal>0"
+        :total="redMoneyDetailTotal"
+        :page.sync="redMoneyDetailQuery.pageNum"
+        :limit.sync="redMoneyDetailQuery.pageSize"
+        @pagination="getRedMoneyDetailList"
+      />
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild, updatePadNum, addRedMoney, addFlowNum } from "@/api/system/dept";
+import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild, updatePadNum, addRedMoney, addFlowNum, deductFlowNum, flowDetailList, redMoneyDetailList, deductRedMoney, exportRedMoneyDetail, exportFlowDetail } from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { addOrEditDeptResource, getDeptResource } from '@/api/system/resourceManagement'
@@ -272,6 +414,26 @@ export default {
       // 是否展开
       expand: false,
       flowPrice: 0,
+      // 流量明细对话框
+      openFlowDetail: false,
+      flowDetailLoading: false,
+      flowDetailList: [],
+      flowDetailTotal: 0,
+      flowDetailQuery: {
+        pageNum: 1,
+        pageSize: 10,
+        deptId: undefined
+      },
+      // 红包明细对话框
+      openRedMoneyDetail: false,
+      redMoneyDetailLoading: false,
+      redMoneyDetailList: [],
+      redMoneyDetailTotal: 0,
+      redMoneyDetailQuery: {
+        pageNum: 1,
+        pageSize: 10,
+        deptId: undefined
+      },
       // 状态数据字典
       statusOptions: [],
       // 查询参数
@@ -435,6 +597,16 @@ export default {
         type: 1,
         deptId: row.deptId,
         money: 0,
+        remark: ''
+      }
+    },
+    handleDeductRedPackage(row) {
+      this.openResource = true;
+      this.resourceForm = {
+        type: 4,
+        deptId: row.deptId,
+        money: 0,
+        remark: ''
       }
     },
     handleUpdateFlow(row) {
@@ -443,8 +615,64 @@ export default {
         type: 2,
         deptId: row.deptId,
         money: 0,
+        remark: ''
       }
     },
+    handleDeductFlow(row) {
+      this.openResource = true;
+      this.resourceForm = {
+        type: 3,
+        deptId: row.deptId,
+        money: 0,
+        remark: ''
+      }
+    },
+    /** 查看流量明细 */
+    handleFlowDetail(row) {
+      this.openFlowDetail = true;
+      this.flowDetailQuery.deptId = row.deptId;
+      this.flowDetailQuery.pageNum = 1;
+      this.getFlowDetailList();
+    },
+    /** 查询流量明细列表 */
+    getFlowDetailList() {
+      this.flowDetailLoading = true;
+      flowDetailList(this.flowDetailQuery).then(response => {
+        this.flowDetailList = response.rows;
+        this.flowDetailTotal = response.total;
+        this.flowDetailLoading = false;
+      }).catch(() => {
+        this.flowDetailLoading = false;
+      });
+    },
+    /** 查看红包明细 */
+    handleRedMoneyDetail(row) {
+      this.openRedMoneyDetail = true;
+      this.redMoneyDetailQuery.deptId = row.deptId;
+      this.redMoneyDetailQuery.pageNum = 1;
+      this.getRedMoneyDetailList();
+    },
+    /** 查询红包明细列表 */
+    getRedMoneyDetailList() {
+      this.redMoneyDetailLoading = true;
+      redMoneyDetailList(this.redMoneyDetailQuery).then(response => {
+        this.redMoneyDetailList = response.rows;
+        this.redMoneyDetailTotal = response.total;
+        this.redMoneyDetailLoading = false;
+      }).catch(() => {
+        this.redMoneyDetailLoading = false;
+      });
+    },
+    /** 导出流量明细 */
+    handleExportFlowDetail() {
+      this.download('/system/dept/exportFlowDetail?deptId=' + this.flowDetailQuery.deptId, {
+      }, `部门流量明细_${new Date().getTime()}.xlsx`);
+    },
+    /** 导出红包明细 */
+    handleExportRedMoneyDetail() {
+      this.download('/system/dept/exportRedMoneyDetail?deptId=' + this.redMoneyDetailQuery.deptId, {
+      }, `部门红包明细_${new Date().getTime()}.xlsx`);
+    },
     formatBalance(flow){
       //对流量值进行判断，换算成GB或TB
       if(!flow){
@@ -519,6 +747,28 @@ export default {
           }
         });
       }
+      if(this.resourceForm.type == 3){
+        deductFlowNum(this.resourceForm).then(response => {
+          if(response.code === 200){
+            this.msgSuccess("扣减成功");
+            this.openResource = false;
+            this.getList();
+          }else{
+            this.msgError(response.msg);
+          }
+        });
+      }
+      if(this.resourceForm.type == 4){
+        deductRedMoney(this.resourceForm).then(response => {
+          if(response.code === 200){
+            this.msgSuccess("扣减成功");
+            this.openResource = false;
+            this.getList();
+          }else{
+            this.msgError(response.msg);
+          }
+        });
+      }
     },
     /** 删除按钮操作 */
     handleDelete(row) {