ソースを参照

bug修复和声部分类管理

1
mo 3 年 前
コミット
428c8b4efc

+ 3 - 1
src/router/index.js

@@ -506,7 +506,9 @@ export const asyncRoutes = {
   // 扣费记录
   chargingRecord:() => import('@/views/tenantSetting/chargingRecord.vue'),
   // 操作手册管理
-  operationManual:() => import('@/views/operationManual')
+  operationManual:() => import('@/views/operationManual'),
+  // 声部分类列表
+  subjectCategroyList:() => import('@/views/categroyManager/subjectCategroyList')
 }
 
 export default router

+ 12 - 19
src/views/categroyManager/generalSettings/overallManagerTwo.vue

@@ -12,29 +12,22 @@
         >
         </el-alert>
         <el-row>
+          <!-- (双乾: YQPAY 汇付: ADAPAY) -->
           <el-form-item prop="68">
-            默认收款渠道(双乾: YQPAY 汇付: ADAPAY):
-            <el-input
-              style="width: 180px"
-              class="marginLR5"
-              v-model="form['68']"
-              placeholder="请输入渠道"
-              
-            >
-            </el-input>
+            默认收款渠道:
+            <el-select v-model="form['68']"  placeholder="请选择渠道">
+              <el-option label="双乾" value="YQPAY"></el-option>
+               <el-option label="汇付" value="ADAPAY"></el-option>
+            </el-select>
           </el-form-item>
         </el-row>
         <el-row>
           <el-form-item prop="69">
-            是否用收费配置(1:使用 0:不使用):
-            <el-input
-              style="width: 180px"
-              class="marginLR5"
-              v-model="form['69']"
-              placeholder="请输入渠道"
-              
-            >
-            </el-input>
+            是否用收费配置:
+               <el-select v-model="form['69']"  placeholder="请选择渠道">
+              <el-option label="使用" value="1"></el-option>
+               <el-option label="不适用" value="0"></el-option>
+            </el-select>
           </el-form-item>
         </el-row>
         <el-row>
@@ -47,7 +40,7 @@
               format="yyyy-MM-dd HH:mm:ss"
               value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择始执行时间"
-              
+
             >
             </el-date-picker>
           </el-form-item>

+ 5 - 4
src/views/categroyManager/globalSubjects.vue

@@ -2,11 +2,11 @@
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      声部设置
+      声部分类设置
     </h2>
     <div class="m-core">
       <!-- navMenu -->
-        <tab-router
+        <!-- <tab-router
           v-model.trim="activeIndex"
           type="card"
           @tab-click="handleClick"
@@ -19,7 +19,7 @@
           >
             <musicalManager v-if="activeIndex == 0" />
           </el-tab-pane>
-          <el-tab-pane
+           <el-tab-pane
             label="声部设置(对外)"
             lazy
             name="1"
@@ -27,7 +27,8 @@
           >
             <musicalManagerOut v-if="activeIndex == 1" />
           </el-tab-pane>
-        </tab-router>
+        </tab-router> -->
+
     </div>
   </div>
 </template>

+ 0 - 0
src/views/categroyManager/specialSetup/modals/subjectForm.vue


+ 217 - 0
src/views/categroyManager/subjectCategroyList.vue

