Merge branch 'iteration_adminOptimiz' into online

dist/static/css/chunk-ac740030.64cf75f6.css

@@ -0,0 +1 @@
+.number-input[data-v-a288aabe]{width:100%}.number-input[data-v-5c1918b2] .el-input__inner,.number-input[data-v-a288aabe] .el-input__inner{text-align:left}.number-input[data-v-55ad3016]{width:100%}.number-input[data-v-55ad3016] .el-input__inner{text-align:left}

dist/static/css/chunk-commons.4411b51b.css

@@ -1 +1 @@
-.pagination-container[data-v-7e7c864b]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-7e7c864b]{display:none}.left-code .code-url{margin-top:10px;margin-bottom:10px}.left-code .code-url .link-btn{margin-top:0;margin-bottom:0;font-size:12px}.content-tooltip[data-v-a6001ff4]{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;max-width:100%;display:inline-block}
+.pagination-container[data-v-5d1dc94e]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5d1dc94e]{display:none}.left-code .code-url{margin-top:10px;margin-bottom:10px}.left-code .code-url .link-btn{margin-top:0;margin-bottom:0;font-size:12px}.content-tooltip[data-v-a6001ff4]{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;max-width:100%;display:inline-block}

dist/static/css/chunk-commons.f101b5cf.css

@@ -0,0 +1 @@
+.pagination-container[data-v-5d1dc94e]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5d1dc94e]{display:none}.left-code .code-url{margin-top:10px;margin-bottom:10px}.left-code .code-url .link-btn{margin-top:0;margin-bottom:0;font-size:12px}.content-tooltip[data-v-a6001ff4]{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;max-width:100%;display:inline-block}

dist/static/css/chunk-e26f0c40.ff1ca6ec.css

@@ -0,0 +1 @@
+.alert[data-v-0118353e]{margin:10px 0}.dialog-footer[data-v-290cb116]{margin-top:20px;display:block;text-align:right}.el-button--primary[data-v-7b09e296],.el-button--primary[data-v-7b09e296]:active,.el-button--primary[data-v-7b09e296]:focus,.el-button--primary[data-v-7b09e296]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-7b09e296] .el-date-editor.el-input,[data-v-7b09e296] .el-select{width:100%!important}[data-v-7b09e296] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}[data-v-7b09e296] .el-dialog__body{padding:10px 20px}.newBand[data-v-7b09e296]{display:inline-block}

dist/static/img/empty.70d4d9a3.svg

@@ -0,0 +1 @@
+<svg t="1609119920930" class="icon" viewBox="0 0 1706 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10437" width="256" height="256"><path d="M0 851.446623a853.285929 172.553377 0 1 0 1706.571857 0 853.285929 172.553377 0 1 0-1706.571857 0Z" fill="#ECEEF2" p-id="10438"></path><path d="M304.149029 857.135196a92.534118 92.534118 0 0 1-91.775642-92.913356L151.316038 301.361628a27.494769 27.494769 0 0 1 9.480955-21.426958L439.726682 6.883173a27.874007 27.874007 0 0 1 18.961909-6.826287h793.555914a27.30515 27.30515 0 0 1 18.961909 6.067811l277.602356 273.620354a34.131437 34.131437 0 0 1 9.670574 21.806196l-61.057349 462.670593a92.534118 92.534118 0 0 1-91.775642 92.913356z" fill="#E1E5EC" p-id="10439"></path><path d="M242.143585 764.22184a61.815825 61.815825 0 0 0 62.005444 62.005444h1099.790752a60.298872 60.298872 0 0 0 60.678111-61.057349l61.057348-452.241542H1076.467604l-2.844287 18.961909a223.371294 223.371294 0 0 1-66.177064 126.096699 217.87234 217.87234 0 0 1-150.178323 60.867729 221.285484 221.285484 0 0 1-216.924245-187.343666l-3.033906-18.961909H180.32776z" fill="#F4F5F7" p-id="10440"></path><path d="M202.133956 282.02048h447.121826a11.377146 11.377146 0 0 1 9.860193 11.187527 197.203859 197.203859 0 1 0 394.407718 0 10.618669 10.618669 0 0 1 10.049812-11.187527h442.570968L1251.675648 29.827084h-792.607818z" fill="#FFFFFF" p-id="10441"></path><path d="M1117.994186 338.147733l378.290095-0.568858-56.316872 405.974483-38.871914-0.948095 53.662204-371.08457-342.831325 1.327334z" fill="#FFFFFF" p-id="10442"></path></svg>

src/components/Pagination/index.vue

