1122 11:22

111

src/views/businessManager/shopManager/shopCategory.vue

@@ -1,16 +1,21 @@
 
 <template>
   <div class='m-container'>
-    <h2><div class="squrt"></div>商品类型管理</h2>
+    <h2>
+      <div class="squrt"></div>商品分类管理
+    </h2>
     <div class="m-core">
-      <div class='newBand' @click="openTypes('create')">添加</div>
+      <div class='newBand'
+           @click="openTypes('create')">添加</div>
       <!-- 列表 -->
       <div class="tableWrap">
-        <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column align='center' prop="name"
+        <el-table :data='tableList'
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <el-table-column align='center'
+                           prop="name"
                            label="分类名称">
           </el-table-column>
-          <el-table-column align='center' 
+          <el-table-column align='center'
                            label="声部属性">
             <template slot-scope="scope">
               {{ scope.row.subjectName | joinArray(',') }}
@@ -19,8 +24,10 @@
           <el-table-column align='center'
                            label="操作">
             <template slot-scope="scope">
-              <el-button @click="openTypes('update', scope.row)" type="text">修改</el-button>
-              <el-button @click="onTypesDelOpeation(scope.row)" type="text">删除</el-button>
+              <el-button @click="openTypes('update', scope.row)"
+                         type="text">修改</el-button>
+              <el-button @click="onTypesDelOpeation(scope.row)"
+                         type="text">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -31,33 +38,42 @@
                     @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="name" :label-width="formLabelWidth">
-          <el-input v-model="form.name" autocomplete="off"></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="name"
+                      :label-width="formLabelWidth">
+          <el-input v-model="form.name"
+                    autocomplete="off"></el-input>
         </el-form-item>
-        <el-form-item label="声部属性" v-if="form.classGroupType != 'MIX'"
-          prop="subjectIds" :label-width="formLabelWidth">
-          <el-select v-model="form.subjectIds" multiple>
-              <el-option-group
-                v-for="group in subjectList"
-                :key="group.label"
-                :label="group.label">
-                <el-option
-                  v-for="item in group.options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-option-group>
+        <el-form-item label="声部属性"
+                      v-if="form.classGroupType != 'MIX'"
+                      prop="subjectIds"
+                      :label-width="formLabelWidth">
+          <el-select v-model="form.subjectIds"
+                     multiple>
+            <el-option-group v-for="group in subjectList"
+                             :key="group.label"
+                             :label="group.label">
+              <el-option v-for="item in group.options"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-option-group>
           </el-select>
         </el-form-item>
       </el-form>
       <span slot="footer"
             class="dialog-footer">
         <el-button @click="typeStatus = false">取 消</el-button>
-        <el-button type="primary" @click="onTypesSubmit('ruleForm')">确 定</el-button>
+        <el-button type="primary"
+                   @click="onTypesSubmit('ruleForm')">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -99,12 +115,12 @@ export default {
       }
     }
   },
