提交样式修改

1

src/views/categroyManager/productSystem/memberFeeSet.vue

@@ -60,7 +60,7 @@
         prop="rankName"
         label="会员名称"
       ></el-table-column>
-      <el-table-column align="center" prop="type" label="1天收费现价（元）">
+      <!-- <el-table-column align="center" prop="type" label="1天收费现价（元）">
         <template slot-scope="scope">
           <div>
             {{ scope.row.memberFeeSetting.currentDayFee | moneyFormat }}元
@@ -73,43 +73,43 @@
             {{ scope.row.memberFeeSetting.originalDayFee | moneyFormat }}元
           </div>
         </template>
-      </el-table-column>
-      <el-table-column align="center" prop="type" label="1个月收费现价（元）">
+      </el-table-column> -->
+      <el-table-column align="center" prop="type" label="月收费现价（元）">
         <template slot-scope="scope">
           <div>
             {{ scope.row.memberFeeSetting.currentMonthFee | moneyFormat }}元
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="type" label="1个月收费原价（元）">
+      <el-table-column align="center" prop="type" label="月收费原价（元）">
         <template slot-scope="scope">
           <div>
             {{ scope.row.memberFeeSetting.originalMonthFee | moneyFormat }}元
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="type" label="6个月收费现价（元）">
+      <el-table-column align="center" prop="type" label="半年收费现价（元）">
         <template slot-scope="scope">
           <div>
             {{ scope.row.memberFeeSetting.currentHalfYearFee | moneyFormat }}元
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="type" label="6个月收费原价（元）">
+      <el-table-column align="center" prop="type" label="半年收费原价（元）">
         <template slot-scope="scope">
           <div>
             {{ scope.row.memberFeeSetting.originalHalfYearFee | moneyFormat }}元
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="type" label="12个月收费现价（元）">
+      <el-table-column align="center" prop="type" label="年收费现价（元）">
         <template slot-scope="scope">
           <div>
             {{ scope.row.memberFeeSetting.currentYearFee | moneyFormat }}元
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="type" label="12个月收费原价（元）">
+      <el-table-column align="center" prop="type" label="年收费原价（元）">
         <template slot-scope="scope">
           <div>
             {{ scope.row.memberFeeSetting.originalYearFee | moneyFormat }}元
@@ -160,9 +160,10 @@
       :title="title"
       :close-on-click-modal="false"
       :visible.sync="branchStatus"
+      v-if="branchStatus"
       default-expand-all
       @close="onFormClose('ruleForm')"
-      width="820px"
+      width="720px"
     >
       <el-form :model="form" :inline="true" ref="ruleForm">
         <el-form-item
@@ -175,7 +176,7 @@
             :disabled="addDisabled"
             class="multiple"
             filterable
-            style="width: 650px !important"
+            style="width: 550px !important"
             v-model.trim="form.organId"
             clearable
             placeholder="请选择分部"
@@ -198,7 +199,7 @@
             :disabled="addDisabled"
             class="multiple"
             filterable
-            style="width: 650px !important"
+            style="width: 550px !important"
             v-model.trim="form.memberRankSettingId"
             clearable
             placeholder="请选择会员"
@@ -211,7 +212,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
+        <!-- <el-form-item
           prop="currentDayFee"
           label="1天收费现价"
           :rules="[
@@ -248,12 +249,12 @@
           <el-input v-model="form.originalDayFee" :disabled="addDisabled">
             <template slot="append">元/日</template>
           </el-input>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item
           prop="currentMonthFee"
-          label="1个月收费现价"
+          label="月收费现价"
           :rules="[
-            { required: true, message: '请输入1个月收费现价' },
+            { required: true, message: '请输入月收费现价' },
             {
               pattern:
                 /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
@@ -262,15 +263,15 @@
           ]"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="form.currentMonthFee" :disabled="addDisabled">
+          <el-input v-model="form.currentMonthFee" :disabled="addDisabled" class="feeInput">
             <template slot="append">元/月</template>
           </el-input>
         </el-form-item>
         <el-form-item
           prop="originalMonthFee"
