Почетна Преглед Помоћ
Пријавите се
zhangqi
/
yos_meida
1
0
Креирај огранак 0
Датотеке Дискусије 0 Захтеви за спајање 0 Вики
Преглед изворни кода

2022-9-29

codeMan пре 2 година
родитељ
957efa060c
комит
bcbf0b2ad8
4 измењених фајлова са 11 додато и 10 уклоњено
Подељен поглед Покажи статистику Diff
  1. 1 0
      src/HManagement/clueManage/clue_import/modules/importClue.vue
  2. 1 1
      src/HManagement/roleManage/index.vue
  3. 8 8
      src/components/import/importFile.vue
  4. 1 1
      yos/index.html

+ 1 - 0
src/HManagement/clueManage/clue_import/modules/importClue.vue
Прегледај датотеку 

@@ -44,6 +44,7 @@ export default {
 
       
       if (res.msg !== '成功') {
 
         this.errorurl = res.msg
 
+        window.open(res.msg,'_self')
 
       } else {
 
         this.errorurl = null
 
       }

+ 1 - 1
src/HManagement/roleManage/index.vue
Прегледај датотеку 

@@ -1,6 +1,6 @@
 
 <template>
 
   <div>
 
-    <add class="container normal-panel" style="margin-bottom:16px"></add>
 
+    <add class="container normal-panel" style="margin-bottom:16px" v-if="tool.checkAuth($route.name,'insert')"></add>
 
     <div class="container normal-panel">
 
       <list ref="list">
 
         <template v-slot:detail="scope">

+ 8 - 8
src/components/import/importFile.vue
Прегледај датотеку 

@@ -7,11 +7,11 @@
 
       <div slot="title"></div>
 
       <div style="background:#f1f2f3" class="my-tabs">
 
         <el-tabs v-model="activeName" type="card">
 
-          <!--标准模板-->
 
-          <el-tab-pane label="Excel标准模板" name="first">
 
+          <el-tab-pane label="Excel专用模板" name="first">
 
+          <!--专用模板-->
 
             <div style="padding:20px;background:#ffffff">
 
               <el-upload style="width:100%" ref="my-upload" class="upload-demo normal-margin" :accept="accept"
 
-                action="#" :auto-upload="false" :show-file-list="false" :on-change="handleChange" drag multiple>
 
+                action="#" :auto-upload="false" :show-file-list="false" :on-change="handleChange2" drag multiple>
 
                 <i class="el-icon-upload"></i>
 
                 <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
 
               </el-upload>
 
@@ -35,7 +35,7 @@
 
                 </div>
 
               </div>
 
               <slot name="errorFile"></slot>
 
-              <p class="tips">• 请下载并使用<a :href="modelurl">《Excel标准模板》</a></p>
 
+              <p class="tips">• 请下载并使用快手与抖音模板<a :href="modelurl2">《Excel专用模板》</a></p>
 
               <p class="tips">• 文件中数据不能超过5000行</p>
 
               <div class="dialog-footer">
 
                 <el-button size="small" @click="dialogUploadVisible = false" class="normal-btn-width">取 消</el-button>
 
@@ -44,11 +44,11 @@
 
               </div>
 
             </div>
 
           </el-tab-pane>
 
-          <el-tab-pane label="Excel专用模板" name="last">
 
-          <!--专用模板-->
 
+          <!--标准模板-->
 
+          <el-tab-pane label="Excel标准模板" name="last">
 
             <div style="padding:20px;background:#ffffff">
 
               <el-upload style="width:100%" ref="my-upload" class="upload-demo normal-margin" :accept="accept"
 
-                action="#" :auto-upload="false" :show-file-list="false" :on-change="handleChange2" drag multiple>
 
+                action="#" :auto-upload="false" :show-file-list="false" :on-change="handleChange" drag multiple>
 
                 <i class="el-icon-upload"></i>
 
                 <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
 
               </el-upload>
 
@@ -72,7 +72,7 @@
 
                 </div>
 
               </div>
 
               <slot name="errorFile"></slot>
 
-              <p class="tips">• 请下载并使用快手与抖音模板<a :href="modelurl2">《Excel专用模板》</a></p>
 
+              <p class="tips">• 请下载并使用<a :href="modelurl">《Excel标准模板》</a></p>
 
               <p class="tips">• 文件中数据不能超过5000行</p>
 
               <div class="dialog-footer">
 
                 <el-button size="small" @click="dialogUploadVisible = false" class="normal-btn-width">取 消</el-button>

+ 1 - 1
yos/index.html
Прегледај датотеку 

@@ -1 +1 @@
 
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>美大营销管理平台</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.c99df0e8.js"></script><link href="css/app.e05006d8.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.25c4112b.js" nomodule></script><script defer="defer" src="js/app-legacy.4b37ac0e.js" nomodule></script></head><body><noscript><strong>We're sorry but 美大营销管理平台 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
 
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>美大营销管理平台</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.9c2ca1a9.js"></script><link href="css/app.e05006d8.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.25c4112b.js" nomodule></script><script defer="defer" src="js/app-legacy.c2e0a533.js" nomodule></script></head><body><noscript><strong>We're sorry but 美大营销管理平台 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>