87

81109740 · chenyishuai@singsingenglish.com · d534a245 · 81109740 · 81109740 · 81109740
Commit 81109740 authored Aug 08, 2019 by chenyishuai@singsingenglish.com
14 changed files
--- a/dev/index.html
+++ b/dev/index.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_x1rivf5f5.css><link rel=stylesheet href=https://lib.baomitu.com/element-ui/2.7.2/theme-chalk/index.css><title>唱唱启蒙-后台</title></head><body><script src=https://cdn.bootcss.com/vue/2.5.17/vue.js></script><script src=https://unpkg.com/vuex@3.0.1></script><script src=https://cdn.bootcss.com/axios/0.18.0/axios.min.js></script><script src=https://lib.baomitu.com/element-ui/2.7.2/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.8083cb5f1be14e9bb64b.js></script><script type=text/javascript src=/static/js/vendor.6a18832950b1e06cbd55.js></script><script type=text/javascript src=/static/js/app.607bd306fb9aee58c3c4.js></script></body><script>let el = document.getElementsByTagName("script");
+<!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_x1rivf5f5.css><link rel=stylesheet href=https://lib.baomitu.com/element-ui/2.7.2/theme-chalk/index.css><title>唱唱启蒙-后台</title></head><body><script src=https://cdn.bootcss.com/vue/2.5.17/vue.js></script><script src=https://unpkg.com/vuex@3.0.1></script><script src=https://cdn.bootcss.com/axios/0.18.0/axios.min.js></script><script src=https://lib.baomitu.com/element-ui/2.7.2/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.0e8d5cdd4f1ea040a8eb.js></script><script type=text/javascript src=/static/js/vendor.6a18832950b1e06cbd55.js></script><script type=text/javascript src=/static/js/app.05d6168e436b6d20fd43.js></script></body><script>let el = document.getElementsByTagName("script");
    el.onerror = function(a,b,c){
      console.log('error:',a,b,c);
    };

