lex-xin 5 年之前
父节点
当前提交
ed3579c11b

文件差异内容过多而无法显示
+ 0 - 0
dist/index.html


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/app.0ad40ad9.css


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.73619114.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.afbc05f7.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-elementUI.1072e27f.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-elementUI.abe15f16.js


+ 5 - 2
src/views/dashboard/index.vue

@@ -19,7 +19,7 @@
         <h2 v-if="MajorList.length > 0">所属乐团</h2>
         <h2 v-if="MajorList.length > 0">所属乐团</h2>
         <ul>
         <ul>
           <!-- MajorList -->
           <!-- MajorList -->
-          <li :class="activeMarjorId == item.id?'active':''"
+          <li :title="item.name" :class="activeMarjorId == item.id?'active':''"
               v-for="(item,index) in MajorList"
               v-for="(item,index) in MajorList"
               :key="index"
               :key="index"
               @click="chioseMajor(item.name,item.id,item.status)">{{ item.name }}</li>
               @click="chioseMajor(item.name,item.id,item.status)">{{ item.name }}</li>
@@ -126,7 +126,7 @@
                            align="center"
                            align="center"
                            label="班级"
                            label="班级"
                            :formatter="filterClass"></el-table-column>
                            :formatter="filterClass"></el-table-column>
-          <el-table-column prop="school"
+          <el-table-column prop="schoolName"
                            align="center"
                            align="center"
                            label="单位/学校"></el-table-column>
                            label="单位/学校"></el-table-column>
           <el-table-column prop="patriarchPhone"
           <el-table-column prop="patriarchPhone"
@@ -756,6 +756,9 @@ export default {
   font-size: 14px;
   font-size: 14px;
   line-height: 70px;
   line-height: 70px;
   cursor: pointer;
   cursor: pointer;
+  overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
 }
 }
 .left li.active {
 .left li.active {
   color: #ffc10d;
   color: #ffc10d;

+ 13 - 12
src/views/order/index.vue

@@ -95,6 +95,9 @@
                          label="教辅费用"
                          label="教辅费用"
                          prop="sdFee"></el-table-column>
                          prop="sdFee"></el-table-column>
         <el-table-column align="left"
         <el-table-column align="left"
+                         label="单位/学校"
+                         prop="poName"></el-table-column>
+        <el-table-column align="left"
                          label="备注"
                          label="备注"
                          width="300"
                          width="300"
                          :formatter="filterRemark">
                          :formatter="filterRemark">
@@ -249,17 +252,15 @@ export default {
       return remark + ' ' + sdName;
       return remark + ' ' + sdName;
     },
     },
     exportis () {
     exportis () {
-      // var curTbl = document.getElementById('tableid');
-      // this.tableId = curTbl;
-      // console.log(curTbl);
-      this.topForm.money = "";
-      this.topForm.team = '';
-      this.topForm.instruments = '';
-      this.getstudentList(() => {
-          setTimeout(() => {
-              this.method5('tableid');
-          }, 100);
-      })
+        //   this.topForm.money = "";
+        //   this.topForm.team = '';
+        //   this.topForm.instruments = '';
+        //   this.getstudentList(() => {
+        //       setTimeout(() => {
+        //           this.method5('tableid');
+        //       }, 100);
+        //   })
+        this.method5('tableid');
     },
     },
 
 
     // 导出
     // 导出
@@ -386,7 +387,7 @@ export default {
                 sums[index] = '总价';
                 sums[index] = '总价';
                 return;
                 return;
             }
             }
-            if(index === 2 || index === 3) {
+            if(index === 2 || index === 3 || index === 9) {
                 sums[index] = 'N/A'
                 sums[index] = 'N/A'
                 return
                 return
             }
             }

+ 2 - 2
vue.config.js

@@ -15,8 +15,8 @@ const name = defaultSettings.title || '大雅报名管理'; // page title
 // port = 9528 npm run dev OR npm run dev --port = 9528
 // port = 9528 npm run dev OR npm run dev --port = 9528
 const port = process.env.port || process.env.npm_config_port || 9528; // dev port
 const port = process.env.port || process.env.npm_config_port || 9528; // dev port
 // const targetUrl = 'http://testpay.dayaedu.com'
 // const targetUrl = 'http://testpay.dayaedu.com'
-const targetUrl = 'https://manage.dayaedu.com'
-// const targetUrl = 'http://192.168.3.27:8088'
+// const targetUrl = 'https://manage.dayaedu.com'
+const targetUrl = 'http://192.168.3.28:8005'
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
 module.exports = {
 	/**
 	/**

部分文件因为文件数量过多而无法显示