Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -233,6 +233,7 @@ export default {
              statusFlag:row.statusFlag,
              tare:row.tare,
              warehouseName: row.warehouseName,  
+             warehouseInOutDetail:row.warehouseInOutDetail
           },
         })
       } else if(row.inOutFlag==1){
@@ -261,6 +262,8 @@ export default {
              statusFlag:row.statusFlag,
              tare:row.tare,
              warehouseName: row.warehouseName,  
+             warehouseInOutDetail:row.warehouseInOutDetail
+
           }
           })
       }

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -390,6 +390,7 @@ export default {
     this.dataList.inOutFlag = this.$route.inOutFlag
     this.dataList.inOutTypeKey = Number(this.$route.query.inOutTypeKey)
     this.dataList.statusFlag = this.$route.statusFlag
+    this.dataList.warehouseInOutDetail = this.$route.query.warehouseInOutDetail
     console.log(this.dataList)
   },
   methods: {

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -177,7 +177,7 @@
       />
       <div class="small-title">化验数据（选填）</div>
       <div class="inspector">
-        <!--自检员-->
+        <!--质检员-->
         <ws-form-item label="质检员" span="1" prop="qualityInspector">
           <ws-input
             v-model="dataList.warehouseInOutDetail.qualityInspector"
@@ -320,6 +320,7 @@ export default {
       storageType: [],
       appendixIdsAdd: '',
       uploadSuccess: {},
+      warehouseInOutDetail:{},
       onChange: {},
       deptBudgetList1: [],
       gradeList: [],
@@ -390,7 +391,8 @@ export default {
     this.dataList.inOutFlag = this.$route.inOutFlag
     this.dataList.inOutTypeKey = Number(this.$route.query.inOutTypeKey)
     this.dataList.statusFlag = this.$route.statusFlag
-    console.log(this.dataList)
+    this.dataList.warehouseInOutDetail = this.$route.query.warehouseInOutDetail
+    console.log(this.$route.query.warehouseInOutDetail,12121212121)
   },
   methods: {
     //返回按钮