Browse Source

Merge branch 'online' into iteration_adminOptimiz

mo 4 năm trước cách đây
mục cha
commit
0fb7d15be8
3 tập tin đã thay đổi với 28 bổ sung84 xóa
  1. 1 0
      .gitignore
  2. 1 0
      debug.log
  3. 26 84
      src/views/teamDetail/components/baseInfo.vue

+ 1 - 0
.gitignore

@@ -18,3 +18,4 @@ debug.log
 *.log
 debug.log
 debug.log
+debug.log

+ 1 - 0
debug.log

@@ -3,3 +3,4 @@
 [1209/094216.333:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 [1211/093733.478:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 [1214/094206.298:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[1216/112417.508:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)

+ 26 - 84
src/views/teamDetail/components/baseInfo.vue

@@ -17,49 +17,35 @@
           <el-form-item label="所属分部">
             <el-input v-model.trim="topForm.section"
                       disabled></el-input>
-            <!-- <el-select v-model.trim="topForm.section">
-              <el-option label="啦啦啦"
-                         value="1"></el-option>
-            </el-select> -->
+
           </el-form-item>
           <el-form-item label="乐队指导">
             <el-input v-model.trim="topForm.boss"
                       disabled></el-input>
-            <!-- <el-select v-model.trim="topForm.boss">
-              <el-option label="啦啦啦"
-                         value="1"></el-option>
-            </el-select> -->
           </el-form-item>
+               <el-form-item label="运营主管">
+            <el-input v-model.trim="topForm.teamTeacherName"
+                      disabled></el-input>
+          </el-form-item>
+               <el-form-item label="维修技师">
+            <el-input v-model.trim="topForm.repairUserName"
+                      disabled></el-input>
+          </el-form-item>
+          <!-- ownershipType  -->
           <el-form-item label="合作单位">
             <el-input v-model.trim="topForm.cooperate"
                       disabled></el-input>
-            <!-- <el-select v-model.trim="topForm.cooperate">
-              <el-option label="啦啦啦"
-                         value="1"></el-option>
-            </el-select> -->
           </el-form-item>
-          <el-form-item label="上课地点">
-            <el-input v-model.trim="topForm.add"
-                      type="textarea"
+          <el-form-item label="机构类型">
+            <el-input v-model.trim="topForm.ownershipType"
                       disabled></el-input>
           </el-form-item>
+
+
           <el-form-item label="收费类型">
             <el-input v-model.trim="topForm.type"
                       disabled></el-input>
-            <!-- <el-select v-model.trim="topForm.type">
-              <el-option label="啦啦啦"
-                         value="1"></el-option>
-            </el-select> -->
           </el-form-item>
-          <!-- <el-form-item label="课酬结算标准">
-            <el-select v-model.trim="topForm.salary">
-              <el-option label="课时默认结算"
-                         value="TEACHER_DEFAULT"></el-option>
-              <el-option label="课时梯度结算"
-                         value="GRADIENT_SALARY"></el-option>
-            </el-select>
-          </el-form-item> -->
-
           <el-form-item label="缴费方式"
                         prop="paymentPattern">
             <el-select placeholder="缴费方式"
@@ -76,22 +62,12 @@
                          label="一次性"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="缴费有效期开始"
-                        prop="paymentValidStartDate">
-            <el-date-picker v-model.trim="topForm.paymentValidStartDate"
-                            type="date"
-                            disabled
-                            value-format="yyyy-MM-dd"
-                            placeholder="有效期开始日期"></el-date-picker>
-          </el-form-item>
-          <el-form-item label="缴费有效期结束"
-                        prop="paymentValidEndDate">
-            <el-date-picker v-model.trim="topForm.paymentValidEndDate"
-                            type="date"
-                            disabled
-                            value-format="yyyy-MM-dd"
-                            placeholder="有效期结束日期"></el-date-picker>
+            <el-form-item label="上课地点">
+            <el-input v-model.trim="topForm.add"
+                      type="textarea"
+                      disabled></el-input>
           </el-form-item>
+
         </el-form>
         <el-button type="text"
                    v-if="lookType!=='look'"
@@ -103,12 +79,6 @@
                    v-permission="'order/musicalListDetailExport'"
                    @click="musicalListDetailExport">分发清单导出</el-button>
       </div>
-      <!-- <div class="right">
-        <ul>
-          <li v-for="(item,index) in processList"
-              :key='index'>{{ item.createTime | dateForMinFormat}} {{ item.realName }} {{item.event}}</li>
-        </ul>
-      </div> -->
     </div>
   </div>
 </template>
@@ -136,7 +106,10 @@ export default {
         cooperate: '',
         add: '',
         type: '',
-        salary: ''
+        salary: '',
+        teamTeacherName:'',
+        ownershipType:'',
+        repairUserName:''
       },
       name: '',
       processList: [],
@@ -167,19 +140,13 @@ export default {
           this.topForm.type = res.data.chargeTypeName;
           this.topForm.section = res.data.organName;
           this.topForm.add = res.data.address
+          this.topForm.teamTeacherName = res.data.teamTeacherName
+          this.topForm.ownershipType = res.data.ownershipType
+          this.topForm.repairUserName = res.data.repairUserName
           // 差上课地点
           this.$emit('getname', res.data.name)
         }
       })
-
-      // 根据乐团id获取乐团流程
-      // getMusicGroupProcess({
-      //   musicGroupId: this.teamid
-      // }).then(res => {
-      //   if (res.code == 200) {
-      //     this.processList = res.data;
-      //   }
-      // })
     },
     musicalListExport () { // 报表导出
       let url = '/api-web/order/musicalListExport'
@@ -302,31 +269,6 @@ export default {
     flex-direction: row;
     justify-content: space-between;
 
-    .left {
-      max-width: 750px;
-
-      .el-select {
-        width: 180px !important;
-      }
-    }
-
-    .right {
-      height: 40vh;
-      overflow: scroll;
-
-      ul {
-        li {
-          list-style: none;
-          line-height: 22px;
-          font-size: 14px;
-          color: #aaa;
-        }
-      }
-
-      &::-webkit-scrollbar {
-        display: none;
-      }
-    }
   }
 
   .baseBottom {