mo пре 4 година
родитељ
комит
701f96293b

+ 21 - 29
src/views/businessManager/resetList/index.vue

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

+ 59 - 2
src/views/businessManager/resetList/resetSound.vue

@@ -1,12 +1,69 @@
 <template>
 <template>
   <div>
   <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>
   </div>
 </template>
 </template>
 <style lang="scss">
 <style lang="scss">
 </style>
 </style>
 <script>
 <script>
 export default {
 export default {
-
+  props: ['show', 'item'],
+  data () {
+    return {
+      soundForm: {},
+      soundVisible: false
+    }
+  },
+  mounted () { },
+  methods: {},
+  watch: {
+    show (val) {
+      this.soundVisible = val
+    }
+  }
 }
 }
 </script>
 </script>