1

src/views/chargeManager/api.js

@@ -11,3 +11,23 @@ export function getPaymentConfigs(data) {
     })
 }
 
+// 新增按费用类型配置
+export function addTypeRoute(data) {
+  return request({
+    url: api + '/paymentConfig/addTypeRoute',
+    method: 'post',
+    headers: {
+      'content-type': 'application/x-www-form-urlencoded'
+    },
+    data: qs.stringify(data)
+  })
+}
+
+// 更新按费用类型配置
+export function updateTypeRoute(data) {
+  return request({
+    url: api + '/paymentConfig/updateTypeRoute',
+    method: 'post',
+    data
+  })
+}

src/views/chargeManager/index.vue

@@ -7,11 +7,14 @@
     <div class="m-core">
       <!-- navMenu -->
       <el-tabs v-model.trim="activeIndex" type="card" @tab-click="handleClick">
-        <el-tab-pane label="比例" name="0" v-if="permissionList.scalc">
-            <one v-if="activeIndex == 0" />
+        <el-tab-pane label="分润" name="0" v-if="permissionList.share">
+            <three v-if="activeIndex == 0" />
         </el-tab-pane>
-        <el-tab-pane label="金额" name="1" v-if="permissionList.money">
-            <two v-if="activeIndex == 1" />
+        <el-tab-pane label="比例" name="1" v-if="permissionList.scalc">
+            <one v-if="activeIndex == 1" />
+        </el-tab-pane>
+        <el-tab-pane label="金额" name="2" v-if="permissionList.money">
+            <two v-if="activeIndex == 2" />
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -20,11 +23,13 @@
 <script>
 import one from './one'
 import two from './two'
