From 42bcfb8a553fcd627f60a7171abe8f5243fce884 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Fri, 22 Sep 2023 17:08:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AD=BE=E6=94=B6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=97=A0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../signdetail/distributionSigndetail.vue         | 10 ++++++++++
 .../signdetail/distributionSigndetaledt.vue       |  5 ++++-
 .../warehouseWarehouseingAddReceipt.vue           | 15 +++++++++------
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/views/distribution/signdetail/distributionSigndetail.vue b/src/views/distribution/signdetail/distributionSigndetail.vue
index cec0a93f..900caa21 100644
--- a/src/views/distribution/signdetail/distributionSigndetail.vue
+++ b/src/views/distribution/signdetail/distributionSigndetail.vue
@@ -277,6 +277,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'signfornum',
+          label: '签收件数',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'completeSet',
           label: '是否齐套',
diff --git a/src/views/distribution/signdetail/distributionSigndetaledt.vue b/src/views/distribution/signdetail/distributionSigndetaledt.vue
index 1d5ff23c..19b33f02 100644
--- a/src/views/distribution/signdetail/distributionSigndetaledt.vue
+++ b/src/views/distribution/signdetail/distributionSigndetaledt.vue
@@ -783,6 +783,7 @@ export default {
     //包件列表
     handlePackage(page){
       let params={}
+      console.log(11111,22222,">>>>>>>>>>>>>>>>>")
       params.deliveryId =  this.orderdata.id
       getpackdetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         console.log("查看>>>>>包间>>",res.data.data);
@@ -943,6 +944,8 @@ export default {
       this.getWrapdetails(this.wpage)
     },
     onLoad() {
+      console.log("初始化执行")
+      console.log('this.$route.query :>> ', this.$route.query);
       //查询详情
       const data = decodeURIComponent(this.$route.query.data);
       this.orderdata = JSON.parse(data);
@@ -954,7 +957,7 @@ export default {
         const data = res.data.data
         this.wpage.total = data.total;
         this.packdata = data.records
-
+        this.data = this.packdata
       });
       this.loading = false;
     }
diff --git a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
index 7dfb1e78..39f484b4 100644
--- a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
+++ b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
@@ -98,9 +98,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
+            <el-form-item label="物流公司" prop="receiptBatch">
+              <el-input v-model="form.logisticsCompany" clearable placeholder="请输入物流公司" />
+            </el-form-item>
             <!--            <el-form-item label="物流单号" prop="trainNumber">-->
-            <el-form-item label="物流车次">
-              <el-input v-model="form.trainNumber" clearable placeholder="请输入物流车次" />
+            <el-form-item label="物流运单号">
+              <el-input v-model="form.trainNumber" clearable placeholder="请输入物流运单号" />
             </el-form-item>
 
             <!--            <el-form-item label="入库车牌" prop="licensePlate">-->
@@ -267,7 +270,7 @@
             @click="handleSubmit"
             :disabled="view && !this.$route.query.type == '3'"
             v-if="this.$route.query.type"
-            >提 交1</el-button
+            >提 交</el-button
           >
           <el-button
             type="primary"
@@ -972,12 +975,12 @@ export default {
     },
     searchChange() {
       // 当是新增入库时
-      if(!this.$route.query.type) {
+      if (!this.$route.query.type) {
         // 清空外部表单
-        this.form = {}
+        this.form = {};
       }
       // 清空弹出框表单
-      this.formDetail = {}
+      this.formDetail = {};
       // 重新加载列表数据
       this.onLoad(this.page);
     },