From a96fa2b584399ce4844b450c3c0eff25ccaf2ec4 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Tue, 26 Dec 2023 17:32:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=9C=A8=E5=BA=93=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=BA=93=E4=BD=8D=E6=98=BE=E7=A4=BA=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../delivery/distributionStockArticle.vue     | 24 ++++-----
 .../distributionStockArticleDiscuss.vue       | 52 ++++++++++++-------
 .../distributionStockArticleMarket.vue        | 52 ++++++++++++-------
 .../delivery/distributionStockArticleSelf.vue | 52 ++++++++++++-------
 4 files changed, 107 insertions(+), 73 deletions(-)

diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index f8b4d34c..9d2ec96f 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -101,9 +101,7 @@
               v-if="handler"
               >修改服务类型</el-button
             >
-            <el-button type="danger" icon="Download" @click="handleExport" plain
-              >导 出</el-button
-            >
+            <el-button type="danger" icon="Download" @click="handleExport" plain>导 出</el-button>
 
             <!--            <el-button type="danger"-->
             <!--                       icon="el-icon-delete"-->
@@ -605,6 +603,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'allocation',
+          label: '货位信息',
+          type: 13,
+          values: '',
+          width: '250',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'totalNumber',
           label: '订单总件数',
@@ -707,16 +715,6 @@ export default {
           fixed: false,
           sortable: true,
         },
-        {
-          prop: 'allocation',
-          label: '货位信息',
-          type: 13,
-          values: '',
-          width: '250',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
         {
           prop: 'resource',
           label: '订单来源',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
index 727a3fe6..63070828 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
@@ -114,16 +114,28 @@
           @selection="selectionChange"
         >
           <template #default="slotProps">
-            <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)"
-              >查看</el-text
-            >
-            <el-text
-              type="primary"
-              text
-              icon="el-icon-edit"
-              @click="handleCallDeliveryOwn(slotProps.scope)"
-              >修改客户信息</el-text
-            >
+            <template v-if="slotProps.scope.column.label === '货位信息'">
+              <el-tag
+                v-for="item in slotProps.scope.row.allocation
+                  ? slotProps.scope.row.allocation.split(',')
+                  : []"
+                :key="item"
+                >{{ item }}</el-tag
+              >
+            </template>
+
+            <template v-if="slotProps.scope.column.label === '操作'">
+              <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)"
+                >查看</el-text
+              >
+              <el-text
+                type="primary"
+                text
+                icon="el-icon-edit"
+                @click="handleCallDeliveryOwn(slotProps.scope)"
+                >修改客户信息</el-text
+              >
+            </template>
           </template>
         </tablecmt>
       </el-row>
@@ -507,6 +519,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'allocation',
+          label: '货位信息',
+          type: 6,
+          values: '',
+          width: '220',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'totalNumber',
           label: '订单总件数',
@@ -594,16 +616,6 @@ export default {
           fixed: false,
           sortable: true,
         },
-        {
-          prop: 'allocation',
-          label: '货位信息',
-          type: 1,
-          values: '',
-          width: '220',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
         {
           prop: 'resource',
           label: '订单来源',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
index 89abc7fa..c80b8493 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
@@ -142,16 +142,28 @@
           @selection="selectionChange"
         >
           <template #default="slotProps">
-            <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)"
-              >查看</el-text
-            >
-            <el-text
-              type="primary"
-              text
-              icon="el-icon-edit"
-              @click="handleCallDeliveryOwn(slotProps.scope)"
-              >修改客户信息</el-text
-            >
+            <template v-if="slotProps.scope.column.label === '货位信息'">
+              <el-tag
+                v-for="item in slotProps.scope.row.allocation
+                  ? slotProps.scope.row.allocation.split(',')
+                  : []"
+                :key="item"
+                >{{ item }}</el-tag
+              >
+            </template>
+
+            <template v-if="slotProps.scope.column.label === '操作'">
+              <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)"
+                >查看</el-text
+              >
+              <el-text
+                type="primary"
+                text
+                icon="el-icon-edit"
+                @click="handleCallDeliveryOwn(slotProps.scope)"
+                >修改客户信息</el-text
+              >
+            </template>
           </template>
         </tablecmt>
       </el-row>
@@ -544,6 +556,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'allocation',
+          label: '货位信息',
+          type: 6,
+          values: '',
+          width: '140',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'handQuantity',
           label: '在库件数',
@@ -620,16 +642,6 @@ export default {
           fixed: false,
           sortable: true,
         },
-        {
-          prop: 'allocation',
-          label: '货位信息',
-          type: 1,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
         {
           prop: 'resource',
           label: '订单来源',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
index 9d0033cd..45f6125e 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
@@ -121,16 +121,28 @@
           @selection="selectionChange"
         >
           <template #default="slotProps">
-            <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)"
-              >查看</el-text
-            >
-            <el-text
-              type="primary"
-              text
-              icon="el-icon-edit"
-              @click="handleCallDeliveryOwn(slotProps.scope)"
-              >修改客户信息</el-text
-            >
+            <template v-if="slotProps.scope.column.label === '货位信息'">
+              <el-tag
+                v-for="item in slotProps.scope.row.allocation
+                  ? slotProps.scope.row.allocation.split(',')
+                  : []"
+                :key="item"
+                >{{ item }}</el-tag
+              >
+            </template>
+
+            <template v-if="slotProps.scope.column.label === '操作'">
+              <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)"
+                >查看</el-text
+              >
+              <el-text
+                type="primary"
+                text
+                icon="el-icon-edit"
+                @click="handleCallDeliveryOwn(slotProps.scope)"
+                >修改客户信息</el-text
+              >
+            </template>
           </template>
         </tablecmt>
       </el-row>
@@ -663,6 +675,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'allocation',
+          label: '货位信息',
+          type: 6,
+          values: '',
+          width: '140',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'handQuantity',
           label: '在库件数',
@@ -739,16 +761,6 @@ export default {
           fixed: false,
           sortable: true,
         },
-        {
-          prop: 'allocation',
-          label: '货位信息',
-          type: 1,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
         {
           prop: 'resource',
           label: '订单来源',