提交测试

1

src/App.vue

@@ -120,9 +120,9 @@ input[type="number"] {
 .el-form-item__content {
   font-size: 14px !important;
 }
-.el-select {
-  width: 180px !important;
-}
+// .el-select {
+//   width: 180px !important;
+// }
 
 .el-input__count{
   background-color: transparent!important;

src/views/categroyManager/generalSettings/earlyWarning.vue

@@ -125,6 +125,10 @@
 </template>
 <script>
 import { sysConfigUpdate, queryByParamName } from "@/api/generalSettings";
+import {
+  getSysTenantConfig,
+  setSysTenantConfig,
+} from "@/views/courseRulersManager/api";
 export default {
   name: "earlyWarning",
   data() {
@@ -200,7 +204,7 @@ export default {
             paranValue: JSON.stringify(object),
             paramName: "warning_min_course_salary",
           }];
-          await sysConfigUpdate(params).then((res) => {
+          await setSysTenantConfig(params).then((res) => {
             let title = this.formActionTitle == "create" ? "添加" : "修改";
             this.messageTips(title, res);
           });
@@ -255,21 +259,22 @@ export default {
       }
     },
     async getList() {
-      await queryByParamName({
-        paramName: "warning_min_course_salary",
+      await getSysTenantConfig({group: 'WARN_COURSE_SALARY',
       }).then((res) => {
-        let result = res.data;
+        let result = res.data[0];
         if (res.code == 200) {
           const paranValue = result.paranValue
             ? JSON.parse(result.paranValue)
             : {};
           this.form.id = result.id;
           const branchs = this.selects.branchs;
+
           const tempValue = [];
           for (let i in paranValue) {
             let branchName = [];
             branchs.forEach((branch) => {
               if (i == branch.id) {
+
                 branchName = branch.name;
                 tempValue.push({
                   branchId: i,

src/views/categroyManager/generalSettings/holidaySetting.vue

@@ -13,6 +13,10 @@
 <script>
 import pagination from '@/components/Pagination/index'
 import { sysConfigList, sysConfigUpdate } from '@/api/generalSettings'
+import {
+  getSysTenantConfig,
+  setSysTenantConfig,
+} from "@/views/courseRulersManager/api";
 import Calendar from 'vue-lunar-calendar-pro'
 export default {
   components: { pagination, Calendar },
@@ -28,8 +32,9 @@ export default {
     this.__init()
   },
   methods: {
+
     __init () {
-      sysConfigList({ group: 'holiday' }).then(res => {
+      getSysTenantConfig({ group: 'holiday' }).then(res => {
         if (res.code == 200 && res.data.length > 0) {
           let holiday = res.data[0]
           this.configList = holiday
@@ -45,7 +50,7 @@ export default {
         paranValue: JSON.stringify(this.dateList),
         paramName: configList.paramName
       }]
-      sysConfigUpdate(params).then(res => {
+      setSysTenantConfig(params).then(res => {
         if (res.code == 200) {
           this.$message.success('保存成功')
         } else {

src/views/categroyManager/productSystem/memberFeeSet.vue

@@ -351,6 +351,7 @@
             v-model="form.groupPurchaseMonthFee"
             :disabled="addDisabled"
             class="feeInput"
+            :placeholder="monthRule"
           >
             <template slot="append">元/月</template>
           </el-input>
@@ -393,6 +394,7 @@
             v-model="form.originalMonthFee"
             :disabled="addDisabled"
             class="feeInput"
+              :placeholder="monthRule"
           >
             <template slot="append">元/月</template>
           </el-input>
@@ -414,6 +416,7 @@
             v-model="form.groupPurchaseQuarterlyFee"
             :disabled="addDisabled"
             class="feeInput"
+            :placeholder="quarterlyRule"
           >
             <template slot="append">元/季度</template>
           </el-input>
@@ -456,6 +459,7 @@
             v-model="form.originalQuarterlyFee"
             :disabled="addDisabled"
             class="feeInput"
+            :placeholder='quarterlyRule'
           >
             <template slot="append">元/季度</template>
           </el-input>
@@ -478,6 +482,7 @@
             v-model="form.groupPurchaseHalfYearFee"
             :disabled="addDisabled"
             class="feeInput"
+            :placeholder="halfYearRule"
           >
             <template slot="append">元/半年</template>
           </el-input>
@@ -520,6 +525,7 @@
             v-model="form.originalHalfYearFee"
             :disabled="addDisabled"
             class="feeInput"
+            :placeholder="halfYearRule"
           >
             <template slot="append">元/半年</template>
           </el-input>
@@ -541,6 +547,7 @@
             v-model="form.groupPurchaseYearFee"
             :disabled="addDisabled"
             class="feeInput"
+            :placeholder="yearRule"
           >
             <template slot="append">元/年</template>
           </el-input>
@@ -583,6 +590,7 @@
             v-model="form.originalYearFee"
             :disabled="addDisabled"
             class="feeInput"
+            :placeholder="yearRule"
           >
             <template slot="append">元/年</template>
           </el-input>
@@ -843,6 +851,20 @@ export default {
       }
     },
   },
+  computed:{
+    monthRule(){
+      return `${this.rulesForm.minMonthFee}-${this.rulesForm.maxMonthFee}`
+    },
+    quarterlyRule(){
+      return `${this.rulesForm.minQuarterlyFee}-${this.rulesForm.maxQuarterlyFee}`
+    },
+    halfYearRule(){
+       return `${this.rulesForm.minHalfYearFee}-${this.rulesForm.maxHalfYearFee}`
+    },
+    yearRule(){
+       return `${this.rulesForm.minYearFee}-${this.rulesForm.maxYearFee}`
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>

src/views/categroyManager/specialSetup/musicCourseFee.vue

@@ -506,7 +506,7 @@ export default {
   width: 100% !important;
 }
 .el-select {
-  width: 100% !important;
+  // width: 100% !important;
 }
 .createForm {
   /deep/.el-input {