--- a/dev/static/js/18.af844b0409c30c723f44.js
+++ b/dev/static/js/18.af844b0409c30c723f44.js
--- a/dev/static/js/25.0b0158f0cbaf2802bec4.js
+++ b/dev/static/js/25.0b0158f0cbaf2802bec4.js
--- a/dev/static/js/33.993597a89feb122d2d55.js
+++ b/dev/static/js/33.993597a89feb122d2d55.js
--- a/dev/static/js/49.86e8fc80737bfdd18e14.js
+++ b/dev/static/js/49.86e8fc80737bfdd18e14.js
--- a/dev/static/js/app.05d6168e436b6d20fd43.js
+++ b/dev/static/js/app.05d6168e436b6d20fd43.js
--- a/dev/static/js/manifest.0e8d5cdd4f1ea040a8eb.js
+++ b/dev/static/js/manifest.0e8d5cdd4f1ea040a8eb.js
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,d,n){for(var r,t,o,i=0,u=[];i<f.length;i++)t=f[i],a[t]&&u.push(a[t][0]),a[t]=0;for(r in d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(c&&c(f,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var f={},a={72:0};function b(c){if(f[c])return f[c].exports;var a=f[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,b),a.l=!0,a.exports}b.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var f=new Promise(function(f,b){c=a[e]=[f,b]});c[2]=f;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+e+"."+{0:"5e21353f9e7f6b913588",1:"74eb00e6fb303e2d2759",2:"1f6a00a1c98fbf2db665",3:"c6779c9b3aa0c8780991",4:"71fc328e214e30832054",5:"6d1a9f7a2e30dd44d02d",6:"f1925ca55ec5c7d41887",7:"f0e8b03080b3b4ebf31c",8:"9f80bdcf1310ef1f4d40",9:"523f6b2142e0b1a59de8",10:"4af583c4dd796e3360f9",11:"aec2a9fb6041eb630d55",12:"2c72155b2154e8815c00",13:"af9f03f63888b915fd7f",14:"8cd0f3a8b31d5e64931e",15:"4bd927c46272193f9e72",16:"51a8748901c539c9d7f6",17:"c6ca0315d005d11917f2",18:"af844b0409c30c723f44",19:"2b43d74d0aa30e036698",20:"f42b11252eb62efb59cd",21:"574b6484dc28d94bef1f",22:"aeadcb935f4215bd1bd5",23:"080a8966b3305c3ae15b",24:"92cbc050ed71b534294b",25:"0b0158f0cbaf2802bec4",26:"d77cdbd1bc2f9789ae81",27:"62a380e3075bb9f61234",28:"24b6f10c46ca1efeb87a",29:"aba6b471e6c95a1907f4",30:"0bc70212b94eb5665fff",31:"135568f2f6466e39320c",32:"24c59027060f0ebec47f",33:"993597a89feb122d2d55",34:"6c63eb8d60c5be1dc2f3",35:"974841988630e681632c",36:"512280620f6044f06ebd",37:"40a0dd48806323a37f8b",38:"508b9a742a79cdae432c",39:"50ccfca6c1306cff512a",40:"7cde0e1c3d8e909777cc",41:"23e1be9d61c60e87d43b",42:"0e33d8489572470ad249",43:"a8d1fc3389fd795b2bce",44:"a5af5802ec28b6068e5b",45:"fe6e1551696349b29668",46:"12a517ba912b03aab935",47:"f0665b8c5b8f3af0c10f",48:"fb608a4f603e4a31cade",49:"86e8fc80737bfdd18e14",50:"7dd0676cbb72e6f2fd1a",51:"939577234b61aded2624",52:"b2ed992be8294772a938",53:"c3b179b20a856816890a",54:"212816b171eafd1488bc",55:"f9539545129dd1bad64b",56:"501b516cd393780837db",57:"aa460a73c9c018520800",58:"a08c9ad93f421380be9d",59:"4b383cfca408a639edd1",60:"9469909bde10400ad51e",61:"e058805f6e7edf48bd52",62:"95820125712b6f2ace7f",63:"b469807b5322df1168f0",64:"83207fa7cfec7327665c",65:"c1554131ce716a3b677c",66:"3b61402de44f86c4ef2a",67:"09ced7442ae82f25505e",68:"0456ffd7b429ae2463ac",69:"1478ab9bf52f6eef71d3"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return n.onerror=n.onload=t,d.appendChild(n),f},b.m=e,b.c=f,b.d=function(e,c,f){b.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},b.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(c,"a",c),c},b.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},b.p="/",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/App.vue
+++ b/src/App.vue
@@ -46,6 +46,7 @@ export default {
            j.router.meta.classManageUnlimited = !!find.classManageUnlimited;
            j.router.meta.classTakeUnlimited = !!find.classTakeUnlimited;
            j.router.meta.promoter = !!find.promoter;
+            j.router.meta.import = !!find.import;
            t.push(j);
            if (find.cover === "3-1") {
              routerTeacherDetail.meta = {};
@@ -119,7 +120,7 @@ body {
  cursor: pointer;
  user-select: none;
 }
-#app .el-main .menu-block{
+/* #app .el-main .menu-block{
  height: 170vh;
-}
+} */
 </style>
--- a/src/components/logistics/index.vue
+++ b/src/components/logistics/index.vue
@@ -44,7 +44,7 @@
        <el-button type="primary" plain @click="exportTable" v-if="$store.state.export">导出当前待发货</el-button>
        <el-button type="primary" plain @click="exportReceiveInfoTable">按期数导出收货信息</el-button>
      </el-form-item>
-      <el-form-item v-if="$store.state.export">
+      <el-form-item v-if="$store.state.import">
        <el-upload
          :show-file-list="false"
          :onSuccess="fileSuccess"

--- a/src/components/putForward/index.vue
+++ b/src/components/putForward/index.vue
@@ -26,7 +26,7 @@
            >
          </el-date-picker>
        </el-form-item>
-          <el-form-item label="">
+          <el-form-item label="" v-if="$store.state.import">
            <el-upload
              :show-file-list="false"
              :onSuccess="fileSuccess"
@@ -40,7 +40,7 @@
          <el-form-item label="">
            <el-button type="primary" @click="onSearch">查询</el-button>
            <el-button type="primary" @click="exportTable" v-if="$store.state.export">导出</el-button>
-            <el-button type="primary" v-if="!$store.state.readonly" @click="manualPutForward">手动提现</el-button>
+            <el-button type="primary" v-if="$store.state.export" @click="manualPutForward">手动提现</el-button>
          </el-form-item>
    </el-form>
    <el-tabs v-model="search.status" type="card" style="background: white;padding-top: 10px" @tab-click="onSearch">

--- a/src/components/system/role.vue
+++ b/src/components/system/role.vue
@@ -65,6 +65,7 @@
                  <el-checkbox v-model="data.classManageUnlimited" v-if="data.cover ==='2-3'|| data.cover=== '3-1'|| data.cover=== '3-2' ">添加观摩班(无限制)</el-checkbox>
                  <el-checkbox v-model="data.classTakeUnlimited" v-if="data.cover ==='2-3'|| data.cover=== '3-1'|| data.cover=== '3-2' ">添加带班班(无限制)</el-checkbox>
                  <el-checkbox v-model="data.distribution" v-if="data.cover ==='5-9'||data.cover ==='7-9'" @change="distribution" >批量分配</el-checkbox>
+                  <el-checkbox v-model="data.import" v-if="data.cover ==='6-3'||data.cover ==='5-3'||data.cover ==='5-9'" >导入</el-checkbox>
                  <el-checkbox v-model="data.export" v-if="exportMenuList.indexOf(data.cover) >-1" >导出</el-checkbox>
                  <el-checkbox v-model="data.readonly">只读</el-checkbox>
                  <el-checkbox v-model="data.delete">删除</el-checkbox>
@@ -136,6 +137,7 @@
                  j.delete = false;
                  if(this.exportMenuList.indexOf(j.cover)>-1)j.export = false;
                  if(j.cover==="5-9"||j.cover==="7-9" )j.distribution = false;
+                  if(j.cover==="6-3"||j.cover==="5-3"||j.cover==="5-9" )j.import = false;
                  if(j.name==='月课订单列表' || j.name==='日课订单列表' || j.name==="来源码管理"|| j.cover==="5-9" || j.cover==="2-3" || j.cover==="3-1"|| j.cover=== '3-2')j.refund = false;
                  if(j.cover==="2-3"||j.cover==="3-1"|| j.cover=== '3-2' ){
                    j.classManageUnlimited= false;
@@ -184,6 +186,7 @@
                  j.delete = false;
                  if(this.exportMenuList.indexOf(j.cover)>-1)j.export = false;
                  if(j.cover==="5-9"||j.cover==="7-9" )j.distribution = false;
+                  if(j.cover==="6-3"||j.cover==="5-3"||j.cover==="5-9" )j.import = false;
                  if(j.name==='月课订单列表' || j.name==='日课订单列表' || j.name==="来源码管理"|| j.cover==="5-9" || j.cover==="2-3" || j.cover==="3-1"|| j.cover=== '3-2')j.refund = false;
                  if(j.cover==="2-3"||j.cover==="3-1"|| j.cover=== '3-2' ){
                    j.classManageUnlimited= false;
@@ -220,6 +223,9 @@
                          x.classManageUnlimited = !!i.classManageUnlimited;
                          x.classTakeUnlimited = !!i.classTakeUnlimited;
                        }
+                        if(i.cover==="6-3"||i.cover==="5-3"||i.cover==="5-9" ){
+                          x.import = !!i.import;
+                        }
                        if(i.cover==="5-9"||i.cover==="7-9"){
                          x.distribution = !!i.distribution;
                        }
@@ -293,6 +299,9 @@
              if(i.export === false || i.export === true){
                json.export = i.export
              }
+              if(i.import === false || i.import === true){
+                json.import = i.import
+              }
              if(i.distribution === false || i.distribution === true){
                json.distribution = i.distribution
              }

--- a/src/components/yunji/index.vue
+++ b/src/components/yunji/index.vue
@@ -95,7 +95,7 @@
      <el-form-item >
        <el-button type="primary" @click="getList">搜索</el-button>
        <el-button type="primary" plain @click="exportTable(list)" v-if="$store.state.export">导出</el-button>
-        <el-button type="primary" plain @click="importDialog=true" v-if="$store.state.export">导入</el-button>
+        <el-button type="primary" plain @click="importDialog=true" v-if="$store.state.import">导入</el-button>
      </el-form-item>
      <el-form-item v-if="!$store.state.readonly">
        <el-button type="primary" plain @click="downLoad()">excel模板下载</el-button>
@@ -221,7 +221,6 @@
      </span>
    </el-dialog>
    <el-dialog title="导入" class="import" :visible.sync="importDialog" center width="600px">
-      <!-- <el-form-item> -->
        <div class='item'>
          <el-upload
            :show-file-list="false"
@@ -233,8 +232,6 @@
            <el-button type="primary" plain>500条以下</el-button>
          </el-upload>
        </div>
-      <!-- </el-form-item> -->
-      <!-- <el-form-item> -->
        <div class='item'>
          <el-upload
            :show-file-list="false"
@@ -246,7 +243,6 @@
            <el-button type="warn" plain>500条或以上</el-button>
          </el-upload>
        </div>
-      <!-- </el-form-item> -->
    </el-dialog>
    <el-dialog title="手动创建外部订单" :visible.sync="postOtherOrderDialog" center width="800px">
      <el-form ref="searchFrom" size="small"  :model="postOtherOrderData"  label-width="125px">

--- a/src/router/index.js
+++ b/src/router/index.js
@@ -94,6 +94,7 @@ router.beforeEach((to,from,next)=> {
  store.state.export =to.meta.export;
  store.state.distribution=to.meta.distribution;
  store.state.classManage=to.meta.classManage;
+  store.state.import=to.meta.import;
  store.dispatch('promoter',to.meta.promoter)
  store.dispatch('classManageUnlimited',to.meta.classManageUnlimited)
  store.dispatch('classTakeUnlimited',to.meta.classTakeUnlimited)

--- a/src/store/index.js
+++ b/src/store/index.js
@@ -17,6 +17,7 @@ export default new vuex.Store({
    classManage:false,
    classManageUnlimited:false,
    classTakeUnlimited:false,
+    import:false,
    promoter:false,
    mainLoad:true,
    menuList:[],