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

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -95,13 +95,13 @@
                       v-show="item1.type!=1&&item1.type!=2&&item1.type!=3" :disabled="!isEdit">-</el-button>
                   </div>
                   <div v-show="item1.type!=4">
-                    <input v-if='item1.type==1' class="water-price" :class="item1.isWrite?'white-bgc':''" v-model="baseInfoForm.waterMin"
+                    <input v-if='item1.type==1' class="water-price"  :class="item1.isWrite?'white-bgc':''" v-model="baseInfoForm.waterMin"
                       :disabled="item1.isWrite?false:true"></input>
-                    <input v-if='item1.type==2' class="water-price" :class="item1.isWrite?'white-bgc':''" v-model="baseInfoForm.waterBase"
+                    <input v-if='item1.type==2' class="water-price"  :class="item1.isWrite?'white-bgc':''" v-model="baseInfoForm.waterBase"
                       :disabled="item1.isWrite?false:true"></input>
-                    <input v-if='item1.type==3' class="water-price" :class="item1.isWrite?'white-bgc':''" v-model="baseInfoForm.waterMax"
+                    <input v-if='item1.type==3' class="water-price"  :class="item1.isWrite?'white-bgc':''" v-model="baseInfoForm.waterMax"
                       :disabled="item1.isWrite?false:true"></input>
-                    <input v-if='item1.type==5' class="water-price" :class="item1.isWrite?'white-bgc':''" v-model="item1.water"
+                    <input v-if='item1.type==5' class="water-price"  :class="item1.isWrite?'white-bgc':''" v-model="item1.water"
                       :disabled="isEdit?false:true"></input>
                   </div>
                   <div class="circle" v-if="item1.type!=4"></div>

src/views/warehouse/warehouseManagementPut.vue

@@ -1051,6 +1051,7 @@ export default {
           return
         }
       }
+      console.log(this.deptBudgetList,'入库对象')
       this.deptBudgetList.id = this.$route.query.id
       this.$confirm(`确定提交入库信息`, {
         cancelButtonText: '取消',