From 89856c1d0db22d85065e885197a4c769cfa754a1 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Thu, 14 Sep 2023 16:04:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E4=BB=BB=E5=8A=A1=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/distributionStockArticle.js  |  20 +++
 .../distributionDeliveryListdis.vue           |   2 +-
 .../distributionDeliveryListedt.vue           | 168 +++++++++---------
 .../distributionDeliveryListmar.vue           |   3 +-
 .../reservation/reservationSubmitFrom.vue     |  14 +-
 .../signfor/distributionSignforedt.vue        |  10 +-
 6 files changed, 120 insertions(+), 97 deletions(-)

diff --git a/src/option/distribution/distributionStockArticle.js b/src/option/distribution/distributionStockArticle.js
index 7a4cc9b2..9efa4b12 100644
--- a/src/option/distribution/distributionStockArticle.js
+++ b/src/option/distribution/distributionStockArticle.js
@@ -628,6 +628,14 @@ export default {
       label: '顾客地址',
       prop: 'customerAddress'
     },
+    {
+      label: '库位信息',
+      prop: 'allocation'
+    },
+    {
+      label: '托盘信息',
+      prop: 'trays'
+    },
     // {
     //   label: '增值服务',
     //   prop: 'fee'
@@ -845,6 +853,18 @@ export default {
       prop: 'customerAddress',
       width: '100'
 
+    },
+    {
+      label: '库位信息',
+      prop: 'allocation',
+      width: '100'
+
+    },
+    {
+      label: '托盘信息',
+      prop: 'trays',
+      width: '100'
+
     },
     // {
     //   label: '增值服务',
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
index 864722d4..e2bba40a 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
@@ -117,7 +117,7 @@
           <template #default="slotProps">
             <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>
             <el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text>
-            <el-text size="small" @click="handleEdit(slotProps.scope)">编 辑</el-text>
+            <el-text size="small" v-if="slotProps.scope.row.deliveryStatusName !== '已完成' || slotProps.scope.row.deliveryStatus !== '3'" @click="handleEdit(slotProps.scope)">编 辑</el-text>
 <!--            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
           </template>
         </tablecmt>
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index d33d61aa..9e559ab5 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -235,15 +235,15 @@
             @selectCheck="selectsc"
             @selection="selectionChange"
           >
-            <template #default="slotProps">
-              <el-text
-                      type="primary"
-                      text
-                      icon="el-icon-view"
-                      @click="inventoryDetail(slotProps.scope.row)"
-              >查看详情
-              </el-text>
-            </template>
+<!--            <template #default="slotProps">-->
+<!--              <el-text-->
+<!--                      type="primary"-->
+<!--                      text-->
+<!--                      icon="el-icon-view"-->
+<!--                      @click="inventoryDetail(slotProps.scope.row)"-->
+<!--              >查看详情-->
+<!--              </el-text>-->
+<!--            </template>-->
           </tablecmt>
         </el-tab-pane>
       </el-tabs>
@@ -1315,28 +1315,30 @@ export default {
           sortable: true,
           head: false,
         },
-        {
-          prop: 'signeeName',
-          label: '签收人',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'sjsigningTime',
-          label: '签收时间',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
+        //      ————————————————————————————————————————————————————————
+        // {
+        //   prop: 'signeeName',
+        //   label: '签收人',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        //   head: false,
+        // },
+        // {
+        //   prop: 'sjsigningTime',
+        //   label: '签收时间',
+        //   type: 4,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        //   head: false,
+        // },
+        //      ————————————————————————————————————————————————————————
         // {
         //   prop: 'deliveryNumber',
         //   label: '备货数',
@@ -1368,27 +1370,27 @@ export default {
         //   fixed: false,
         //   sortable: true,
         // },
-        {
-          prop: 'cargoNumber',
-          label: '物料编号',
-          type: 3,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'cargoUnit',
-          label: '单位',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
+        // {
+        //   prop: 'cargoNumber',
+        //   label: '物料编号',
+        //   type: 3,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        // {
+        //   prop: 'cargoUnit',
+        //   label: '单位',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        //   head: false,
+        // },
         {
           prop: 'pallet',
           label: '托盘码',
@@ -1400,37 +1402,37 @@ export default {
           sortable: true,
           head: false,
         },
-        {
-          prop: 'goodsAllocation',
-          label: '库位信息',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'goodsAllocation',
-          label: '签收人',
-          type: 1,
-          values: '',
-          width: '180',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'readyStock',
-          label: '签收时间',
-          type: 1,
-          values: '',
-          width: '180',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'goodsAllocation',
+        //   label: '库位信息',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        //   head: false,
+        // },
+        // {
+        //   prop: 'goodsAllocation',
+        //   label: '签收人',
+        //   type: 1,
+        //   values: '',
+        //   width: '180',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        // {
+        //   prop: 'readyStock',
+        //   label: '签收时间',
+        //   type: 1,
+        //   values: '',
+        //   width: '180',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: '',
           label: '操作',
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
index d0eb2d32..495ba47c 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
@@ -111,7 +111,8 @@
           <template #default="slotProps">
             <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>
             <el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text>
-            <el-text size="small" @click="handleEdit(slotProps.scope)">编 辑</el-text>
+            <el-text size="small"  v-if="slotProps.scope.row.deliveryStatusName !== '已完成' || slotProps.scope.row.deliveryStatus !== '3'" @click="handleEdit(slotProps.scope)">编 辑</el-text>
+
 <!--            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
           </template>
         </tablecmt>
diff --git a/src/views/distribution/reservation/reservationSubmitFrom.vue b/src/views/distribution/reservation/reservationSubmitFrom.vue
index 39d59f83..9408a2ec 100644
--- a/src/views/distribution/reservation/reservationSubmitFrom.vue
+++ b/src/views/distribution/reservation/reservationSubmitFrom.vue
@@ -404,13 +404,13 @@
                         </el-table-column>
                     </template>
                     <!-- 操作栏模块 -->
-                    <el-table-column prop="menu" label="操作" :width="220" align="center">
-                        <template #="{row}">
-                            <!--              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>-->
-                            <!--              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>-->
-                            <!--              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>-->
-                        </template>
-                    </el-table-column>
+<!--                    <el-table-column prop="menu" label="操作" :width="220" align="center">-->
+<!--                        <template #="{row}">-->
+<!--                            &lt;!&ndash;              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>&ndash;&gt;-->
+<!--                            &lt;!&ndash;              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>&ndash;&gt;-->
+<!--                            &lt;!&ndash;              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>&ndash;&gt;-->
+<!--                        </template>-->
+<!--                    </el-table-column>-->
                 </el-table>
                 <el-form-item style="margin-left: 45%;margin-top: 5px">
                     <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitPackage">提交(包件)</el-button>
diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue
index 6da9598d..84186c34 100644
--- a/src/views/distribution/signfor/distributionSignforedt.vue
+++ b/src/views/distribution/signfor/distributionSignforedt.vue
@@ -279,11 +279,11 @@
                 </el-table-column>
 
               </template>
-              <el-table-column prop="menu" label="操作" :width="220" align="center">
-                <template #="{row}">
-                  <el-button type="primary" text icon="el-icon-view" @click="handleInventoryView(row)">查看详情</el-button>
-                </template>
-              </el-table-column>
+<!--              <el-table-column prop="menu" label="操作" :width="220" align="center">-->
+<!--                <template #="{row}">-->
+<!--                  <el-button type="primary" text icon="el-icon-view" @click="handleInventoryView(row)">查看详情</el-button>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
 
             </el-table>