lilei 6 hónapja
szülő
commit
1f21d7757e

+ 0 - 1
src/views/salesManagement/salesQueryNew/comps/activeStatisticsList.vue

@@ -117,7 +117,6 @@ export default {
       // 单元格样式
       cellStyleOption: {
         headerCellClass: ({ column, rowIndex }) => {
-          console.log(column)
           if (column.key >= 4 && column.key <= 6) {
             return 'table-header-cell-blue'
           }

+ 8 - 3
src/views/salesManagement/salesQueryNew/discountSortModal.vue

@@ -58,12 +58,13 @@ export default {
     return {
       opened: this.show,
       spinning: false,
-      confirmLoading: false
+      confirmLoading: false,
+      list: []
     }
   },
   computed: {
     activeSortList () {
-      return this.activeList.sort((a, b) => {
+      return this.list.sort((a, b) => {
         return a.sort - b.sort
       })
     }
@@ -88,10 +89,11 @@ export default {
     },
     // 排序
     sortRow (item, rowIndex, type) {
-      const temp = this.activeList[type == 1 ? rowIndex - 1 : rowIndex + 1]
+      const temp = this.list[type == 1 ? rowIndex - 1 : rowIndex + 1]
       const tempSort = temp.sort
       temp.sort = item.sort
       item.sort = tempSort
+      this.list.splice()
     },
     // 取消
     cancel () {
@@ -103,6 +105,9 @@ export default {
   watch: {
     show (newValue, oldValue) {
       this.opened = newValue
+      if (newValue) {
+        this.list = this.activeList
+      }
     }
   }
 }

+ 3 - 1
src/views/salesManagement/salesQueryNew/edit.vue

@@ -172,6 +172,7 @@ import activeStatisticsList from './comps/activeStatisticsList.vue'
 import chooseProduct from './comps/chooseProduct.vue'
 import newPromoModal from './newPromoModal.vue'
 import discountSortModal from './discountSortModal.vue'
+import vaildPriceModal from './vaildPriceModal.vue'
 import { salesChangePromo } from '@/api/salesDetailNew'
 import {
   salesDetailBySn,
@@ -192,7 +193,8 @@ export default {
     productNormalList,
     newPromoModal,
     activeStatisticsList,
-    discountSortModal
+    discountSortModal,
+    vaildPriceModal
   },
   data () {
     return {