Merge remote-tracking branch 'origin/dev' into dev

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: '是否齐套',

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;
     }

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);
     },