1

src/views/chargeManager/one.vue

@@ -0,0 +1,513 @@
+<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" label="收款方式">
+            <template slot-scope="scope">{{ scope.row.payType | paymentChannelStatus }}</template>
+          </el-table-column>
+          <el-table-column align="center" prop="hfMerNo" label="汇付商户号"></el-table-column>
+          <el-table-column align="center" prop="yqMerNo" label="双乾商户号"></el-table-column>
+          <el-table-column align="center" label="收款比例">
+            <template slot-scope="scope">
+              {{ scope.row.type == 1 ? '比数比例' : null }}
+              {{ scope.row.type == 2 ? '金额比例' : null }}
+            </template>
+          </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="organId" :label-width="formLabelWidth">
+          <el-select v-model.trim="form.organId" placeholder="请选择所属分部">
+            <el-option
+              v-for="(item, index) in branchList"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="收款方式" prop="payType" :label-width="formLabelWidth">
+          <el-select v-model.trim="form.payType" @change="onPayTypeChange" placeholder="请选择收款方式">
+            <el-option value="YQPAY" label="双乾"></el-option>
+            <el-option value="ADAPAY" label="汇付"></el-option>
+          </el-select>
+        </el-form-item>
+        <!-- prop="yqMerNo" -->
+        <el-form-item
+          label="双乾商户号"
+          :required="form.payType === 'YQPAY'"
+          :error="result.yqError"
+          :label-width="formLabelWidth"
+        >
+          <el-input
+            type="text"
+            @blur="onMerNoBlur('YQPAY')"
+            placeholder="请输入双乾商户号"
+            v-model.trim="form.yqMerNo"
+          ></el-input>
+        </el-form-item>
+        <!--  prop="hfMerNo" -->
+        <el-form-item
+          label="汇付商户号"
+          :required="form.payType === 'ADAPAY'"
+          :error="result.hfError"
+          :label-width="formLabelWidth"
+        >
+          <el-input
+            type="text"
+            @blur="onMerNoBlur('ADAPAY')"
+            placeholder="请输入汇付商户号"
+            v-model.trim="form.hfMerNo"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="收费比例" required :label-width="formLabelWidth">
+          <el-radio
+            v-model.trim.number="form.type"
+            @change="onRadioChange('ruleForm')"
+            :label="2"
+          >金额比例</el-radio>
+          <el-radio
+            v-model.trim.number="form.type"
+            @change="onRadioChange('ruleForm')"
+            :label="1"
+          >比数比例</el-radio>
+        </el-form-item>
+
+        <el-form-item class="moreRule" :label-width="formLabelWidth" style="margin-bottom: 0;">
+          <span class="min">分部</span>
+          <span class="min">比例</span>
+          <span class="max">是否承担手续费</span>
+        </el-form-item>
+        <div class="moreRule">
+          <div class="moreRuleIn" v-for="(domain, index) in result.domains" :key="domain.key">
+            <el-form-item class="setWidth" :label="'第' + (index + 1)" :label-width="formLabelWidth">
+              <el-select v-model.trim="domain.organId" 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-form-item class="setWidth">
+              <el-input
+                type="number"
+                v-number
+                min="0"
+                :max="form.type === 1 ? 100 : 10"
+                placeholder="请输入比例"
+                :disabled="domain.disabled"
+                @mousewheel.native.prevent
+                v-model.trim="domain.scale"
+              >
+                <template v-if="form.type === 1" slot="append">%</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-select
+                v-model.trim="domain.feeFlag"
+                placeholder="请选择是否承担手续费"
+                style="width: 150px !important;"
+              >
+                <el-option value="Y" label="是"></el-option>
+                <el-option value="N" label="否"></el-option>
+              </el-select>
+              <el-button
+                v-if="index != 0 && !domain.disabled"
+                @click.prevent="removeDomain(result, domain)"
+              >删除</el-button>
+            </el-form-item>
+          </div>
+          <div class="el-form-item__error" v-if="result.errorText">{{ result.errorText }}</div>
+        </div>
+        <el-form-item class="add" :label-width="formLabelWidth">
+          <el-button icon="el-icon-plus" @click="addDomain(result)">新增</el-button>
+        </el-form-item>
+      </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,
+  paymentConfigGet,
+  paymentConfigAdd,
+  paymentConfigUpdate,
+  paymentConfigDel
+} from "@/api/systemManage";
+import { getPaymentConfigs } from "./api";
+import { branchQueryPage } from "@/api/specialSetting";
+import store from "@/store";
+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: {
+        organId: null,
+        hfMerNo: null,
+        yqMerNo: null,
+        payType: null, // 支付渠道
+        type: 2,
+        routeScale: []
+      },
+      rules: {
+        hfMerNo: [
+          { required: true, message: "请输入汇付商户号", trigger: "blur" }
+        ],
+        yqMerNo: [
+          { required: true, message: "请输入双乾商户号", trigger: "blur" }
+        ],
+        organId: [
+          { required: true, message: "请选择所属分部", trigger: "change" }
+        ],
+        payType: [
+          { required: true, message: "请选择收款方式", trigger: "change" }
+        ]
+      },
+      result: {
+        domains: [
+          {
+            organId: null,
+            scale: null,
+            feeFlag: null,
+            disabled: false,
+            key: Date.now()
+          }
+        ],
+        errorText: null,
+        yqError: null,
+        hfError: null
+      }
+    };
+  },
+  mounted() {
+    this.getList();
+    this.getRoleList();
+  },
+  methods: {
+    onPayTypeChange(val) {
+      if (!val) {
+        return;
+      }
+      getPaymentConfigs({ payType: val }).then(res => {
+        if (res.code == 200 && res.data) {
+          res.data.forEach(item => {
+            this.calcBranchList.push({
+              label: item.organName,
+              value: item.organId
+            });
+          });
+        }
+      });
+    },
+    onRadioChange(formName) {
+      this.$refs[formName].clearValidate();
+    },
+    onMerNoBlur(type) {
+      let form = this.form;
+      let result = this.result;
+      if (type === "YQPAY" && form.payType === "YQPAY") {
+        if (form.yqMerNo) {
+          result.yqError = null;
+        } else {
+          result.yqError = "请输入双乾商户号";
+        }
+      } else if (type === "ADAPAY" && form.payType === "ADAPAY") {
+        if (form.hfMerNo) {
+          result.hfError = null;
+        } else {
+          result.hfError = "请输入汇付商户号";
+        }
+      }
+    },
+    onChargeSubmit(formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          let params = JSON.parse(JSON.stringify(this.form));
+          params.routeScale = null;
+          if (params.payType === "YQPAY" && !params.yqMerNo) {
+            this.result.yqError = "请输入双乾商户号";
+            return;
+          } else if (params.payType === "ADAPAY" && !params.hfMerNo) {
+            this.result.hfError = "请输入汇付商户号";
+            return;
+          }
+          console.log(params);
+          return;
+          if (this.formActionTitle == "create") {
+            if (this.form.id) {
+              // 判断有没有Id，如果有则删除
+              delete this.form.id;
+            }
+            paymentConfigAdd(this.form).then(res => {
+              this.messageTips("添加", res);
+            });
+          } else if (this.formActionTitle == "update") {
+            paymentConfigUpdate(this.form).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);
+      }
+    },
+    addDomain(form, checked) {
+      // debugger
+      let domains = form.domains,
+        forms = this.form,
+        singleLength = domains.length,
+        lastDate = domains[singleLength - 1] // 获取倒数一个对象
+      let countScale = 0
+      domains.forEach(item => {
+        countScale += item.scale
+      })
+      const num = 0
+      if(forms.type === 2) {
+        num = 10
+      } else if(forms.type === 1) {
+        num = 100
+      }
+      if (!lastDate.organId) {
+        form.errorText = '选择分部不能为空'
+        return
+      }
+
+      if(!parseInt(lastDate.scale)) {
+        form.errorText = '比例不能为空'
+        return
+      } else if(parseInt(lastDate.scale) > num){
+        form.errorText = "比例总和不能超过" + num
+      }
+
+      if(!lastDate.feeFlag) {
+        form.errorText = "请选择是否承担手续费"
+        return
+      }
+
+      form.errorText = null
+      if (!checked) {
+        lastDate.disabled = true
+        domains.push({
+          organId: null,
+          scale: null,
+          feeFlag: null,
+          disabled: false,
+          key: Date.now()
+        })
+      }
+    },
+    removeDomain(result, domain) {
+
+    },
+    getList() {
+      let params = {};
+      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;
+        }
+      });
+    },
+    getRoleList() {
+      //
+      branchQueryPage({
+        // 获取分部
+        delFlag: 0,
+        rows: 9999
+      }).then(res => {
+        if (res.code == 200 && res.data && res.data.rows) {
+          res.data.rows.forEach(item => {
+            this.branchList.push({
+              label: item.name,
+              value: item.id
+            });
+          });
+        }
+      });
+    },
+    chargeOperation(type, data) {
+      this.formActionTitle = type;
+      this.chargeStatus = true;
+      // 修改的时候
+      if (type == "update") {
+        this.form = {
+          id: data.id,
+          type: Number(data.type),
+          comScale: data.comScale,
+          perScale: data.perScale,
+          courseFee: data.courseFee,
+          instrumentFee: data.instrumentFee,
+          accessoriesFee: data.accessoriesFee,
+          otherFee: data.otherFee,
+          organId: data.organId
+        };
+      }
+    },
+    chargeDel(row) {
+      // 删除数据
+      // paymentConfigDel
+      this.$confirm("你确定删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          paymentConfigDel({ id: row.id }).then(res => {
+            this.messageTips("删除", res);
+          });
+        })
+        .catch();
+    },
+    onFormClose(formName) {
+      // 关闭弹窗重置验证
+      this.form = {
+        organId: null,
+        hfMerNo: null,
+        yqMerNo: null,
+        payType: null, // 支付渠道
+        type: 2,
+        routeScale: []
+      };
+      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-dialog__body {
+  padding: 0 20px;
+}
+/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: 120px;
+    top: 100%;
+    margin-top: -21px;
+  }
+}
+.add {
+  margin-bottom: 22px;
+  background: #f0f0f0;
+  padding-bottom: 22px;
+}
+.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: 150px;
+    }
+  }
+  /deep/.el-input-group__append {
+    padding: 0 8px;
+  }
+}
+.min,
+.max {
+  display: inline-block;
+  width: 150px;
+  text-align: center;
+}
+</style>

