|
@@ -1799,11 +1799,7 @@
|
|
@current-change="handleCurrentChange"></el-pagination>
|
|
@current-change="handleCurrentChange"></el-pagination>
|
|
</div>
|
|
</div>
|
|
<span slot="footer" class="dialog-footer">
|
|
<span slot="footer" class="dialog-footer">
|
|
-<<<<<<< HEAD
|
|
|
|
<el-button @click="dialogVisibleMember = false;">取 消</el-button>
|
|
<el-button @click="dialogVisibleMember = false;">取 消</el-button>
|
|
-=======
|
|
|
|
- <el-button @click="dialogVisibleMember = false">取 消</el-button>
|
|
|
|
->>>>>>> 8c46a58ae3ab9d21e5cba63afb0429906a3f0988
|
|
|
|
<el-button type="primary" @click="isAddPPTeacher">确定</el-button>
|
|
<el-button type="primary" @click="isAddPPTeacher">确定</el-button>
|
|
</span>
|
|
</span>
|
|
</el-dialog>
|
|
</el-dialog>
|