-          label="1个月收费原价"
+          label="月收费原价"
           :rules="[
-            { required: true, message: '请输入1个月收费原价' },
+            { required: true, message: '请输入月收费原价' },
             {
               pattern:
                 /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
@@ -279,15 +280,15 @@
           ]"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="form.originalMonthFee" :disabled="addDisabled">
+          <el-input v-model="form.originalMonthFee" :disabled="addDisabled"  class="feeInput">
             <template slot="append">元/月</template>
           </el-input>
         </el-form-item>
         <el-form-item
           prop="currentHalfYearFee"
-          label="6个月收费现价"
+          label="半年收费现价"
           :rules="[
-            { required: true, message: '请输入6个月收费现价' },
+            { required: true, message: '请输入半年收费现价' },
             {
               pattern:
                 /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
@@ -296,15 +297,15 @@
           ]"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="form.currentHalfYearFee" :disabled="addDisabled">
-            <template slot="append">元/年</template>
+          <el-input v-model="form.currentHalfYearFee" :disabled="addDisabled"  class="feeInput">
+            <template slot="append">元/半年</template>
           </el-input>
         </el-form-item>
         <el-form-item
           prop="originalHalfYearFee"
-          label="6个月收费原价"
+          label="半年收费原价"
           :rules="[
-            { required: true, message: '请输入6个月收费原价' },
+            { required: true, message: '请输入半年收费原价' },
             {
               pattern:
                 /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
@@ -313,15 +314,15 @@
           ]"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="form.originalHalfYearFee" :disabled="addDisabled">
-            <template slot="append">元/年</template>
+          <el-input v-model="form.originalHalfYearFee" :disabled="addDisabled"  class="feeInput">
+            <template slot="append">元/半年</template>
           </el-input>
         </el-form-item>
         <el-form-item
           prop="currentYearFee"
-          label="12个月收费现价"
+          label="年收费现价"
           :rules="[
-            { required: true, message: '请输入12个月收费现价' },
+            { required: true, message: '请输入年收费现价' },
             {
               pattern:
                 /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
@@ -330,15 +331,15 @@
           ]"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="form.currentYearFee" :disabled="addDisabled">
+          <el-input v-model="form.currentYearFee" :disabled="addDisabled"  class="feeInput">
             <template slot="append">元/年</template>
           </el-input>
         </el-form-item>
         <el-form-item
           prop="originalYearFee"
-          label="12个月收费原价"
+          label="年收费原价"
           :rules="[
-            { required: true, message: '请输入12个月收费原价' },
+            { required: true, message: '请输入年收费原价' },
             {
               pattern:
                 /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
@@ -347,14 +348,14 @@
           ]"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="form.originalYearFee" :disabled="addDisabled">
+          <el-input v-model="form.originalYearFee" :disabled="addDisabled"  class="feeInput">
             <template slot="append">元/年</template>
           </el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="branchStatus = false">取 消</el-button>
