Merge branch '10/23-test' into yuetuan

src/api/auditManager.js

@@ -0,0 +1,12 @@
+import request from '@/utils/request'
+import qs from 'qs'
+let api = '/api-web'
+
+// 分页查询活动列表
+export function getAuditList(data) {
+    return request({
+      url: api + '/musicGroupPaymentCalender/auditList',
+      method: 'get',
+      params: data
+    })
+  }

src/constant/index.js

@@ -90,3 +90,11 @@ export const payOrderType = {
   STUDENT:'学生',
   SCHOOL:'学校'
 }
+
+// export const auditType = {
+//   AUDITING,
+//   REJECT,
+//   NO,
+//   OPEN,
+//   OVER
+// }

src/views/auditList/index.vue

@@ -2,135 +2,209 @@
 <template>
   <div class="m-container">
     <h2>
-      <div class="squrt"></div>帮助中心
+      <div class="squrt"></div>
+      审核列表
     </h2>
     <div class="m-core">
-        <!-- 搜索标题 -->
-        <el-form :inline="true"
-                class="searchForm"
-                v-model.trim="searchForm">
-            <el-form-item>
-                <el-input v-model.trim="searchForm.search"
-                    @keyup.enter.native="search"
-                    placeholder="乐团名称/编号"></el-input>
-            </el-form-item>
-            <el-form-item>
-                <el-select class="multiple"
-                            v-model.trim="searchForm.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>
-                <el-select class="multiple"
-                            v-model.trim="searchForm.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>
-                <el-select class="multiple"
-                            v-model.trim="searchForm.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>
-                <el-button @click="getList"
-                        type="danger">搜索</el-button>
-            </el-form-item>
-        </el-form>
-        <div class="tableWrap">
-            <el-table :data="tableList"
-                    :header-cell-style="{background:'#EDEEF0',color:'#444'}">>
-            <el-table-column width="120px"
-                            align="center"
-                            prop="id"
-                            label="编号"></el-table-column>
-            <el-table-column align="center"
-                            prop="title"
-                            label="标题"></el-table-column>
-            <el-table-column align="center"
-                            prop="content"
-                            label="内容"></el-table-column>
-            <el-table-column align="center"
-                            prop="catalog.text"
-                            label="分类名"></el-table-column>
-            <el-table-column align="center"
-                            label="操作">
-                <template slot-scope="scope">
-                <el-button v-permission="'helpCenterContent/modify'"
-                            @click="openTypes('update', scope.row)"
-                            type="text">修改</el-button>
-                <el-button @click="onTypeDelOpeation(scope.row)"
-                            v-permission="'helpCenterContent/delete'"
-                            type="text">删除</el-button>
-                </template>
-            </el-table-column>
-            </el-table>
-            <pagination :total="pageInfo.total"
-                        :page.sync="pageInfo.page"
-                        :limit.sync="pageInfo.limit"
-                        :page-sizes="pageInfo.page_size"
-                        @pagination="getList" />
-        </div>
+      <!-- 搜索标题 -->
+      <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+        <el-form-item>
+          <el-input
+            v-model.trim="searchForm.search"
+            @keyup.enter.native="search"
+            placeholder="乐团名称/编号"
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-select
+            class="multiple"
+            v-model.trim="searchForm.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>
+          <el-select
+            class="multiple"
+            v-model.trim="searchForm.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>
+          <el-select
+            class="multiple"
+            v-model.trim="searchForm.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>
+          <el-button @click="getList" type="danger">搜索</el-button>
+        </el-form-item>
+      </el-form>
+      <div class="tableWrap">
+        <el-table
+          :data="tableList"
+          :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+          >
+          <el-table-column type="selection" width="55"></el-table-column>
+          <el-table-column
+            width="120px"
+            align="center"
+            prop="organName"
+            label="分部名称"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="musicGroupName"
+            label="乐团名称"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="musicGroupId"
+            label="乐团编号"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="paymentType"
+            label="申请类型"
+          ></el-table-column>
+           <el-table-column
+            align="center"
+            prop="payUserType"
+            label="订单类型"
+          ></el-table-column>
+           <el-table-column
+            align="center"
+            prop="addCourseTotalTime"
+            label="加课总时长(分钟)"
+          ></el-table-column>
+           <el-table-column
+            align="center"
+            prop="courseOriginalPrice"
+            label="原现价(分钟)"
+          ></el-table-column>
+             <el-table-column
+            align="center"
+            prop="courseCurrentPrice"
+            label="申请价格(分钟)"
+          ></el-table-column>
+           <el-table-column
+            align="center"
+            prop="memo"
+            label="备注"
+          ></el-table-column>
+           <el-table-column
+            align="center"
+            prop="operatorName"
+            label="申请人"
+          ></el-table-column>
+            <el-table-column
+            align="center"
+            prop="auditStatus"
+            label="状态"
+          ></el-table-column>
+               <el-table-column
+            align="center"
+            prop="createTime"
+            label="申请时间"
+          ></el-table-column>
+          <el-table-column align="center" label="操作">
+            <template slot-scope="scope">
+              <el-button
+                v-permission="'helpCenterContent/modify'"
+                @click="openTypes('update', scope.row)"
+                type="text"
+                >修改</el-button
+              >
+              <el-button
+                @click="onTypeDelOpeation(scope.row)"
+                v-permission="'helpCenterContent/delete'"
+                type="text"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          :total="pageInfo.total"
+          :page.sync="pageInfo.page"
+          :limit.sync="pageInfo.limit"
+          :page-sizes="pageInfo.page_size"
+          @pagination="getList"
+        />
+      </div>
     </div>
