From 17fa70782b0908bb37e0df7dc44ae2e737b3c440 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Wed, 13 Sep 2023 21:25:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E5=BA=93=E5=AD=98=E5=93=81?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/distribution/distributionSignfor.js   |  14 ++
 .../distributionDeliveryListedt.vue           | 135 +++++++++++-
 .../signfor/distributionSignforedt.vue        | 204 +++++++++++++++---
 3 files changed, 311 insertions(+), 42 deletions(-)

diff --git a/src/api/distribution/distributionSignfor.js b/src/api/distribution/distributionSignfor.js
index 6ab55337..ce5972df 100644
--- a/src/api/distribution/distributionSignfor.js
+++ b/src/api/distribution/distributionSignfor.js
@@ -106,6 +106,20 @@ export const signforPackageList = (signforId) => {
     }
   })
 }
+/**
+ * 查询签收库存品信息
+ * @param signforId
+ * @returns {AxiosPromise}
+ */
+export const signforInventoryList = (signforId) => {
+  return request({
+    url: '/api/logpm-distribution/signfor/signforInventoryList',
+    method: 'get',
+    params: {
+      signforId
+    }
+  })
+}
 
 
 export const getLocationAddress = (signforId) => {
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index ccd760c3..d33d61aa 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -236,6 +236,13 @@
             @selection="selectionChange"
           >
             <template #default="slotProps">
+              <el-text
+                      type="primary"
+                      text
+                      icon="el-icon-view"
+                      @click="inventoryDetail(slotProps.scope.row)"
+              >查看详情
+              </el-text>
             </template>
           </tablecmt>
         </el-tab-pane>
@@ -1232,8 +1239,8 @@ export default {
           head: false,
         },
         {
-          prop: 'deliveryNumber',
-          label: '备货数',
+          prop: 'cargoNumber',
+          label: '物料编号',
           type: 2,
           values: '',
           width: '150',
@@ -1243,25 +1250,124 @@ export default {
           head: false,
         },
         {
-          prop: 'readyStock',
-          label: '已备数量',
+          prop: 'cargoNorms',
+          label: '物料规格',
           type: 2,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
+          head: false,
         },
         {
-          prop: 'readyStock',
-          label: '签收数量',
+          prop: 'cargoUnit',
+          label: '物料单位',
           type: 2,
           values: '',
-          width: '180',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'loadingStatusName',
+          label: '装车状态',
+          type: 2,
+          values: '',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
+          head: false,
         },
+        {
+          prop: 'reservationNum',
+          label: '计划出库数',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'loadedinNumber',
+          label: '实际出库数',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'signingStatusName',
+          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: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        // {
+        //   prop: 'deliveryNumber',
+        //   label: '备货数',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        //   head: false,
+        // },
+        // {
+        //   prop: 'readyStock',
+        //   label: '已备数量',
+        //   type: 2,
+        //   values: '',
+        //   width: '180',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        // {
+        //   prop: 'readyStock',
+        //   label: '签收数量',
+        //   type: 2,
+        //   values: '',
+        //   width: '180',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: 'cargoNumber',
           label: '物料编号',
@@ -1325,6 +1431,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
       ],
       height: 300,
       // 弹框标题
@@ -2433,6 +2549,9 @@ export default {
       this.signform = row;
       this.signBox = true;
     },
+    inventoryDetail(row) {
+      console.log('一键签收>>>>>>>>>>', row);
+    },
     handleOne(row) {
       console.log('签收>>>>>>>>>>', row);
       this.$confirm('确认一键装车？')
diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue
index b6950a1d..6da9598d 100644
--- a/src/views/distribution/signfor/distributionSignforedt.vue
+++ b/src/views/distribution/signfor/distributionSignforedt.vue
@@ -257,42 +257,36 @@
         </el-tab-pane>
           <el-tab-pane label="库 存 品 列 表" name="tab3">
             <!-- 列表模块 -->
-<!--            <el-table ref="table" v-loading="loading"-->
-<!--                      @selection-change="selectionChange"-->
-<!--                      :data="packageData"-->
-<!--                      :height="height"-->
-<!--                      style="width: 100%"-->
-<!--                      :border="wrapoption.border"-->
-<!--            >-->
+            <el-table ref="table" v-loading="loading"
+                      @selection-change="selectionChange"
+                      :data="inventoryData"
+                      :height="height"
+                      style="width: 100%"
+                      :border="inventory.border"
+            >
               <!--                        align="center"-->center
 
-<!--              <el-table-column type="expand" v-if="wrapoption.expand"></el-table-column>-->
-<!--              <template v-for="(item,index) in wrapoption.column">-->
-<!--                &lt;!&ndash; table字段 &ndash;&gt;-->
-<!--                <el-table-column v-if="item.hide!==true"-->
-<!--                                 :prop="item.prop"-->
-<!--                                 :label="item.label"-->
-<!--                                 :show-overflow-tooltip="true"-->
-<!--                                 :width="item.width"-->
-<!--                                 :key="index">-->
-<!--                  &lt;!&ndash;                                :align="center"&ndash;&gt;-->
+              <el-table-column type="expand" v-if="inventory.expand"></el-table-column>
+              <template v-for="(item,index) in inventory.column">
+                <!-- table字段 -->
+                <el-table-column v-if="item.hide!==true"
+                                 :prop="item.prop"
+                                 :label="item.label"
+                                 :show-overflow-tooltip="true"
+                                 :width="item.width"
+                                 :key="index">
+                  <!--                                :align="center"-->
+                </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>
 
-<!--                </el-table-column>-->
-<!--              </template>-->
-<!--            </el-table>-->
-<!--          <div class="avue-crud__pagination" style="width:100%">-->
-<!--            &lt;!&ndash; 分页模块 &ndash;&gt;-->
-<!--            <el-pagination align="right"-->
-<!--                           background-->
-<!--                           @size-change="psizeChange"-->
-<!--                           @current-change="pcurrentChange"-->
-<!--                           :current-page="packpage.currentPage"-->
-<!--                           :page-sizes="[30, 50,80, 120]"-->
-<!--                           :page-size="packpage.pageSize"-->
-<!--                           layout="total, sizes, prev, pager, next, jumper"-->
-<!--                           :total="packpage.total">-->
-<!--            </el-pagination>-->
-<!--          </div>-->
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -300,7 +294,7 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove ,getDetailById,getListOrder,signforPackageList} from '@/api/distribution/distributionSignfor';
+import { getList, getDetail, add, update, remove ,getDetailById,getListOrder,signforPackageList,signforInventoryList} from '@/api/distribution/distributionSignfor';
 
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
@@ -1080,6 +1074,137 @@ export default {
         ]
       },
 
+      inventory: {
+        expand: false,
+        index: true,
+        border: true,
+        selection: true,
+        column: [
+          {
+            prop: 'sku',
+            label: 'SKU',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'descriptionGoods',
+            label: '物料名称',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'cargoNumber',
+            label: '物料编号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'cargoNorms',
+            label: '物料规格',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'cargoUnit',
+            label: '物料单位',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'category',
+            label: '品分类',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'reservationNum',
+            label: '计划出库数',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'loadedinNumber',
+            label: '实际出库数',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'loadingStatusName',
+            label: '装车状态',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'signingStatusName',
+            label: '签收状态',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'signUser',
+            label: '签收人',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+
+        ]
+      },
+
       // 订单列表
       data: [],
       // 基本信息表单列表
@@ -1298,6 +1423,11 @@ export default {
       getWrapdetail(row.id).then(res => {
         console.log("查看>>>>>>>",res.data.data);
       });
+    },
+    handleInventoryView(row) {
+      console.log("查看>>>>>>>>>>",row);
+
+
     },
     //查看增值服务
     checkAddValue(scope) {
@@ -1471,6 +1601,12 @@ export default {
         // this.page.total = data.total
           this.packageData =data
       });
+      signforInventoryList(signforId).then(res => {
+        const data =res.data.data
+        console.log("------------>data",data);
+        // this.page.total = data.total
+          this.inventoryData =data
+      });
     },
   }
 };