前端

src/views/warehouse/warehouseManagementList.vue

@@ -139,7 +139,7 @@
             </ws-button>
              <ws-button v-hasPermission="
            `warehouseManagement.warehouse.warehouseInfo.in`
-          " class="putstorage" @click="nocomplete1(scope.row)">
+          " class="putstorage" @click="nocomplete1(scope.row,2)">
               皮检
             </ws-button>
             <!-- <ws-button v-hasPermission="
@@ -158,7 +158,7 @@
             </ws-button>
             <ws-button v-hasPermission="
            `warehouseManagement.warehouse.warehouseInfo.out`
-          " class="deliverystorage" @click="nocomplete1(scope.row)">
+          " class="deliverystorage" @click="nocomplete1(scope.row,3)">
               毛检
             </ws-button>
             <!-- <ws-button v-hasPermission="
@@ -666,7 +666,7 @@ export default {
       }
     },
     //检斤待完成
-    nocomplete1(row) {
+    nocomplete1(row,status) {
       this.$router.push({
         path: 'warehouseManagementNoWeight',
         query: {
@@ -676,6 +676,7 @@ export default {
           binNumber: row.binNumber,
           warehouseType: this.warehouseType,
           createType: row.createType,
+          status:status
         },
       })
     },

src/views/warehouse/warehouseManagementNoWeight.vue

@@ -218,6 +218,7 @@ export default {
     // this.getVesselData();
     this.deptBudgetList1.warehouseName = this.$route.query.warehouseName
     this.binNumber = this.$route.params.binNumber
+    this.status = this.$route.query.status
     this.deptBudgetList.warehouseType = this.$route.query.warehouseType
     this.createType=this.$route.query.createType,
     //接参
@@ -275,7 +276,7 @@ export default {
             pureWeight:row.pureWeight,
             deductionAmount:row.deductionAmount,
             deductionWeight:row.deductionWeight,
-            allowEdit:row.allowEdit
+            allowEdit:row.allowEdit,
 
           },
         })
@@ -295,6 +296,7 @@ export default {
             goodsName: row.goodsName,
             goodsNameKey: row.goodsNameKey,
             grade: row.grade,
+            status:'',
             grossWeight: row.grossWeight,
             inOutDate: row.inOutDate,
             inOutFlag: row.inOutFlag,
@@ -383,6 +385,7 @@ export default {
           positionId: id1,
           pageSize: this.pageSize,
           currentPage: this.currentPage,
+          searchType:this.status
         })
           .toPromise()
           .then((response) => {

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -634,7 +634,7 @@
           }
         }
         for (var i = 0; i < this.outContractNo.length; i++) {
-          if (this.outContractNo[i].contractNo == e) {
+          if (this.outContractNo[i].contractNo == this.dataList.contractNo) {
             if (this.outContractNo[i].inOutType == '采购入库') {
               this.dataList.tips='卖方'+this.outContractNo[i].seller+ '（ '+this.outContractNo[i].unitContractPrice+'元/吨）'
               this.dataList.inOutTypeKey = 1