diff --git a/src/views/reagent/warehousing/index.vue b/src/views/reagent/warehousing/index.vue
index 447795c..2a385f7 100644
--- a/src/views/reagent/warehousing/index.vue
+++ b/src/views/reagent/warehousing/index.vue
@@ -297,7 +297,7 @@
     <el-dialog title="选择柜层号" :visible.sync="detailVisible" width="35%">
       <div>
         <el-radio-group v-model="radio1" @change="changeHandler" size="medium" style="margin-bottom: 40px;">
-          <el-radio-button :label="item.client_id" :key="item.client_id" v-for="item in chosedata" style="margin-bottom: 10px">{{item.client_name}}</el-radio-button>
+          <el-radio-button :disabled="item.conflict =='' ? false:true"  :label="item.client_id" :key="item.client_id" v-for="item in chosedata" style="margin-bottom: 10px">{{item.client_name}}</el-radio-button>
         </el-radio-group>
 
         <div :key="index" v-for="item,index in chosedata">
@@ -671,6 +671,8 @@ export default {
     getCode(code) {
       var that =this
       this.barCode = code
+      that.radio1=''
+      that.radio2=''
       if (this.barCode) {
         if (!this.client_id_input) {
           this.$message.warning('请选择存储柜体！')
@@ -683,8 +685,8 @@ export default {
         enter_db_client_list(stringify(data)).then(res => {
           console.log(res.data)
           that.chosedata=res.data
-          that.radio1=res.data[0].client_id
-          that.radio2=res.data[0].client_cell[0]
+          // that.radio1=res.data[0].client_id
+          // that.radio2=res.data[0].client_cell[0]
         })
         this.detailVisible =true
       }