到线下课 vip

1

src/views/baseRulesManager/components/goodsRules.vue

@@ -0,0 +1,47 @@
+<template>
+  <div class="m-container">
+    <div class="m-core">
+      <el-form :inline="true" :model="form">
+        <el-alert
+          style="margin: 10px 0"
+          title="商品库存预警"
+          :closable="false"
+          type="info"
+        >
+        </el-alert>
+        <el-row>
+          内部库存预警值:
+          <el-input v-model="form.num" placeholder="请输入时间" size="mini">
+            <template slot="append">件</template>
+          </el-input>
+
+        </el-row>
+        <el-row>
+          外部库存预警值:
+          <el-input v-model="form.num" placeholder="请输入时间" size="mini">
+            <template slot="append">件</template>
+          </el-input>
+
+        </el-row>
+        <el-row>
+          库存预警手机号:
+          <el-input v-model="form.num" placeholder="请输入手机号" size="mini">
+          </el-input>
+        </el-row>
+      </el-form>
+    </div>
+     <el-button size="mini" type="primary"> 保存 </el-button>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      form:{}
+    };
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "~@scss/views/courseRulersManager/index.scss";
+</style>

src/views/baseRulesManager/components/institutionRules.vue

@@ -0,0 +1,35 @@
+<template>
+  <div class="m-container">
+    <div class="m-core">
+      <el-form :inline="true" :model="form">
+        <el-alert
+          style="margin: 10px 0"
+          title="退款周期"
+          :closable="false"
+          type="info"
+        >
+        </el-alert>
+        <el-row>
+          学员退款后提示:
+          <el-input v-model="form.num" placeholder="请输入天数" size="mini">
+            <template slot="append">天</template>
+          </el-input>
+            退款到账
+        </el-row>
+      </el-form>
+    </div>
+     <el-button size="mini" type="primary"> 保存 </el-button>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      form:{}
+    };
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "~@scss/views/courseRulersManager/index.scss";
+</style>

src/views/baseRulesManager/components/schedule.vue

@@ -1,126 +0,0 @@
-<template>
-  <div class="m-container">
-    <div class="m-core">
-      <el-form :inline="true" :model="form">
-        <el-alert
-          style="margin: 10px 0"
-          title="日程安排角色"
-          :closable="false"
-          type="info"
-        >
-        </el-alert>
-        <el-row>
-          日程安排角色
-          <el-select
-            size="mini"
-            class="multiple"
-            v-model.trim="form.organId"
-            filterable
-            clearable
-            placeholder="请选择角色"
-          >
-            <el-option
-              v-for="item in roleList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option
-          ></el-select>
-        </el-row>
-        <el-row>
-          日程执行角色
-          <el-select
-            size="mini"
-            class="multiple"
-            v-model.trim="form.organId"
-            filterable
-            clearable
-            placeholder="请选择角色"
-          >
-            <el-option
-              v-for="item in roleList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option
-          ></el-select>
-        </el-row>
-                <el-alert
-          style="margin: 10px 0"
-          title="退团申请角色"
-          :closable="false"
-          type="info"
-        >
-        </el-alert>
-        <el-row>
-          退团处理角色
-          <el-select
-            size="mini"
-            class="multiple"
-            v-model.trim="form.organId"
-            filterable
-            clearable
-            placeholder="请选择角色"
-          >
-            <el-option
-              v-for="item in roleList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option
-          ></el-select>
-        </el-row>
-        <el-row>
-          退团审批角色
-          <el-select
-            size="mini"
-            class="multiple"
-            v-model.trim="form.organId"
-            filterable
-            clearable
-            placeholder="请选择角色"
-          >
-            <el-option
-              v-for="item in roleList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option
-          ></el-select>
-        </el-row>
-      </el-form>
-    </div>
-    <el-button size="mini" type="primary">保存</el-button>
-  </div>
-</template>
-<script>
-export default {
-  data() {
-    return {
-      form: {
-        num: null,
-      },
-      roleList:[]
-    };
-  },
-};
-</script>
-<style lang="scss" scoped>
-/deep/.el-input-group {
-  width: 180px;
-}
-p,
-.el-row {
-  font-size: 14px;
-  line-height: 32px;
-  color: #000;
-  margin-bottom: 10px;
-}
-.subtitle {
-  font-size: 14px;
-  line-height: 32px;
-}
-.append {
-  max-width: 80px !important;
-}
-</style>

src/views/baseRulesManager/components/serverMinitor.vue

@@ -12,19 +12,19 @@
 
         <el-row>
           课程结束后，老师未在
-           <el-input v-model="form.num" placeholder="请输入距离" size="mini">
+          <el-input v-model="form.num" placeholder="请输入距离" size="mini">
             <template slot="append">
               <el-select class="append" v-model.trim="form.organId" size="mini">
                 <el-option label="元" value="yuan"> </el-option>
                 <el-option label="%" value="bi"> </el-option>
               </el-select>
-            </template>
-          </el-input>内未布置课后训练提醒异常
+            </template> </el-input
+          >内未布置课后训练提醒异常
         </el-row>
 
         <el-row>
           学员提交课后训练后，老师未在
-         <el-input v-model="form.num" placeholder="请输入距离" size="mini">
+          <el-input v-model="form.num" placeholder="请输入距离" size="mini">
             <template slot="append">
               <el-select class="append" v-model.trim="form.organId" size="mini">
                 <el-option label="元" value="yuan"> </el-option>
@@ -34,25 +34,44 @@
           </el-input>
           内点评提醒异常
         </el-row>
-                <el-row>
+        <el-row>
           课程开始时间早于
           <el-time-picker
