新增月课新增订单

src/components/achievement/dialog.vue

@@ -19,15 +19,17 @@
     },
     methods:{
      initPage(){
-         
+         console.log(this.dialogObj)
      },
     },
     watch:{
-      'dialogObj'(value){
+      'dialogObj.show'(value){
+        if(value){
         this.initPage()
         }
       }
     }
+  }
 </script>
 
 <style scoped>

src/components/achievement/index.vue

@@ -139,8 +139,8 @@
            dialogObj:{
             show:false,
             title:'售卖课程',
-            id:"",
-            time:""
+            teacher_id:"",
+            timeValue:"",
         },
         }
       },
@@ -171,7 +171,6 @@
               end_at:this.searchFirstFrom.dateValue[1]
             };
           }
-           console.log(json)
           getTeacherRankListApi(json).then(res=>{
             this.firstList = res;
           })
@@ -203,7 +202,10 @@
         this.searchSecondFrom.dateValue = [star,end]
       },
       nameClick(val){
-        console.log(val)
+        this.dialogObj.teacher_id=val.tid;
+        if(val.cur_date){
+        this.dialogObj.timeValue=val.cur_date
+        }
           this.dialogObj.show=true;
       },
       }

src/components/class/userList.vue

@@ -682,7 +682,6 @@
             })
         });
         getClassUserApi(this.userObj.classId,json).then(res=>{
-          console.log(res.list)
           this.userTable = res.list
         });
         this.changeClassObj={

src/components/framework/headIndex.vue

@@ -101,9 +101,6 @@ export default {
     getLink
   },
   methods: {
-    a() {
-      console.log("aa");
-    },
     logOut() {
       this.$confirm("确定退出系统?", "提示", {
         confirmButtonText: "确定",

src/components/lesson/dialog.vue

@@ -321,7 +321,6 @@
                     this.selectBox([i.id])
                   });
                 }
-
               });
               break;
             case 2:

src/components/monthOrder/index.vue

@@ -71,7 +71,7 @@
             <el-button type="primary" plain @click="exportTable">导出</el-button>
           </el-form-item>
           <el-form-item style="float:right">
-            <!-- <el-button type="success" plain @click="add">新增订单</el-button> -->
+            <el-button type="success" plain @click="add"  v-if="!$store.state.readonly">新增订单</el-button>
           </el-form-item>
     </el-form>
     <el-table
@@ -229,7 +229,7 @@
       </el-table-column>
     </el-table>
     <address-dialog v-if="dialogObj.show" :dialogObj="dialogObj" @reflash="onUpdateAddress"></address-dialog>
-    <order-dialog v-if="newdialogObj.show" :newdialogObj="newdialogObj"></order-dialog>
+    <order-dialog v-if="newdialogObj.show" :newdialogObj="newdialogObj"  @reflash="getOrderList"></order-dialog>
     <refund-dialog :dialogObj="refundDialogObj" @reflash="onAfterRefund" @changeShow="changeShow"></refund-dialog>
     <detail-dialog :dialogObj="dialogDetailObj" @changeShow="changeDetailShow"/>
     <source-dialog :dialogObj="sourceDialog"/>
@@ -588,7 +588,6 @@
             json.name = name
         }
         getTeacherListApi(json).then(res=>{
-          console.log(res.list)
           this.teacherList = res.list
           this.loading = false
         });