-    <el-dialog :title="formTitle[formActionTitle]"
-               :visible.sync="typeStatus"
-               @close="onFormClose('ruleForm')"
-               width="500px">
-      <el-form :model="form"
-               :rules="rules"
-               ref="ruleForm">
-        <el-form-item label="标题"
-                      prop="title"
-                      :label-width="formLabelWidth">
-          <el-input v-model.trim="form.title"
-                    autocomplete="off"
-                    placeholder="请输入标题"></el-input>
+    <el-dialog
+      :title="formTitle[formActionTitle]"
+      :visible.sync="typeStatus"
+      @close="onFormClose('ruleForm')"
+      width="500px"
+    >
+      <el-form :model="form" :rules="rules" ref="ruleForm">
+        <el-form-item label="标题" prop="title" :label-width="formLabelWidth">
+          <el-input
+            v-model.trim="form.title"
+            autocomplete="off"
+            placeholder="请输入标题"
+          ></el-input>
         </el-form-item>
-        <el-form-item label="分类"
-                      prop="catalogId"
-                      :label-width="formLabelWidth">
-          <el-cascader v-if="typeStatus"
-                       style="width: 100%;"
-                       :show-all-levels="false"
-                       ref="formCascader"
-                       :options="treeList"
-                       v-model="form.catalogId"
-                       :props="{ checkStrictly: true }"
-                       clearable></el-cascader>
+        <el-form-item
+          label="分类"
+          prop="catalogId"
+          :label-width="formLabelWidth"
+        >
+          <el-cascader
+            v-if="typeStatus"
+            style="width: 100%"
+            :show-all-levels="false"
+            ref="formCascader"
+            :options="treeList"
+            v-model="form.catalogId"
+            :props="{ checkStrictly: true }"
+            clearable
+          ></el-cascader>
         </el-form-item>
-        <el-form-item label="内容"
-                      prop="content"
-                      :label-width="formLabelWidth">
-          <el-input type="textarea"
-                    :rows="3"
-                    placeholder="请输入内容"
-                    v-model="form.content">
+        <el-form-item label="内容" prop="content" :label-width="formLabelWidth">
+          <el-input
+            type="textarea"
+            :rows="3"
+            placeholder="请输入内容"
+            v-model="form.content"
+          >
           </el-input>
         </el-form-item>
       </el-form>
-      <span slot="footer"
-            class="dialog-footer">
+      <span slot="footer" class="dialog-footer">
         <el-button @click="typeStatus = false">取 消</el-button>
-        <el-button type="primary"
-                   @click="onTypeSubmit('ruleForm')">确 定</el-button>
+        <el-button type="primary" @click="onTypeSubmit('ruleForm')"
+          >确 定</el-button
+        >
       </span>
     </el-dialog>
   </div>
