Merge branch '11/24SAAS' of http://git.dayaedu.com/yonge/dy-admin-manager into 11/24SAAS

src/views/adapayAccount/form.vue

@@ -11,6 +11,7 @@
         <el-form :model="form"
                  :rules="rules"
                  ref="accountForm"
+                 size="small"
                  label-position="right"
                  label-width="180px">
           <el-form-item label="商户号"
@@ -63,11 +64,10 @@
                          :value="item.value"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="省市"
-                        required>
+          <el-form-item label="省市" required>
             <el-row>
               <el-col :span="12">
-                <el-form-item prop="provCode">
+                <el-form-item prop="provCode" style="margin-bottom: 0;">
                   <el-select v-model="form.provCode"
                              style="width: 98% !important"
                              @change="onProvChange"
@@ -80,7 +80,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item prop="areaCode">
+                <el-form-item prop="areaCode" style="margin-bottom: 0;">
                   <el-select v-model="form.areaCode"
                              style="width: 100% !important"
                              placeholder="请选择城市">
@@ -159,9 +159,9 @@
                       placeholder="请输入邮编"></el-input>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary"
+            <el-button type="primary" size="small"
                        @click="onSubmit('accountForm')">确 定</el-button>
-            <el-button @click="onCancel">取 消</el-button>
+            <el-button @click="onCancel" size="small">取 消</el-button>
           </el-form-item>
         </el-form>
       </el-col>

src/views/adapayAccount/index.vue

@@ -4,25 +4,22 @@
     <h2>
       <div class="squrt"></div>汇付账号管理
     </h2>
-    <div class="topWrap">
-      <div class="newBand"
-           v-permission="'adapay/createMember'"
-           @click="onOperationAccount('create')">创建账号</div>
-    </div>
     <div class="m-core">
       <save-form :inline="true"
                class="searchForm"
                @submit="search"
+               @reset="reset"
+               size="small"
                :model="searchForm">
-        <el-form-item>
+        <el-form-item prop="memberId">
           <el-input v-model.trim="searchForm.memberId" clearable
                     placeholder="请输入商户号"></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="name">
           <el-input v-model.trim="searchForm.name" clearable
                     placeholder="请输入公司名称"></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="status">
           <el-select v-model.trim="searchForm.status"
                      filterable
                      clearable
@@ -37,8 +34,10 @@
         </el-form-item>
         <el-form-item>
           <el-button native-type="submit" type="danger">搜索</el-button>
+          <el-button native-type="reset" type="primary">重置</el-button>
         </el-form-item>
       </save-form>
+      <el-button size="small" style="margin-bottom: 20px;" type="primary" v-permission="'adapay/createMember'" @click="onOperationAccount('create')" icon="el-icon-plus">创建账号</el-button>
       <div class="tableWrap">
         <el-table :data="tableList"
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}">
@@ -81,15 +80,15 @@
               <el-button v-if="scope.row.status === 'failed'"
                          v-permission="'adapay/updateMember'"
                          @click="onOperationAccount('update', scope.row)"
-                         type="text">修改</el-button>
+                         type="text" size="small">修改</el-button>
               <el-button v-if="scope.row.status === 'succeeded'"
                          v-permission="'adapay/createSettleAccount'"
                          @click="onUpdateAccount(scope.row)"
-                         type="text">修改结算账户</el-button>
+                         type="text" size="small">修改结算账户</el-button>
               <el-button v-if="scope.row.status === 'succeeded'"
                          v-permission="'adapay/updateMonthMaxReceipt'"
                          @click="onMoneyAccount(scope.row)"
-                         type="text">设置金额</el-button>
+                         type="text" size="small">设置金额</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -109,6 +108,7 @@
                :rules="maskRules"
                label-width="100px"
                label-position="right"
+               size="small"
                ref="maskForm">
         <el-form-item label="银行卡号"
                       prop="cardNo">
@@ -129,8 +129,8 @@
       </el-form>
       <span slot="footer"
             class="dialog-footer">
