diff --git a/src/views/material/purchase/goodsEntry/detail.vue b/src/views/material/purchase/goodsEntry/detail.vue
index d7338bb0..1b419ac9 100644
--- a/src/views/material/purchase/goodsEntry/detail.vue
+++ b/src/views/material/purchase/goodsEntry/detail.vue
@@ -79,13 +79,20 @@
       <!-- <el-table-column label="供应商" align="center" prop="supplierName" /> -->
       <el-table-column label="是否未固定资产" align="center" prop="fixCodeStr" :show-overflow-tooltip="true"/>
       <el-table-column label="出厂日期" align="center" prop="productionTime" :show-overflow-tooltip="true"/>
+      <el-table-column label="管理模式" align="center" prop="manageType">
+          <template slot-scope="scope">
+              <!-- 0编码1数量 -->
+                <div v-if="scope.row.manageType==0">编码管理</div>
+                <div v-if="scope.row.manageType==1">数量管理</div>
+          </template>
+      </el-table-column>
       <el-table-column label="相关配套资料" align="center" prop="" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <div style="color: rgb(2, 167, 240);cursor: pointer;" @click="openFileDialog(scope.row)">报告管理</div>
         </template>
       </el-table-column>
       <el-table-column label="验收结论" align="center" prop="checkResult" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" width="180">
+      <el-table-column label="操作" align="center" width="180" v-if="!isView">
           <template slot-scope="scope">
               <el-button size="mini" type="success" @click="pass(scope.row)">
                 入库
@@ -150,7 +157,30 @@
       <img width="100%" height="500px" :src="dialogImageUrl"  />
     </el-dialog>
 
-
+    <!-- 编码入库 -->
+    <el-dialog title="编码入库" :visible.sync="openCode" width="1000px" append-to-body> 
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button type="primary" size="mini" >入库</el-button>
+            </el-col>
+        </el-row>
+        <el-table :data="codeTableData" width="100%" height="450px">
+            <el-table-column label="序号" type="index" width="55" align="center"/>
+            <el-table-column label="类型名称" prop="typeName" align="center" :show-overflow-tooltip="true"></el-table-column>
+            <el-table-column label="规格型号" prop="type" align="center" :show-overflow-tooltip="true"></el-table-column> 
+            <el-table-column label="设备编码" prop="code" align="center" :show-overflow-tooltip="true"></el-table-column>
+            <!-- <el-table-column label="操作" align="center"  width="300px">
+              <template slot-scope="scope">
+                  <el-button size="mini" type="warning" @click="openInnerDialog(scope.row)">内部维修</el-button> 
+                  <el-button size="mini" type="danger" @click="openScrapDialog(scope.row)">待报废</el-button>
+              </template>
+            </el-table-column> -->
+        </el-table>
+        <!-- <div style="width: 100%;height: 50px;display: flex;justify-content: flex-end;align-items: center;">
+            <el-button type="primary" size="mini" >保存</el-button>
+            <el-button type="normal" size="mini" @click="openCode=false">取消</el-button>
+        </div> -->
+    </el-dialog>
   </div>
 </template> 
 
@@ -216,6 +246,9 @@ export default {
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + '/file/upload'
       },
+      //编码入库
+      openCode:false,
+      codeTableData:[]
     };
   },
   mounted() {
@@ -297,19 +330,23 @@ export default {
           this.multiple = !selection.length
       },
       //入库
-      pass(row) { 
-        let obj = {
-          // taskId: this.taskId,
-          purchaseId: row.id
-        };
-        console.log(obj)  
-        purchaseWarehouse(obj).then((res)=>{
-            console.log(res)
-            if(res.code==200){
-              this.$modal.msgSuccess('操作成功')
-              this.getList()
-            }
-        })
+      pass(row) {
+        if(row.manageType==0){//编码
+
+          this.openCode=true
+        }else{
+            this.$modal.confirm('是否确认新购入库该物资类型？').then(function() {
+              let obj = {
+                purchaseId: row.id
+              };
+              return purchaseWarehouse(obj)
+            }).then((res) => {
+              if(res.code==200){
+                  this.$modal.msgSuccess('入库成功')
+                  this.getList()
+                }
+            }).catch(() => {});
+        }
       },
       //不合格
       reject(row) {
diff --git a/src/views/material/purchase/goodsEntry/index.vue b/src/views/material/purchase/goodsEntry/index.vue
index 3eb2a3a2..c11c4b01 100644
--- a/src/views/material/purchase/goodsEntry/index.vue
+++ b/src/views/material/purchase/goodsEntry/index.vue
@@ -60,7 +60,7 @@
             </el-form-item>
         </el-form>
         <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
+            <!-- <el-col :span="1.5">
                 <el-button
                     type="success"
                     plain
@@ -70,7 +70,7 @@
                 >
                     入库
                 </el-button>
-            </el-col>
+            </el-col> -->
 
             <el-col :span="1.5">
                 <el-button