需求更新

src/App.vue

@@ -17,6 +17,7 @@ export default {
     // 权限验证 动态路由
     if(window.location.href.indexOf('login') < 0){
       let permission = this.$store.state.progressList;
+      // console.log(this.$store.state)
       let menuList = [];
       this.$router.options.routes[0].children = [];
       let routerUserDetail = {

src/components/monthOrder/newDialog.vue

@@ -19,7 +19,7 @@
             </el-select>
           </el-form-item>
            </el-col>
-           <el-col :span="10">
+           <!-- <el-col :span="10">
          <el-form-item label="期数名称" prop="periods_id">
             <el-select v-model="form.periods_id"  placeholder="请选择">
               <el-option
@@ -30,7 +30,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-           </el-col>
+           </el-col> -->
           </el-row>
             <el-row>
         <el-col :span="10">

src/components/teacherDetail/index.vue

@@ -153,6 +153,13 @@
             prop="start_at"
             label="开课时间">
           </el-table-column>
+          <el-table-column
+            prop="source"
+            label="招生来源">
+            <template slot-scope="scope">
+              {{scope.row.source | classSource}}
+            </template>
+          </el-table-column>
           <el-table-column
             label="操作"  width="280">
             <template slot-scope="scope">
@@ -410,7 +417,7 @@
 
 <script>
   import {getTeacherDetailApi,getClassStatisticsApi,task4Api,getUserListApi,teacherBindUserApi,getOrderListApi,getGoodsListApi,editOrderDescApi,updateOrderTeacherApi } from "../../service/api";
-  import {TEACHERTYPE,ORDERSTATUSOPTION,GOODSTYPE,ORDERSTATUS} from "../../util/wordbook";
+  import {TEACHERTYPE,ORDERSTATUSOPTION,GOODSTYPE,ORDERSTATUS,CLASSSOURCE} from "../../util/wordbook";
   import AddressArray from '../framework/address-picker/addr'
   import task from './task'
   import page from '../framework/page'
@@ -776,6 +783,9 @@
       },
       filterGoods(val){
         return '[' + GOODSTYPE[val.goods_type] + ']' + '[' +val.current_price / 100 + '元]' + val.name
+      },
+      classSource(val){
+        return CLASSSOURCE[val]
       }
     },
 

src/components/teacherDetail/task1.vue

@@ -44,6 +44,9 @@
               </template>
             </el-table-column>
             <el-table-column prop="into_periods_num" label="当日已激活人数" align="center">
+              <template slot-scope="scope" >
+                <el-button type="text" size="mini" style="font-size: 20px" @click="showTask6Detail2()">{{scope.row.into_periods_num}}</el-button>
+              </template>
             </el-table-column>
             <el-table-column prop="total" label="激活率" align="center">
               <template slot-scope="scope">
@@ -97,6 +100,58 @@
 
       <page :total="total" :limit="limit" @pageChange="onPageChange" @sizeChange="onSizeChange"/>
     </el-dialog>
+
+    <el-dialog append-to-body :visible.sync="task6Show2" title="外部订单已激活列表" width="1000px">
+      <el-button @click="allDesc6()" size="mini" type="success">批量添加备注</el-button>
+      <el-table size="mini" :data="task6Obj && task6Obj.into_periods_list ? task6Obj.into_periods_list : []"
+                @selection-change="handleSelectionChange123">
+        <el-table-column
+          type="selection"
+          width="55">
+        </el-table-column>
+        <el-table-column label="用户" className="f-c" min-width="180"   prop="user_id">
+          <template slot-scope="scope">
+            <img :src="scope.row.avatar" style="width: 40px;min-width:40px;height: 40px;border-radius: 50px"> {{scope.row.nickname}}(ID:{{scope.row.id}})
+          </template>
+        </el-table-column>
+        <el-table-column prop="order_id" label="订单号">
+        </el-table-column>
+
+        <el-table-column prop="receiver_mobile" label="手机号" align="center">
+        </el-table-column>
+        <el-table-column prop="all_num" label="支付金额">
+          <template slot-scope="scope">
+            {{scope.row.money / 100}}元
+          </template>
+        </el-table-column>
+        <el-table-column prop="goods_id" label="商品编号">
+        </el-table-column>
+        <el-table-column prop="periods_id" label="期数">
+        </el-table-column>
+        <el-table-column prop="invite_type" label="来源">
+        </el-table-column>
+        <el-table-column prop="periods_title" label="期数名称">
+        </el-table-column>
+        <el-table-column prop="all_num" label="收货信息" width="150px">
+          <template slot-scope="scope">
+            姓名：{{scope.row.receiver_name}}
+            <br>
+            地址：{{scope.row.receiver_province}}{{scope.row.receiver_city}}{{scope.row.receiver_area}}{{scope.row.receiver_address}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="desc" label="备注" align="center">
+        </el-table-column>
+
+        <el-table-column prop="desc" label="备注" align="center">
+          <template slot-scope="scope">
+            <el-button @click="editNote(scope.row.id, scope.row.desc)" size="mini" plain type="primary">编辑备注</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <page :total="into_periods_num" :limit="limit" @pageChange="onPageChange" @sizeChange="onSizeChange"/>
+    </el-dialog>
+
     <el-dialog append-to-body :visible.sync="task1Detail.show" :title="task1Detail.title" width="80%" >
       <el-table :data="task1Detail.list" size="mini" fixed>
         <el-table-column label="用户" className="f-c" min-width="180"   prop="user_id">
@@ -160,8 +215,10 @@
           cur_date:''
         },
         task6Show:false,
+        task6Show2:false,
         limit:10,
         total:0,
+        into_periods_num:0,
         nowPage:1,
         task6Obj:null,
         selectedTask6:[]
@@ -243,8 +300,10 @@
           page: this.nowPage
         };
         task6Api(this.teacherId,json).then(res=>{
+          console.log(res)
           this.task6Obj = res;
           this.total = res.total
+          this.into_periods_num = res.into_periods_num
         });
       },
       initPage(){
@@ -272,6 +331,10 @@
         this.nowPage = 1;
         this.task6Show = true
       },
+      showTask6Detail2(){
+        this.nowPage = 1;
+        this.task6Show2 = true
+      },
       refDesc1(){
         task1Api(this.teacherId).then(res=>{
           this.task1List = res;