@@ -56,6 +56,10 @@ export default {
     sync: {
       type: Boolean,
       default: false
+    },
+    saveKey: {
+      type: String,
+      default: ''
     }
   },
   computed: {
@@ -86,7 +90,7 @@ export default {
   },
   mounted() {
     if (this.sync) {
-      const searchs = new Searchs(this.$route.path)
+      const searchs = new Searchs(this.saveKey || this.$route.path)
       const active = searchs.get()
       if (active && active.page) {
         for (const key in active.page) {
@@ -101,7 +105,7 @@ export default {
   methods: {
     syncStore() {
       if (this.sync) {
-        const searchs = new Searchs(this.$route.path)
+        const searchs = new Searchs(this.saveKey || this.$route.path)
         searchs.update(this._props, undefined, 'page')
       }
     },

src/components/Tooltip/index.vue

@@ -1,6 +1,6 @@
 <template>
   <el-tooltip effect="dark" placement="top">
-    <div slot="content" style="max-width: 200px; max-height: 250px; overflow-y: auto;">{{ content }}</div>
+    <div slot="content" style="max-width: 300px; max-height: 250px; min-height: 16px; overflow-y: auto">{{ content }}</div>
     <span class="content-tooltip">{{ content }}</span>
   </el-tooltip>
 </template>

src/components/copy-text/index.vue

@@ -22,13 +22,14 @@ export default {
   },
   computed: {
     textContent() {
-      return this.$slots.default || this.text
+      const slot = this.$slots.default || []
+      const text = slot[0]?.text || this.text
+      return text
     }
   },
   methods: {
     copyText() {
-      const slot = this.$slots.default || []
-      const text = slot[0]?.text || this.text
+      const text = this.textContent
       if (text) {
         copy(text)
         if (this.hint) {

src/components/overflow-text/index.vue

@@ -6,9 +6,9 @@
     :open-delay="300"
   >
     <template #content>
-      <span class="tooltip-content">{{text}}</span>
+      <span class="tooltip-content" :class="{split}">{{text}}</span>
     </template>
-    <div class="overflow-text" :style="{width}">
+    <div class="overflow-text" :class="{split}" :style="{width}">
       {{text}}
       </div>
   </el-tooltip>
@@ -24,6 +24,10 @@ export default {
     width: {
       type: String,
       default: '200px'
+    },
+    split: {
+      type: Boolean,
+      default: false
     }
   }
 }
@@ -40,4 +44,7 @@ export default {
     -webkit-line-clamp: 2;
     -webkit-box-orient: vertical;
   }
+  .split {
+    word-break: keep-all;
+  }
 </style>

src/components/save-form/index.vue

@@ -20,6 +20,7 @@ export default {
       searchs: null
     }
   },
+
   mounted() {
     this.setFormValue()
   },
@@ -46,6 +47,7 @@ export default {
       if (this.$listeners.submit) {
         this.$listeners.submit(evt)
       }
+
     },
     reset(evt) {
       evt.stopPropagation()
@@ -57,7 +59,7 @@ export default {
           this.resetFields()
           // this.setFormValue()
         })
-        console.log({...this.model})
+
       } else {
         this.resetFields()
       }

src/components/tab-router/index.vue

@@ -1,74 +1,84 @@
 <template>
-  <el-tabs :value="active" v-bind="{...$attrs}" v-on="{...$listeners, 'tab-click': tab}">
-    <slot/>
+  <el-tabs
+    :value="active"
+    v-bind="{ ...$attrs }"
+    v-on="{ ...$listeners, 'tab-click': tab }"
+  >
+    <slot />
   </el-tabs>
 </template>
 <script>
-import qs from 'qs'
+import qs from "qs";
+import merge from 'webpack-merge'
 export default {
-  name: 'tab-router',
+  name: "tab-router",
   props: {
     searchKey: {
       type: String,
-      default: 'tabrouter'
+      default: "tabrouter",
     },
     lazy: {
       type: Boolean,
-      defaule: true
+      defaule: true,
     },
     value: {
       type: String,
-      default: ''
-    }
+      default: "",
+    },
   },
   data() {
     return {
-      active: '',
+      active: "",
       panels: [],
-      panelsByName: {}
-    }
+      panelsByName: {},
+    };
   },
   methods: {
     getAllPanel() {
-      const data = {}
-      const routes = []
-      this.panels = this.$slots.default.filter(item => {
-        const isPanel = item.tag && item.tag.indexOf('ElTabPane') > -1
+      const data = {};
+      const routes = [];
+      this.panels = this.$slots.default.filter((item) => {
+        const isPanel = item.tag && item.tag.indexOf("ElTabPane") > -1;
         if (isPanel && item.child) {
-          data[item.child.name] = item.child
+          data[item.child.name] = item.child;
         }
-        return isPanel
-      })
-      const search = qs.parse(location.hash.split('?')[1])
+        return isPanel;
+      });
+      const search = qs.parse(location.hash.split("?")[1]);
       if (this.panels.length) {
         this.$nextTick(() => {
-          this.active= search[this.searchKey] || this.panels[0].child?.name
-        })
+          this.active = search[this.searchKey] || this.panels[0].child?.name;
+        });
       }
-      this.panelsByName = data
+      this.panelsByName = data;
     },
     tab(item, evt) {
-      const { query } = this.$route
+      let { query } = this.$route;
       const search = qs.stringify({
         ...query,
-        [this.searchKey]: item.name
-      })
-      this.active = item.name
-      history.replaceState(location.pathname, null, `#${this.$route.path}?${search}`)
-      const parentClick = this.$listeners['tab-click']
+        [this.searchKey]: item.name,
+      });
+      this.active = item.name;
+      this.$router.replace({
+        query: merge(this.$route.query, {
+            ...query,
+          [this.searchKey]: item.name,
+        }),
+      });
+      this.$store.dispatch("addVisitedViews",  this.$route);
+      const parentClick = this.$listeners["tab-click"];
       if (parentClick) {
-        parentClick(item, evt)
+        parentClick(item, evt);
       }
-    }
+    },
   },
   beforeUpdate() {
-    this.getAllPanel()
+    this.getAllPanel();
   },
   mounted() {
-    this.getAllPanel()
-  }
-}
+    this.getAllPanel();
+  },
+};
 </script>
 <style lang="less" scoped>
