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

src/views/houseSelfCollect/inspectionManagement.vue

@@ -169,6 +169,13 @@ export default {
       this.getList()
     },
     inspectInfo(row, index) {
+      console.log(this.warehouseList,"仓库")
+      console.log( this.WAREHOUSE[1].payname)
+      for(let i = 0 ; i < this.warehouseList.length ; i++){
+        if(this.WAREHOUSE[1].payname == this.warehouseList[i].value){
+          this.cangid = this.warehouseList[i].id
+        }
+      }
       //添加,编辑，查看
       this.$router.push({
         path: 'inspectInfo',
@@ -250,10 +257,10 @@ export default {
             })
           }
           if(this.warehouseList.length > 0){
-            this.warehouseName =  this.warehouseList[0].value
+            this.warehouseName = this.warehouseList[0].value
              if (this.cangid) {
             this.warehouseName = this.WAREHOUSE[1].payname
-          } 
+               } 
           else {
             this.WAREHOUSE[1].payname = this.warehouseList[0].value
           }
@@ -264,7 +271,6 @@ export default {
             this.getList()
           }
         })
-
     },
     getList() {
       getinspectList({

src/views/houseSelfCollect/settlement.vue

@@ -396,9 +396,7 @@
         <!-- <el-button type="primary" @click="printSmall">打印小票</el-button> -->
         <el-button type="primary" @click="printBig">打印单据</el-button>
       </div>
-       
     </el-dialog>
-
   </div>
 </template>
 <script>
@@ -439,7 +437,6 @@ export default {
          this.information = '结算'   
     }
    this.getList()
- 
   },
   methods: {
     closeDialog(){