From f1b1e0aa91ebe0e44bb3f3d7ff38faa95ec14971 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Fri, 31 May 2024 18:03:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E6=96=B0=E5=A2=9E=E5=8C=85?=
 =?UTF-8?q?=E4=BB=B6=E7=AD=BE=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/distrilbutionBillLading.js   | 10 ++++
 .../distributionDeliveryListedt.vue           |  2 -
 .../inventory/distrilbutionBillLadingView.vue | 56 +++++++++++++++++++
 src/views/factory/mt/packageInfo.vue          |  2 +-
 4 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/src/api/distribution/distrilbutionBillLading.js b/src/api/distribution/distrilbutionBillLading.js
index 998d3f81..70c6e997 100644
--- a/src/api/distribution/distrilbutionBillLading.js
+++ b/src/api/distribution/distrilbutionBillLading.js
@@ -226,3 +226,13 @@ export const $_distrilbutionBillLading = row => {
     data: row,
   });
 };
+
+
+// 自提批量签收
+export const $_batchSign = data => {
+  return request({
+    url: '/api/logpm-distribution/distrilbutionBillLading/batchSign',
+    method: 'post',
+    data,
+  });
+};
\ No newline at end of file
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 50fb31ad..5927f82b 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -3845,8 +3845,6 @@ if($useStore.getters && $useStore.getters.permission){
   console.log(this.accessControl,'accessControl按钮权限');
 }
 
-
-
     // this.onLoad();
     // //查询字典
     // this.queryDictionary();
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingView.vue b/src/views/distribution/inventory/distrilbutionBillLadingView.vue
index 6b3f986f..4cdeefe0 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingView.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingView.vue
@@ -95,6 +95,9 @@
           <el-button type="warning" plain icon="el-icon-camera" @click="handleqr('')"
             >批量查看二维码
           </el-button>
+          <el-button type="warning" plain  v-if="permission.Self_pickup_receipt" @click="Selfpickupreceipt"
+            ><el-icon><EditPen /></el-icon>批量签收
+          </el-button>
           <!-- 列表模块 -->
           <tablecmt
             ref="tableNodePackageRef"
@@ -196,6 +199,7 @@ import {
   getBillLadingDetail,
   getOrderDetail,
   $_checkBillLadingIsRelease,
+  $_batchSign,
 } from '@/api/distribution/distrilbutionBillLading';
 import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
 import { ElMessage, ElMessageBox } from 'element-plus';
@@ -213,6 +217,7 @@ import { downloadXls, hanleTextLineFeed, setNodeHeight } from '@/utils/util';
 import { exportBlob } from '@/api/common';
 import { dateNow } from '@/utils/date';
 import print from '@/utils/print';
+import error from '@/error';
 export default {
   data() {
     return {
@@ -1423,6 +1428,7 @@ export default {
   },
   computed: {
     ...mapGetters(['permission']),
+
     ids() {
       let ids = [];
       this.selectionList.forEach(ele => {
@@ -1570,6 +1576,56 @@ export default {
     searchChange() {
       this.onLoad(this.page);
     },
+    // 自提包件签收
+    Selfpickupreceipt(){
+      if(!this.selectionList.length){
+        ElMessage({
+        message: '请勾选要签收的数据',
+        type: 'warning',
+      })
+        return
+      }
+      console.log(this.selectionList,'this.selectionList');
+      ElMessageBox.confirm(
+    '是否确认操作自提批量签收?',
+    '提示',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  )
+    .then(() => {
+      this.loading=true
+      let data={
+        id:this.$route.query.id,
+        packageIds:this.selectionList.map(item=>item.id).join(',')
+    
+      }
+      $_batchSign(data).then(res=>{
+        console.log(res,'自提签收成返回值');
+        if(res.data.code===200){
+          
+        this.handlePackage(this.packpage)
+        ElMessage({
+        message:res.data.msg,
+        type: 'success',
+      })
+        }
+      }).catch(error=>{
+        console.log(error,'自提签收失败返回值');
+      }).finally(()=>{
+
+        this.loading=false
+      })
+      console.log(this.selectionList,'');
+      // handlePackage(this.packpage)
+    })
+    .catch(() => { })
+},
+
+
+
     // 查看二维码
     async handleqr(val) {
       console.log(val, 'val');
diff --git a/src/views/factory/mt/packageInfo.vue b/src/views/factory/mt/packageInfo.vue
index d48b8fa2..cad1f31c 100644
--- a/src/views/factory/mt/packageInfo.vue
+++ b/src/views/factory/mt/packageInfo.vue
@@ -49,7 +49,7 @@
         <!-- 表单字段 -->
         <el-date-picker
           v-model="showPushData"
-          type="date"
+          type="datetime"
           placeholder="选择推送时间"
           :disabled-date="disabledDate"
           :shortcuts="shortcuts"