-        <el-button @click="zeroVisible = false">取 消</el-button>
-        <el-button type="primary"
+        <el-button size="small" @click="zeroVisible = false">取 消</el-button>
+        <el-button size="small" type="primary"
                    @click="addZero('maskForm')">确 定</el-button>
       </span>
     </el-dialog>
@@ -143,6 +143,7 @@
                :rules="moneyRules"
                label-width="160px"
                label-position="right"
+               size="small"
                ref="moneyForm">
         <el-form-item label="每日最大收款金额"
                       prop="monthMaxReceipt">
@@ -184,8 +185,8 @@
       </el-form>
       <span slot="footer"
             class="dialog-footer">
-        <el-button @click="moneyVisible = false">取 消</el-button>
-        <el-button type="primary"
+        <el-button size="small" @click="moneyVisible = false">取 消</el-button>
+        <el-button size="small" type="primary"
                    @click="addMaxMoney('moneyForm')">确 定</el-button>
       </span>
     </el-dialog>
@@ -200,6 +201,11 @@ import { getPaymentConfigs } from "../chargeManager/api";
 import { cityJson } from './cityJson'
 import { bankJson } from './bankJson'
 import cleanDeep from 'clean-deep'
+const initSearch = {
+  memberId: null,
+  name: null,
+  status: null,
+};
 export default {
   components: {
     pagination,
@@ -217,7 +223,7 @@ export default {
         page_size: [10, 20, 50, 100] // 选择限制显示条数
       },
       tableList: [],
-      searchForm: {},
+      searchForm: { ...initSearch },
       maskRules: {
         cardNo: [{ required: true, message: '请输入银行卡号', trigger: 'blur' }],
         bankCode: [{ required: true, message: '请选择所属银行', trigger: 'change' }]
@@ -277,6 +283,10 @@ export default {
       this.rules.page = 1
       this.getList()
     },
+    reset() {
+      this.searchForm = { ...initSearch };
+      this.search();
+    },
     onFormClose (formName) {
       this.$refs[formName].resetFields()
     },

src/views/baseRulesClassSetting/audition/auditionForm.vue

@@ -0,0 +1,135 @@
+<template>
+  <div>
+    <el-form :model="auditionForm" ref="auditionForm" size="small">
+      <el-form-item
+        label="分部"
+        prop="organId"
+        :label-width="formLabelWidth"
+        :rules="[{ required: true, message: '请选择分部', trigger: 'blur' }]"
+      >
+        <el-select
+          style="width: 100% !important"
+          class="multiple"
+          v-model.trim="auditionForm.organId"
+          filterable
+          clearable
+          placeholder="请选择分部"
+        >
+          <el-option
+            v-for="(item, index) in organList"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="课程时长"
+        prop="courseType"
+        :label-width="formLabelWidth"
+        :rules="[
+          { required: true, message: '请选择课程时长', trigger: 'blur' },
+        ]"
+      >
+        <el-select
+          style="width: 100% !important"
+          class="multiple"
+          v-model.trim="auditionForm.courseType"
+          filterable
+          clearable
+          placeholder="课程时长"
+        >
+          <el-option
+            v-for="(item, index) in courseType"
+            :key="index"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="课程单价"
+        prop="courseType"
+        :label-width="formLabelWidth"
+        :rules="[
+          { required: true, message: '请选择课程单价', trigger: 'blur' },
+        ]"
+      >
+        <el-input clearable placeholder="课程单价" type="number" v-model="courseType" maxlength="9" />
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+<script>
+import { resetOrganizationCourseDurationSettings,addOrganizationCourseDurationSettings } from "@/api/specialSetting";
+export default {
+  props: ["activeRow", "organList", "courseType"],
+  data() {
+    return {
+      auditionForm: {
+        organId: "",
+        courseType: "",
+        timer: [],
+        id: "",
+      },
+      inputVisible: false,
+      formLabelWidth: "80px",
+      dynamicTags: [],
+      inputValue: "",
+    };
+  },
+  mounted() {
+    if (this.activeRow) {
+      this.auditionForm.organId = this.activeRow.organId;
+      this.auditionForm.timer = this.activeRow.duration.split(",");
+      this.dynamicTags = this.activeRow.duration.split(",");
+      this.auditionForm.courseType = this.activeRow.courseType;
+      this.auditionForm.id = this.activeRow.id;
+    }
+  },
+  methods: {
+    async submitInfo(str) {
+      console.log(str);
+      this.$refs.auditionForm.validate(async (_) => {
+        if (_) {
+          if (str == "update") {
+            try {
+              const res = await resetOrganizationCourseDurationSettings({
+                organId: this.auditionForm.organId,
+                duration: this.dynamicTags.join(","),
+                courseType: this.auditionForm.courseType,
+                id: this.auditionForm.id,
+              });
+                this.$message.success("修改成功");
+                this.$emit('close')
+            } catch {}
+          }else if(str == "create"){
+                   try {
+              const res = await addOrganizationCourseDurationSettings({
+                organId: this.auditionForm.organId,
+                duration: this.dynamicTags.join(","),
+                courseType: this.auditionForm.courseType,
+              });
+                this.$message.success("新建成功");
+                this.$emit('close')
+            } catch {}
+          }
+        }
+      });
+
+    },
+  },
+  watch: {
+    dynamicTags(val) {
+      this.auditionForm.timer = val;
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.courseMask {
+  .el-tag.el-tag--info {
+    margin-right: 4px;
+  }
+}
+</style>

src/views/baseRulesClassSetting/audition/index.vue

@@ -0,0 +1,189 @@
+<template>
+  <div class="m-container">
+    <save-form
+      :inline="true"
+      class="searchForm"
+      ref="searchForm"
+      @submit="search"
+      @reset="reset"
+      size="small"
+      :saveKey="'auditionSetting'"
+      :model.sync="searchForm"
+    >
+      <el-form-item :rules="[]">
+        <el-select
+          class="multiple"
+          v-model.trim="searchForm.organId"
+          filterable
+          clearable
+          placeholder="请选择分部"
+        >
+          <el-option
+            v-for="(item, index) in selects.branchs"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button native-type="submit" type="danger">搜索</el-button>
+        <el-button native-type="reset" type="primary">重置</el-button>
+      </el-form-item>
+    </save-form>
+    <el-button size="small" style="margin-bottom: 20px;" type="primary" v-permission="'organizationCourseDurationSettings/insert'" @click="openJob('create')" icon="el-icon-plus">添加</el-button>
+    <!-- 列表 -->
+    <div class="tableWrap">
+      <el-table
+        :data="tableList"
+        size="small"
+        :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+      >
+        <el-table-column align="center" prop="organ.name" label="分部名称">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="classGroupTypeName"
+          label="课程时长（分钟）"
+        >
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.courseType | coursesType }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="课程单价（元）" prop="duration">
+        </el-table-column>
+        <el-table-column align="center" label="操作">
+          <template slot-scope="scope">
+            <el-button
+              @click="resetCourseTime(scope.row)"
+              v-permission="'organizationCourseDurationSettings/update'"
+              type="text"
+              size="small"
+              >修改</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+       :saveKey="'auditionSetting'"
+        sync
+        :total.sync="pageInfo.total"
+        :page.sync="pageInfo.page"
+        :limit.sync="pageInfo.limit"
+        :page-sizes="pageInfo.page_size"
+        @pagination="getList"
+      />
+    </div>
+    <el-dialog
+      :title="isAdd ? '新增网管课设置' : '修改网管课设置'"
+      class="courseMask"
+      width="500px"
+      :visible.sync="courseVisible"
+    >
+      <auditionForm
+        ref="auditionForm"
+        :activeRow="activeRow"
+        v-if="courseVisible"
+        :organList="selects.branchs"
+        :courseType="courseType"
+        @close="close"
+      />
+      <div slot="footer" class="dialog-footer">
+        <el-button size="small" @click="courseVisible = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="submitInfo">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import pagination from "@/components/Pagination/index";
+import { musicCourseType } from "@/utils/searchArray";
+import { getOrganizationCourseDurationSettings,delOrganizationCourseDurationSettings } from "@/api/specialSetting";
+import auditionForm from "./auditionForm";
+const initSearch = {
+  courseScheduleType: null,
+  organId: null,
+};
+export default {
+  components: { pagination, auditionForm },
+  data() {
+    return {
+      tableList: [],
+      pageInfo: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
+      },
+      searchForm: { ...initSearch },
+      courseType: musicCourseType,
+      isAdd: true,
+      courseVisible: false,
+      activeRow: null,
+    };
+  },
+  mounted() {
+    this.$store.dispatch("setBranchs");
+    this.getList();
+  },
+  methods: {
+    async getList() {
+      try {
+        const res = await getOrganizationCourseDurationSettings({
+          ...this.searchForm,
+          page: this.pageInfo.page,
+          rows: this.pageInfo.limit,
+        });
+        this.pageInfo.total = res.data.total;
+        this.tableList = res.data.rows;
+      } catch (e) {}
+    },
+    search() {
+      this.pageInfo.page = 1;
+      this.$refs.searchForm.save(this.searchForm);
+      this.$refs.searchForm.save(this.pageInfo, "page");
+      this.getList();
+    },
+    reset() {
+      this.searchForm = { ...initSearch };
+      this.search();
+    },
+    resetCourseTime(row) {
+      this.isAdd = false;
+      this.activeRow = row;
+      this.courseVisible = true;
+    },
+    submitInfo() {
+      const str = this.isAdd ? "create" : "update";
+      this.$refs.auditionForm.submitInfo(str);
+    },
+    close() {
+      this.courseVisible = false;
+      this.getList();
+    },
+    openJob() {
+      this.isAdd = true;
+      this.activeRow = null;
+      this.courseVisible = true;
+    },
+    async delCourseTime(row) {
+      this.$confirm("是否删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then( async() => {
+        try{
+         const res =   await delOrganizationCourseDurationSettings({ id:row.id})
+         this.$message.success('删除成功')
+         this.getList()
+        }catch{}
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+</style>

src/views/baseRulesClassSetting/index.vue

@@ -0,0 +1,88 @@
+<template>
+  <div class="m-container">
+    <h2>
+      <div class="squrt"></div>
+      课程参数设置
+    </h2>
+    <div class="m-core">
+      <!-- navMenu -->
+      <tab-router v-model.trim="activeIndex" @tab-click="handleClick">
+        <el-tab-pane
+          label="乐团课程设置"
+          lazy
+          name="1"
+          v-if="permissionList.typesManager"
+        >
+          <courseTimerSetting v-if="activeIndex == 1" />
+        </el-tab-pane>
+        <el-tab-pane
+          label="乐团课程价格设置"
+          lazy
+          name="2"
+          v-if="permissionList.typesManager"
+        >
+          <musicCourseFee v-if="activeIndex == 2" />
+        </el-tab-pane>
+        <el-tab-pane
+          label="乐团收费标准"
+          lazy
+          name="3"
+          v-if="permissionList.typesManager"
+        >
+          <chargesList v-if="activeIndex == 3" />
+        </el-tab-pane>
+        <el-tab-pane
+          label="VIP课设置"
+          lazy
+          name="4"
+          v-if="permissionList.typesManager"
+        >
+          <vipCourseType v-if="activeIndex == '4'" />
+        </el-tab-pane>
+        <el-tab-pane
+          label="网管课设置"
+          lazy
+          name="5"
+          v-if="permissionList.typesManager"
+        >
+          <audition-setting v-if="activeIndex == '5'" />
+        </el-tab-pane>
+      </tab-router>
+    </div>
+  </div>
+</template>
+<script>
+import courseTimerSetting from "@/views/categroyManager/specialSetup/courseTimerSetting";
+import musicCourseFee from "@/views/categroyManager/specialSetup/musicCourseFee";
+import chargesList from "@/views/categroyManager/specialSetup/chargesList";
+import vipCourseType from "@/views/categroyManager/generalSettings/vipCourseType";
+import auditionSetting from './audition';
+export default {
+  components: {
+    courseTimerSetting,
+    musicCourseFee,
+    chargesList,
+    vipCourseType,
+    auditionSetting
+  },
+  name: "baseRulersManager",
+  data() {
+    return {
+      activeIndex: "1",
+      permissionList: {
+        typesManager: ("/globalConfig/typesManager"),
+      },
+    };
+  },
+  methods: {
+    handleClick(val) {
+      this.activeIndex = val.name;
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+/deep/.m-container {
+  padding: 0 10px 40px;
+}
+</style>

src/views/categroyManager/generalSettings/vipCourseType.vue

@@ -4,12 +4,15 @@
       v-permission="'vipGroupCategory/add'"
       @click="addGroupCategory"
       type="primary"
+      size="small"
       style="margin-bottom: 20px"
+       icon="el-icon-plus"
       >新建</el-button
     >
     <el-table
       :data="leftList"
       :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+      size="small"
     >
       <el-table-column label="课程形式" prop="name"> </el-table-column>
       <el-table-column label="课程类型" prop="singleClassMinutes">
@@ -31,6 +34,7 @@
               type="text"
               v-permission="'vipGroupCategory/update'"
               @click="resetGroupCategory(scope.row)"
+              size="small"
               >修改</el-button
             >
             <el-popover
@@ -54,7 +58,7 @@
                   >确定</el-button
                 >
               </div>
-              <el-button type="text" slot="reference">删除</el-button>
+              <el-button type="text" slot="reference" size="small">删除</el-button>
             </el-popover>
           </div>
         </template>
@@ -68,7 +72,7 @@
       @close="onVipStatusClose('vipStatus')"
       :visible.sync="vipStatus"
     >
-      <el-form :model="vipStatusFrom" ref="vipStatus">
+      <el-form :model="vipStatusFrom" ref="vipStatus" size="small">
         <el-form-item
           label="课程形式"
           prop="name"
@@ -165,8 +169,8 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="vipStatus = false">取 消</el-button>
-        <el-button type="primary" @click="addVipStatus('vipStatus')"
+        <el-button size="small" @click="vipStatus = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="addVipStatus('vipStatus')"
           >确 定</el-button
         >
       </div>
@@ -305,4 +309,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.el-tag--info {
+  margin-right: 4px;
+}
 </style>

src/views/categroyManager/specialSetup/chargesList.vue

@@ -1,8 +1,8 @@
 <template>
   <div class='m-container'>
     <!-- <h2>收费类型设置</h2> -->
-    <div class="m-core">
-      <save-form :inline="true" @submit="search" @reset="onReSet" :saveKey="'chargesList'" :model="searchForm">
+    <div>
+      <save-form :inline="true" @submit="search" @reset="onReSet" :saveKey="'chargesList'" size="small" :model="searchForm">
         <el-form-item>
           <el-select
             placeholder="请选择分部"
@@ -38,11 +38,10 @@
           <el-button type="primary" native-type="reset">重置</el-button>
         </el-form-item>
       </save-form>
-      <div @click="onChargeOperation('create')" v-permission="'musicGroupOrganizationCourseSettings/add'"
-           class='newBand'>添加</div>
+      <el-button size="small" style="margin-bottom: 20px;" type="primary" v-permission="'musicGroupOrganizationCourseSettings/add'" @click="onChargeOperation('create')" icon="el-icon-plus">添加</el-button>
       <div class="tableWrap">
         <el-table :data="dataList"
-                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}" size="small">
           <el-table-column prop="organId"
                            label="所属分部">
             <template slot-scope="scope">
@@ -89,10 +88,10 @@
           <el-table-column align='center'
                            label="操作">
             <template slot-scope="scope">
-              <el-button @click="onChargeOperation('update', scope.row)"
+              <el-button @click="onChargeOperation('update', scope.row)" size="small"
                          v-permission="'musicGroupOrganizationCourseSettings/update'"
                          type="text">修改</el-button>
-              <el-button @click="onChargeDelete(scope.row)"
+              <el-button @click="onChargeDelete(scope.row)" size="small"
                          v-permission="'musicGroupOrganizationCourseSettings/delSetting'"
                          type="text">删除</el-button>
             </template>

src/views/categroyManager/specialSetup/courseTimerSetting.vue

@@ -1,11 +1,12 @@
 <template>
-  <div class="m-core">
+  <div class="m-container">
     <save-form
       :inline="true"
       class="searchForm"
       ref="searchForm"
       @submit="search"
       @reset="reset"
+      size="small"
       :saveKey="'courseTimerSetting'"
       :model.sync="searchForm"
     >
@@ -46,17 +47,12 @@
         <el-button native-type="reset" type="primary">重置</el-button>
       </el-form-item>
     </save-form>
-    <div
-      class="newBand"
-      v-permission="'organizationCourseDurationSettings/insert'"
-      @click="openJob('create')"
-    >
-      添加
-    </div>
+    <el-button size="small" style="margin-bottom: 20px;" type="primary" v-permission="'organizationCourseDurationSettings/insert'" @click="openJob('create')" icon="el-icon-plus">添加</el-button>
     <!-- 列表 -->
     <div class="tableWrap">
       <el-table
         :data="tableList"
+        size="small"
         :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
       >
         <el-table-column align="center" prop="organ.name" label="分部名称">
@@ -83,6 +79,7 @@
               @click="resetCourseTime(scope.row)"
               v-permission="'organizationCourseDurationSettings/update'"
               type="text"
+              size="small"
               >修改</el-button
             >
             <!-- <el-button
@@ -118,8 +115,8 @@
         @close="close"
       />
       <div slot="footer" class="dialog-footer">
-        <el-button @click="courseVisible = false">取 消</el-button>
-        <el-button type="primary" @click="submitInfo">确 定</el-button>
+        <el-button size="small" @click="courseVisible = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="submitInfo">确 定</el-button>
       </div>
     </el-dialog>
   </div>

src/views/categroyManager/specialSetup/modals/chargesForm.vue

@@ -2,6 +2,7 @@
   <div>
     <el-form :model="form"
              label-suffix=": "
+             size="small"
              ref="form">
       <el-form-item label="所属分部"
                     prop="organId"
@@ -37,7 +38,7 @@
                     prop="name"
                     :rules="[{required: true, message: '请输入收费方式名称', trigger: 'blur'}]"
                     :label-width="formLabelWidth">
-        <el-input v-model.trim="form.name"
+        <el-input v-model.trim="form.name" style="width: 98% !important;"
                   placeholder="请输入收费方式名称"
                   clearable>
         </el-input>
@@ -137,23 +138,22 @@
           <el-form-item label="原价"
                         prop="totalOriginalPrice"
                         label-width="50px">
-            {{ totalOriginalPrice | moneyFormat}}
+            {{ totalOriginalPrice | moneyFormat}}元
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="现价"
                         prop="totalCurrentPrice"
                         label-width="50px">
-            {{ totalCurrentPrice | moneyFormat}}
+            {{ totalCurrentPrice | moneyFormat}}元
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <span slot="footer"
           class="dialog-footer">
-      <el-button @click="$listeners.close">取 消</el-button>
-      <el-button @click="submit"
-                 type="primary">确 定</el-button>
+      <el-button @click="$listeners.close" size="small">取 消</el-button>
+      <el-button @click="submit" size="small" type="primary">确 定</el-button>
     </span>
   </div>
 </template>

src/views/categroyManager/specialSetup/modals/courseTimeForm.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form :model="courseTimeForm" ref="courseTimeForm">
+    <el-form :model="courseTimeForm" ref="courseTimeForm" size="small">
       <el-form-item
         label="分部"
         prop="organId"
@@ -65,21 +65,18 @@
           v-model.trim="inputValue"
           ref="saveTagInput"
           style="width: 100px"
-          size="small"
           @keyup.enter.native="handleInputConfirm"
         >
         </el-input>
         <el-button
           v-if="!inputVisible"
           class="button-new-tag"
-          size="small"
           @click="showInput"
           >+ 添加</el-button
         >
         <el-button
           v-if="inputVisible"
           class="button-new-tag"
-          size="small"
           @click="handleInputConfirm"
           >保存</el-button
         >

src/views/categroyManager/specialSetup/musicCourseFee.vue

@@ -1,12 +1,13 @@
 <template>
   <div class="m-container">
     <!-- <h2>折扣设置</h2> -->
-    <div class="m-core">
+    <div>
       <save-form :inline="true"
                @submit="search"
                @reset="onReSet"
                ref="searchForm"
                :saveKey="'musicCourseFee'"
+               size="small"
                :model="searchForm">
         <el-form-item prop="organId">
           <el-select placeholder="请选择分部"
@@ -36,15 +37,12 @@
                      type="primary">重置</el-button>
         </el-form-item>
       </save-form>
-      <div class="newBand"
-           v-permission="'organizationCourseUnitPriceSettings/insert'"
-           @click="newVisiable = true">
-        添加
-      </div>
+      <el-button size="small" style="margin-bottom: 20px;" type="primary" v-permission="'organizationCourseUnitPriceSettings/insert'" @click="newVisiable = true" icon="el-icon-plus">添加</el-button>
+
       <!-- 列表 -->
       <div class="tableWrap">
         <el-table :data="tableList"
-                  :header-cell-style="{ background: '#EDEEF0', color: '#444' }">
+                  :header-cell-style="{ background: '#EDEEF0', color: '#444' }" size="small">
           <el-table-column align="center"
                            prop="organName"
                            label="分部名称">
@@ -81,7 +79,7 @@
           <el-table-column align="center"
                            label="操作">
             <template slot-scope="scope">
-              <el-button @click="openTypes(scope.row)"
+              <el-button @click="openTypes(scope.row)" size="small"
                          v-permission="'organizationCourseUnitPriceSettings/update'"
                          type="text">修改</el-button>
             </template>
@@ -103,6 +101,7 @@
                width="500px">
       <el-form :model="createForm"
                class="createForm"
+               size="small"
                ref="ruleForm">
         <el-form-item label="所属分部"
                       :rules="[{ required: true, message: '所属分部', trigger: 'blur' }]"
@@ -157,8 +156,8 @@
       </el-form>
       <span slot="footer"
             class="dialog-footer">
-        <el-button @click="newVisiable = false">取 消</el-button>
-        <el-button type="primary"
+        <el-button size="small" @click="newVisiable = false">取 消</el-button>
+        <el-button size="small" type="primary"
                    @click="submitInfo">确 定</el-button>
       </span>
     </el-dialog>
@@ -169,6 +168,7 @@
                destroy-on-close>
       <el-form :model="resetForm"
                class="resetForm"
+               size="small"
                ref="resetForm">
         <el-form-item label="所属分部"
                       :rules="[{ required: true, message: '所属分部', trigger: 'blur' }]"
@@ -222,9 +222,8 @@
         </el-form-item>
       </el-form>
       <div slot="footer">
-        <el-button @click="resetVisible = false">取 消</el-button>
-        <el-button type="primary"
-                   @click="resetSubmit">确 定</el-button>
+        <el-button size="small" @click="resetVisible = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="resetSubmit">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -274,7 +273,7 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50], // 选择限制显示条数
       },
-      formLabelWidth: "120px",
+      formLabelWidth: "100px",
       actvieRow: null,
     };
   },