修改

src/api/zeroManager.js

@@ -43,3 +43,21 @@ export function updateOpenFlag (data) {
     data: qs.stringify(data)
   })
 }
+
+// 所属乐团
+export function queryOrganMusicInfos(data) {
+  return request({
+    url: api + '/musicGroup/queryOrganMusicInfos',
+    method: 'get',
+    params: data
+  })
+}
+
+// 所属乐团
+export function queryUserMusicInfos(data) {
+  return request({
+    url: api + '/studentManage/queryUserMusicInfos',
+    method: 'get',
+    params: data
+  })
+}

src/views/businessManager/shopManager/shopList.vue

@@ -279,7 +279,7 @@ export default {
       // // 报表导出
       Export(this, {
         url: "/api-web/import/downloadTemplate",
-        params: {templateType: 'goods'},
+        params: {templateType: 'GOODS'},
         fileName: '商品导入模板.xlsx'
       })
     }

src/views/sporadicManager/sporadicList.vue

@@ -33,26 +33,7 @@
           <el-select v-model.trim="searchForm.chargeType"
                      placeholder='请选择收费类型'
                      clearable>
-            <el-option label="考级"
-                       :value="1"></el-option>
-            <el-option label="声部更改"
-                       :value="2"></el-option>
-            <el-option label="乐器更换"
-                       :value="3"></el-option>
-            <el-option label="配件销售"
-                       :value="4"></el-option>
-            <el-option label="维修费"
-                       :value="5"></el-option>
-            <el-option label="福袋活动"
-                       :value="6"></el-option>
-            <el-option label="上门费"
-                       :value="7"></el-option>
-            <el-option label="账户充值"
-                       :value="9"></el-option>
-            <el-option label="乐保服务"
-                       :value="10"></el-option>
-            <el-option label="其它"
-                       :value="11"></el-option>
+            <el-option v-for="item in orderType" :key="item.value" :label="item.label" :value="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -191,26 +172,7 @@
                      :disabled='!isNew'
                      clearable
                      filterable>
-            <el-option label="考级"
-                       :value="1"></el-option>
-            <el-option label="声部更改"
-                       :value="2"></el-option>
-            <el-option label="乐器更换"
-                       :value="3"></el-option>
-            <el-option label="配件销售"
-                       :value="4"></el-option>
-            <el-option label="维修费"
-                       :value="5"></el-option>
-            <el-option label="福袋活动"
-                       :value="6"></el-option>
-            <el-option label="上门费"
-                       :value="7"></el-option>
-            <el-option label="账户充值"
-                       :value="9"></el-option>
-            <el-option label="乐保服务"
-                       :value="10"></el-option>
-            <el-option label="其它"
-                       :value="11"></el-option>
+            <el-option v-for="item in orderType" :key="item.value" :label="item.label" :value="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="金额"
@@ -233,6 +195,7 @@
           <el-select v-model.trim="maskForm.organId"
                      :disabled='!isNew'
                      clearable
+                     @change="onMusicGroupChange"
                      filterable>
             <el-option v-for='(item,index) in organList'
                        :key="index"
@@ -240,6 +203,18 @@
                        :label="item.name"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="所属乐团"
+                      prop="musicGroupId">
+          <el-select v-model.trim="maskForm.musicGroupId"
+                     :disabled='!isNew || !maskForm.organId'
+                     clearable
+                     filterable>
+            <el-option v-for='(item,index) in maskMusicList'
+                       :key="index"
+                       :value="item.musicGroupId"
+                       :label="item.musicGroupName"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="查看链接"
                       v-if="!isNew">
           <el-input style='width:400px'
@@ -290,24 +265,7 @@
                      :disabled='!isNew1'
                      clearable
                      filterable>
-            <el-option label="考级"
-                       :value="1"></el-option>
-            <el-option label="声部更改"
-                       :value="2"></el-option>
-            <el-option label="乐器更换"
-                       :value="3"></el-option>
-            <el-option label="配件销售"
-                       :value="4"></el-option>
-            <el-option label="维修费"
-                       :value="5"></el-option>
-            <el-option label="上门费"
-                       :value="7"></el-option>
-            <el-option label="账户充值"
-                       :value="9"></el-option>
-            <el-option label="乐保服务"
-                       :value="10"></el-option>
-            <el-option label="其它"
-                       :value="11"></el-option>
+            <el-option v-for="item in orderType1" :key="item.value" :label="item.label" :value="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="学员编号"
@@ -331,6 +289,18 @@
           <el-input v-model.trim="maskForm1.studentName"
                     :disabled='true'></el-input>
         </el-form-item>
+        <el-form-item label="所属乐团"
+                      prop="musicGroupId">
+          <el-select v-model.trim="maskForm1.musicGroupId"
+                     :disabled='!isNew'
+                     clearable
+                     filterable>
+            <el-option v-for='(item,index) in maskMusicList1'
+                       :key="index"
+                       :value="item.musicGroupId"
+                       :label="item.musicGroupName"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="查看链接"
                       v-if="!isNew1">
           <el-input style='width:400px'
