已签订单导出修复

src/option/warehouse/distributionStockArticle.js

@@ -81,7 +81,19 @@ export const columnList = [
       sortable: true,
       head: false,
     },
-    {
+
+      {
+        prop: 'consigneeUnit',
+        label: '收货单位',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
         prop: 'consigneePerson',
         label: '运单收货人',
         type: 2,
@@ -93,9 +105,9 @@ export const columnList = [
         head: false,
       },
       {
-        prop: 'consigneeUnit',
+        prop: 'totalNumber',
-        label: '收货单位',
+        label: '订单总数',
-        type: 2,
+        type: 1,
         values: '',
         width: '150',
         checkarr: [],
@@ -103,7 +115,62 @@ export const columnList = [
         sortable: true,
         head: false,
       },
+      {
+        prop: 'handQuantity',
+        label: '在库数量',
+        type: 1,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      // {
+      //   prop: 'reservationNumber',
+      //   label: '预约数量',
+      //   type: 1,
+      //   values: '',
+      //   width: '150',
+      //   checkarr: [],
+      //   fixed: false,
+      //   sortable: true,
+      //   head: false,
+      // },
 
+      {
+        prop: 'stockUpNumber',
+        label: '备货数量',
+        type: 1,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'deliveryNumber',
+        label: '出库数量',
+        type: 1,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'signForNumber',
+        label: '签收数量',
+        type: 1,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
       // {
       //   prop: 'deliveryListInfo',
       //   label: '配送信息',
@@ -248,72 +315,7 @@ export const columnList = [
         head: false,
       },
 
-      {
+
-        prop: 'deliveryNumber',
-        label: '出库数量',
-        type: 1,
-        values: '',
-        width: '150',
-        checkarr: [],
-        fixed: false,
-        sortable: true,
-        head: false,
-      },
-      {
-        prop: 'handQuantity',
-        label: '在库数量',
-        type: 1,
-        values: '',
-        width: '150',
-        checkarr: [],
-        fixed: false,
-        sortable: true,
-        head: false,
-      },
-      // {
-      //   prop: 'reservationNumber',
-      //   label: '预约数量',
-      //   type: 1,
-      //   values: '',
-      //   width: '150',
-      //   checkarr: [],
-      //   fixed: false,
-      //   sortable: true,
-      //   head: false,
-      // },
-      {
-        prop: 'signForNumber',
-        label: '签收数量',
-        type: 1,
-        values: '',
-        width: '150',
-        checkarr: [],
-        fixed: false,
-        sortable: true,
-        head: false,
-      },
-      {
-        prop: 'stockUpNumber',
-        label: '备货数量',
-        type: 1,
-        values: '',
-        width: '150',
-        checkarr: [],
-        fixed: false,
-        sortable: true,
-        head: false,
-      },
-      {
-        prop: 'totalNumber',
-        label: '总数量',
-        type: 1,
-        values: '',
-        width: '150',
-        checkarr: [],
-        fixed: false,
-        sortable: true,
-        head: false,
-      },
 
       {
         prop: 'createTime',

src/views/aftersales/aftersalesWorkOrderAdd.vue

@@ -720,6 +720,7 @@
   </el-dialog>
 </template>
 <script>
+// 缓存要引入当前页面地址
 export default {
   name: '/aftersales/aftersalesWorkOrderAdd',
 };

src/views/warehouse/warehousesignedorder/distributionStockArticle.vue

@@ -389,7 +389,7 @@ const searchHide = () => {
 // 导出
 
 const exportExcel = () => {
-  if (!Object.values(queryCarn.value).length || Object.values(details.query).length) {
+  if (!Object.values(queryCarn.value).length && !Object.values(details.query).length) {
     ElMessage({
       message: '请输入查询条件',
       type: 'warning',
@@ -402,6 +402,7 @@ const exportExcel = () => {
     type: 'warning',
   })
     .then(() => {
+      details.loadingObj.list = true;
       let data = {
         current: details.page.currentPage,
         size: details.page.pageSize,
@@ -409,6 +410,7 @@ const exportExcel = () => {
         ...queryCarn.value,
       };
       $_signforDistributionStockArticleList(data).then(res => {
+        details.loadingObj.list = false;
         downloadXls(res.data, `已签订单.xlsx`);
         ElMessage({
           message: '导出成功',