客户导入

src/components/common/searchHeader.vue

@@ -6,6 +6,7 @@
     <el-col :span="18" class="header-search">
       <el-form ref="form" :model="search" size="mini" label-width="0">
         <div class="pull-right search-form">
+          <slot name="pre"></slot>
           <el-form-item v-if="searchKey">
             <el-input size="small" v-model="search['ClientSearch[keyword]']" placeholder="关键词">
               <el-button slot="append" type="primary" @click.stop.prevent="searchKeyword">搜索</el-button>

src/components/setting_list/import-history/import_history_list.vue

@@ -7,6 +7,11 @@
         :add-title="'客户导入'"
         @update:headerAdd="() => add()"
         @update:headerClear="() => searchClear()">
+        <el-form-item slot="pre">
+          <el-button type="primary" size="mini" @click.stop.prevent="downLoad">
+            <i class="fa fa-download"></i><a href="/setting/download-templete">下载导入模版</a>
+          </el-button>
+        </el-form-item>
       </search-header>
       <div class="page-body-content">
         <el-alert title="" type="info">
@@ -20,7 +25,7 @@
           </el-table-column>
           <el-table-column prop="description" align="center" label="导入信息">
             <template slot-scope="scope">
-              <a @click="showTip(scope.row)"><i class="fa fa-fw fa-file"></i></a>
+              <a v-if="scope.row.status !== 3" @click="showTip(scope.row)"><i class="fa fa-fw fa-file"></i></a>
             </template>
           </el-table-column>
           <el-table-column prop="status_display" align="center" label="状态">
@@ -61,12 +66,15 @@
       </div>
     </div>
     <FormModal ref="formModal"></FormModal>
+    <TipModal ref="tipModal">
+    </TipModal>
   </section>
 </template>
 <script>
 import SearchHeader from '../../common/searchHeader'
 import BreadCrumb from '../BreadCrumb'
 import FormModal from './modal'
+import TipModal from './tipModal.vue'
 import Pagenation from '../pagenation'
 import {
   requestAPI,
@@ -79,7 +87,8 @@ export default {
     SearchHeader,
     BreadCrumb,
     Pagenation,
-    FormModal
+    FormModal,
+    TipModal
   },
 
   data () {
@@ -126,7 +135,7 @@ export default {
     },
 
     showTip (model) {
-      // this.$refs.
+      this.$refs.tipModal.show(model)
     },
 
     // 6.1新增
@@ -173,4 +182,8 @@ export default {
 }
 </script>
 <style scoped>
+a {
+  cursor: pointer;
+  color: white;
+}
 </style>

src/components/setting_list/import-history/tipModal.vue

@@ -2,7 +2,13 @@
   <section>
     <sidePopup ref="sidePopup" title="客户导入" :width="50" @update:close="() => btnClose()">
       <ul>
-        <li v-for="(index, item) in model.fail_description">
+        <li v-for="(value, key, index) in model.fail_description">
+          在第{{ key }}行
+          <ul>
+            <li v-for="sItem in value">
+              {{ sItem }}
+            </li>
+          </ul>
         </li>
       </ul>
     </sidePopup>
@@ -17,7 +23,7 @@ export default {
   data () {
     return {
       diaVis: false,
-      model: null
+      model: {}
     }
   },
 
@@ -28,13 +34,10 @@ export default {
     },
 
     handleClose () {
-      this.$refs.sidePopup.close(() => {
-        this.$refs.form._resetFields()
-      })
+      this.$refs.sidePopup.close()
     },
 
     btnClose () {
-      this.$refs.form._resetFields()
     }
   }
 }