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

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -9,7 +9,7 @@
           <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
           </el-option>
         </el-select>
-        <el-checkbox v-model="checked" @change="allowEdit">允许手动编辑重量</el-checkbox>
+        <el-checkbox v-model="checked" @change="allowEdit" :disabled="tableData.length==0">允许手动编辑重量</el-checkbox>
       </div>
       </template>
     </BaseHeaderLayout>

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -273,6 +273,7 @@
             }
           }
         })
+        this.isCountShow = true
       switch (this.$route.query.type) {
         case "新增":
           this.submitName = "提交"
@@ -340,7 +341,7 @@
           }]
           break;
         case "编辑":
-          // this.isEdit = false;
+          this.isEdit = true;
           this.submitName = "提交"
           this.getData()
           break;