-  mounted() {
+  mounted () {
     this.getList()
     this.getSubjectTree()
   },
   methods: {
-    onTypesDelOpeation(row) {
+    onTypesDelOpeation (row) {
       categoryUpSetDel({ id: row.id }).then(res => {
         this.messageTips('删除', res)
       })
@@ -113,7 +129,7 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (this.formActionTitle == 'create') {
-            if(this.form.id) { // 判断有没有Id，如果有则删除
+            if (this.form.id) { // 判断有没有Id，如果有则删除
               delete this.form.id
             }
             categoryUpSet(this.form).then(res => {
@@ -129,9 +145,9 @@ export default {
         }
       })
     },
-    
-    messageTips(title, res) {
-      if(res.code == 200) {
+
+    messageTips (title, res) {
+      if (res.code == 200) {
         this.$message({
           message: title + '成功',
           type: 'success'
@@ -142,14 +158,14 @@ export default {
         this.$message.error(res.msg)
       }
     },
-    getList () { 
+    getList () {
       categoryListTree({
         delFlag: 0,
         rows: this.pageInfo.limit,
         page: this.pageInfo.page
       }).then(res => {
         let result = res.data
-        if(res.code == 200) {
+        if (res.code == 200) {
           result.rows.forEach(row => {
             let subjectname = [],
               subjectIds = []
@@ -165,7 +181,7 @@ export default {
         }
       })
     },
-    openTypes(type, row) {
+    openTypes (type, row) {
       this.typeStatus = true
       this.formActionTitle = type
       // 修改的时候赋值
@@ -186,13 +202,13 @@ export default {
       }
       this.$refs[formName].resetFields()
     },
-    getSubjectTree() { // 获取声部列表
+    getSubjectTree () { // 获取声部列表
       subjectListTree({
         delFlag: 0,
         rows: 9999
       }).then(res => {
         let result = res.data
-        if(res.code == 200) {
+        if (res.code == 200) {
           let tempArray = []
           result.rows.forEach((item, index) => {
             let subject = []
@@ -202,7 +218,7 @@ export default {
                 label: s.name
               })
             })
-            
+
             tempArray[index] = {
               label: item.name,
               options: subject
@@ -220,13 +236,15 @@ export default {
   background: #14928a;
   border-color: #14928a;
   color: #fff;
-  &:hover, &:active, &:focus {
+  &:hover,
+  &:active,
+  &:focus {
     background: #14928a;
     border-color: #14928a;
-    color: #FFF;
+    color: #fff;
   }
 }
-.el-date-editor.el-input{
+.el-date-editor.el-input {
   width: 100% !important;
 }
 .el-select {

src/views/teamBuild/components/teamBaseInfo.vue

@@ -153,10 +153,10 @@
           <el-select v-model="topFrom.ownershipType">
             <el-option label="自有"
                        value="OWN"></el-option>
-            <el-option label="合作"
+            <el-option label="三方"
                        value="COOPERATION"></el-option>
-            <el-option label="租赁"
-                       value="LEASE"></el-option>
+            <!-- <el-option label="租赁"
+                       value="LEASE"></el-option> -->
           </el-select>
         </el-form-item>
 

src/views/teamBuild/teamSeting/components/coursePlan.vue

@@ -722,7 +722,11 @@ export default {
       // 请求排课
     },
     resetaLL () {
-      Object.assign(this.$data, this.$options.data());
+      // Object.assign(this.$data, this.$options.data());
+      this.classCardList = [];
+      this.SignList = [];
+      this.tableList = [];
+      // this.leftFrom.all = activeVal
       this.teamid = this.$route.query.id;
       getAllClass({ musicGroupId: this.teamid }).then(res => {
         if (res.code == 200) {

src/views/vipClass/vipDetail/components/teacherRecord.vue

@@ -77,12 +77,19 @@
             </div>
           </template>
         </el-table-column>
-        <!-- <el-table-column align='center'
-                         label="当前课次">
-        </el-table-column> -->
+        <el-table-column align='center'
+                         label="教学点"
+                         prop='schoolName'>
+          <template slot-scope="scope">
+            <div>
+              {{scope.row.schoolName?scope.row.schoolName:'网络教室'}}
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column align='center'
                          label="上课学员数"
                          prop="attendanceNum">
+
         </el-table-column>
         <el-table-column align='center'
                          prop="status"
@@ -138,6 +145,8 @@
                width="420px">
       <el-form :model="maskForm"
                :rules="maskrules"
+               label-width="120px"
+               label-position="right"
                ref='maskForm'>
         <el-form-item label="选择上课日期"
                       prop="date">
@@ -168,7 +177,16 @@
                           placeholder="选择时间">
           </el-time-picker>
         </el-form-item>
-
+        <!-- 新增教学点 -->
+        <el-form-item label="教学点"
+                      v-if='activeRow&&activeRow.teachMode == "OFFLINE"'>
+          <el-select v-model="maskForm.cooperation">
+            <el-option v-for='(item,index) in cooperationList'
+                       :key="index"
+                       :value="id"
+                       :label="item.name"></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <span slot="footer"
             class="dialog-footer">
@@ -180,6 +198,7 @@
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
+import { queryByOrganId } from '@/api/systemManage'
 import { findVipGroupTeachingRecord, getStudyStudents, resetVipClass } from '@/api/vipSeting'
 export default {
   components: { pagination },
@@ -201,15 +220,18 @@ export default {
       studentVisible: false, // 查看上课学员数的弹窗
       courseVisible: false, // 课时调整弹窗
       studentList: [],
+      cooperationList: [],
       maskForm: {
         data: '',
         startTime: '',
         endTime: '',
         status: '',
-        type: ''
+        type: '',
+        cooperation: ''
 
       },
       activeId: '',
+      activeRow: null, //
       maskrules: {
         date: [{ required: true, message: '请选择修改日期', trigger: 'blur' }],
         startTime: [{ required: true, message: '请选择开始', trigger: 'blur' }],
@@ -225,11 +247,16 @@ export default {
     }
   },
   mounted () {
-    let id = this.$route.query.id || 1;
+    let id = this.$route.query.id;
     this.id = id;
     // 获取vip教学记录
     this.getList()
-
+    // 获取分部教学点
+    queryByOrganId({ organId: this.$store.getters.organ }).then(res => {
+      if (res.code == 200) {
+        this.cooperationList = res.data;
+      }
+    })
   }, methods: {
     search () {
       this.rules.page = 1;
@@ -284,6 +311,7 @@ export default {
       this.courseVisible = true;
       // 弹出弹窗
       this.activeId = row.id;
+      this.activeRow = row;
       // resetVipClass().then()
 
     },
@@ -293,7 +321,7 @@ export default {
       this.$refs['maskForm'].validate(valid => {
         if (valid) {
           // 效验成功
-          resetVipClass({ id: this.activeId, classDate: this.maskForm.date, startClassTime: this.maskForm.date + ' ' + this.maskForm.startTime, endClassTime: this.maskForm.date + ' ' + this.maskForm.endTime }).then(
+          resetVipClass({ id: this.activeId, classDate: this.maskForm.date, startClassTime: this.maskForm.date + ' ' + this.maskForm.startTime, endClassTime: this.maskForm.date + ' ' + this.maskForm.endTime, schoolId: this.maskForm.cooperation }).then(
             res => {
               if (res.code == 200) {
                 this.$message({

vue.config.js

@@ -17,8 +17,9 @@ const name = defaultSettings.title || '大雅后台管理系统' // page title
 // http://47.99.212.176:8000 
 // 
 // let target = 'http://testadm.dayaedu.com/' //勇哥迁库
-// let target = 'http://192.168.3.27:8000' // 箭河
+// let target = 'http://192.168.3.27:18000' // 箭河
 let target = 'http://192.168.3.28:8000' //邹璇
+
 // let target = 'http://192.168.3.8:8000' //勇哥
 // let target = 'http://47.99.212.176:8000' // 测试服
 // let target = 'http://192.168.3.48:8080' // 乔