Kaynağa Gözat

Merge branch '03/03Lebao' of http://git.dayaedu.com/molingzhide/dy-admin-manager into 03/03Lebao

lex-xin 4 yıl önce
ebeveyn
işleme
f5a0000f7e

+ 1 - 1
src/views/repairManager/repairList.vue

@@ -17,7 +17,7 @@
             v-model.trim="searchForm.search"
             clearable
             @keyup.enter.native="search"
-            placeholder="维修单号/学生姓名/编号"
+            placeholder="维修单号/姓名/编号"
           ></el-input>
         </el-form-item>
         <el-form-item>

+ 1 - 1
src/views/studentManager/components/studentLebao.vue

@@ -95,7 +95,7 @@
       :visible.sync="addMusicVisible"
       v-if="addMusicVisible"
     >
-      <addMusic :categoryList='categoryList' ref='addMusic' @getList='getList'/>
+      <addMusic :categoryList='categoryList' ref='addMusic' @getList='getList' @close='addMusicVisible = false'/>
       <span slot="footer" class="dialog-footer">
         <el-button @click="addMusicVisible = false">取 消</el-button>
         <el-button type="primary" @click="addMusicSubmit">确 定</el-button>

+ 1 - 0
src/views/studentManager/modals/addMusic.vue

@@ -131,6 +131,7 @@ export default {
             };
             const res = await addStudentInstrument(obj);
             this.$message.success('添加成功')
+            this.$emit('close')
             this.$emit('getList')
           } catch (e) {
             console.log(e);

+ 1 - 1
vue.config.js

@@ -64,7 +64,7 @@ module.exports = {
       // http://192.168.3.134
       // http://47.114.176.40:8000
       '/api-auth': {
-        target: 'http://192.168.3.134',
+        target: 'http://dev.dayaedu.com',
         changeOrigin: true,
         pathRewrite: {
           '^api-auth': ''