Browse Source

Merge branch '02/23reviewBUG' into iteration_0926

lex-xin 3 năm trước cách đây
mục cha
commit
bef4a52711
2 tập tin đã thay đổi với 43 bổ sung4 xóa
  1. 42 1
      src/views/teamBuild/components/teamBaseInfo.vue
  2. 1 3
      vue.config.js

+ 42 - 1
src/views/teamBuild/components/teamBaseInfo.vue

@@ -8,8 +8,8 @@
         :inline="true"
         ref="topinfo"
         label-width="120px"
-        style="margin-left: 11px"
       >
+      <!-- style="margin-left: 11px" -->
         <el-form-item
           label="所属分部"
           prop="section"
@@ -310,6 +310,43 @@
             </el-option>
           </el-select>
         </el-form-item>
+
+        <div class="head">乐团设置:</div>
+        <el-form-item
+          label="同步群消息"
+          prop="homeworkPushFlag"
+          label-width="200px"
+          :rules="[{ required: true, message: '同步群消息不能为空' }]">
+          <template #label>
+            <p style="position: relative; display: inline-block">
+              开课后作业同步群消息
+              <el-tooltip placement="top" popper-class="mTooltip">
+                <div slot="content">
+                  学员提交乐团课后作业时,群聊中是否发送作业提交消息
+                </div>
+                <i
+                  class="el-icon-question"
+                  style="font-size: 18px; color: #f56c6c"
+                ></i>
+              </el-tooltip>
+            </p>
+          </template>
+          <el-switch
+            v-model="topFrom.homeworkPushFlag"
+            :disabled="basdisabled"
+            :active-value="1"
+            :inactive-value="0" >
+          </el-switch>
+          <!-- <el-select
+            v-model="topFrom.homeworkPushFlag"
+            filterable
+            :disabled="basdisabled"
+            clearable
+          >
+            <el-option label="开启" :value="1"></el-option>
+            <el-option label="关闭" :value="0"></el-option>
+          </el-select> -->
+        </el-form-item>
         <!-- <el-form-item label prop="isClass">
           <el-checkbox v-model.trim="topFrom.isClass" :disabled="basdisabled"
             >课堂课乐团</el-checkbox
@@ -396,6 +433,7 @@ export default {
         address: "", // 教学地点
         salary: "", // 收费模式
         head: "",
+        homeworkPushFlag: 1, // 是否同步群消息
         isClass: false, //是否为课堂课
         startTime: "",
         feeType: null,
@@ -837,6 +875,7 @@ export default {
               repairUserId: this.topFrom.repairUserId || null,
               feeType: this.topFrom.feeType,
               transactionTeacherId: this.topFrom.transactionTeacherId,
+              homeworkPushFlag: this.topFrom.homeworkPushFlag,
             };
             // obj.musicGroupPaymentEntities = [];
             // createTeam
@@ -953,6 +992,7 @@ export default {
         startTime: "",
         ownershipType: "OWN", // 合作机构类型
         feeType: null,
+        homeworkPushFlag: 1,
       };
       this.$refs["topinfo"].resetFields();
     },
@@ -1190,6 +1230,7 @@ export default {
       this.applyExpireDate = res.data.musicGroup.applyExpireDate;
       this.topFrom.transactionTeacherId =
         res.data.musicGroup.transactionTeacherId||'';
+      this.topFrom.homeworkPushFlag = res.data.musicGroup.homeworkPushFlag
       localStorage.setItem(`${this.teamid}base`, JSON.stringify(this.topFrom));
     },
     changeType(val) {

+ 1 - 3
vue.config.js

@@ -54,9 +54,7 @@ module.exports = {
     //   warnings: false,
     //   errors: true
     // },
-    host: '127.0.0.1',
-    https: true,
-
+    // https: true,
     proxy: {
       // change xxx-api/login => mock/login
       // detail: https://cli.vuejs.org/config/#devserver-proxy