diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index 17563f5..d56a082 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -59,14 +59,14 @@
           <template slot-scope="scope">
             <el-button
               type="text"
-              :disabled="!configParms.basicInv"
+              :disabled="!configParms.basicInv || scope.row.advanceType =='2' || scope.row.advanceType =='3'"
               @click.native.stop="handleSubForm( scope.row, 'add')"
             >新增
             </el-button
             >
             <el-button
               type="text"
-              :disabled="!configParms.basicInv"
+              :disabled="!configParms.basicInv "
               @click.native.stop="handleSubForm( scope.row, 'edit')"
             >编辑
             </el-button
@@ -91,7 +91,7 @@
 
             <el-button
               type="text"
-              :disabled="!configParms.basicInv"
+              :disabled="!configParms.basicInv || scope.row.advanceType =='2' || scope.row.advanceType =='3' "
               @click.native.stop="handleDelInv(scope.row)"
             >删除
             </el-button
@@ -168,12 +168,20 @@
           </el-row>
           <el-row :gutter="20" class="el-row" type="flex">
             <el-col :span="12" class="el-col">
-              <el-form-item label="寄售仓库" prop="advanceType" class="query-form-item">
-                <el-radio-group :disabled="isAdvanceTypeShow" v-model="subData.advanceType">
-                  <el-radio :label="false">非寄售</el-radio>
-                  <el-radio :label="true">寄售</el-radio>
-                </el-radio-group>
+              <el-form-item label="仓库类型" prop="advanceType" >
+                <el-select v-model="subData.advanceType" :disabled="invWouse != null" placeholder="请选择仓库类型" style="width: 80%">
+                  <el-option  label="入账库"  value="1"/>
+                  <el-option  label="寄售库"  value="2"/>
+                  <el-option  label="预验收库" value="3"/>
+                </el-select>
               </el-form-item>
+
+              <!--<el-form-item label="寄售仓库" prop="advanceType" class="query-form-item">-->
+              <!--  <el-radio-group :disabled="isAdvanceTypeShow" v-model="subData.advanceType">-->
+              <!--    <el-radio :label="false">非寄售</el-radio>-->
+              <!--    <el-radio :label="true">寄售</el-radio>-->
+              <!--  </el-radio-group>-->
+              <!--</el-form-item>-->
             </el-col>
 
             <el-col :span="12" class="el-col">
@@ -397,6 +405,7 @@ export default {
         add: "仓库信息-新增",
         edit: "仓库信息-编辑"
       },
+      invWouse:{},
       formName: null,
       configParms: {},
       currentCode: null,
@@ -482,9 +491,13 @@ export default {
         });
     },
     handleSubForm(data, formName) {   //新增，编辑
+      if(data != null ){
+        this.invWouse=data;
+      }
       this.formName = formName;
       if (formName === "edit") {
         this.subData = JSON.parse(JSON.stringify(data));
+        this.subData.advanceType=this.subData.advanceType.toString();
         if(this.subData.parentCode!=null && this.subData.parentCode!=""){
           this.isAdvanceTypeShow=true;
           this.isShow=false;
@@ -497,10 +510,10 @@ export default {
         this.isShow=true
         if(data==null){
           this.isAdvanceTypeShow=false;
-          this.subData = {advanceType: false, spUse: false,parentCode:null};
+          this.subData = {advanceType: '1', spUse: false,parentCode:null};
         }else{
           this.isAdvanceTypeShow=true;
-          this.subData = {advanceType: data.advanceType, spUse: false,parentCode:data.code};
+          this.subData = {advanceType: data.advanceType.toString(), spUse: false,parentCode:data.code};
         }
       }
       this.subFormVisible = true;