Skip to content

A
admin-base
Commit f68a93f4 authored by wangwei's avatar wangwei
Browse files
Options

Merge remote-tracking branch 'origin/development' into development 

# Conflicts:
#	src/components/periods/index.vue
parents 6db49bd1 441d2224
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 15 deletions
dist/index.html
View file @ f68a93f4
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=never><link rel=stylesheet href=https://at.alicdn.com/t/font_746649_7dsnjecwkpg.css><title>唱唱启蒙-后台</title><link href=/static/css/app.c24cd2a040e585ed31f855ee4b91d9ea.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.684189c8c7c193fa55cf.js></script><script type=text/javascript src=/static/js/vendor.0b35d0c5581d0a6334a7.js></script><script type=text/javascript src=/static/js/app.eb9d4a2ca348c1013cec.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=never><link rel=stylesheet href=https://at.alicdn.com/t/font_746649_7dsnjecwkpg.css><title>唱唱启蒙-后台</title><link href=/static/css/app.008c2410b3d171931cb69139d614e8e8.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.4bc6a4ebabe097d932db.js></script><script type=text/javascript src=/static/js/vendor.0b35d0c5581d0a6334a7.js></script><script type=text/javascript src=/static/js/app.eb9d4a2ca348c1013cec.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/7.0c25f803cb7f87694d59.js 0 → 100644
View file @ f68a93f4
This diff is collapsed.
dist/static/js/7.755ba70f5ed3ca8b7804.js deleted 100644 → 0
View file @ 6db49bd1
This diff is collapsed.
dist/static/js/manifest.684189c8c7c193fa55cf.js → dist/static/js/manifest.4bc6a4ebabe097d932db.js
View file @ f68a93f4
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,t,f){for(var o,d,b,i=0,u=[];i<c.length;i++)d=c[i],n[d]&&u.push(n[d][0]),n[d]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(a&&a(c,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=r(r.s=f[i]);return b};var c={},n={32:0};function r(a){if(c[a])return c[a].exports;var n=c[a]={i:a,l:!1,exports:{}};return e[a].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var a=n[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,r){a=n[e]=[c,r]});a[2]=c;var t=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,r.nc&&f.setAttribute("nonce",r.nc),f.src=r.p+"static/js/"+e+"."+{0:"a0cb175b4369580fe6d9",1:"c0927229680fd987bfe7",2:"ecf48e10d45f2bc29d43",3:"d0a09be5802508c20889",4:"b68fdaa3fb36c125fd0c",5:"bdf48f4553239f0df5bb",6:"57484f62673b2b73d56a",7:"755ba70f5ed3ca8b7804",8:"f67eaac71db3345a5b5e",9:"c0941face12e9e508c12",10:"6186374cb159b5c34094",11:"764f30eda110f7d6dc44",12:"4436a45597a8bce84dc8",13:"6c7187a7f1a3a08227c3",14:"edf1d48dcea7e41a58b8",15:"bd87a7d96c90ad105f9c",16:"110c0eb5396f5726b15a",17:"1ab66d364dd18e9aee3f",18:"a42722a887716b917941",19:"093685fab41a1832ef3a",20:"63196b0f61c8940df744",21:"baf6671ac90a7fa1e351",22:"6fecb4623fd7e822ca84",23:"15081e48ea873dad9fc1",24:"f8f9819a6023d975129a",25:"9e84cc6619173c9882b9",26:"13ce6dd1ba9c09f98fcf",27:"15017d15321256dd421b",28:"29e177b13098e72e13d3",29:"467369eed262ffbae7dd"}[e]+".js";var o=setTimeout(d,12e4);function d(){f.onerror=f.onload=null,clearTimeout(o);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=d,t.appendChild(f),c},r.m=e,r.c=c,r.d=function(e,a,c){r.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},r.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(a,"a",a),a},r.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},r.p="/",r.oe=function(e){throw console.error(e),e}}([]); !function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,t,f){for(var o,d,b,i=0,u=[];i<c.length;i++)d=c[i],n[d]&&u.push(n[d][0]),n[d]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(a&&a(c,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=r(r.s=f[i]);return b};var c={},n={32:0};function r(a){if(c[a])return c[a].exports;var n=c[a]={i:a,l:!1,exports:{}};return e[a].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var a=n[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,r){a=n[e]=[c,r]});a[2]=c;var t=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,r.nc&&f.setAttribute("nonce",r.nc),f.src=r.p+"static/js/"+e+"."+{0:"a0cb175b4369580fe6d9",1:"c0927229680fd987bfe7",2:"ecf48e10d45f2bc29d43",3:"d0a09be5802508c20889",4:"b68fdaa3fb36c125fd0c",5:"bdf48f4553239f0df5bb",6:"57484f62673b2b73d56a",7:"0c25f803cb7f87694d59",8:"f67eaac71db3345a5b5e",9:"c0941face12e9e508c12",10:"6186374cb159b5c34094",11:"764f30eda110f7d6dc44",12:"4436a45597a8bce84dc8",13:"6c7187a7f1a3a08227c3",14:"edf1d48dcea7e41a58b8",15:"bd87a7d96c90ad105f9c",16:"110c0eb5396f5726b15a",17:"1ab66d364dd18e9aee3f",18:"a42722a887716b917941",19:"093685fab41a1832ef3a",20:"63196b0f61c8940df744",21:"baf6671ac90a7fa1e351",22:"6fecb4623fd7e822ca84",23:"15081e48ea873dad9fc1",24:"f8f9819a6023d975129a",25:"9e84cc6619173c9882b9",26:"13ce6dd1ba9c09f98fcf",27:"15017d15321256dd421b",28:"29e177b13098e72e13d3",29:"467369eed262ffbae7dd"}[e]+".js";var o=setTimeout(d,12e4);function d(){f.onerror=f.onload=null,clearTimeout(o);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=d,t.appendChild(f),c},r.m=e,r.c=c,r.d=function(e,a,c){r.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},r.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(a,"a",a),a},r.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},r.p="/",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file \ No newline at end of file
src/components/periods/index.vue
View file @ f68a93f4
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
<el-form-item> <el-form-item>
<el-button @click="onSearch" type="primary">查询</el-button> <el-button @click="onSearch" type="primary">查询</el-button>
</el-form-item> </el-form-item>
<el-form-item style="float: left;margin-left: 20px;"> <el-form-item style="float: right;">
<el-button @click="onAdd" type="primary" v-if="!$store.state.readonly">添加期数</el-button> <el-button @click="onAdd" type="primary">添加期数</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<el-table-column <el-table-column
label="操作" label="操作"
width="148"> width="148">
<template slot-scope="scope" v-if="!$store.state.readonly"> <template slot-scope="scope">
<el-button size="mini" plain type="primary" @click="onEdit(scope.row)"> <el-button size="mini" plain type="primary" @click="onEdit(scope.row)">
编辑 编辑
</el-button> </el-button>
......
src/components/periods/newDialog.vue
View file @ f68a93f4
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="商品名称" prop="goods_id"> <el-form-item label="商品名称" prop="goods_id">
<el-select v-model="form.goods_id" placeholder="请选择" clearable @change="getLessonDetail"> <el-select v-model="form.goods_id" placeholder="请选择" clearable @change="onOptionChange">
<el-option <el-option
v-for="(data,index) in goodList" v-for="(data,index) in goodList"
:key="index" :key="index"
...@@ -204,16 +204,17 @@ ...@@ -204,16 +204,17 @@
} }
}); });
}, },
// getChooseGood(val){
// this.form.goods_id = val.id;
// this.getLessonDetail(val.course_id);
// this.goodDialogObj.show = false;
// },
getTeachers(){ getTeachers(){
getTeacherListApi().then((res)=>{ getTeacherListApi().then((res)=>{
this.teacherOptions = res.list; this.teacherOptions = res.list;
}) })
}, },
onOptionChange(id){
let index = this.goodList.findIndex((val)=>{ return val.id = id});
if(index >-1){
this.getLessonDetail(this.goodList[index].course_id);
}
},
getLessonDetail(id){ getLessonDetail(id){
console.log('getLessonDetail', id); console.log('getLessonDetail', id);
this.form.start_num='' this.form.start_num=''
...@@ -235,8 +236,8 @@ ...@@ -235,8 +236,8 @@
// this.initPage() // this.initPage()
this.getTeachers(); this.getTeachers();
this.getGoodsOption(); this.getGoodsOption();
if(this.dialogObj.form.goods_id){ if(this.dialogObj.form.course_id){
this.getLessonDetail(this.dialogObj.form.goods_id); this.getLessonDetail(this.dialogObj.form.course_id);
} }
this.form = this.dialogObj.form; this.form = this.dialogObj.form;
this.teacherList = this.dialogObj.form.teacher_ids; this.teacherList = this.dialogObj.form.teacher_ids;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment