1233

front/src/renderer/src/views/dingdan.vue

@@ -91,7 +91,7 @@
 </template>
 
 <script>
-import _, { range } from 'lodash'
+import _ from 'lodash'
 import tableHeaderLocal from '../assets/json/dingdan.json'
 import dayjs from 'dayjs'
 import dingdantablecomponent from "../components/dingdantablecomponent.vue"
@@ -477,6 +477,7 @@ export default {
     },
     //处理销售订单的导出数据
     dealexportxiaoshou(list) {
+      let listCopy = _.sortBy(_.cloneDeep(list), "shunxu")
       let isNotSaleGroupy = _.filter(list, o => o.isNotSale)
       let lowcaigoujia = _.filter(list, o => o.xiaoshoujine < o.zuigaocaigoujia)
       let duogechanpin = _.filter(list, o => o.pinmingxuanxiang.length > 1)
@@ -493,8 +494,8 @@ export default {
         .then(async () => {
           let lilstLocal = []
           let allMoney = 0
-          for (let i = 0; i < list.length; i++) {
+          for (let i = 0; i < listCopy.length; i++) {
-            let item = list[i];
+            let item = listCopy[i];
             let listItem = {}
             allMoney += item.xiaoshoujine
             for (let j = 0; j < this.exportxiaoshou.length; j++) {
@@ -522,6 +523,7 @@ export default {
     },
     //导出S6
     dealexportS6(list) {
+      let listCopy = _.sortBy(_.cloneDeep(list), "shunxu")
       let isNotSaleGroupy = _.filter(list, o => o.isNotSale)
       let lowcaigoujia = _.filter(list, o => o.xiaoshoujine < o.zuigaocaigoujia)
       let duogechanpin = _.filter(list, o => o.pinmingxuanxiang.length > 1)
@@ -566,8 +568,8 @@ export default {
             "预计开票日": "",
             "预订货编号": "",
           }
-          for (let i = 0; i < list.length; i++) {
+          for (let i = 0; i < listCopy.length; i++) {
-            let item = list[i];
+            let item = listCopy[i];
             let listItem = {}
             allMoney += item.danjudanweishuliang
             for (let j = 0; j < this.exportS6.length; j++) {