From 91f456460ed594520842bc9ffa58d0550f37e75a Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Thu, 13 Jun 2024 20:10:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E7=AD=BE=E8=AE=A2=E5=8D=95=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse/distributionStockArticle.js     | 142 +++++++++---------
 .../aftersales/aftersalesWorkOrderAdd.vue     |   1 +
 .../distributionStockArticle.vue              |   4 +-
 3 files changed, 76 insertions(+), 71 deletions(-)

diff --git a/src/option/warehouse/distributionStockArticle.js b/src/option/warehouse/distributionStockArticle.js
index 8c4b3a1d..d2a6aa6c 100644
--- a/src/option/warehouse/distributionStockArticle.js
+++ b/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',
-        label: '收货单位',
-        type: 2,
+        prop: 'totalNumber',
+        label: '订单总数',
+        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',
diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue
index 93d60207..f10c1495 100644
--- a/src/views/aftersales/aftersalesWorkOrderAdd.vue
+++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue
@@ -720,6 +720,7 @@
   </el-dialog>
 </template>
 <script>
+// 缓存要引入当前页面地址
 export default {
   name: '/aftersales/aftersalesWorkOrderAdd',
 };
diff --git a/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue b/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue
index c99d7e5c..4a76de3c 100644
--- a/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue
+++ b/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: '导出成功',