修改临时工和云教练类型

src/constant/index.js

@@ -149,7 +149,7 @@ export const journalType = {
 export const jobNature = {
   PART_TIME: "兼职",
   FULL_TIME: "全职",
-  TEMPORARY: "临时工"
+  // TEMPORARY: "临时工"
 }
 
 export const workType = {

src/utils/searchArray.js

@@ -46,7 +46,7 @@ export const attendance = [
 export const jobNature = [
   { label: '兼职', value: 'PART_TIME' },
   { label: '全职', value: 'FULL_TIME' },
-  { label: '临时工', value: 'TEMPORARY' }
+  // { label: '临时工', value: 'TEMPORARY' }
 ]
 
 // 老师状态

src/views/businessManager/shopManager/shopList.vue

@@ -204,6 +204,11 @@
               {{ scope.row.musicGroupShow ? "是" : "否" }}
             </template>
           </el-table-column>
+          <el-table-column align="center" label="乐团收费模式">
+            <template slot-scope="scope">
+              <Tooltip :content="scope.row.courseViewType | courseViewTypeFormat" />
+            </template>
+          </el-table-column>
           <el-table-column align="center" label="是否库存预警">
             <template slot-scope="scope">
               <span v-if="!scope.row.complementGoodsIdList">
@@ -432,6 +437,7 @@
           <el-select
             v-model.trim="form.type"
             :disabled="addDisabled"
+            style="width: 100% !important"
             placeholder="请选择商品类型"
           >
             <el-option
@@ -449,6 +455,7 @@
         >
           <el-select
             v-model.trim="form.goodsCategoryId"
+            style="width: 100% !important"
             placeholder="请选择商品分类"
             :disabled="addDisabled"
             filterable
@@ -478,7 +485,7 @@
           <el-form-item
             :label="'商品' + (index + 1)"
             :label-width="formLabelWidth"
-            style="display: inline-block"
+            style="display: inline-block;  width: 80% !important"
             :prop="'goodsList.' + index + '.id'"
             :rules="[
               { required: true, message: '请选择商品', trigger: 'change' },
@@ -488,6 +495,7 @@
               v-model.trim="goodsList.id"
               @change="onGoodsChange"
               filterable
+              style=" width: 100% !important"
               :disabled="addDisabled"
               placeholder="请选择商品"
             >
@@ -560,7 +568,7 @@
           prop="clientShow"
           :label-width="formLabelWidth"
         >
-          <el-select v-model="form.clientShow" placeholder="请选择学员是否展示">
+          <el-select v-model="form.clientShow" style="width: 100% !important" :disabled="addDisabled" placeholder="请选择学员是否展示">
             <el-option label="是" :value="1"></el-option>
             <el-option label="否" :value="0"></el-option>
           </el-select>
@@ -572,6 +580,8 @@
         >
           <el-select
             v-model="form.educationalShow"
+            style="width: 100% !important"
+            :disabled="addDisabled"
             placeholder="请选择教务端是否展示"
           >
             <el-option label="是" :value="1"></el-option>
@@ -585,18 +595,42 @@
         >
           <el-select
             v-model="form.musicGroupShow"
+            style="width: 100% !important"
+            :disabled="addDisabled"
             placeholder="请选择乐团是否展示"
           >
             <el-option label="是" :value="1"></el-option>
             <el-option label="否" :value="0"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="乐团收费模式" :label-width="formLabelWidth" prop="courseViewType">
+          <select-all v-model.trim="form.courseViewType"
+                     filterable
+                     placeholder="请选择乐团收费模式"
+                     multiple
+                     :disabled="addDisabled"
+                     clearable>
+            <el-option label="课程收费" value="0"></el-option>
+            <el-option label="系统收费" value="1"></el-option>
+            <el-option label="云教练收费" value="2"></el-option>
+          </select-all>
+          <!-- <el-select
+            v-model="form.courseViewType"
+            multiple
+            placeholder="请选择乐团收费模式"
+            :disabled="addDisabled"
+          >
+            <el-option label="课程收费" :value="0"></el-option>
+            <el-option label="系统收费" :value="1"></el-option>
+            <el-option label="云教练收费" :value="2"></el-option>
+          </el-select> -->
+        </el-form-item>
         <el-form-item
           label="是否参与置换"
           prop="replacementShow"
           :label-width="formLabelWidth"
         >
-          <el-select v-model="form.replacementShow" placeholder="是否参与置换">
+          <el-select v-model="form.replacementShow" style="width: 100% !important" :disabled="addDisabled" placeholder="是否参与置换">
             <el-option label="是" :value="1"></el-option>
             <el-option label="否" :value="0"></el-option>
           </el-select>
@@ -666,6 +700,7 @@ import { getToken } from "@/utils/auth";
 import { goodsType } from "@/utils/searchArray";
 import load from "@/utils/loading";
 import { permission } from "@/utils/directivePage";
+import courseEvaluateVue from '@/views/teamDetail/componentCourse/courseEvaluate.vue';
 let validPrice = (rule, value, callback) => {
   if ((value == "" && typeof value == "string") || value == null) {
     callback(new Error("请输入金额"));
@@ -749,6 +784,7 @@ export default {
         clientShow: null,
         educationalShow: null,
         musicGroupShow: null,
+        courseViewType: [],
         stockWarning: null,
         image: null,
         complementGoodsIdList: null,
@@ -872,6 +908,9 @@ export default {
             trigger: "change",
           },
         ],
+        courseViewType: [
+          { required: true, message: "请选乐团收费模式", trigger: 'change' },
+        ],
         replacementShow: [
           {
             required: true,
@@ -1005,6 +1044,7 @@ export default {
       params.page = this.pageInfo.page;
       goodsQuery(params).then((res) => {
         if (res.code == 200 && res.data) {
+          
           this.tableList = res.data.rows;
           this.pageInfo.total = res.data.total;
         }
@@ -1047,6 +1087,7 @@ export default {
         clientShow: null,
         educationalShow: null,
         musicGroupShow: null,
+        courseViewType: [],
         stockWarning: null,
         image: null,
         complementGoodsIdList: null,
@@ -1057,6 +1098,7 @@ export default {
         ],
         brief: null,
         desc: null,
+        replacementShow: null,
       };
       this.onValidGoodsStatus();
       this.routeShopStatus = true;
@@ -1111,6 +1153,8 @@ export default {
         form.goodsList = goodsList;
         form.id = row.id;
 
+        form.courseViewType = row.courseViewType.split(',')
+
         this.onValidGoodsStatus();
         this.getAllGoodsList();
       } else {
@@ -1237,6 +1281,7 @@ export default {
             }
           });
           form.complementGoodsIdList = tempIds.join(",");
+          form.courseViewType = form.courseViewType.join(',')
           form.goodsList = null;
           if (this.addType == "create") {
             if (this.form.id) {
@@ -1299,6 +1344,20 @@ export default {
       form.marketPrice = Number(marketPrice.toFixed(2));
     },
   },
+  filters: {
+    courseViewTypeFormat(value) {
+      let template = ['课程收费', '系统收费', '云教练收费']
+      if(!value) {
+        return ''
+      }
+      let ids = value.split(',')
+      let str = []
+      ids.forEach(item => {
+        str.push(template[item])
+      })
+      return str.join(',')
+    }
+  }
 };
 </script>
 <style lang="scss">

src/views/businessManager/shopManager/shopOperation.vue

@@ -130,6 +130,7 @@
         <el-form-item label="学员是否展示" prop="clientShow">
           <el-select
             v-model="form.clientShow"
+            :disabled="pageDisabled"
             placeholder="请选择学员是否展示"
             style="width: 400px !important"
           >
@@ -141,6 +142,7 @@
           <el-select
             v-model="form.educationalShow"
             placeholder="请选择教务端是否展示"
+            :disabled="pageDisabled"
             style="width: 400px !important"
           >
             <el-option label="是" :value="1"></el-option>
@@ -150,6 +152,7 @@
         <el-form-item label="乐团是否展示" prop="musicGroupShow">
           <el-select
             v-model="form.musicGroupShow"
+            :disabled="pageDisabled"
             placeholder="请选择乐团是否展示"
             style="width: 400px !important"
           >
@@ -157,6 +160,30 @@
             <el-option label="否" :value="0"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="乐团收费模式" prop="courseViewType">
+          <select-all v-model.trim="form.courseViewType"
+                     filterable
+                     placeholder="请选择乐团收费模式"
+                     style="width: 400px !important"
+                     multiple
+                     :disabled="pageDisabled"
+                     clearable>
+            <el-option label="课程收费" value="0"></el-option>
+            <el-option label="系统收费" value="1"></el-option>
+            <el-option label="云教练收费" value="2"></el-option>
+          </select-all>
+          <!-- <el-select
+            v-model="form.courseViewType"
+            :disabled="pageDisabled"
+            multiple
+            placeholder="请选择乐团收费模式"
+            style="width: 400px !important"
+          >
+            <el-option label="课程收费" :value="0"></el-option>
+            <el-option label="系统收费" :value="1"></el-option>
+            <el-option label="云教练收费" :value="2"></el-option>
+          </el-select> -->
+        </el-form-item>
         <el-form-item label="是否库存预警" prop="stockWarning">
           <el-select
             v-model="form.stockWarning"
@@ -283,6 +310,7 @@ export default {
         clientShow: null,
         educationalShow: null,
         musicGroupShow: null,
+        courseViewType: [],
         stockWarning: null,
         image: null,
         brief: null,
@@ -394,6 +422,9 @@ export default {
         musicGroupShow: [
           { required: true, message: "请选择乐团是否展示", trigger: "change" },
         ],
+        courseViewType: [
+          { required: true, message: "请选乐团收费模式", trigger: 'change' },
+        ],
         stockWarning: [
           { required: true, message: "请选择是否库存预警", trigger: "change" },
         ],
@@ -443,6 +474,7 @@ export default {
     onSubmit(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
+          this.form.courseViewType = this.form.courseViewType.join(',')
           if (this.pageType == "create") {
             if (this.form.id) {
               // 判断有没有Id，如果有则删除
@@ -512,6 +544,7 @@ export default {
           clientShow: null,
           educationalShow: null,
           musicGroupShow: null,
+          courseViewType: [],
           stockWarning: null,
           image: null,
           brief: null,
@@ -524,6 +557,10 @@ export default {
         goodsSingleQuery(this.id).then((res) => {
           if (res.code == 200) {
             let result = res.data;
+            let courseViewType = null
+            if(result.courseViewType) {
+              courseViewType = result.courseViewType.split(',')
+            }
             this.form = {
               id: result.id,
               sn: result.sn,
@@ -542,6 +579,7 @@ export default {
               clientShow: result.clientShow,
               educationalShow: result.educationalShow,
               musicGroupShow: result.musicGroupShow,
+              courseViewType: courseViewType,
               stockWarning: result.stockWarning,
               image: result.image,
               brief: result.brief,

src/views/categroyManager/insideSetting/staffManager.vue

@@ -29,8 +29,8 @@
                        value="FULL_TIME"></el-option>
             <el-option label="兼职"
                        value="PART_TIME"></el-option>
-            <el-option label="临时"
-                       value="TEMPORARY"></el-option>
+            <!-- <el-option label="临时"
+                       value="TEMPORARY"></el-option> -->
           </el-select>
         </el-form-item>
         <el-form-item prop="organId">
@@ -230,8 +230,8 @@
                        value="FULL_TIME"></el-option>
             <el-option label="兼职"
                        value="PART_TIME"></el-option>
-            <el-option label="临时"
-                       value="TEMPORARY"></el-option>
+            <!-- <el-option label="临时"
+                       value="TEMPORARY"></el-option> -->
           </el-select>
         </el-form-item>
         <el-form-item label="入职时间"

src/views/teacherManager/teacherDetail/components/teacherInfo.vue

@@ -267,7 +267,7 @@ export default {
       let template = {
         PART_TIME: "兼职",
         FULL_TIME: "全职",
-        TEMPORARY: "零时工"
+        // TEMPORARY: "零时工"
       }
       return template[value]
     }

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

@@ -379,6 +379,7 @@ export default {
       getSubjectGoods({
         subjectIds: val,
         chargeTypeId: this.topfor.type,
+        musicGroupId: this.teamid
       }).then((res) => {
         if (res.code == 200) {
           if (res.data) {

src/views/teamBuild/components/teamBaseInfo.vue

@@ -64,6 +64,7 @@
           >
             <el-option label="课程收费" :value="0"></el-option>
             <el-option label="系统收费" :value="1"></el-option>
+            <el-option label="云教练收费" :value="2"></el-option>
           </el-select>
         </el-form-item>