-
 </style>

src/main.js

@@ -1,6 +1,13 @@
 import Vue from 'vue'
 import ElementUI from 'element-ui'
 
+import dayjs from 'dayjs'
+import numeral from 'numeral'
+import lodash from 'lodash'
+import qs from 'qs'
+
+import * as constant from '@/constant'
+
 import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 import 'default-passive-events'
 import 'babel-polyfill'
@@ -104,6 +111,17 @@ Vue.mixin({
   computed: {
     selects() {
       return store.state.selects
+    },
+    $helpers() {
+      return {
+        dayjs,
+        numeral,
+        lodash,
+        qs,
+      }
+    },
+    $constant() {
+      return constant
     }
   },
   methods: {

src/router/notKeepAliveList.js

@@ -45,5 +45,37 @@ export default [
   '/insideSetting/editionList', // 版本控制
   '/insideSetting/adapayManager', // 汇仁账号管理
   '/insideSetting/adapayOperation', //
-  '/operateManager/stuRecodeManager'
+  '/operateManager/stuRecodeManager',// 学生考勤
+  '/operateManager/operateStudent', // 运营指标
+  '/operateManager/serverIndexList', // 服务指标
+  '/operateManager/settlementList', // 结转奖励
+  '/insideSetting/entryActivities', // 时间充值活动
+  '/insideSetting/entryOperation',
+  '/insideSetting/helpContent', // 帮助中心
+  '/insideSetting/helpCategory', // 帮助中心分类
+  '/shopManager/shopManager', // 商品管理
+  '/shopManager/shopOperation', // 商品详情
+  '/shopManager/purchaseLlist', // 进货清单
+  '/shopManager/shopCategory',
+  '/operateManager/operationalList', // 运营预警
+  '/operateManager/sporadicManager', //零星收费
+  '/operateManager/recodeList', // 老师考勤列表
+  '/operateManager/HumanResources', //人力资源表
+  '/operateManager/commentManager', // 评论管理
+  '/orderList/income', // 订单管理
+  '/orderList/backOrder', // 退费管理
+  '/orderList/expend', // 提现列表
+  '/orderList/salesList', // 销售列表
+  '/orderList/payRecord', // 支出记录
+  '/orderList/businessStatement', // 经营报表
+  '/business/buildVip', // 新建vip
+  '/orderList/businessStatement', // 经营报表
+  '/orderList/resetList', // 更换列表
+  '/orderList/incomeOut', // 对外订单管理
+  '/business/signupList', // 报名缴费
+  '/business/teamDetails', //进行中 查看
+  '/business/teamLookBase', // 筹备中 乐团信息
+  '/business/vipReset', // vip修改
+  '/business/vipDetail', // vip查看
+  '/contentManager/contentManager', // 内容管理
 ]

src/store/modules/selects.js

@@ -22,7 +22,13 @@ export default {
     teachers: [],
     schools: [],
     vipGroupCategory: [],
-    educations:[]
+    educations:[],
+    branchsLoading:false,
+    subjectsLoading:false,
+    teachersLoading:false,
+    schoolsLoading:false,
+    vipGroupCategoryLoading:false,
+    educationsLoading:false
   },
   mutations: {
     commit_branchs: (state, branchs) => {
@@ -53,54 +59,72 @@ export default {
   },
   actions: {
     async setBranchs ({ commit, state }, force) {
-      if (!state.branchs.length || force === true) {
+      if (!state.branchs.length || force === true || !state.branchsLoading) {
+        if(state.branchsLoading)return
         try {
+          state.branchsLoading = true
           const res = await getEmployeeOrgan()
           commit('commit_branchs', res.data)
         } catch (error) { }
+        state.branchsLoading = false
       }
     },
     async setSubjects ({ commit, state }, force) {
       if (!state.subjects.length || force === true) {
+        if(state.subjectsLoading)return
         try {
+          state.subjectsLoading = true
           const res = await getSubject({rows: 9999, tenantId: '1'})
           commit('commit_subjects', res.data)
         } catch (error) { }
+        state.subjectsLoading = false
       }
     },
     async setTeachers ({ commit, state }, force) {
       if (!state.teachers.length || force === true) {
-
+        if(state.teachersLoading)return
         try {
+          state.teachersLoading =true
           const res = await getTeacher()
           commit('commit_teachers', res.data)
         } catch (error) { }
+        state.teachersLoading = false
       }
     },
     async setSchools ({ commit, state }, force) {
       if (!state.schools.length || force === true) {
+        if(state.schoolsLoading)return
         try {
+          state.schoolsLoading = true
           const res = await getSchool()
           commit('commit_schools', res.data)
         } catch (error) { }
+        state.schoolsLoading = false
       }
     },
     async setVipGroupCategory ({ commit, state }, force) {
       if (!state.vipGroupCategory.length || force === true) {
+        if(state.vipGroupCategoryLoading)return
         try {
+          state.vipGroupCategoryLoading = true
           const res = await vipGroupCategory()
           commit('commit_vip_group_category', res.data)
         } catch (error) { }
+        state.vipGroupCategoryLoading = false
+
       }
     },
     async setEducations({commit,state},force){
-      if (!state.educations.length || force === true) {
+      if (!state.educations.length || force === true ) {
+        if(state.educationsLoading)return
         try {
-
+          state.educationsLoading = true
           const res = await findEducationUsers()
           commit('commit_educations', res.data)
-        } catch (error) { }
+        } catch (error) {  }
+        state.educationsLoading = false
       }
+
     }
   }
 }

src/store/modules/tagsView.js

@@ -82,7 +82,7 @@ const tagsView = {
     delOthersViews ({ commit, state }, view) {
       return new Promise((resolve) => {
         commit('DEL_OTHERS_VIEWS', view)
-        resolve([...state.visitedViews]) 
+        resolve([...state.visitedViews])
       })
     },
     delAllViews ({ commit, state }) {
@@ -94,4 +94,4 @@ const tagsView = {
   }
 }
 
-export default tagsView
+export default tagsView

src/utils/downLoadFile.js

@@ -54,6 +54,7 @@ export const Export = (that, params, message) => {
                     let objectUrl = URL.createObjectURL(blob);
                     let link = document.createElement("a");
                     let fname = params.fileName || "导出文件.xlsx"; //下载文件的名字
+                    console.log(params)
                     link.href = objectUrl;
                     link.setAttribute("download", fname);
                     document.body.appendChild(link);

src/views/accompaniment/index.vue

@@ -21,7 +21,7 @@
           </el-select>
         </el-form-item>
         <el-form-item prop="subjectId">
-          <el-select v-model="searchForm.subjectId" clearable placeholder="请选择声部">
+          <el-select v-model="searchForm.subjectId" clearable filterable placeholder="请选择声部">
             <el-option v-for="item in selects.subjects" :value="item.id" :label="item.name" :key="item.id"></el-option>
           </el-select>
         </el-form-item>
@@ -37,13 +37,26 @@
           align="center"
           prop="id"
           label="伴奏编号"
-        />
+        >
+                <template slot-scope="scope">
+              <div>
+                <copy-text>{{ scope.row.id }}</copy-text>
+              </div>
+            </template>
+        </el-table-column>
+        </el-table-column>
         <el-table-column
           align="center"
           prop="name"
           label="伴奏名称"
           width="180px"
-        />
+        >
+         <template slot-scope="scope">
+              <div>
+                <copy-text>{{ scope.row.name }}</copy-text>
+              </div>
+            </template>
+        </el-table-column>
         <el-table-column
           align="center"
           prop="type"