-             size="mini"
-              v-model="value1"
-              :picker-options="{
-                selectableRange: '00:00:00 - 23:59:59',
-              }"
-              placeholder="请选择时间"
-            >
-            </el-time-picker> 结束时间晚于 <el-time-picker
-             size="mini"
-              v-model="value1"
-              :picker-options="{
-                selectableRange: '00:00:00 - 23:59:59',
-              }"
-              placeholder="请选择时间"
-            >
-            </el-time-picker> 点时，提醒异常
+            size="mini"
+            v-model="value1"
+            :picker-options="{
+              selectableRange: '00:00:00 - 23:59:59',
+            }"
+            placeholder="请选择时间"
+          >
+          </el-time-picker>
+          结束时间晚于
+          <el-time-picker
+            size="mini"
+            v-model="value1"
+            :picker-options="{
+              selectableRange: '00:00:00 - 23:59:59',
+            }"
+            placeholder="请选择时间"
+          >
+          </el-time-picker>
+          点时，提醒异常
+        </el-row>
+        <el-alert
+          style="margin: 10px 0"
+          title="学员异常提醒"
+          :closable="false"
+          type="info"
+        >
+        </el-alert>
+
+        <el-row>
+          学员单月请假次数达到
+          <el-input v-model="form.num" placeholder="请输入请假次数" size="mini">
+            <template slot="append">
+              次
+            </template> </el-input
+          >时提醒异常
         </el-row>
       </el-form>
     </div>
@@ -71,21 +90,5 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-/deep/.el-input-group {
-  width: 180px;
-}
-p,
-.el-row {
-  font-size: 14px;
-  line-height: 32px;
-  color: #000;
-  margin-bottom: 10px;
-}
-.subtitle {
-  font-size: 14px;
-  line-height: 32px;
-}
-.append {
-  max-width: 80px !important;
-}
+@import "~@scss/views/courseRulersManager/index.scss";
 </style>

src/views/baseRulesManager/components/studuntMinitor.vue

@@ -1,75 +0,0 @@
-<template>
-  <div class="m-container">
-    <div class="m-core">
-      <el-form :inline="true" :model="form">
-        <el-alert
-          style="margin: 10px 0"
-          title="学员异常提醒参数设置"
-          :closable="false"
-          type="info"
-        >
-        </el-alert>
-
-        <el-row>
-          学员会员过期时
-          <el-select  v-model.trim="form.organId" size="mini">
-            <el-option label="元" value="yuan"> </el-option>
-            <el-option label="%" value="bi"> </el-option> </el-select
-          >异常
-        </el-row>
-
-        <el-row>
-          课程开始时间早于
-          <el-time-picker
-             size="mini"
-              v-model="value1"
-              :picker-options="{
-                selectableRange: '00:00:00 - 23:59:59',
-              }"
-              placeholder="请选择时间"
-            >
-            </el-time-picker>结束时间晚于<el-time-picker
-             size="mini"
-              v-model="value1"
-              :picker-options="{
-                selectableRange: '00:00:00 - 23:59:59',
-              }"
-              placeholder="请选择时间"
-            >
-            </el-time-picker>点时，提醒异常
-        </el-row>
-      </el-form>
-    </div>
-    <el-button size="mini" type="primary">保存</el-button>
-  </div>
-</template>
-<script>
-export default {
-  data() {
-    return {
-      form: {
-        num: null,
-      },
-    };
-  },
-};
-</script>
-<style lang="scss" scoped>
-/deep/.el-input-group {
-  width: 180px;
-}
-p,
-.el-row {
-  font-size: 14px;
-  line-height: 32px;
-  color: #000;
-  margin-bottom: 10px;
-}
-.subtitle {
-  font-size: 14px;
-  line-height: 32px;
-}
-.append {
-  max-width: 80px !important;
-}
-</style>

src/views/baseRulesManager/components/teamMinitor.vue

@@ -1,68 +0,0 @@
-<template>
-  <div class="m-container">
-    <div class="m-core">
-      <el-form :inline="true" :model="form">
-        <el-alert
-          style="margin: 10px 0"
-          title="乐团异常提醒参数设置"
-          :closable="false"
-          type="info"
-        >
-        </el-alert>
-
-        <el-row>
-          班级学员数量小于
-          <el-input v-model="form.num" placeholder="请输入时间" size="mini">
-            <template slot="append">人</template> </el-input
-          >时提醒异常
-        </el-row>
-
-        <el-row>
-          乐团在读学员不在该乐团任何班级时
-          <el-select  v-model.trim="form.organId" size="mini">
-            <el-option label="元" value="yuan"> </el-option>
-            <el-option label="%" value="bi"> </el-option> </el-select
-          >异常
-        </el-row>
-
-        <el-row>
-          基础技能班少于
-          <el-input v-model="form.num" placeholder="请输入时间" size="mini">
-            <template slot="append">人</template> </el-input
-          >时提醒异常
-        </el-row>
-      </el-form>
-    </div>
-    <el-button size="mini" type="primary">保存</el-button>
-  </div>
-</template>
-<script>
-export default {
-  data() {
-    return {
-      form: {
-        num: null,
-      },
-    };
-  },
-};
-</script>
-<style lang="scss" scoped>
-/deep/.el-input-group {
-  width: 180px;
-}
-p,
-.el-row {
-  font-size: 14px;
-  line-height: 32px;
-  color: #000;
-  margin-bottom: 10px;
-}
-.subtitle {
-  font-size: 14px;
-  line-height: 32px;
-}
-.append {
-  max-width: 80px !important;
-}
-</style>

src/views/baseRulesManager/index.vue

@@ -2,34 +2,34 @@
   <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="课酬预警设置"
+          label="乐保设置"
           lazy
           name="1"
           v-if="permissionList.earlyWarning"
         >
-            <earlyWarning v-if="activeIndex == 1" />
+          <leBaoRules v-if="activeIndex == 1" />
         </el-tab-pane>
         <el-tab-pane
-          label="乐团异常提醒"
+          label="商品库存预警"
           lazy
           name="2"
           v-if="permissionList.earlyWarning"
         >
-        <teamMinitor />
+          <goodsRules />
         </el-tab-pane>
         <el-tab-pane
-          label="学员异常提醒"
+          label="登录限制"
           lazy
           name="3"
           v-if="permissionList.earlyWarning"
         >
-        <studuntMinitor />
+          <loginRules />
         </el-tab-pane>
         <el-tab-pane
           label="服务异常提醒"
@@ -39,43 +39,44 @@
         >
           <serverMinitor />
         </el-tab-pane>
-              <el-tab-pane
-          label="日程安排设置"
+        <el-tab-pane
+          label="机构参数设置"
           lazy
           name="5"
           v-if="permissionList.earlyWarning"
         >