@@ -597,7 +596,6 @@
         console.log('handleCurrentTeacherChange', val)
       },
       updateTeacher(val){
-        console.log(val)
         this.promoterDialog.show = true;
         this.promoterDialog.id = val.id;
         this.promoterDialog.teacher_id = val.invite_id;

src/components/notBuyClass/entrance.vue

@@ -96,7 +96,6 @@
         getConfigListApi({key:this.searchFrom2.key}).then(res=>{
           if(res.list && res.list.length>0){
                   // 期数默认配置
-                  // console.log(res.list)
           }else{
             this.searchFrom2.value = '';
           }
@@ -113,7 +112,6 @@
         })
       },
       getUser(data){
-        console.log(data)
         if(data.value!=""){
           this.$confirm('此操作将设置系统指定配置为商品?', '提示', {
             confirmButtonText: '确定',

src/components/notBuyClass/index.vue

@@ -116,7 +116,6 @@ export default {
             json.goods_id=this.searchFrom.goods_id
         }
       getClassConfigApi(json).then(res => {
-        console.log(res);
          this.total = res.total;
         this.configList=res.list;
       });
@@ -142,7 +141,6 @@ export default {
               cancelButtonText: '取消',
               type: 'warning'
             }).then(()=>{
-              console.log(id,value)
               updateDescApi({desc: value},id).then(res=>{
                 this.$message({
                   type: 'success',

src/components/order/index.vue

@@ -28,6 +28,12 @@
       <el-form-item label="团ID">
         <el-input v-model="searchFrom.order_group_id"></el-input>
       </el-form-item>
+      <el-form-item label="是否团长">
+        <el-select v-model="searchFrom.is_captain" placeholder="请选择" @change="getOrderList" clearable>
+          <el-option v-for="item in isLeaderOption" :key="item.id" :label="item.value" :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="购买方式">
         <el-select v-model="searchFrom.buy_type" placeholder="请选择" @change="getOrderList" clearable>
           <el-option v-for="item in buyTypeOption" :key="item.id" :label="item.value" :value="item.id">
@@ -51,9 +57,6 @@
         <el-button type="primary" plain @click="getOrderList">搜索</el-button>
         <el-button type="primary" plain @click="exportTable">导出</el-button>
       </el-form-item>
-      <el-form-item style="float:right">
-        <!-- <el-button type="success" plain @click="add">新增订单</el-button> -->
-      </el-form-item>
     </el-form>
     <el-table :data="tableData" @expand-change="changeRow" style="width: 100%">
       <el-table-column prop="out_trade_no" label="订单号">
@@ -111,7 +114,7 @@
       </el-table-column>
       <el-table-column label="实付金额" width="80">
         <template slot-scope="scope">
-          {{scope.row.money|moneytFilter}}
+          {{scope.row.money | moneytFilter}}
         </template>
       </el-table-column>
       <el-table-column label="收货地址">
@@ -155,7 +158,6 @@
       </el-table-column>
     </el-table>
     <address-dialog v-if="dialogObj.show" :dialogObj="dialogObj" @reflash="onUpdateAddress"></address-dialog>
-    <order-dialog v-if="newdialogObj.show" :newdialogObj="newdialogObj"></order-dialog>
     <refund-dialog :dialogObj="refundDialogObj" @reflash="onAfterRefund" @changeShow="changeShow"></refund-dialog>
     <detail-dialog :dialogObj="dialogDetailObj" @changeShow="changeDetailShow" />
     <source-dialog :dialogObj="sourceDialog" />
@@ -192,7 +194,6 @@ import {
 } from "../../service/api";
 import page from "../framework/page";
 import addressDialog from "./dialog";
-import orderDialog from "./newDialog";
 import sourceDialog from "./sourceDialog";
 import refundDialog from "./refundDialog";
 import couponDialog from "./couponDialog";
@@ -207,7 +208,8 @@ import {
   ORDERSTATUSOPTION,
   INVITETYPEOPTION,
   GOODSTYPE,
-  ISLEADER
+  ISLEADER,
+  ISLEADEROPTION
 } from "../../util/wordbook";
 import CommonJs from "../../util/common";
 
@@ -240,15 +242,13 @@ export default {
         goods_id: "",
         out_trade_no: "",
         payTime: [],
-        order_group_id: ""
+        order_group_id: "",
+        is_captain:"",
       },
       tableData: [],
       dialogObj: {
         show: false
       },
-      newdialogObj: {
-        show: false
-      },
       refundDialogObj: {
         show: false,
         id: "",
@@ -274,7 +274,8 @@ export default {
         teacher_id: ""
       },
       teacherList: [],
-      loading: false
+      loading: false,
+      isLeaderOption:ISLEADEROPTION,
     };
   },
   methods: {
@@ -325,6 +326,9 @@ export default {
       }
       if (this.searchFrom.out_trade_no) {
         json.out_trade_no = this.searchFrom.out_trade_no;
+      }
+       if (this.searchFrom.is_captain || this.searchFrom.is_captain == 0) {
+        json.is_captain = this.searchFrom.is_captain;
       }
       if (this.searchFrom.receive_mobile) {
         json.receive_mobile = this.searchFrom.receive_mobile;
@@ -431,6 +435,9 @@ export default {
       if (this.searchFrom.goods_id) {
         json.goods_id = this.searchFrom.goods_id;
       }
+     if (this.searchFrom.is_captain || this.searchFrom.is_captain == 0) {
+        json.is_captain = this.searchFrom.is_captain;
+      }
       if (this.searchFrom.out_trade_no) {
         json.out_trade_no = this.searchFrom.out_trade_no;
       }
@@ -449,7 +456,6 @@ export default {
       }
       json.course_type = 1; //日课
       getOrderListApi(json).then(res => {
-        console.log(res.list);
         res.list.forEach(i => {
           i.refundList = [];
         });
@@ -584,13 +590,10 @@ export default {
         });
       });
     },
-    add() {
-      this.newdialogObj.show = true;
-    }
+   
   },
   components: {
     addressDialog,
-    orderDialog,
     refundDialog,
     detailDialog,
     refundDetail,
@@ -606,11 +609,6 @@ export default {
     this.getGoodsOption();
   },
   watch: {
-    "newdialogObj.show": function(val) {
-      if (!val) {
-        this.getOrderList();
-      }
-    }
   },
   filters: {
      isLeader(value){

src/components/shop/dialog.vue

@@ -8,19 +8,19 @@
       <el-form ref="form" :model="form" label-width="100px" :disabled="dialogObj.type === 2">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="商品名称">
+            <el-form-item label="商品名称" required>
               <el-input v-model="form.name"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="商品描述">
+            <el-form-item label="商品描述" required>
               <el-input v-model="form.goods_desc.desc"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="商品类型">
+            <el-form-item label="商品类型" required>
               <el-select v-model="form.goods_type" placeholder="请选择">
                 <el-option
                   :label="'普通商品'"
@@ -46,7 +46,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="form.goods_type === 4">
-            <el-form-item label="可用商品">
+            <el-form-item label="可用商品" required>
               <el-select multiple v-model="goodsYou" placeholder="全部">
                 <el-option v-for="data in goodsList"
                            :key="data.id"
@@ -59,7 +59,7 @@
         </el-row>
         <el-row v-if="form.goods_type === 3">
           <el-col :span="12">
-            <el-form-item label="续课已购商品">
+            <el-form-item label="续课已购商品" required>
               <el-select v-model="goOn_goods_Id.before_goods_id" placeholder="请选择">
                 <el-option v-for="data in goodsList"
                            :key="data.id"
@@ -71,7 +71,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="续购商品">
+            <el-form-item label="续购商品" required>
               <el-select v-model="goOn_goods_Id.after_goods_id" placeholder="请选择">
                 <el-option v-for="data in goodsList"
                            :key="data.id"
@@ -84,7 +84,7 @@
         </el-row>
         <el-row v-if="form.goods_type !== 3 && form.goods_type !== 4 && form.goods_type !== 5">
           <el-col :span="12">
-            <el-form-item label="课程类型">
+            <el-form-item label="课程类型" required>
               <el-select v-model="form.course_type" placeholder="请选择" @change="changeLessonType()">
                 <el-option
                   :label="'日课'"
@@ -98,7 +98,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="课程">
+            <el-form-item label="课程" required>
               <el-select v-model="form.course_id" placeholder="请选择">
                 <el-option
                   v-for="data in lessonList"
@@ -248,7 +248,7 @@
         </el-form-item>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="商品详情">
+            <el-form-item label="商品详情" required>
               <!-- <el-input type="textarea" :rows="25" v-model="form.desc.detail"></el-input> -->
               <editor-detail  :lookData="form.desc" />
             </el-form-item>
@@ -256,7 +256,7 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="购买须知">
+            <el-form-item label="购买须知" required>
               <!-- <el-input type="textarea" :rows="25" v-model="form.desc.qa"></el-input> -->
               <editor-know  :lookData1="form.desc"/>
             </el-form-item>

src/components/smsRecord/index.vue

@@ -139,7 +139,6 @@
            json.mobile = this.searchFrom.mobile
          }
          getsmsRecordApi(json).then((res)=>{
-           console.log(res.list)
            this.total = res.total;
            this.list = res.list ? res.list : []
          })

src/components/yunji/index.vue

@@ -52,7 +52,7 @@
       <el-form-item>
         <el-button type="primary" @click="getList">搜索</el-button>
         <el-button type="primary" plain @click="exportTable(list)">导出</el-button>
-        <el-button type="success" plain @click="classListOption()">同步进度</el-button>
+        <el-button type="success" plain @click="classListOption()">当前同步进度</el-button>
       </el-form-item>
     </el-form>
     <el-table :data="list" style="width: 100%">
@@ -156,7 +156,7 @@ export default {
       goodList: [],
       classObj:{
         show: false,
-        title: "同步进度",
+        title: "当前同步进度",
         order_id: 0,
         teacher_id: 0
       },
@@ -244,11 +244,6 @@ export default {
       getyunjiApi(json).then(res => {
         this.total = res.total;
         this.list = res.list ? res.list : [];
-        console.log(res)
-        this.classList=res.teacher;
-        if(res.last_pull_time){
-        this.last_pull_time=res.last_pull_time;
-        }
       });
     },
     getGoodsOption() {
@@ -314,6 +309,12 @@ export default {
     },
     classListOption() {
       this.classObj.show=true;
+      getyunjiApi({ page: 1,limit: 200}).then(res => {
+        this.classList=res.teacher;
+        if(res.last_pull_time){
+        this.last_pull_time=res.last_pull_time;
+        }
+      });
     }
   }
 };

src/util/wordbook.js

@@ -134,3 +134,14 @@ export const ISLEADER = {
   0:'否',
   1:'是'
 }
+export const ISLEADEROPTION = [
+  {
+    id: 0,
+    value: '否'
+  },
+  {
+    id: 1,
+    value: '是'
+  },
+ 
+];
\ No newline at end of file