暂存

src/HDrpManagement/contractManage/modules/detail.vue

@@ -195,9 +195,9 @@ export default {
             "ownerid":this.$route.query.id
           }
         })
-        if (this.mainData.leader.length !== 0){
+        console.log(this.mainData.leader,'leader')
+        if (this.mainData.leader && this.mainData.leader.length > 0){
           if (JSON.parse(window.sessionStorage.getItem('active_account')).userid === this.mainData.leader[0].userid){
-            /*是负责人*/
             this.isLeader = true
           }else {
             let flag = 0
@@ -213,15 +213,9 @@ export default {
                 }
               }
             }
-            /*不是负责人*/
             flag === 0?this.isLeader = false:this.isLeader = true
           }
         }
-               /*if (Object.keys(JSON.parse(window.sessionStorage.getItem('userInfo'))).length > 0) {
-        this.isLeader = val.leader ? JSON.parse(window.sessionStorage.getItem('active_account')).userid == val.leader[0].userid : false
-        } else {
-          this.isLeader = true
-        }*/
 
       },
       deep:true,
@@ -241,7 +235,8 @@ export default {
         }
       })
       this.mainData = res.data
-      this.$refs.details.param.content.type = this.$route.query.tabIndex
+      console.log(this.$refs.details.param.content,'param')
+      // this.$refs.details.param.content.type = this.$route.query.tabIndex
       // this.$refs.details.param.content.where.type = this.$route.query.type
       this.mainData.type == '项目' 
         ? this.mainData.typemx == '直销' 

src/HDrpManagement/orderManage/details/importFile.vue

@@ -1,7 +1,8 @@
 <template>
   <div>
     <!-- 按钮类型 -->
-    <el-button type="success" size="small" @click="dialogUploadVisible = true" icon="el-icon-upload">导 入</el-button>
+    <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-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" >
@@ -86,15 +87,20 @@ export default {
       activeName:'last',
       modelurl:'',
       campaignid:'',
-      folderid:JSON.parse(sessionStorage.getItem('folderid')).appfolderid
-
+      folderid:JSON.parse(sessionStorage.getItem('folderid')).appfolderid,
+      orderType:0
     }
   },
   mounted () {
-    this.getModelUrl()
+   
     // this.listData()
   },
   methods: {
+    onShow (type) {
+      this.orderType = type
+      this.dialogUploadVisible = true
+       this.getModelUrl()
+    },
     cancel () {
       this.dialogUploadVisible = false
       this.campaignid = ''
@@ -115,7 +121,7 @@ export default {
     // 获取导入模板
     async getModelUrl () {
       const res = await this.$api.requested({
-       "id": 20230227194703,
+       "id":this.orderType == 1?20230308155703: 20230227194703,
         "content": {
         }
       })

src/HDrpManagement/orderManage/details/index.vue

@@ -55,7 +55,7 @@
       <div slot="slot0">
         <product-list @select="select" @onSuccess="queryMainData()" :data="mainData" ref="prod">
           <div slot="operation">
-            <importFile v-if="tool.checkAuth($route.name,'importOrderMx')" 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'}" :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>
@@ -490,9 +490,8 @@ export default {
       })
     },
     async bindImportOrder (id) {
-      console.log(id)
       const res = await this.$api.requested({
-        "id": 20230227194803,
+        "id": this.mainData.type =='特殊订单'?20230308155803:20230227194803,
         "content": {
         "sa_orderid":this.$route.query.id,
         "attachmentid":id

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

@@ -64,6 +64,13 @@ export default {
       loading:'loading'
     })
   },
+  watch:{
+    tableName () {
+      this.$nextTick(() => {
+        this.$refs.tables.doLayout()
+      });
+    }
+  },
   methods:{
     rowClick (row) {
       this.$emit('rowClick',row)

src/style/style.css

@@ -228,4 +228,7 @@ ul{
   color:#3874F6;
   text-decoration: underline;
   cursor: pointer;
+}
+.el-table__header-wrapper {
+  overflow: visible !important;
 }