-        <el-button @click="onSubmit" type="primary">确 定</el-button>
+        <el-button   v-if="!addDisabled" @click="branchStatus = false">取 消</el-button>
+        <el-button   @click="onSubmit" type="primary">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -390,7 +391,7 @@ export default {
       tableList: [],
       addDisabled: false,
       title: "新增收费标准",
-      formLabelWidth: "140px",
+      formLabelWidth: "120px",
       form: {
         currentDayFee: "",
         currentHalfYearFee: "",
@@ -514,3 +515,13 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+  /deep/.el-input-group__append{
+    width: 88px;
+  }
+  .feeInput{
+    /deep/.el-input__inner{
+      width: 120px!important;
+    }
+  }
+</style>

src/views/categroyManager/productSystem/memberSet.vue

@@ -85,6 +85,7 @@
       :title="title"
       :close-on-click-modal="false"
       :visible.sync="branchStatus"
+      v-if="branchStatus"
       default-expand-all
       @close="onFormClose('ruleForm')"
       width="800px"
@@ -177,7 +178,7 @@
           style="margin-bottom: 20px"
         >
         </el-alert>
-        <el-form-item label="搜索" :label-width="formLabelWidth">
+        <el-form-item :label="searchName" :label-width="formLabelWidth">
           <el-input
             style="width: 210px"
             v-model.trim="seachRoleValue"
@@ -217,7 +218,7 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="branchStatus = false">取 消</el-button>
+        <el-button  v-if="!addDisabled"  @click="branchStatus = false">取 消</el-button>
         <el-button @click="onSubmit" type="primary">确 定</el-button>
       </span>
     </el-dialog>
@@ -287,6 +288,7 @@ export default {
       pageType: "",
       allChildIds: [],
       checkList: [],
+      searchName:'搜索\xa0\xa0\xa0\xa0\xa0\xa0\xa0'
     };
   },
   async mounted() {

src/views/dictionaryManager/api.js

@@ -36,6 +36,6 @@ export function deleteMemberPrivilegesItem(data) {
   return request2({
     url: api + '/memberPrivilegesItem/del',
     method: 'post',
-    data
+    params: data
   })
 }

src/views/dictionaryManager/index.vue

@@ -10,8 +10,9 @@
         :inline="true"
         :model="searchForm"
         @submit="search"
-        @reset="onReSet"
+
       >
+      <!--        @reset="onReSet" -->
         <el-form-item>
           <el-input
             v-model.trim="searchForm.search"
@@ -22,7 +23,7 @@
         </el-form-item>
         <el-form-item>
           <el-button native-type="submit" type="primary">搜索</el-button>
-          <el-button native-type="reset" type="danger">重置</el-button>
+          <!-- <el-button native-type="reset" type="danger">重置</el-button> -->
         </el-form-item>
       </save-form>
       <div class="btnList">
@@ -30,13 +31,14 @@
           type="primary"
           v-permission="'memberPrivilegesItem/add'"
           @click="createDiction()"
-          >添加按钮</el-button
+          >添加</el-button
         >
       </div>
 
       <div class="tableWrap">
         <el-table
-          :data="tableList"
+          default-expand-all
+          :data="treeTable"
           :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
           style="width: 100%; margin-bottom: 20px; margin-top: 40px"
           row-key="id"
@@ -81,6 +83,19 @@
     >
       <el-form :model="form" :rules="rules" ref="ruleForm">
         <el-form-item
+          label="父节点"
+          prop="parentId"
+          :label-width="formLabelWidth"
+        >
+          <el-cascader
+            v-model="form.parentId"
+            style="width: 100%"
+            :options="cascaderList"
+            :props="optionProps"
+            placeholder="为空则为根元素"
+          ></el-cascader>
+        </el-form-item>
+        <el-form-item
           label="功能名称"
           prop="name"
           :label-width="formLabelWidth"
@@ -94,18 +109,7 @@
         >
           <el-input v-model.trim="form.code" autocomplete="off"></el-input>
         </el-form-item>
-        <el-form-item
-          label="父元素ID"
-          prop="parentId"
-          :label-width="formLabelWidth"
-        >
-          <el-cascader
-            v-model="form.parentId"
-            style="width: 100%"
-            :options="cascaderList"
-            :props="optionProps"
-          ></el-cascader>
-        </el-form-item>
+
         <el-form-item
           label="功能描述"
           :label-width="formLabelWidth"
@@ -165,9 +169,6 @@ export default {
         name: [{ required: true, message: "请输入功能", trigger: "blur" }],
         desc: [{ required: true, message: "请输入功能描述", trigger: "blur" }],
         code: [{ required: true, message: "请输入功能标识", trigger: "blur" }],
-        parentId: [
-          { required: true, message: "请输入父元素ID", trigger: "blur" },
-        ],
       },
       disctionStatus: "create",
     };
@@ -189,11 +190,11 @@ export default {
         const res = await getMemberPrivilegesItem();
         this.tableList = this.setTableData(res.data);
         this.cascaderList = this.setTableData(res.data);
-        this.cascaderList.unshift({
-          id: 0,
-          name: "根结点",
-          children: [],
-        });
+        // this.cascaderList.unshift({
+        //   id: 0,
+        //   name: "根结点",
+        //   children: [],
+        // });
       } catch (e) {
         console.log(e);
       }
@@ -202,16 +203,18 @@ export default {
       // 搜索
 
       // this.rules.page = 1;
-      // this.getList();
+      this.getList();
     },
-    onReSet() {},
+    // onReSet() {
+
+    // },
     createDiction() {
-      this.title = "添加字典";
+      this.title = "添加";
       this.branchStatus = true;
       this.disctionStatus = "create";
     },
     resetDiction(row) {
-      this.title = "修改字典";
+      this.title = "修改";
       this.disctionStatus = "update";
       this.form = {
         id: row.id,
@@ -229,16 +232,13 @@ export default {
         type: "warning",
       })
         .then(async () => {
-          try{
-            const res = await  deleteMemberPrivilegesItem({id:row.id})
-              this.$message.success("删除成功");
-              this.getList();
-
-          }catch{}
-
+          try {
+            const res = await deleteMemberPrivilegesItem({ id: row.id });
+            this.$message.success("删除成功");
+            this.getList();
+          } catch {}
         })
         .catch(() => {});
-
     },
     onBranchSubmit() {
       this.$refs["ruleForm"].validate(async (valid) => {
@@ -249,7 +249,7 @@ export default {
             try {
               const res = await addMemberPrivilegesItem({
                 name: form.name,
-                parentId: form.parentId.pop(),
+                parentId: form.parentId?.pop()||0,
                 code: form.code,
                 desc: form.desc,
               });
@@ -261,7 +261,7 @@ export default {
             }
           } else if (this.disctionStatus == "update") {
             if (typeof form.parentId === "object") {
-              form.parentId = form.parentId.pop();
+              form.parentId = form.parentId.pop()||0;
             }
             try {
               const res = await resetMemberPrivilegesItem(form);
@@ -278,7 +278,6 @@ export default {
       });
     },
     setTableData(result) {
-
       let list = [];
       list = result.map((res) => {
         let tempList = {};
@@ -307,6 +306,44 @@ export default {
       };
       this.$refs[formName].resetFields();
     },
+    handleTreeData(treeData, searchValue) {
+      if (!treeData || treeData.length === 0) {
+        return [];
+      }
+      const array = [];
+      for (let i = 0; i < treeData.length; i += 1) {
+        let match = false;
+        for (let pro in treeData[i]) {
+          if (typeof treeData[i][pro] == "string") {
+            match |= treeData[i][pro].includes(searchValue);
+            console.log(match);
+            if (match) break;
+          }
+        }
+        if (
+          this.handleTreeData(treeData[i].children, searchValue).length > 0 ||
+          match
+        ) {
+          array.push({
+            ...treeData[i],
+            children: this.handleTreeData(treeData[i].children, searchValue),
+          });
+        }
+      }
+      return array;
+    },
+  },
+  computed: {
+    treeTable() {
+      let searchValue = this.searchForm.search;
+      if (searchValue) {
+        let treeData = this.tableList;
+        let handleTreeData = this.handleTreeData(treeData, searchValue);
+        return handleTreeData;
+      } else {
+        return this.tableList;
+      }
+    },
   },
 };
 </script>

src/views/resetTeaming/modals/member-pay-form.vue

@@ -5,17 +5,17 @@
     <div class="tilteWrap">
       <h4>会员团排课规则：</h4>
       <p>
-        1、会员团每学期赠送3960分钟免费课程时长，该时长可排声部课、集训声部课、合奏课、集训合奏课、综合课，课程时长以上类型课程共享；
+        1、会员团每学期赠送3960(88x45)分钟免费课程时长，该时长可排声部课、集训声部课、合奏课、集训合奏课、综合课，课程时长以上类型课程共享；
       </p>
       <p>
-        2、在本学期内声部课、集训声部课总共最多能排课1980分钟；合奏课、集训合奏课最多能排课1980分钟；综合课最多能排课3960分钟；
+        2、在本学期内声部课、集训声部课总共最多能排课1980(44x45)分钟；合奏课、集训合奏课最多能排课1980(44x45)分钟；综合课最多能排课3960(88x45)分钟；
       </p>
       <p>
         3、赠送课程仅可在该学期内完成排课，且不可将本学期课程调整至学期时间范围之外；
       </p>
       <p>4、学期时间段：9月1日至2月28/29日，3月1日至8月31日；</p>
       <p>
-        5、排课时系统根据【开课日期】计算本学期最大可排课时长，计算方式为开课日期到本学期结束日期周次*4*45分钟，若超过1980分钟，按1980分钟计算。既：若学期中途开始排课，则可能排课时长并不能达到1980分钟。
+        5、排课时系统根据【开课日期】计算本学期最大可排课时长，计算方式为开课日期到本学期结束日期周次1980(44x45)分钟，若超过1980(44x45)分钟，按1980(44x45)分钟计算。即：若学期中途开始排课，则可能排课时长并不能达到1980分钟。
       </p>
     </div>
     <el-alert title="会员设置" :closable="false" class="alert" type="info">

src/views/resetTeaming/modals/user-baseinfo.vue

@@ -12,7 +12,7 @@
       v-if="typeof paymentType === 'undefined'"
     >
       <el-radio-group style="width: 100%" v-model="form.leixing">
-        <el-radio label="1">乐团续费</el-radio>
+        <el-radio label="1" v-if="courseViewType != 1">乐团续费</el-radio>
         <el-radio label="2">临时加课</el-radio>
       </el-radio-group>
     </el-form-item>
@@ -46,7 +46,7 @@
 </template>
 <script>
 export default {
-  props: ['form', 'isCommon', 'isUserType', 'typeList', 'charges', 'paymentType', 'chargeTypeName', 'rowDetail'],
+  props: ['form', 'isCommon', 'isUserType', 'typeList', 'charges', 'paymentType', 'chargeTypeName', 'rowDetail','courseViewType'],
   mounted() {
 
   },

src/views/resetTeaming/modals/user-pay-form.vue

@@ -20,6 +20,7 @@
       :rowDetail="rowDetail"
       :chargeTypeName="chargeTypeName"
       :paymentType="paymentType"
+      :courseViewType="courseViewType"
       ref="base"
     />
     <template v-if="paymentTypeString === 'SPAN_GROUP_CLASS_ADJUST'">

src/views/teamBuild/components/soundSetComponents/chioseMusic.vue

@@ -92,7 +92,13 @@
               >
             </div>
             <i
-              class="el-icon-close marginLeft10"
+              class="el-icon-circle-plus-outline marginLeft10 iconStyle"
+              v-if="!basdisabled && index == 0"
+              @click="addMusic"
+              style="font-size: 20px; cursor: pointer"
+            ></i>
+            <i
+              class="el-icon-remove-outline marginLeft10 iconStyle"
               v-if="
                 item.chioseMusic.length > 1 &&
                 !basdisabled &&
@@ -133,7 +139,7 @@
       </div>
       <el-divider></el-divider>
     </div>
-    <div class="coreItemRow" v-if="!basdisabled">
+    <!-- <div class="coreItemRow" v-if="!basdisabled">
       <p class="title"></p>
       <el-button
         type="info"
@@ -144,7 +150,7 @@
         @click="addMusic"
         >新增可选乐器</el-button
       >
-    </div>
+    </div> -->
   </div>
 </template>
 <script>
@@ -201,6 +207,9 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.iconStyle {
+  color: #999;
+}
 .chioseMusic {
   width: 100%;
   // margin: 30px 0 0;

src/views/teamBuild/components/teamBaseInfo.vue

@@ -872,7 +872,7 @@ export default {
                   this.$msgbox({
                     title: "提示",
                     message: h("p", null, [
-                      h("p", null, "新建乐团成功 "),
+                      h("p", null, "新乐团基础信息创建完成"),
                       h("p", null, "请设置声部信息"),
                     ]),
                     type: "warning",