src/views/chargeManager/two.vue

@@ -0,0 +1,297 @@
+<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" prop="money" label="金额"></el-table-column>
+          <el-table-column align="center" width="250px" label="操作">
+            <template slot-scope="scope">
+              <el-button @click="chargeOperation('update', scope.row)" type="text">修改</el-button>
+              <el-button @click="chargeDel(scope.row)" 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="500px"
+    >
+      <el-form :model="form" :rules="rules" ref="ruleForm">
+        <el-form-item label="所属分部" prop="organId" :label-width="formLabelWidth">
+          <el-select v-model.trim="form.organId">
+            <el-option
+              v-for="item in branchList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+              :disabled="item.disabled"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="金额" prop="money" :label-width="formLabelWidth">
+          <el-input-number
+            style="width: 100%;"
+            v-model="form.money"
+            :precision="0"
+            controls-position="right"
+            :min="1"
+            :max="999999999"
+          ></el-input-number>
+        </el-form-item>
+      </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,
+  paymentConfigGet,
+  paymentConfigAdd,
+  paymentConfigUpdate,
+  paymentConfigDel
+} from "@/api/systemManage";
+import { branchQueryPage } from "@/api/specialSetting";
+import { sysConfigList, sysConfigUpdate } from "@/api/generalSettings";
+import store from "@/store";
+export default {
+  name: "chargeProfitManager",
+  components: { pagination },
+  data() {
+    return {
+      tableList: [],
+      pageInfo: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      },
+      chargeStatus: false,
+      roleList: [], // 角色列表
+      branchList: [], // 分部列表
+      formActionTitle: "create",
+      formLabelWidth: "100px",
+      formTitle: {
+        create: "添加收费",
+        update: "修改收费"
+      },
+      form: {
+        organName: null,
+        organId: null,
+        money: null
+      },
+      rules: {
+        organId: [
+          { required: true, message: "请选择所属分部", trigger: "change" }
+        ],
+        money: [{ required: true, message: "请输入金额", trigger: "blur" }]
+      },
+      selectId: null, // 编号
+      selectItem: {} // 选中对象
+    };
+  },
+  mounted() {
+    this.getList();
+  },
+  methods: {
+    onChargeSubmit(formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          let value = {};
+          let str = "更新";
+          let form = this.form;
+          const money = form.money;
+          const organId = form.organId;
+          let status = false;
+          if (this.formActionTitle == "create") {
+            value[money] = organId;
+            str = "添加";
+            this.tableList.forEach(item => {
+              value[item.money] = item.organId;
+              if (item.money == money) {
+                this.$message.error("输入金额不能重复");
+                status = true;
+              }
+            });
+          } else if (this.formActionTitle == "update") {
+            const selectItem = this.selectItem;
+            selectItem.organId = form.organId;
+            selectItem.money = form.money;
+            this.tableList.forEach(item => {
+              value[item.money] = item.organId;
+              if (item.money == money && item.key != selectItem.key) {
+                this.$message.error("输入金额不能重复");
+                status = true;
+              }
+            });
+          }
+          if (status) {
+            return;
+          }
+          let params = {
+            id: this.selectId,
+            paranValue: JSON.stringify(value),
+            paramName: "amount_channel"
+          };
+          sysConfigUpdate(params).then(res => {
+            if (res.code == 200) {
+              this.messageTips(str, 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);
+      }
+    },
+    async getList() {
+      await branchQueryPage({
+        // 获取分部
+        delFlag: 0,
+        rows: 9999
+      }).then(res => {
+        this.branchList = [];
+        if (res.code == 200 && res.data && res.data.rows) {
+          res.data.rows.forEach(item => {
+            this.branchList.push({
+              label: item.name,
+              value: item.id
+            });
+          });
+        }
+      });
+      await sysConfigList({ group: "payment_config" }).then(res => {
+        if (res.code == 200 && res.data.length > 0) {
+          let tempResult = [];
+          let paranValue = {};
+          res.data.forEach((item, index) => {
+            if (item.paramName === "amount_channel") {
+              paranValue = item.paranValue ? JSON.parse(item.paranValue) : {};
+              this.selectId = item.id;
+            }
+          });
+          this.branchList.forEach(item => {
+            for (let key in paranValue) {
+              if (paranValue[key] == item.value) {
+                tempResult.push({
+                  organId: item.value,
+                  organName: item.label,
+                  money: key,
+                  key: +new Date() + item.value
+                });
+              }
+            }
+          });
+          this.tableList = tempResult;
+        }
+      });
+    },
+    chargeOperation(type, data) {
+      this.formActionTitle = type;
+      this.chargeStatus = true;
+      this.branchList.forEach(item => {
+        this.tableList.forEach(table => {
+          if (item.value == table.organId) {
+            item.disabled = true;
+          }
+        });
+      });
+      // 修改的时候
+      if (type == "update") {
+        this.form = {
+          organId: data.organId,
+          organName: data.organName,
+          money: data.money,
+          key: data.key
+        };
+        this.selectItem = data;
+      } else if (type == "create") {
+      }
+    },
+    chargeDel(row) {
+      // 删除数据
+      // paymentConfigDel
+      this.$confirm("你确定删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          let value = {};
+          this.tableList.forEach(item => {
+            if (row.organId != item.organId) {
+              value[item.money] = item.organId;
+            }
+          });
+          let params = {
+            id: this.selectId,
+            paranValue: JSON.stringify(value),
+            paramName: "amount_channel"
+          };
+          sysConfigUpdate(params).then(res => {
+            if (res.code == 200) {
+              this.messageTips("删除", res);
+            }
+          });
+        })
+        .catch();
+    },
+    onFormClose(formName) {
+      this.form = {
+        organName: null,
+        organId: null,
+        money: null
+      };
+      // 关闭弹窗重置验证
+      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-dialog__body {
+  padding: 0 20px;
+}
+/deep/.el-select,
+/deep/.el-date-editor.el-input {
+  width: 100% !important;
+}
+</style>

vue.config.js

@@ -17,6 +17,7 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // http://47.99.212.176:8000 
 // //  https://online.dayaedu.com
 // let target = 'https://online.dayaedu.com' //线上
+<<<<<<< Updated upstream
 // let target = 'http://testadm.dayaedu.com/' //test环境
 // let target = 'http://192.168.3.27:8000' // 箭河
 // let target = 'http://192.168.3.28:8000' //邹璇
@@ -24,6 +25,14 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 let target = 'http://admin.dayaedu.com' // 测试服
 // let target = 'http://192.168.3.48:8080' // 乔
 // let target = 'http://195s22s709.imwork.net/' // 邹璇家
+=======
+// let target = 'http://dyme.utools.club' //test环境
+// let target = 'http://192.168.3.139:8000' // 箭河
+// let target = 'http://192.168.3.28:8000' //邹璇
+// let target = 'http://192.168.3.8:8000' //勇哥
+let target = 'http://dev.dayaedu.com' // 测试服
+// let target = 'http://dev.dayaedu.com' // 乔
+>>>>>>> Stashed changes
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**