商品，课程，期数

src/components/lesson/dialog.vue

@@ -6,7 +6,7 @@
     :visible.sync="dialogObj.show"
     width="800px">
     <div v-loading="loading">
-      <el-form ref="form" :model="form" label-width="120px" :rules="rules">
+      <el-form ref="form" :model="form" label-width="120px" :rules="rules" :disabled="dialogObj.read">
         <el-form-item label="课程标题" prop="title">
           <el-input v-model="form.title"></el-input>
         </el-form-item>
@@ -52,7 +52,7 @@
               <div class="selected-block" v-for="(data, index) in selectedLessonList" :key="index">
                 <el-card shadow="always">
                   <div class="name">{{index+1}}.{{data.name}}</div>
-                  <div class="move">
+                  <div class="move" v-if="!dialogObj.read">
                     <img class="directionIcon" :src="upSrc" v-if="index !== 0" @click="moveItem(index-1,index)"/>
                     <img class="directionIcon" :src="downSrc" v-if="index !== selectedLessonList.length - 1" @click="moveItem(index,index+1)"/>
                     <i class="el-icon-delete grey" @click="delLesson(data)"></i>
@@ -88,7 +88,7 @@
               <div class="selected-block" v-for="(data,index) in selectedBoxList" :key="data.id">
                 <el-card shadow="always">
                   <div class="name">{{data.name}}</div>
-                  <div class="move">
+                  <div class="move" v-if="!dialogObj.read">
                     <img class="directionIcon" :src="upSrc" v-if="index !== 0" @click="moveBox(index-1, index)">
                     <img class="directionIcon" :src="downSrc" v-if="index !== selectedBoxList.length - 1" @click="moveBox(index, index+1)">
                     <i class="el-icon-delete grey" @click="delBox(data)"></i>
@@ -100,7 +100,7 @@
           </el-col>
         </el-row>
       </el-form>
-      <span slot="footer" class="dialog-footer" v-if="dialogObj.type !== 2">
+      <span slot="footer" class="dialog-footer" v-if="dialogObj.type !== 2 && !dialogObj.read">
         <el-button @click="dialogObj.show = false">取 消</el-button>
         <el-button type="primary" @click="sub">确 定</el-button>
       </span>

src/components/lesson/index.vue

@@ -56,9 +56,9 @@
         width="250"
         label="操作">
         <template slot-scope="scope">
-          <!--<el-button size="mini" plain type="primary" @click="detail(scope.row)">-->
-            <!--查看详情-->
-          <!--</el-button>-->
+          <el-button size="mini" plain type="primary" @click="detail(scope.row)">
+            查看详情
+          </el-button>
           <el-button size="mini" plain type="warning" @click="edit(scope.row)" v-if="!$store.state.readonly">
             编辑
           </el-button>
@@ -151,7 +151,8 @@
       detail(data){
         this.dialogObj.id = data.id;
         this.dialogObj.type = 1;
-        this.dialogObj.show = true
+        this.dialogObj.show = true;
+        this.dialogObj.read = true;
       },
       delTeacher(data){
         this.$confirm('此操作将删除该课程?', '提示', {

src/components/periods/index.vue

@@ -190,7 +190,7 @@
   import newDialog from './newDialog'
   import page from '../framework/page'
   import {getPeriodsApi,delPeriodApi,getGoodsListApi,getLessonApi,getPeriodsStatisticsApi} from "../../service/api";
-  import {WEEKDAY} from '../../util/wordbook';
+  import {WEEKDAY,GOODSTYPE} from '../../util/wordbook';
   import CommonJs from '../../util/common';
   export default {
     name: "index",
@@ -224,7 +224,7 @@
         return list.join(',')
       },
       filterGoods(val){
-        return val.name + '[' +val.current_price / 100 + '元]'
+        return '[' + GOODSTYPE[val.goods_type] + ']' + '[' +val.current_price / 100 + '元]' + val.name
       },
       percent(val){
         return (val * 100).toFixed(2)+'%'

src/components/shop/index.vue

@@ -8,11 +8,39 @@
           </el-form-item>
         </el-col>
         <el-col :span="4">
+          <el-form-item label="课程">
+            <el-select v-model="searchFrom.course_id" placeholder="请选择" @change="getUser">
+              <el-option value="" label="请选择"></el-option>
+              <el-option
+                v-for="(data,index) in classList"
+                :key="index"
+                :label="data.title"
+                :value="data.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="商品状态" >
+            <el-select v-model="searchFrom.status" placeholder="请选择" @change="getUser">
+              <el-option value="" label="请选择"></el-option>
+              <el-option value="0" label="编辑中"></el-option>
+              <el-option value="1" label="上架"></el-option>
+              <el-option value="2" label="下架"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="商品现价/团购价" label-width="120px">
+            <el-input-number v-model="searchFrom.current_price"></el-input-number>
+          </el-form-item>
+        </el-col>
+        <el-col :span="2" :offset="2">
           <el-form-item>
             <el-button type="primary" plain @click="getUser">搜索</el-button>
           </el-form-item>
         </el-col>
-        <el-col :span="4" :offset="12">
+        <el-col :span="4">
           <el-form-item>
             <el-button type="success" plain @click="add" v-if="!$store.state.readonly">添加商品</el-button>
           </el-form-item>
@@ -154,7 +182,7 @@
 </template>
 
 <script>
-  import {getGoodsListApi,deleteGoodsApi,downGoodsApi,upGoodsApi,bindOtherApi,conflictApi,copyShopApi} from "../../service/api";
+  import {getGoodsListApi,deleteGoodsApi,downGoodsApi,upGoodsApi,bindOtherApi,conflictApi,copyShopApi,getLessonApi} from "../../service/api";
   import {ISORNOT,GOODSTYPE,LESSONTYPE,GOODSSTATUS} from "../../util/wordbook";
   import page from '../framework/page'
   import dialogCom from './dialog'
@@ -185,6 +213,7 @@
           title:'',
           id:''
         },
+        classList: []
       }
     },
     components:{
@@ -206,7 +235,8 @@
       },
     },
     mounted(){
-      this.getUser()
+      this.getUser();
+      this.getClassList();
     },
     methods:{
       onPageChange(val){
@@ -268,6 +298,7 @@
         }
       },
       getUser(){
+          console.log('getuser')
         let json = {
           limit: this.limit,
           page: this.nowPage
@@ -275,6 +306,15 @@
         if (this.searchFrom.name) {
             json.name = this.searchFrom.name
         }
+        if (this.searchFrom.course_id) {
+          json.course_id = this.searchFrom.course_id
+        }
+        if (this.searchFrom.status) {
+          json.status = this.searchFrom.status
+        }
+        if (this.searchFrom.current_price) {
+          json.current_price = this.searchFrom.current_price * 100
+        }
         getGoodsListApi(json).then(res=>{
           res.list.forEach(i=>{
             if(i.conflict_goods_ids === ''){
@@ -380,7 +420,16 @@
           },
           type:1
         }
-      }
+      },
+      getClassList(){
+        let json = {
+          limit: 2000,
+          page: 1
+        }
+        getLessonApi(json).then(res=>{
+          this.classList = res.list;
+        })
+      },
     }
   }
 </script>