Merge branch 'LAO_MO' into online

src/router/index.js

@@ -326,6 +326,8 @@ export const asyncRoutes = {
   // 人力资源
   HumanResources: () => import('@/views/HumanResources'),
   // 查看乐团基本信息
-  teamLookBase: () => import('@/views/teamDetail/teamInfo')
+  teamLookBase: () => import('@/views/teamDetail/teamInfo'),
+  // 更换列表
+  resetList: () => import('@/views/businessManager/resetList')
 }
 export default router

src/views/businessManager/resetList/index.vue

@@ -50,10 +50,9 @@
         </el-form-item>
         <el-form-item>
           <el-date-picker style="width:410px;"
-                          v-model.trim="orderDate"
+                          v-model.trim="searchForm.resetDate"
                           type="daterange"
                           value-format="yyyy-MM-dd"
-                          @change="searchOrderDate"
                           range-separator="至"
                           start-placeholder="开始日期"
                           end-placeholder="结束日期"
@@ -65,12 +64,37 @@
         <el-table style="width: 100%"
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}"
                   :data="tableList">
-          <el-table-column align="center"
-                           prop="studentId"
-                           label="交易流水号"></el-table-column>
-          <el-table-column align="center"
-                           prop="studentId"
-                           label="订单号"></el-table-column>
+          <el-table-column type="expand">
+            <template slot-scope="props">
+              <el-form label-position="left"
+                       inline
+                       label-width="120px"
+                       class="demo-table-expand">
+                <el-form-item label="交易流水号">
+                  <span>{{ props.row.name }}</span>
+                </el-form-item>
+                <el-form-item label="订单号">
+                  <span>{{ props.row.shop }}</span>
+                </el-form-item>
+                <el-form-item label="更换金额(元)">
+                  <span>{{ props.row.id }}</span>
+                </el-form-item>
+                <el-form-item label="教务老师">
+                  <span>{{ props.row.shopId }}</span>
+                </el-form-item>
+                <el-form-item label="交易方式">
+                  <span>{{ props.row.category }}</span>
+                </el-form-item>
+                <el-form-item label="收款账户">
+                  <span>{{ props.row.address }}</span>
+                </el-form-item>
+                <el-form-item label="商品描述">
+                  <span>{{ props.row.desc }}</span>
+                </el-form-item>
+              </el-form>
+            </template>
+          </el-table-column>
+
           <el-table-column align="center"
                            prop="studentId"
                            label="学员姓名"></el-table-column>
@@ -88,24 +112,12 @@
                            label="更换教辅"></el-table-column>
           <el-table-column align="center"
                            prop="studentId"
-                           label="更换金额(元)"></el-table-column>
-          <el-table-column align="center"
-                           prop="studentId"
                            label="差价(元)"></el-table-column>
           <el-table-column align="center"
                            prop="studentId"
                            label="成本差(元)"></el-table-column>
           <el-table-column align="center"
                            prop="studentId"
-                           label="教务老师"></el-table-column>
-          <el-table-column align="center"
-                           prop="studentId"
-                           label="交易方式"></el-table-column>
-          <el-table-column align="center"
-                           prop="studentId"
-                           label="收款账户"></el-table-column>
-          <el-table-column align="center"
-                           prop="studentId"
                            label="所属分部"></el-table-column>
           <el-table-column align="center"
                            prop="studentId"
@@ -133,6 +145,7 @@
                     @pagination="getList" />
       </div>
     </div>
+    <resetSound />
   </div>
 </template>
 
@@ -142,16 +155,17 @@ import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
 import { getTeacher, getEmployeeOrgan } from "@/api/buildTeam";
-
+import resetSound from './resetSound'
 export default {
-  components: { pagination },
+  components: { pagination, resetSound },
   data () {
     return {
       searchForm: {
-        search: null
+        search: null,
+        resetDate: null
       },
       teacherList: [],
-      tableList: [],
+      tableList: [{}],
       organList: [],
       rules: {
         // 分页规则
@@ -193,4 +207,12 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
+/deep/.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 50%;
+}
+/deep/.demo-table-expand label {
+  color: #99a9bf;
+}
 </style>

src/views/businessManager/resetList/resetSound.vue

@@ -1,12 +1,69 @@
 <template>
   <div>
-
+    <el-dialog title="修改"
+               width="700px"
+               :visible.sync="soundVisible">
+      <el-form :model="soundForm"
+               ref="soundForm">
+        <el-form-item label="原乐器">
+          <el-input></el-input>
+        </el-form-item>
+        <el-form-item label="原教辅">
+          <el-input></el-input>
+        </el-form-item>
+        <el-form-item label="缴费开始日期">
+          <el-date-picker v-model="value1"
+                          type="date"
+                          placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="缴费结束日期">
+          <el-date-picker v-model="value1"
+                          type="date"
+                          placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="更改声部">
+          <el-input></el-input>
+        </el-form-item>
+        <el-form-item label="更换乐器">
+          <el-input></el-input>
+        </el-form-item>
+        <el-form-item label="更换教辅">
+          <el-input></el-input>
+        </el-form-item>
+        <el-form-item label="支付差价">
+          <el-input></el-input>
+        </el-form-item>
+        <el-form-item label="成本差(元)">
+          <el-input></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer"
+           class="dialog-footer">
+        <el-button @click="soundVisible = false">取 消</el-button>
+        <el-button type="primary">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <style lang="scss">
 </style>
 <script>
 export default {
-
+  props: ['show', 'item'],
+  data () {
+    return {
+      soundForm: {},
+      soundVisible: false
+    }
+  },
+  mounted () { },
+  methods: {},
+  watch: {
+    show (val) {
+      this.soundVisible = val
+    }
+  }
 }
 </script>