-          <schedule />
+          <institutionRules />
         </el-tab-pane>
       </tab-router>
     </div>
   </div>
 </template>
 <script>
-import earlyWarning from "@/views/categroyManager/generalSettings/earlyWarning";
-import teamMinitor from './components/teamMinitor'
-import studuntMinitor from './components/studuntMinitor'
-import serverMinitor from './components/serverMinitor'
-import schedule from './components/schedule'
+import leBaoRules from "@/views/courseRulersManager/components/leBaoRules";
+import loginRules from "@/views/courseRulersManager/components/loginRules";
+import serverMinitor from "./components/serverMinitor";
+import goodsRules from "./components/goodsRules";
+import institutionRules from "./components/institutionRules";
+
 import { permission } from "@/utils/directivePage";
 export default {
   components: {
-    earlyWarning,
-    teamMinitor,
-    studuntMinitor,
+    leBaoRules,
     serverMinitor,
-    schedule
+    loginRules,
+    goodsRules,
+    institutionRules,
   },
   name: "baseRulersManager",
   data() {
     return {
       activeIndex: "1",
-       permissionList: {
+      permissionList: {
         overallManager: permission("/globalConfig/overallManager"),
         overallManagerTwo: permission("/globalConfig/overallManagerTwo"),
         holidaySetting: permission("/globalConfig/holidaySetting"),
         earlyWarning: permission("/globalConfig/earlyWarning"),
-      }
+      },
     };
   },
   methods: {

src/views/categroyManager/accompanyBaseConfig.vue

@@ -1,42 +1,102 @@
 <template>
-  <div class="m-container">
-    <h2>
+  <div>
+    <!-- <h2> class="m-container"
       <div class="squrt"></div>
       网管课基础配置设置
-    </h2>
+    </h2> -->
     <div class="m-core">
-      <el-alert
-        style="margin: 20px 0"
-        title="网管课分部设置"
-        :closable="false"
-        class="alert"
-        type="info"
-      >
-      </el-alert>
-      <el-row class="row">
-        网管课可选分部
-        <select-all
-          class="chioseOragn"
-          multiple
-          collapse-tags
-          v-model="organIdList"
-          clearable
-          filterable
-          size="mini"
-          placeholder="请选择分部"
+      <el-form :inline="true" :model="form">
+        <el-alert
+          style="margin: 20px 0"
+          title="网管课分部设置"
+          :closable="false"
+          class="alert"
+          type="info"
         >
-          <el-option
-            v-for="(item, index) in selects.branchs"
-            :key="index"
-            :label="item.name"
-            :value="item.id"
-          ></el-option>
-        </select-all>
-        老师
-        <el-button type="primary" size="mini" class="submitBtn" @click="submit"
+        </el-alert>
+        <el-row class="row">
+          网管课可选分部
+          <select-all
+            class="chioseOragn"
+            multiple
+            collapse-tags
+            v-model="organIdList"
+            clearable
+            filterable
+            size="mini"
+            placeholder="请选择分部"
+          >
+            <el-option
+              v-for="(item, index) in selects.branchs"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </select-all>
+          老师
+          <!-- <el-button type="primary" size="mini" class="submitBtn" @click="submit"
           >保存</el-button
+        > -->
+        </el-row>
+        <el-row class="row">
+          网管课可预约声部
+          <select-all
+            class="chioseOragn"
+            multiple
+            collapse-tags
+            v-model="organIdList"
+            clearable
+            filterable
+            size="mini"
+            placeholder="请选择分部"
+          >
+            <el-option
+              v-for="(item, index) in selects.branchs"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </select-all>
+          <!-- <el-button type="primary" size="mini" class="submitBtn" @click="submit"
+          >保存</el-button
+        > -->
+        </el-row>
+        <el-row class="row">
+          网管课可预约时间为每日
+          <el-time-picker
+            v-model="value1"
+            size="mini"
+            :picker-options="{
+              selectableRange: '18:30:00 - 20:30:00',
+            }"
+            placeholder="请输入时间"
+          >
+          </el-time-picker>
+          点至
+          <el-time-picker
+            v-model="value1"
+            size="mini"
+            :picker-options="{
+              selectableRange: '18:30:00 - 20:30:00',
+            }"
+            placeholder="请输入时间"
+          >
+          </el-time-picker>
+        </el-row>
+                <el-alert
+          style="margin: 20px 0"
+          title="试听课设置"
+          :closable="false"
+          class="alert"
+          type="info"
         >
-      </el-row>
+        </el-alert>
+        <el-row class="row">
+          试听课单课时时长  <el-input v-model="form.num" size="mini">
+              <template slot="append">分钟</template>
+            </el-input>
+        </el-row>
+      </el-form>
     </div>
   </div>
 </template>