@@ -377,7 +347,7 @@
 import { getEmployeeOrgan } from '@/api/buildTeam'
 import pagination from '@/components/Pagination/index'
 import { vaildStudentUrl } from '@/utils/validate'
-import { addZero, getZero, removeZero, getBasic, updateOpenFlag } from '@/api/zeroManager'
+import { addZero, getZero, removeZero, getBasic, updateOpenFlag, queryOrganMusicInfos, queryUserMusicInfos } from '@/api/zeroManager'
 import axios from 'axios'
 import qs from 'qs'
 import {
@@ -400,6 +370,29 @@ export default {
       },
       tableList: [],
       organList: [],
+      orderType: [
+        { label: '考级', value: 1 },
+        { label: '声部更改', value: 2 },
+        { label: '乐器更换', value: 3 },
+        { label: '配件销售', value: 4 },
+        { label: '维修费', value: 5 },
+        { label: '福袋活动', value: 6 },
+        { label: '上门费', value: 7 },
+        { label: '账户充值', value: 9 },
+        { label: '乐保服务', value: 10 },
+        { label: '其它', value: 11 },
+      ],
+      orderType1: [
+        { label: '考级', value: 1 },
+        { label: '声部更改', value: 2 },
+        { label: '乐器更换', value: 3 },
+        { label: '配件销售', value: 4 },
+        { label: '维修费', value: 5 },
+        { label: '上门费', value: 7 },
+        { label: '账户充值', value: 9 },
+        { label: '乐保服务', value: 10 },
+        { label: '其它', value: 11 },
+      ],
       maskForm: {
         organId: '',
         type: '',
@@ -407,10 +400,13 @@ export default {
         desc: '',
         title: '',
         code: '',
+        musicGroupId: '',
         subMoney: ''
       },
+      maskMusicList: [],
       maskRules: {
         organId: [{ required: true, message: '请选择分部', trigger: 'change' }],
+        musicGroupId: [{ required: true, message: '请选择所属乐团', trigger: 'change' }],
         type: [{ required: true, message: '请选择收费类型', trigger: 'change' }],
         money: [{ required: true, message: '请输入收费金额', trigger: 'change' }],
         title: [{ required: true, message: '请输入标题名称', trigger: 'change' }],
@@ -428,8 +424,6 @@ export default {
       qrcodeStatus: false,
       qrcodes: true,
       activeRow: null,
-
-
       title1: '新增收费',
       activeRow1: null,
       zeroVisible1: false,
@@ -439,12 +433,15 @@ export default {
         desc: null,
         title: null,
         code: null,
+        musicGroupId: null,
         studentId: null,
         studentName: null,
       },
       isNew1: false,
+      maskMusicList1: [],
       maskRules1: {
         organId: [{ required: true, message: '请选择分部', trigger: 'change' }],
+        musicGroupId: [{ required: true, message: '请选择所属乐团', trigger: 'change' }],
         type: [{ required: true, message: '请选择收费类型', trigger: 'change' }],
         money: [{ required: true, message: '请输入收费金额', trigger: 'change' }],
         title: [{ required: true, message: '请输入标题名称', trigger: 'change' }],
@@ -496,6 +493,7 @@ export default {
       if (formName == 'maskForm') {
         this.maskForm = {
           organId: null,
+          musicGroupId: null,
           type: null,
           money: null,
           desc: null,
@@ -505,6 +503,7 @@ export default {
       } else if (formName == 'maskForm1') {
         this.maskForm1 = {
           type: null,
+          musicGroupId: null,
           money: null,
           desc: null,
           title: null,
@@ -573,6 +572,18 @@ export default {
         }
       }, 500)
     },
+    onMusicGroupChange() {
+      let maskForm = this.maskForm
+      if(!maskForm.organId) {
+        return
+      }
+      queryOrganMusicInfos({ organId: maskForm.organId }).then(res => {
+        console.log(res)
+        if(res.code == 200) {
+          this.maskMusicList = res.data
+        }
+      })
+    },
     addZero () {
       this.$refs['maskForm'].validate(item => {
         if (item) {
@@ -582,6 +593,7 @@ export default {
             title: this.maskForm.title,
             organId: this.maskForm.organId,
             amount: this.maskForm.money,
+            musicGroupId: this.maskForm.musicGroupId,
             discountAmount: this.maskForm.subMoney
           }
           addZero(obj).then(res => {
@@ -619,7 +631,7 @@ export default {
         }
       })
     },
-    onStudentChange () {
+    async onStudentChange () {
       let studentId = this.maskForm1.studentId
       // 判断学生编号是否存在
       if (!studentId) {
@@ -631,15 +643,22 @@ export default {
         return
       }
 
-      getBasic({ userId: studentId }).then(res => {
+      await getBasic({ userId: studentId }).then(res => {
         if (res.code == 200) {
           if (res.data) {
             this.maskForm1.studentName = res.data.name
+
+            queryUserMusicInfos({ userId: studentId }).then(studentInfo => {
+              console.log(studentInfo)
+            })
           } else {
             this.maskForm1.studentName = null
           }
         }
       })
+
+
+
     },
     removeItem (row) {
       this.$confirm('是否删除该收费', '提示', {