+import three from './three'
 import { permission} from '@/utils/directivePage'
 export default {
   components: {
     one,
-    two
+    two,
+    three
   },
   name: 'chargeManager',
   data () {
@@ -33,6 +38,7 @@ export default {
       permissionList: {
         scalc: permission('/chargeManager/scalc'),
         money: permission('/chargeManager/money'),
+        share: permission('/chargeManager/share'),
       }
     }
   },

src/views/chargeManager/three.vue

@@ -0,0 +1,307 @@
+<template>
+  <div class="m-container">
+    <div class="m-core">
+      <div @click="chargeOperation('create')" v-permission="'paymentConfig/add'" class="newBand">添加</div>
+      <!-- 列表 -->
+      <div class="tableWrap">
+        <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <el-table-column align="center" prop="organName" label="分部"></el-table-column>
+
+          <el-table-column align="center" width="250px" label="操作">
+            <template slot-scope="scope">
+              <el-button
+                @click="chargeOperation('update', scope.row)"
+                v-permission="'paymentConfig/update'"
+                type="text"
+              >修改</el-button>
+              <el-button
+                @click="chargeDel(scope.row)"
+                v-permission="'paymentConfig/del'"
+                type="text"
+              >删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          :total="pageInfo.total"
+          :page.sync="pageInfo.page"
+          :limit.sync="pageInfo.limit"
+          :page-sizes="pageInfo.page_size"
+          @pagination="getList"
+        />
+      </div>
+    </div>
+
+    <el-dialog
+      :title="formTitle[formActionTitle]"
+      :visible.sync="chargeStatus"
+      @close="onFormClose('ruleForm')"
+      width="700px"
+    >
+      <el-form :model="form" :rules="rules" ref="ruleForm">
+        <el-form-item label="所属分部" prop="id" :label-width="formLabelWidth">
+          <el-select @change="onChange" v-model.trim="form.id" :disabled="formActionTitle === 'update'" placeholder="请选择所属分部">
+            <el-option
+              v-for="(item, index) in calcBranchList"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-row :gutter="10" v-for="(domain, index) in form.typeRouteScale" :key="index">
+          <el-col :span="12">
+            <el-form-item :label-width="formLabelWidth" label="收费方式" :prop="'typeRouteScale.' + index + '.feeType'" :rules="[
+              { required: true, message: '请选择收费方式', trigger: 'change' },
+            ]">
+              <el-select
+                v-model.trim="domain.feeType"
+                placeholder="请选择收费方式"
+                style="width: 100% !important;"
+                disabled
+              >
+                <el-option value="SERVICE" label="服务收入"></el-option>
+                <el-option value="SELL" label="销售收入"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :prop="'typeRouteScale.' + index + '.organId'" :rules="[
+              { required: true, message: '请选择分润分部', trigger: 'change' },
+            ]">
+              <el-select
+                v-model.trim="domain.organId"
+                placeholder="请选择分润分部"
+                clearable
+              >
+                <el-option
+                  v-for="(item, index) in calcBranchList"
+                  :key="index"
+                  :label="item.label"
+                  :value="item.value"
+                  :disabled="item.disabled"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="chargeStatus = false">取 消</el-button>
+        <el-button @click="onChargeSubmit('ruleForm')" type="primary">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import pagination from "@/components/Pagination/index";
+import {
+  paymentConfigQueryPage
+} from "@/api/systemManage";
+import { getPaymentConfigs, addTypeRoute, updateTypeRoute } from "./api";
+import { branchQueryPage } from "@/api/specialSetting";
+import cleanDeep from 'clean-deep'
+export default {
+  name: "chargeProfitManager",
+  components: { pagination },
+  data() {
+    return {
+      tableList: [],
+      pageInfo: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      },
+      chargeStatus: false,
+      branchList: [], // 分部列表
+      calcBranchList: [], // 可选比例分部
+      formActionTitle: "create",
+      formLabelWidth: "100px",
+      formTitle: {
+        create: "添加分润",
+        update: "修改分润"
+      },
+      form: {
+        id: null,
+        typeRouteScale: [{
+          feeType: 'SERVICE',
+          organId: null
+        }, {
+          feeType: 'SELL',
+          organId: null
+        }]
+      },
+      rules: {
+        id: [
+          { required: true, message: "请选择所属分部", trigger: "change" }
+        ]
+      },
+    };
+  },
+  mounted() {
+    this.getList();
+    this.getRoleList()
+  },
+  methods: {
+    onChargeSubmit(formName) {
+      this.$refs[formName].validate(valid => {
+        let params = JSON.parse(JSON.stringify(this.form));
+        if (valid) {
+          console.log(params)
+          params.typeRouteScale = JSON.stringify(params.typeRouteScale)
+          if (this.formActionTitle == "create") {
+            // if (params.id) {
+            //   // 判断有没有Id，如果有则删除
+            //   delete params.id;
+            // }
+            addTypeRoute(params).then(res => {
+              this.messageTips("添加", res);
+            });
+          } else if (this.formActionTitle == "update") {
+            updateTypeRoute(params).then(res => {
+              this.messageTips("修改", res);
+            });
+          }
+        } else {
+          return;
+        }
+      });
+    },
+    messageTips(title, res) {
+      if (res.code == 200) {
+        this.$message.success(title + "成功");
+        this.chargeStatus = false;
+        this.getList();
+      } else {
+        this.$message.error(res.msg);
+      }
+    },
+    onChange() {
+      let form = this.form
+      console.log(form)
+    },
+    getList() {
+      let params = {
+        hasTypeRoute: 1
+      };
+      params.rows = this.pageInfo.limit;
+      params.page = this.pageInfo.page;
+      paymentConfigQueryPage(params).then(res => {
+        if (res.code == 200 && res.data) {
+          this.tableList = res.data.rows;
+          this.pageInfo.total = res.data.total;
+        }
+      });
+    },
+    async getRoleList(val) {
+      await getPaymentConfigs(cleanDeep({ payType: val })).then(res => {
+        if (res.code == 200 && res.data) {
+          res.data.forEach(item => {
+            this.calcBranchList.push({
+              label: item.organName,
+              value: item.id
+            });
+          });
+        }
+      });
+    },
+    chargeOperation(type, data) {
+      this.formActionTitle = type;
+      this.chargeStatus = true;
+      // 修改的时候
+      if (type == "update") {
+        this.$nextTick(() => {
+          console.log(data)
+          this.form = {
+            id: data.id,
+            typeRouteScale: data.typeRouteScale ? JSON.parse(data.typeRouteScale) : []
+          }
+        })
+      }
+    },
+    chargeDel(row) {
+      // 删除数据
+      // paymentConfigDel
+      this.$confirm("你确定删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          paymentConfigDel({ id: row.id }).then(res => {
+            this.messageTips("删除", res);
+          });
+        })
+        .catch();
+    },
+    onFormClose(formName) {
+      this.$refs[formName].resetFields();
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+/deep/.el-button--primary {
+  background: #14928a;
+  border-color: #14928a;
+  color: #fff;
+  &:hover,
+  &:active,
+  &:focus {
+    background: #14928a;
+    border-color: #14928a;
+    color: #fff;
+  }
+}
+
+/deep/.el-select,
+/deep/.el-date-editor.el-input {
+  width: 100% !important;
+}
+
+.moreRule {
+  background: #f0f0f0;
+  position: relative;
+
+  .el-form-item__error {
+    color: #f56c6c;
+    font-size: 12px;
+    line-height: 1;
+    position: absolute;
+    left: 100px;
+    top: 100%;
+    margin-top: -21px;
+  }
+}
+
+.moreRuleIn {
+  .el-form-item {
+    display: inline-block;
+    &:first-child {
+      /deep/.el-form-item__content {
+        margin-left: 100px !important;
+      }
+    }
+    /deep/.el-form-item__content {
+      margin-left: 0 !important;
+    }
+  }
+
+  .setWidth {
+    /deep/.el-form-item__content {
+      width: 250px;
+    }
+  }
+  /deep/.el-input-group__append {
+    padding: 0 8px;
+  }
+}
+.min,
+.max {
+  display: inline-block;
+  width: 250px;
+  text-align: center;
+}
+</style>

vue.config.js

@@ -18,10 +18,10 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // //  https://online.dayaedu.com
 // let target = 'https://online.dayaedu.com' //线上
 // let target = 'http://dyme.utools.club' //test环境
-// let target = 'http://192.168.3.139:8000' // 箭河
+let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.248:8000' //邹璇
 // let target = 'http://192.168.3.8:8000' //勇哥
-let target = 'http://dev.dayaedu.com' // 测试服
+// let target = 'http://dev.dayaedu.com' // 测试服
 // let target = 'http://192.168.3.196' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {