Merge branch 'mergeBranch' of http://124.70.211.186:3000/zhangqi/yos_web into mergeBranch

src/HDrpManagement/orderManage/details/importFile.vue

@@ -2,7 +2,7 @@
   <div>
     <!-- 按钮类型 -->
     <el-button v-if="tool.checkAuth($route.name,'importOrderMx')" type="success" size="small" @click="onShow(0)" icon="el-icon-upload">导 入</el-button>
-    <el-button v-if="tool.checkAuth($route.name,'importSpecialOrderMx')" type="success" size="small" @click="onShow(1)" icon="el-icon-upload">特殊订单导入</el-button>
+    <el-button v-if="tool.checkAuth($route.name,'importSpecialOrderMx') && ordertype=='特殊订单'" type="success" size="small" @click="onShow(1)" icon="el-icon-upload">特殊订单导入</el-button>
     <el-dialog title="文件上传" class="import-panel" :visible.sync="dialogUploadVisible" width="500px" append-to-body :close-on-click-modal="false" :show-close="false" @close="clearFiles">
       <div slot="title"></div>
       <div style="background:#f1f2f3" class="my-tabs" >
@@ -68,7 +68,7 @@ export default {
     accept:限制上传文件类型;
     bindData:附件上传成功后对应需要绑定的数据信息
   */
-  props:['btntype','accept','bindData','errorUrl'],
+  props:['ordertype','btntype','accept','bindData','errorUrl'],
   data () {
     return {
       dialogUploadVisible: false,

src/HDrpManagement/orderManage/details/index.vue

@@ -54,7 +54,7 @@
       <div slot="slot0">
         <product-list @select="select" @onSuccess="queryMainData()" :data="mainData" ref="prod">
           <div slot="operation">
-            <importFile class="inline-16" :bindData="{ownertable:'sa_order',ownerid:$route.query.id,usetype:'default'}" :errorUrl="errorUrl" @clearUrl="errorUrl = null" @onSuccess="bindImportOrder"></importFile>
+            <importFile class="inline-16" :bindData="{ownertable:'sa_order',ownerid:$route.query.id,usetype:'default'}" :ordertype="mainData.type" :errorUrl="errorUrl" @clearUrl="errorUrl = null" @onSuccess="bindImportOrder"></importFile>
             <changeOrderMx v-if="mainData.status === '审核'" :tableData="selection" class="inline-16" :data="mainData" @onSuccess="$refs['prod'].listData();queryMainData"></changeOrderMx>
             <el-button :disabled="mainData.status !== '审核' || selection.length === 0"  size="small" type="primary" style="margin-bottom:12px" @click="adddispatch">一键发货</el-button>
           </div>
@@ -478,7 +478,6 @@ export default {
         }
       })
       this.tool.showMessage(res,()=>{
-
         let route = this.$route
 
         this.oldRoute = {path:route.path,query:route.query}

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -408,11 +408,6 @@ export default {
       this.tableData = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
-      setTimeout(() => {
-         this.$nextTick(() => {
-          this.$refs.multipleTable.doLayout()
-        });
-      }, 300);
       this.queryBasicInfo()
     },
     handleSizeChange(val) {

src/components/normal-basic-layout/modules/table.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="bs-table">
     <el-table border stripe ref="tables" :row-class-name="tableClassName" :header-cell-style="{background:'#fafafafa',height:'40px','color':'#000000'}" highlight-current-row :data="data" size="mini" @row-click="rowClick" height="calc(100vh - 330px)" style="width:100%;" @selection-change="handleSelectionChange" >
       <!-- <div slot="empty">
         <el-empty :image="require('../../../assets/empty.svg')" :image-size="250">
@@ -101,6 +101,9 @@ export default {
 
 </script>
 <style>
+.bs-table .el-table__header-wrapper {
+  overflow: visible !important;
+}
 </style>
 <style scoped>
 .search-icon:hover{

src/style/style.css

@@ -229,6 +229,3 @@ ul{
   text-decoration: underline;
   cursor: pointer;
 }
-.el-table__header-wrapper {
-  overflow: visible !important;
-}