暂存

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'}" :ordertype="mainData.type" :errorUrl="errorUrl" @clearUrl="errorUrl = null" @onSuccess="bindImportOrder"></importFile>
+            <importFile ref="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>
@@ -489,7 +489,7 @@ export default {
     },
     async bindImportOrder (id) {
       const res = await this.$api.requested({
-        "id": this.mainData.type =='特殊订单'?20230308155803:20230227194803,
+        "id": this.$refs.importFile.orderType == 1?20230308155803:20230227194803,
         "content": {
         "sa_orderid":this.$route.query.id,
         "attachmentid":id

src/SDrpManagement/ProductGroup/modules/Select.vue

@@ -55,7 +55,7 @@ export default {
         "content": {
             "pageNumber": 1,
             "pageSize": 20,
-            "sys_enterpriseid":this.sys_enterpriseid(),
+            // "sys_enterpriseid":this.sys_enterpriseid(),
             "where": {
               "condition": ""
             }
@@ -76,7 +76,7 @@ export default {
           "id": "20220924163702",
           "content": {
             "pageSize":1000,
-            "sys_enterpriseid":this.sys_enterpriseid(),
+            // "sys_enterpriseid":this.sys_enterpriseid(),
             "where":{
               "condition":""
             }
@@ -97,7 +97,11 @@ export default {
 
     async queryClass () {
       const res = await this.$api.requested({
-        "id":"20220922110403","content":{"sa_brandid":this.brand_act,"sys_enterpriseid":this.sys_enterpriseid(),where:{istool:0}}
+        "id":"20220922110403","content":{
+          "sa_brandid":this.brand_act,
+          // "sys_enterpriseid":this.sys_enterpriseid(),
+           where:{istool:0}
+          }
       })
       console.log(res.data,'pop')
       this.itemclass = res.data[0].ttemclass

src/components/normal-basic-layout/details/index.vue

@@ -136,7 +136,7 @@ export default {
     },
     ...mapGetters({
       activeApp:"activeApp",
-      listData:'listData'
+      svlistData:'svlistData'
     })
   },
   components:{
@@ -188,13 +188,14 @@ export default {
     next () {
       let nowId = this.$route.query.id
       let changeId = ''
-      if ((this.idx + 1) == this.listData.length) return this.$message({
+      console.log( this.svlistData.listData)
+      if ((this.idx + 1) == this.svlistData.listData.length) return this.$message({
         message:"已经是当前页最后一条了!",
         type:'warning'
       })
-      this.listData.forEach((e,index)=>{
+      this.svlistData.listData.forEach((e,index)=>{
         if (e[this.idname] == nowId) {
-          changeId = this.listData[index + 1][this.idname]
+          changeId = this.svlistData.listData[index + 1][this.idname]
           this.idx = index + 1
         }
       })
@@ -209,9 +210,9 @@ export default {
         message:"当前是第一条",
         type:'warning'
       })
-      this.listData.forEach((e,index)=>{
+      this.svlistData.listData.forEach((e,index)=>{
         if (e[this.idname] == nowId) {
-          changeId = this.listData[index - 1][this.idname]
+          changeId = this.svlistData.listData[index - 1][this.idname]
           this.idx = index - 1
         }
       })

src/components/normal-basic-layout/index.vue

@@ -161,7 +161,7 @@ export default {
       this.$emit('listData',this.list)
 
       // 保存一下列表数据用于翻页
-      this.$store.dispatch('saveListData',this.list)
+      this.$store.dispatch('saveListData',{listData:this.list,param:this.param})
     },
     selectChange () {
       this.param.content.pageNumber = 1

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

@@ -1,6 +1,6 @@
 <template>
-  <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 class="bs-table" style="height:calc(100vh - 330px)">
+    <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="100%" style="width:100%;" @selection-change="handleSelectionChange" >
       <!-- <div slot="empty">
         <el-empty :image="require('../../../assets/empty.svg')" :image-size="250">
         </el-empty>
@@ -101,9 +101,10 @@ export default {
 
 </script>
 <style>
-.bs-table .el-table__header-wrapper {
-  overflow: visible !important;
-}
+/* .bs-table .el-table {
+  display: flex;
+  flex-direction: column;
+} */
 </style>
 <style scoped>
 .search-icon:hover{

src/store/index.js

@@ -28,7 +28,7 @@ export default new Vuex.Store({
     DrawerShow:false,
     historyRouter:null,
     pageCache:[],
-    listData:[]
+    svlistData:[]
   },
   getters: {
     siteinfo:state => state.siteinfo,
@@ -50,7 +50,7 @@ export default new Vuex.Store({
     historyRouter:state => state.historyRouter,
     isRouterAlive:state => state.isRouterAlive,
     pageCache: state => state.pageCache,
-    listData:state => state.listData,
+    svlistData:state => state.svlistData,
     
   },
   mutations: {
@@ -122,7 +122,7 @@ export default new Vuex.Store({
       state.pageCache = res
     },
     saveListData (state,data) {
-      state.listData = data
+      state.svlistData = data
     }
   },
   actions: {