@@ -47,6 +107,8 @@ export default {
     return {
       organIdList: [],
       activeItem: null,
+      form: {},
+      value1: new Date(2016, 9, 10, 18, 40),
     };
   },
   mounted() {
@@ -56,9 +118,11 @@ export default {
         res.data.forEach((item, index) => {
           if (item.paramName == "practice_teacher_organ_range") {
             this.activeItem = item;
-            this.organIdList = item.paranValue?item.paranValue.split(",").map((oragn) => {
-              return Number(oragn);
-            }):[]
+            this.organIdList = item.paranValue
+              ? item.paranValue.split(",").map((oragn) => {
+                  return Number(oragn);
+                })
+              : [];
           }
         });
       }
@@ -91,17 +155,10 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+@import "~@scss/views/courseRulersManager/index.scss";
 .chioseOragn {
-  width: 400px;
+  width: 400px !important;
   margin: 0 5px;
-}
-.row {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  font-size: 14px;
-}
-.submitBtn {
-  margin-left: 10px;
+  display: inline-block;
 }
 </style>

src/views/courseRulersManager/api.js

@@ -0,0 +1,21 @@
+import request2 from '@/utils/request2'
+
+export const getSysTenantConfig = data => request2({
+  url: '/api-web/sysTenantConfig/queryAll',
+  params: data,
+  method: 'get',
+})
+
+// 获取问卷接口
+export const questionnaireTopicQueryPage = data => request2({
+  url: '/api-web/questionnaireTopic/queryPage',
+  params: data,
+  method: 'get',
+})
+
+export const setSysTenantConfig = data => request2({
+  url: '/api-web/sysTenantConfig/batchUpSet',
+  data,
+  method: 'post',
+  requestType:'json'
+})

src/views/courseRulersManager/components/courseRules.vue

@@ -58,4 +58,5 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+@import '../index.scss';
 </style>

src/views/courseRulersManager/components/leBaoRules.vue

@@ -46,19 +46,5 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-/deep/.el-input-group {
-  width: 180px;
-}
-p,.el-row {
-  font-size: 14px;
-  line-height: 32px;
-  color: #000;
-}
-.subtitle {
-  font-size: 14px;
-  line-height: 32px;
-}
-.append {
-  max-width: 80px!important;
-}
+@import '../index.scss';
 </style>

src/views/courseRulersManager/components/loginRules.vue

@@ -45,20 +45,5 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-/deep/.el-input-group {
-  width: 180px;
-}
-p,.el-row {
-  font-size: 14px;
-  line-height: 32px;
-  color: #000;
-  margin-bottom: 10px;
-}
-.subtitle {
-  font-size: 14px;
-  line-height: 32px;
-}
-.append {
-  width: 80px!important;
-}
+@import '../index.scss';
 </style>

src/views/courseRulersManager/components/offlineTeamRules.vue

@@ -12,7 +12,7 @@
         <p class="subtitle">线下课考勤定位范围:</p>
         <el-row>
           GPS定位距离教学点<el-input
-            v-model="form.num"
+            v-model="form['6']"
             placeholder="请输入距离"
             size="mini"
           >
@@ -23,11 +23,11 @@
         <p class="subtitle">签到签退定位异常:</p>
         <el-row>
           乐团线下课签到签退地点、VIP线下课点名地点未在定位范围内，扣减课酬
-          <el-input v-model="form.num" placeholder="请输入金额" size="mini">
+          <el-input v-model="form['138']" placeholder="请输入金额" size="mini"  class="chiose">
             <template slot="append">
-              <el-select class="append" v-model.trim="form.organId">
-                <el-option label="元" value="yuan"> </el-option>
-                <el-option label="%" value="bi"> </el-option>
+              <el-select class="append" v-model.trim="form['139']">
+                <el-option label="元" value="1"> </el-option>
+                <el-option label="%" value="2"> </el-option>
               </el-select>
             </template>
           </el-input>
@@ -44,7 +44,7 @@
         <el-row>
           课程开始前
           <el-form-item>
-            <el-input v-model="form.num" placeholder="请输入时间" size="mini">
+            <el-input v-model="form['80']" placeholder="请输入时间" size="mini">
               <template slot="append">分钟</template> </el-input
             >可进行签到
           </el-form-item>
@@ -52,21 +52,21 @@
         <p class="subtitle">正常签到:</p>
         <el-row>
           课程开始
-          <el-input v-model="form.num" placeholder="请输入时间" size="mini">
+          <el-input v-model="form['140']" placeholder="请输入时间" size="mini">
             <template slot="append">分钟</template> </el-input
           >前，且在定位范围内签到
         </el-row>
         <p class="subtitle">异常签到:</p>
         <el-row>
           未在课程开始
-          <el-input v-model="form.num" placeholder="请输入时间" size="mini">
+          <el-input disabled v-model="form['140']" placeholder="请输入时间" size="mini">
             <template slot="append">分钟</template> </el-input
           >前签到，扣减课酬
-          <el-input v-model="form.num" placeholder="请输入金额" size="mini">
+          <el-input v-model="form['141']" placeholder="请输入金额" size="mini"  class="chiose">
             <template slot="append">
-              <el-select class="append" v-model.trim="form.organId" size="mini">
-                <el-option label="元" value="yuan"> </el-option>
-                <el-option label="%" value="bi"> </el-option>
+              <el-select class="append" v-model.trim="form['142']" size="mini" >
+                <el-option label="元" value="1"> </el-option>
+                <el-option label="%" value="2"> </el-option>
               </el-select>
             </template>
           </el-input>
@@ -74,14 +74,14 @@
         <p class="subtitle">迟到</p>
         <el-row>
           课程开始
-          <el-input v-model="form.num" placeholder="请输入时间" size="mini">
+          <el-input v-model="form['143']" placeholder="请输入时间" size="mini">
             <template slot="append">分钟</template> </el-input
           >内签到，扣减课酬
-          <el-input v-model="form.num" placeholder="请输入金额" size="mini">
+          <el-input v-model="form['144']" placeholder="请输入金额" size="mini"  class="chiose">
             <template slot="append">
-              <el-select class="append" v-model.trim="form.organId" size="mini">
-                <el-option label="元" value="yuan"> </el-option>
-                <el-option label="%" value="bi"> </el-option>
+              <el-select class="append" v-model.trim="form['145']" size="mini" >
+                <el-option label="元" value="1"> </el-option>
+                <el-option label="%" value="2"> </el-option>
               </el-select>
             </template>
           </el-input>
@@ -89,15 +89,15 @@
         <p class="subtitle">旷课：</p>
         <el-row>
           课程开始
-          <el-input v-model="form.num" placeholder="请输入时间" size="mini">
+          <el-input v-model="form['146']" placeholder="请输入时间" size="mini">
             <template slot="append">分钟</template>
           </el-input>
           后签到，扣减课酬
-          <el-input v-model="form.num" placeholder="请输入金额" size="mini">
+          <el-input v-model="form['147']" placeholder="请输入金额" size="mini"  class="chiose">
             <template slot="append">
-              <el-select class="append" v-model.trim="form.organId" size="mini">
-                <el-option label="元" value="yuan"> </el-option>
-                <el-option label="%" value="bi"> </el-option>
+              <el-select class="append" v-model.trim="form['148']" size="mini">
+                <el-option label="元" value="1"> </el-option>
+                <el-option label="%" value="2"> </el-option>
               </el-select>
             </template>
           </el-input>
@@ -105,11 +105,11 @@
         <p class="subtitle">未签到：</p>
         <el-row>
           扣减课酬
-          <el-input v-model="form.num" placeholder="请输入金额" size="mini">
+          <el-input v-model="form['149']" placeholder="请输入金额" size="mini"  class="chiose">
             <template slot="append">
-              <el-select class="append" v-model.trim="form.organId">
-                <el-option label="元" value="yuan"> </el-option>
-                <el-option label="%" value="bi"> </el-option>
+              <el-select class="append" v-model.trim="form['150']">
+                <el-option label="元" value="1"> </el-option>
+                <el-option label="%" value="2"> </el-option>
               </el-select>
             </template>
           </el-input>
@@ -124,21 +124,21 @@
         <p class="subtitle">正常签退:</p>
         <el-row>
           课程结束后
-          <el-input v-model="form.num" placeholder="请输入时间" size="mini">
+          <el-input v-model="form['151']" placeholder="请输入时间" size="mini">
             <template slot="append">分钟</template> </el-input
           >内签退，且在定位范围内签退
         </el-row>
         <p class="subtitle">异常签退:</p>
         <el-row>
           课程结束时间
-          <el-input v-model="form.num" placeholder="请输入时间" size="mini">
+          <el-input v-model="form['151']" disabled placeholder="请输入时间" size="mini">
             <template slot="append">分钟</template> </el-input
           >内签退，扣减课酬
-          <el-input v-model="form.num" placeholder="请输入金额" size="mini">
+          <el-input v-model="form['152']" placeholder="请输入金额" size="mini"  class="chiose">
             <template slot="append">
-              <el-select class="append" v-model.trim="form.organId" size="mini">
-                <el-option label="元" value="yuan"> </el-option>
-                <el-option label="%" value="bi"> </el-option>
+              <el-select class="append" v-model.trim="form['153']" size="mini">
+                <el-option label="元" value="1"> </el-option>
+                <el-option label="%" value="2"> </el-option>
               </el-select>
             </template>
           </el-input>
@@ -146,15 +146,15 @@
         <p class="subtitle">早退</p>
         <el-row>
           课程结束
-          <el-input v-model="form.num" placeholder="请输入时间" size="mini">
+          <el-input v-model="form['154']" placeholder="请输入时间" size="mini">
             <template slot="append">分钟</template>
           </el-input>
           前签退，扣减课酬
-          <el-input v-model="form.num" placeholder="请输入金额" size="mini">
+          <el-input v-model="form['155']" placeholder="请输入金额" size="mini"  class="chiose">
             <template slot="append">
-              <el-select class="append" v-model.trim="form.organId" size="mini">
-                <el-option label="元" value="yuan"> </el-option>
-                <el-option label="%" value="bi"> </el-option>
+              <el-select class="append" v-model.trim="form['156']" size="mini">
+                <el-option label="元" value="1"> </el-option>
+                <el-option label="%" value="2"> </el-option>
               </el-select>
             </template>
           </el-input>
@@ -162,11 +162,11 @@
         <p class="subtitle">未签退：</p>
         <el-row>
           课程未签退扣减课酬
-          <el-input v-model="form.num" placeholder="请输入金额" size="mini">
+          <el-input v-model="form['157']" placeholder="请输入金额" size="mini"  class="chiose">
             <template slot="append">
-              <el-select class="append" v-model.trim="form.organId" size="mini">
-                <el-option label="元" value="yuan"> </el-option>
-                <el-option label="%" value="bi"> </el-option>
+              <el-select class="append" v-model.trim="form['158']" size="mini">
+                <el-option label="元" value="1"> </el-option>
+                <el-option label="%" value="2"> </el-option>
               </el-select>
             </template>
           </el-input>
@@ -174,7 +174,7 @@
         <p class="subtitle">签退提醒：</p>
         <el-row>
           课程结束
-          <el-input v-model="form.num" placeholder="请输入时间" size="mini">
+          <el-input v-model="form['14']" placeholder="请输入时间" size="mini">
             <template slot="append">分钟</template>
           </el-input>
           后，对未签退老师发送短信提醒
@@ -205,7 +205,7 @@
         </p>
         <el-row>
           乐团线下课程间隔
-          <el-input v-model="form.num" placeholder="请输入时间" size="mini">
+          <el-input v-model="form['178']" placeholder="请输入时间" size="mini">
             <template slot="append">分钟</template>
           </el-input>
           以内视为连堂课
@@ -218,25 +218,25 @@
         >
         </el-alert>
         <p class="subtitle">未点名：</p>
-        <el-row>
+        <!-- <el-row>
           未点名扣减课酬
-          <el-input v-model="form.num" placeholder="请输入金额" size="mini">
-            <template slot="append">
+          <el-input v-model="form.num" placeholder="请输入金额" size="mini" class="chiose">
+            <template slot="append" >
               <el-select class="append" v-model.trim="form.organId" size="mini">
-                <el-option label="元" value="yuan"> </el-option>
-                <el-option label="%" value="bi"> </el-option>
+                <el-option label="元" value="1"> </el-option>
+                <el-option label="%" value="2"> </el-option>
               </el-select>
             </template>
           </el-input>
-        </el-row>
+        </el-row> -->
         <p class="subtitle">点名时间范围：</p>
         <el-row>
           VIP课可点名时间范围为课程开始前
-          <el-input v-model="form.num" placeholder="请输入时间" size="mini">
+          <el-input v-model="form['39']" placeholder="请输入时间" size="mini">
             <template slot="append">分钟</template>
           </el-input>
           至课程结束后
-          <el-input v-model="form.num" placeholder="请输入时间" size="mini">
+          <el-input v-model="form['40']" placeholder="请输入时间" size="mini">
             <template slot="append">分钟</template>
           </el-input>
         </el-row>
@@ -295,55 +295,66 @@
           >内可以提交考勤申诉
         </el-row>
       </el-form>
-      <el-button size="mini" type="primary"> 保存 </el-button>
+      <el-button size="mini" type="primary" @click="save" class="saveBtn"
+        >保存</el-button
+      >
     </div>
   </div>
 </template>
 <script>
+import {
+  getSysTenantConfig,
+  questionnaireTopicQueryPage,
+  setSysTenantConfig,
+} from "../api";
 export default {
   data() {
     return {
       form: {},
-      roleList: [],
-      value1: null,
+      questionList: [],
+      rulesVisiable: false,
     };
   },
+  async mounted() {
+    this.getRules();
+  },
+  methods: {
+    async getRules() {
+      try {
+        const res = await getSysTenantConfig({ group: "MEMBER_MUSIC" });
+        res.data.forEach((item) => {
+          // this.form[item.paramName] = item.paranValue
+          this.$set(this.form, item.id, item.paranValue);
+        });
+        // this.$forceUpdate()
+        console.log(this.form);
+      } catch (e) {
+        console.log(e);
+      }
+    },
+    async save() {
+      this.$refs.form.validate(async (valid) => {
+        if (valid) {
+          let param = [];
+          for (let i in this.form) {
+            param.push({
+              id: i,
+              paranValue: this.form[i],
+            });
+          }
+          try {
+            const res = await setSysTenantConfig(param);
+            this.$message.success("保存成功");
+            this.getRules();
+          } catch (e) {
+            console.log(e);
+          }
+        }
+      });
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>
-/deep/.el-form-item--mini.el-form-item {
-  margin-bottom: 0px;
-}
-.mTooltip {
-  width: 300px;
-}
-/deep/.el-input-group {
-  width: 180px;
-  margin: 0 5px;
-}
-.el-row {
-  align-items: center;
-}
-/deep/.el-input-group {
-  width: 180px;
-}
-p,
-.el-row {
-  font-size: 14px;
-  line-height: 32px;
-  color: #000;
-  margin-bottom: 10px;
-  padding: 0 24px;
-}
-p {
-  font-weight: bold;
-  margin-bottom: 0;
-}
-.subtitle {
-  font-size: 14px;
-  line-height: 32px;
-}
-.append {
-  width: 80px !important;
-}
+@import "../index.scss";
 </style>

src/views/courseRulersManager/components/offlineVipRules.vue

@@ -62,19 +62,5 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-/deep/.el-input-group {
-  width: 180px;
-}
-p,.el-row {
-  font-size: 14px;
-  line-height: 32px;
-  color: #000;
-}
-.subtitle {
-  font-size: 14px;
-  line-height: 32px;
-}
-.append {
-  width: 80px!important;
-}
+@import '../index.scss';
 </style>

src/views/courseRulersManager/components/onlineCloudRules.vue

@@ -125,39 +125,5 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-/deep/.el-form-item--mini.el-form-item {
-  margin-bottom: 0px;
-}
-.mTooltip {
-  width: 300px;
-}
-/deep/.el-input-group {
-  width: 180px;
-  margin: 0 5px;
-}
-.el-row {
-  align-items: center;
-}
-/deep/.el-input-group {
-  width: 180px;
-}
-p,
-.el-row {
-  font-size: 14px;
-  line-height: 32px;
-  color: #000;
-  margin-bottom: 10px;
-  padding: 0 24px;
-}
-p {
-  font-weight: bold;
-  margin-bottom: 0;
-}
-.subtitle {
-  font-size: 14px;
-  line-height: 32px;
-}
-.append {
-  width: 80px !important;
-}
+@import '../index.scss';
 </style>

src/views/courseRulersManager/components/remberRules.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="m-container">
     <div class="m-core">
-      <el-form :inline="true" :model="form">
+      <el-form :inline="true" :model="form" ref="form">
         <el-alert
           style="margin: 10px 0"
           title="会员乐团规则"
@@ -10,71 +10,110 @@
         >
         </el-alert>
         <el-row>
-          <el-form-item>
-             各声部不购买会员入团资格限制  <el-input v-model="form.num" size="mini">
+          <el-form-item   prop="136"
+            :rules="[
+              {
+                required: true,
+                message: '请输入人数',
+                trigger: 'change',
+              },
+            ]">
+             <span style="color: #f56c6c; margin-right: 4px">*</span
+            >
+            各声部不购买会员入团资格限制
+            <el-input v-model="form[136]" size="mini" placeholder="请输入人数">
               <template slot="append">人</template>
             </el-input>
-
           </el-form-item>
         </el-row>
         <el-row>
-          <el-form-item>
-            会员团每学期赠送  <el-input v-model="form.num" size="mini">
+          <el-form-item   prop="133"
+            :rules="[
+              {
+                required: true,
+                message: '请输入分钟数',
+                trigger: 'change',
+              },
+            ]">
+             <span style="color: #f56c6c; margin-right: 4px">*</span
+            >
+            会员团每学期赠送
+            <el-input v-model="form[133]" size="mini"  placeholder="请输入分钟数">
               <template slot="append">分钟</template>
-            </el-input> 课程
+            </el-input>
+            课程
           </el-form-item>
         </el-row>
         <el-row>
           <el-form-item>
-            每学期结束前   <el-input v-model="form.num" size="mini">
+            每学期结束前
+            <el-input v-model="form[99]" size="mini">
               <template slot="append">天</template>
-            </el-input> 提醒乐团主管安排下学期课程
+            </el-input>
+            提醒乐团主管安排下学期课程
           </el-form-item>
         </el-row>
       </el-form>
-      <el-button>保存</el-button>
+      <el-button size="mini" type="primary" @click="save" class="saveBtn"
+        >保存</el-button
+      >
     </div>
   </div>
 </template>
 <script>
+import {
+  getSysTenantConfig,
+  questionnaireTopicQueryPage,
+  setSysTenantConfig,
+} from "../api";
 export default {
   data() {
     return {
       form: {},
-      roleList: [],
+      questionList: [],
+      rulesVisiable: false,
     };
   },
+  async mounted() {
+    this.getRules();
+  },
+  methods: {
+    async getRules() {
+      try {
+        const res = await getSysTenantConfig({ group: "MEMBER_MUSIC" });
+        res.data.forEach((item) => {
+          // this.form[item.paramName] = item.paranValue
+          this.$set(this.form, item.id, item.paranValue);
+        });
+        // this.$forceUpdate()
+        console.log(this.form);
+      } catch (e) {
+        console.log(e);
+      }
+    },
+    async save() {
+      this.$refs.form.validate(async (valid) => {
+        if (valid) {
+          let param = [];
+          for (let i in this.form) {
+            param.push({
+              id: i,
+              paranValue: this.form[i],
+            });
+          }
+          try {
+            const res = await setSysTenantConfig(param);
+            this.$message.success("保存成功");
+            this.getRules();
+          } catch (e) {
+            console.log(e);
+          }
+        }
+      });
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>
-/deep/.el-form--inline .el-form-item__content{
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-}
-/deep/.el-form-item {
-  margin-bottom: 0;
-}
-/deep/.el-input-group {
-  width: 180px;
-   margin: 0 5px;
-}
-.el-row {
-  align-items: center;
-}
-/deep/.el-input-group {
-  width: 180px;
-}
-p,
-.el-row {
-  font-size: 14px;
-  line-height: 32px;
-  color: #000;
-  margin-bottom: 20px;
-  padding: 0 24px;
-}
-.subtitle {
-  font-size: 14px;
-  line-height: 32px;
-}
+@import "../index.scss";
 </style>

src/views/courseRulersManager/components/studentAttRules.vue

@@ -4,14 +4,14 @@
       <el-form :inline="true" :model="form">
         <el-alert
           style="margin: 10px 0"
-          title="云教室考勤规则"
+          title="学员请假规则设置"
           :closable="false"
           type="info"
         >
         </el-alert>
         <el-row>
           课程开始前
-           <el-input v-model="form.num" placeholder="请输入距离" size="mini">
+          <el-input v-model="form.num" placeholder="请输入距离" size="mini">
             <template slot="append">
               <el-select class="append" v-model.trim="form.organId">
                 <el-option label="天" value="yuan"> </el-option>
@@ -21,39 +21,38 @@
             </template>
           </el-input>
           前可提交请假申请
-            <el-button size="mini" type="primary">保存</el-button>
+          <!-- <el-button size="mini" type="primary">保存</el-button> -->
+        </el-row>
+        <el-alert
+          style="margin: 10px 0"
+          title="课程调整规则"
+          :closable="false"
+          type="info"
+        >
+        </el-alert>
+        <el-row>
+          老师可在开课
+          <el-input v-model="form.num" placeholder="请输入时间" size="mini">
+            <template slot="append">分钟</template>
+          </el-input>
+          前调整VIP、网管课程
         </el-row>
       </el-form>
     </div>
-
   </div>
 </template>
 <script>
 export default {
   data() {
     return {
-      form:{
-        num:null
-      }
+      form: {
+        num: null,
+      },
     };
   },
 };
 </script>
 
 <style lang="scss" scoped>
-/deep/.el-input-group {
-  width: 180px;
-}
-p,.el-row {
-  font-size: 14px;
-  line-height: 32px;
-  color: #000;
-}
-.subtitle {
-  font-size: 14px;
-  line-height: 32px;
-}
-.append {
-  width: 80px!important;
-}
+@import "../index.scss";
 </style>

src/views/courseRulersManager/components/teamRules.vue

@@ -3,7 +3,7 @@
     <div class="m-core">
       <!-- <el-button size="mini" type="primary">添加规则</el-button> -->
 
-      <el-form :inline="true" :model="form">
+      <el-form :inline="true" :model="form" ref="form">
         <el-alert
           style="margin: 20px 0"
           title="预报名规则"
@@ -12,23 +12,34 @@
         >
         </el-alert>
         <el-row>
-          是否开启乐团预报名调查
-          <el-select
-            size="mini"
-            class="multiple"
-            v-model.trim="form.organId"
-            filterable
-            clearable
-            placeholder="请选择角色"
-          >
-            <el-option label="是" value="1"></el-option>
-            <el-option label="否" value="0"></el-option>
-            </el-select
+          <el-form-item
+            prop="201"
+            :rules="[
+              {
+                required: true,
+                message: '请选择是否开启乐团预报名',
+                trigger: 'change',
+              },
+            ]"
           >
+            <span style="color: #f56c6c; margin-right: 4px">*</span
+            >是否开启乐团预报名调查
+            <el-select
+              size="mini"
+              class="multiple"
+              v-model.trim="form['201']"
+              filterable
+              clearable
+              placeholder="请选择是否开启"
+            >
+              <el-option label="是" value="1"></el-option>
+              <el-option label="否" value="0"></el-option>
+            </el-select>
+          </el-form-item>
         </el-row>
         <el-row>
           乐团预报名人数达到
-          <el-input v-model="form.num" size="mini">
+          <el-input v-model="form['132']" size="mini" placeholder="请输入人数">
             <template slot="append">人</template>
           </el-input>
           时，可将乐团状态变更为创建缴费中
@@ -42,14 +53,14 @@
         </el-alert>
         <el-row>
           报名缴费阶段乐团若未合并学员，缴费人数达到
-          <el-input v-model="form.num" size="mini">
+          <el-input v-model="form['134']" size="mini" placeholder="请输入人数">
             <template slot="append">人</template>
           </el-input>
           时，可确认开团
         </el-row>
         <el-row>
           报名缴费阶段乐团若合并学员，缴费人数达到
-          <el-input v-model="form.num" size="mini">
+          <el-input v-model="form['135']" size="mini" placeholder="请输入人数">
             <template slot="append">人</template>
           </el-input>
           时，可确认开团
@@ -63,7 +74,7 @@
         </el-alert>
         <el-row>
           确认发货
-          <el-input v-model="form.num" size="mini">
+          <el-input v-model="form['76']" size="mini" placeholder="请输入天数">
             <template slot="append">天</template>
           </el-input>
           后自动确认收货
@@ -81,13 +92,13 @@
           <el-select
             size="mini"
             class="multiple"
-            v-model.trim="form.organId"
+            v-model.trim="form['103']"
             filterable
             clearable
             placeholder="请选择问卷"
           >
             <el-option
-              v-for="item in roleList"
+              v-for="item in questionList"
               :key="item.value"
               :label="item.label"
               :value="item.value"
@@ -95,44 +106,77 @@
           ></el-select>
         </el-row>
       </el-form>
-      <el-button size="mini" type="primary">保存</el-button>
+      <el-button size="mini" type="primary" @click="save" class="saveBtn"
+        >保存</el-button
+      >
     </div>
   </div>
 </template>
 <script>
+import {
+  getSysTenantConfig,
+  questionnaireTopicQueryPage,
+  setSysTenantConfig,
+} from "../api";
 export default {
   data() {
     return {
       form: {},
-      roleList: [],
+      questionList: [],
       rulesVisiable: false,
     };
   },
-  mounted() {},
-  methods: {},
+  async mounted() {
+    this.getRules();
+    try {
+      const res = await questionnaireTopicQueryPage({ page: 1, rows: 999 });
+      this.questionList = res.data.rows.map((item) => {
+        return {
+          label: item.title,
+          value: String(item.id),
+        };
+      });
+    } catch (e) {
+      console.log(e);
+    }
+  },
+  methods: {
+    async getRules() {
+      try {
+        const res = await getSysTenantConfig({ group: "MUSIC" });
+        res.data.forEach((item) => {
+          // this.form[item.paramName] = item.paranValue
+          this.$set(this.form, item.id, item.paranValue);
+        });
+        // this.$forceUpdate()
+        console.log(this.form);
+      } catch (e) {
+        console.log(e);
+      }
+    },
+    async save() {
+      this.$refs.form.validate(async (valid) => {
+        if (valid) {
+          let param = [];
+          for (let i in this.form) {
+            param.push({
+              id: i,
+              paranValue: this.form[i],
+            });
+          }
+          try {
+            const res = await setSysTenantConfig(param);
+            this.$message.success("保存成功");
+            this.getRules();
+          } catch (e) {
+            console.log(e);
+          }
+        }
+      });
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>
-/deep/.el-input-group {
-  width: 180px;
-   margin: 0 5px;
-}
-.el-row {
-  align-items: center;
-}
-/deep/.el-input-group {
-  width: 180px;
-}
-p,
-.el-row {
-  font-size: 14px;
-  line-height: 32px;
-  color: #000;
-  margin-bottom: 20px;
-  padding: 0 24px;
-}
-.subtitle {
-  font-size: 14px;
-  line-height: 32px;
-}
+@import "../index.scss";
 </style>

src/views/courseRulersManager/index.scss

@@ -0,0 +1,47 @@
+/deep/.el-input-group {
+  width: 180px;
+  margin: 0 5px;
+}
+
+p,
+.el-row {
+  align-items: center;
+  font-size: 14px;
+  color: #000;
+  margin-bottom: 20px;
+  padding: 0 24px;
+}
+
+.subtitle {
+  font-size: 14px;
+
+}
+
+.chiose{
+  /deep/.el-input-group__append {
+    padding: 0;
+  }
+  .append {
+    line-height: 26px;
+    height: 26px;
+    margin: 0;
+    width: 70px!important;
+  }
+}
+
+
+
+
+.saveBtn {
+  margin-left: 24px;
+}
+/deep/.el-form-item__content {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  line-height: 28px;
+}
+
+/deep/.el-form-item {
+  margin-bottom: 0px;
+}

src/views/courseRulersManager/index.vue

@@ -33,14 +33,7 @@
         >
           <offlineTeamRules />
         </el-tab-pane>
-        <!-- <el-tab-pane
-          label="VIP线下课考勤规则"
-          lazy
-          name="4"
-          v-if="permissionList.chargesList"
-        >
-          <offlineVipRules />
-        </el-tab-pane> -->
+
         <el-tab-pane
           label="云教室考勤规则"
           lazy
@@ -49,15 +42,24 @@
         >
           <onlineCloudRules />
         </el-tab-pane>
+                <el-tab-pane
+          label="网管&试听课规则"
+          lazy
+          name="4"
+          v-if="permissionList.chargesList"
+        >
+          <accompanyBaseConfig />
+        </el-tab-pane>
+
         <el-tab-pane
-          label="学员考勤规则设置"
+          label="课程规则设置"
           lazy
           name="6"
           v-if="permissionList.jobTemplateSetting"
         >
           <studentAttRules />
         </el-tab-pane>
-        <el-tab-pane
+        <!-- <el-tab-pane
           label="乐保设置"
           lazy
           name="7"
@@ -72,7 +74,7 @@
           v-if="permissionList.errorManager"
         >
           <loginRules />
-        </el-tab-pane>
+        </el-tab-pane> -->
       </tab-router>
     </div>
   </div>
@@ -86,6 +88,7 @@ import offlineVipRules from "./components/offlineVipRules";
 import onlineCloudRules from "./components/onlineCloudRules";
 import remberRules from "./components/remberRules";
 import studentAttRules from "./components/studentAttRules";
+import accompanyBaseConfig from "@/views/categroyManager/accompanyBaseConfig";
 import { permission } from "@/utils/directivePage";
 export default {
   components: {
@@ -97,6 +100,7 @@ export default {
     onlineCloudRules,
     remberRules,
     studentAttRules,
+    accompanyBaseConfig
   },
   name: "baseRulersManager",
   data() {
@@ -111,6 +115,7 @@ export default {
         musicCourseFee: 1,
         discountManage: 1,
         courseTimerSetting: 1,
+        accompanyBaseConfig:1,
       },
     };
   },

vue.config.js

@@ -16,8 +16,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // http://47.99.212.176:8000
 // //  https://online.dayaedu.com
 // let target = 'https://online.dayaedu.com' //线上
-let target = 'http://192.168.3.227:8000' // 何国威
-// let target = 'http://192.168.3.124:8000' //邹璇
+// let target = 'http://192.168.3.227:8000' // 何国威
+let target = 'http://192.168.3.124:8000' //邹璇
 // let target = 'http://192.168.3.112:8000' //勇哥
 // let target = 'http://dev.dayaedu.com' // 开发环境
 // let target = 'https://test.dayaedu.com' //测试环境
@@ -127,7 +127,8 @@ module.exports = {
     name: name,
     resolve: {
       alias: {
-        '@': resolve('src')
+        '@': resolve('src'),
+        '@scss':path.resolve(__dirname,'src')
       }
     }
   },