@@ -0,0 +1,217 @@
+<!--  -->
+<template>
+  <div class="m-container">
+    <h2>
+      <div class="squrt"></div>
+      声部分类管理
+    </h2>
+    <div class="m-core">
+      <!-- <save-form
+        :inline="true"
+        :model="searchForm"
+        @submit="search"
+        @reset="onReSet"
+      >
+        <el-form-item>
+          <el-input
+            v-model.trim="searchForm.search"
+            clearable
+            @keyup.enter.native="search"
+            placeholder="请输入乐团编号"
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input
+            v-model.trim="searchForm.search"
+            @keyup.enter.native="search"
+            placeholder="请输入乐团编号"
+          ></el-input>
+        </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-form-item> -->
+      <!-- </save-form> -->
+      <div class="tableWrap">
+        <el-table
+          style="width: 100%"
+          :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+          :data="tableList"
+        >
+          <el-table-column
+            align="center"
+            prop="id"
+            label="分类编号"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="name"
+            label="分类名称"
+          ></el-table-column>
+          <el-table-column align="center" prop="name" label="操作">
+            <template slot-scope="scope">
+              <div>
+                <el-button type="text" @click="resetSubjectCategory(scope.row)"
+                  >修改</el-button
+                >
+                <el-button type="text" @click="removeSubjectCategory(scope.row)"
+                  >删除</el-button
+                >
+              </div>
+            </template>
+          </el-table-column>
+          <!-- <el-table-column align="center" prop="name" label="分类图片">
+            <template slot-scope="scope">
+              <el-image
+                v-if="scope.row.img"
+                style="width: 60px; height: 60px"
+                fit="cover"
+                :src="scope.row.img.split(',')[0]"
+                :previewSrcList="scope.row.img.split(',')"
+              >
+              </el-image>
+            </template>
+          </el-table-column> -->
+        </el-table>
+        <pagination
+          sync
+          :total.sync="rules.total"
+          :page.sync="rules.page"
+          :limit.sync="rules.limit"
+          :page-sizes="rules.page_size"
+          @pagination="getList"
+        />
+      </div>
+    </div>
+    <el-dialog
+      title="修改分类"
+      :visible.sync="categoryVisible"
+       width="500px"
+       v-if="categoryVisible"
+    >
+      <el-form :model="form" :inline="true" ref="form">
+        <el-form-item label="分类名称" :rules="{required: true, message: '请输入分类名称', trigger: 'change,blur'}">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="categoryVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitReset"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import axios from "axios";
+import { getToken } from "@/utils/auth";
+import pagination from "@/components/Pagination/index";
+import load from "@/utils/loading";
+import { subjectListTree } from "@/api/specialSetting";
+export default {
+  components: { pagination },
+  data() {
+    return {
+      searchForm: {
+        search: null,
+      },
+      form:{
+        name:null,
+        id:null
+      },
+      tableList: [],
+      organList: [],
+      rules: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
+      },
+      categoryVisible:false
+    };
+  },
+  //生命周期 - 创建完成(可以访问当前this实例)
+  created() {},
+  //生命周期 - 挂载完成(可以访问DOM元素)
+  mounted() {
+    // 获取分部
+
+    this.init();
+  },
+  methods: {
+    init() {
+      this.getList();
+    },
+    getList() {
+      subjectListTree({
+        delFlag: "NO",
+        tenantId: 1,
+        rows: this.rules.limit,
+        page: this.rules.page,
+      }).then((res) => {
+        if (res.code == 200) {
+          //   let tempArray = []
+          //   result.rows.forEach(item => {
+          //     item.inputStatus = false
+          //     tempArray.push(item)
+          //   })
+          //   this.subjectList = tempArray
+          this.tableList = res.data.rows;
+          this.rules.total = res.data.total;
+        }
+      });
+    },
+    search() {
+      this.rules.page = 1;
+      this.getList();
+    },
+    onReSet() {},
+    resetSubjectCategory(row) {
+      console.log(row)
+      this.form.name = row.name;
+      this.form.id = row.id;
+      this.categoryVisible = true;
+    },
+    removeSubjectCategory(row) {
+      this.$confirm("是否确认删除分类", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        subjectUpset({
+          delFlag: "YES",
+          id: row.id,
+        }).then((res) => {
+          this.messageTips("删除", res);
+        });
+      });
+    },
+    messageTips(title, res) {
+      if (res.code == 200) {
+        this.$message.success(title + "成功");
+        this.getList();
+      } else {
+        this.$message.error(res.msg);
+      }
+    },
+    submitReset(){
+      // this.$refs.form.
+       subjectUpset({
+        parentSubjectId: 0,
+        tenantId: 1,
+        name: this.oneTypeName
+      }).then(res => {
+        this.messageTips('添加', res)
+        if (res.code == 200) {
+          this.oneTypeName = null
+        }
+      })
+    }
+  },
+};
+</script>
+<style lang='scss' scoped>
+</style>

+ 4 - 3
src/views/resetTeaming/components/payInfoDetail.vue

@@ -200,6 +200,7 @@
                 @priceChange="priceChange"
               />
               <payMember
+                ref="payMember"
                 :memberRankList="memberRankList"
                 @moneyChange="syncAllMoney"
                 @priceChange="priceChange"
@@ -231,9 +232,7 @@
       width="400px"
       class="subjectPreview"
     >
-      <subject-preview
-        :preViewData="preViewData"
-      ></subject-preview>
+      <subject-preview :preViewData="preViewData"></subject-preview>
     </el-dialog>
   </div>
 </template>
@@ -356,6 +355,7 @@ export default {
         this.teamActive = false;
         this.leBaoDisabled = true;
         this.teamActiveDisabled = true;
+      }else{
       }
       await this.getCharges(); // 续费的选择缴费类型
       await this.formatCourse(); // 临时加课的类型选择以及价格
@@ -391,6 +391,7 @@ export default {
               // 团练保
               this.member = true;
               this.$set(this.form, "memberList", [{ ...res.data.member }]);
+
             }
             if (res.data.repair) {
               this.leBao = true;

+ 6 - 2
src/views/resetTeaming/components/resetPayListSchool.vue

@@ -659,7 +659,9 @@ export default {
         this.$router.push({
           path: "/business/studentPaySet",
           query: { ...query, payUserType: "SCHOOL" },
-        });
+        },(route) => {
+        route.meta.title = '学校缴费设置'
+      });
       }
     },
     getList() {
@@ -709,7 +711,9 @@ export default {
         this.$router.push({
           path: "/business/studentPaySet",
           query: { ...query, payUserType: "SCHOOL", calenderId: row.id },
-        });
+        },(route) => {
+        route.meta.title = '学校缴费设置'
+      });
         // 跳转新接口
         // this.memberVisible = true;
       } else {

+ 6 - 0
src/views/resetTeaming/modals/payMember.vue

@@ -244,8 +244,14 @@ export default {
       memberPrice: {},
     };
   },
+  mounted(){
+    if(this.form?.memberList[0]?.memberRankSettingId){
+      this.changeMember(this.form.memberList[0]?.memberRankSettingId)
+    }
+  },
   methods: {
     changeMemberperiodEnum(val) {
+      console.log(this.memberPrice)
       if (val == "DAY") {
         this.$set(
           this.form.memberList[0],

+ 1 - 1
src/views/teamDetail/components/studentList.vue

@@ -959,7 +959,7 @@
     <el-dialog
       title="添加会员"
       width="500px"
-      :visible.sync="memberVisible"
+      :visible.sync="memberVisible" 
     >
       <createMember
         ref="addMember"