@@ -139,24 +213,21 @@
 import pagination from "@/components/Pagination/index";
 // import store from '@/store'
 import {
-  helpCenterCatalogList,
-  helpCenterContentList,
-  helpCenterContentModify,
-  helpCenterContentDelete
-} from "@/api/appTenant";
+ getAuditList
+} from "@/api/auditManager";
 export default {
   components: { pagination },
   name: "helpCategory",
-  data () {
+  data() {
     return {
       searchForm: {
-        catalogId: null
+        catalogId: null,
       },
       tableList: [],
       formActionTitle: "create",
       formTitle: {
         create: "添加帮助中心",
-        update: "修改帮助中心"
+        update: "修改帮助中心",
       },
       typeStatus: false, // 添加教学点
       formLabelWidth: "100px",
@@ -168,48 +239,50 @@ export default {
       rules: {
         title: [{ required: true, message: "请输入标题", trigger: "blur" }],
         content: [{ required: true, message: "请输入内容", trigger: "blur" }],
-        catalogId: [{ required: true, message: "请输入选择分类", trigger: "blur" }]
+        catalogId: [
+          { required: true, message: "请输入选择分类", trigger: "blur" },
+        ],
       },
       pageInfo: {
         // 分页规则
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
-        page_size: [10, 20, 40, 50] // 选择限制显示条数
-      }
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
+      },
     };
   },
-  activated () {
+  activated() {
     this.getList();
   },
-  mounted () {
+  mounted() {
     this.getList();
   },
   methods: {
-    onTypeDelOpeation (row) {
-      this.$confirm('您是否删除该内容?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        helpCenterContentDelete({ id: row.id }).then(res => {
-          this.messageTips('删除', res)
-        })
-      }).catch(() => {
+    onTypeDelOpeation(row) {
+      this.$confirm("您是否删除该内容?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
-
+        .then(() => {
+          helpCenterContentDelete({ id: row.id }).then((res) => {
+            this.messageTips("删除", res);
+          });
+        })
+        .catch(() => {});
     },
-    onTypeSubmit (formName) {
+    onTypeSubmit(formName) {
       // 添加数据
-      this.$refs[formName].validate(valid => {
+      this.$refs[formName].validate((valid) => {
         if (valid) {
           if (this.formActionTitle == "create") {
             let params = {
               title: this.form.title, // 标题
               content: this.form.content, // 内容
               catalogId: this.form.catalogId[this.form.catalogId.length - 1], // 分类编号
-            }
-            helpCenterContentModify(params).then(res => {
+            };
+            helpCenterContentModify(params).then((res) => {
               this.messageTips("添加", res);
             });
           } else if (this.formActionTitle == "update") {
@@ -218,8 +291,8 @@ export default {
               title: this.form.title, // 标题
               content: this.form.content, // 内容
               catalogId: this.form.catalogId[this.form.catalogId.length - 1], // 分类编号
-            }
-            helpCenterContentModify(params).then(res => {
+            };
+            helpCenterContentModify(params).then((res) => {
               this.messageTips("修改", res);
             });
           }
@@ -228,7 +301,7 @@ export default {
         }
       });
     },
-    messageTips (title, res) {
+    messageTips(title, res) {
       if (res.code == 200) {
         this.$message.success(title + "成功");
         this.typeStatus = false;
@@ -237,43 +310,38 @@ export default {
         this.$message.error(res.msg);
       }
     },
-    getList () {
-      let catalogId = this.searchForm.catalogId ? this.searchForm.catalogId : null
-      if (catalogId) {
-        catalogId = catalogId[catalogId.length - 1]
-      }
+    getList() {
       let params = {
-        catalogIds: catalogId,
         page: this.pageInfo.page,
-        rows: this.pageInfo.limit
-      }
-      helpCenterContentList(params).then(res => {
+        rows: this.pageInfo.limit,
+      };
+      getAuditList(params).then((res) => {
         let result = res.data;
         if (res.code == 200) {
           this.tableList = result.rows;
-          this.pageInfo.total = result.total
+          this.pageInfo.total = result.total;
         }
       });
     },
-    setTableData (result) {
-      let list = []
-      list = result.map(res => {
-        let tempList = {}
+    setTableData(result) {
+      let list = [];
+      list = result.map((res) => {
+        let tempList = {};
         tempList = {
           value: res.id,
           label: res.text,
-          parentId: res.parentId
-        }
+          parentId: res.parentId,
+        };
         if (res.children && res.children.length > 0) {
-          tempList.children = this.setTableData(res.children)
+          tempList.children = this.setTableData(res.children);
         }
-        return tempList
-      })
-      return list
+        return tempList;
+      });
+      return list;
     },
-    openTypes (type, row) {
-      this.typeStatus = true
-      this.formActionTitle = type
+    openTypes(type, row) {
+      this.typeStatus = true;
+      this.formActionTitle = type;
       if (type == "update") {
         // 修改的时候赋值
         this.form = {
@@ -284,19 +352,20 @@ export default {
         };
       }
     },
-    onToUrl () {
-      this.$router.push('/insideSetting/helpCategory')
+    onToUrl() {
+      this.$router.push("/insideSetting/helpCategory");
     },
-    getAllIds (row) {
-      let idAndParent = [];// idAndParent保存 Tree所有节点的id和parentId
+    getAllIds(row) {
+      let idAndParent = []; // idAndParent保存 Tree所有节点的id和parentId
       this.getIdAndParent(this.treeList, idAndParent);
       let parentIds = []; // 用于保存选中节点的父节点及父节点的父节点
       this.getId(row.catalogId, parentIds, idAndParent);
       return parentIds.reverse(); //反转数组
     },
-    getIdAndParent (tree, idAndParentIds) {// idAndParentIds用来保存所有节点的id，parentId
+    getIdAndParent(tree, idAndParentIds) {
+      // idAndParentIds用来保存所有节点的id，parentId
       // 对原有的数据结构进行遍历，拿出所有节点的id，parentId到一个一维数组中。
-      tree.forEach(item => {
+      tree.forEach((item) => {
         let mid = {
           id: item.value,
           parentId: item.parentId,
@@ -307,8 +376,8 @@ export default {
         }
       });
     },
-    getId (id, parentIds, idAndParent) {
-      idAndParent.forEach(item => {
+    getId(id, parentIds, idAndParent) {
+      idAndParent.forEach((item) => {
         if (item.id == id) {
           parentIds.push(id);
           if (item.parentId != -1) {
@@ -317,17 +386,17 @@ export default {
         }
       });
     },
-    onFormClose (formName) {
+    onFormClose(formName) {
       // 关闭弹窗重置验证
       this.form = {
         title: null, // 标题
         content: null, // 内容
         catalogId: [], // 分类编号
-      }
-      this.$refs.cascader.handleClear()
+      };
+      this.$refs.cascader.handleClear();
       this.$refs[formName].resetFields();
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/resetTeaming/components/resetPayList.vue

@@ -328,6 +328,7 @@ import review from '../modals/review'
 import reviewDetail from '../modals/review-detail'
 import { userPaymentType } from '@/constant'
 import { objectToOptions } from '@/utils'
+import { payOrderTypeList}  from "@/utils/searchArray";
 export default {
   props: ['baseInfo','isNewGropu'],
   components: {
@@ -381,10 +382,11 @@ export default {
       qrcodes: true,
       qrcode: null,
       codeUrl: null,
-      chioseStudentVisible: true,
+      chioseStudentVisible: false,
       chioseStudentList: [],
       clearStduent: true,
       musicGroupPaymentCalenderId: '',
+      payOrderTypeList,
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -599,7 +601,15 @@ export default {
           }
         }
       }
+    },
+    search(){
+      this.rules.page = 1;
+      this.getList()
+    },
+    onReSet(){
+      this.searchForm = {payUserType: null}
     }
+
   },
   watch: {
     qrcodeStatus (val) {

src/views/teamBuild/components/teamPayInfo.vue

@@ -4,7 +4,7 @@
   </div>
 </template>
 <script> 
-import { payOrderTypeList}  from "@/utils/searchArray";
+// import { payOrderTypeList}  from "@/utils/searchArray";
 import resetPayList from '@/views/resetTeaming/components/resetPayList'
 export default {
     components:{resetPayList},
@@ -13,7 +13,7 @@ export default {
         searchForm:{
             courseScheduleType:null
         },
-        payOrderTypeList
+
     }
   },
   created (){