diff --git a/src/views/foodManage/stockManage/warehouseIn/detail.vue b/src/views/foodManage/stockManage/warehouseIn/detail.vue
index b28e03fd..4c0f54db 100644
--- a/src/views/foodManage/stockManage/warehouseIn/detail.vue
+++ b/src/views/foodManage/stockManage/warehouseIn/detail.vue
@@ -4,7 +4,7 @@
             <el-descriptions style="margin-bottom: 20px;" title="基本信息" :column="4" size="medium" border>  
                 <el-descriptions-item>
                     <template slot="label">入库单号</template>
-                    {{baseInfo.inToWareHouseCode}}
+                    {{baseInfo.intoCode}}
                 </el-descriptions-item> 
                 <el-descriptions-item>
                     <template slot="label">所属区域</template>
@@ -26,12 +26,8 @@
                 </el-descriptions-item>  
                 <el-descriptions-item>
                     <template slot="label">入库时间</template>
-                    {{ baseInfo.inToWareHouseTime }}
-                </el-descriptions-item>
-                <el-descriptions-item>
-                  <template slot="label">备注</template>
-                  {{ baseInfo.remark }}
-                </el-descriptions-item>
+                    {{ baseInfo.intoDate }}
+                </el-descriptions-item> 
             </el-descriptions> 
         </div>
 
@@ -56,18 +52,21 @@
                             <span v-if="scope.row.salesMode==2">称重</span>
                         </template> -->
                     </el-table-column> 
-                    <el-table-column label="单价（元）" align="center" prop="singlePrice" :show-overflow-tooltip="true">
+                    <el-table-column label="供应商" align="center" prop="supplierName" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="生产日期" align="center" prop="productDate" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="保质期截止日期" align="center" prop="expireTime" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="单价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                          <span>{{ (scope.row.singlePrice/100).toFixed(2) }}</span>
+                          <span>{{ (scope.row.unitPrice/100).toFixed(2) }}</span>
                         </template>
                     </el-table-column> 
-                    <el-table-column label="数量" align="center" prop="orderNum" :show-overflow-tooltip="true"></el-table-column> 
+                    <el-table-column label="入库数量" align="center" prop="purNum" :show-overflow-tooltip="true"></el-table-column> 
                     <el-table-column label="总金额（元）" align="center" prop="" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                            <span>{{ scope.row.orderNum*scope.row.singlePrice }}</span>
+                            <span>{{ scope.row.purNum*scope.row.unitPrice }}</span>
                         </template>
                     </el-table-column> 
-                    <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"></el-table-column>
+                     
                 </el-table>
             </div>
         </div>
@@ -163,7 +162,7 @@ export default {
             //查询查询食堂下拉结构
             getWarehouseInInfoApi(param).then((response) => {
                 this.baseInfo = response.data;
-                this.materialLis = this.baseInfo.orderGoodsDetailList;  
+                this.materialLis = this.baseInfo.imsIntoInventoryDetailVOList;  
             }); 
         },  
         // 多选框选中数据
diff --git a/src/views/foodManage/stockManage/warehouseIn/edit.vue b/src/views/foodManage/stockManage/warehouseIn/edit.vue
index 5ed1e0d3..8b78ed3e 100644
--- a/src/views/foodManage/stockManage/warehouseIn/edit.vue
+++ b/src/views/foodManage/stockManage/warehouseIn/edit.vue
@@ -2,8 +2,8 @@
     <div style="padding: 10px;background: #E5EBF6;min-height: 830px;">
         <div style="background: #FFF;padding: 10px;border-radius: 10px;margin-bottom: 20px;">
             <el-form :model="baseInfo" ref="baseInfo" :rules="baseRules" size="medium" :inline="true" label-width="110px">
-                <el-form-item label="入库单号" prop="intoId">
-                    <el-input v-model="baseInfo.intoId" placeholder="入库单号自动生成" disabled maxlength="20" clearable style="width: 240px"/>
+                <el-form-item label="入库单号" prop="intoCode">
+                    <el-input v-model="baseInfo.intoCode" placeholder="入库单号自动生成" disabled maxlength="20" clearable style="width: 240px"/>
                 </el-form-item> 
                 <el-form-item label="所属区域" prop="areaId">
                     <el-cascader v-model="baseInfo.areaId"
@@ -26,9 +26,9 @@
                 </el-form-item>
                 <el-form-item label="入库类型" prop="intoType"> 
                     <el-select v-model="baseInfo.intoType" placeholder="请选择入库类型" style="width: 240px;">
-                        <el-option label="采购入库" :value="1"></el-option>
-                        <el-option label="退料入库" :value="2"></el-option>  
-                        <el-option label="即入即出" :value="4"></el-option>  
+                        <el-option label="采购入库" value="1"></el-option>
+                        <el-option label="退料入库" value="2"></el-option>  
+                        <el-option label="即入即出" value="4"></el-option>  
                     </el-select> 
                 </el-form-item>
                 <el-form-item label="入库时间" prop="intoDate">
@@ -39,9 +39,9 @@
                         :picker-options="pickerOptions" @change="baseInfo.intoDate=formatDateTime(baseInfo.intoDate)">
                     </el-date-picker>
                 </el-form-item>  
-                <el-form-item label="备注" prop="remark">
+                <!-- <el-form-item label="备注" prop="remark">
                     <el-input v-model="baseInfo.remark" placeholder="请输入备注" maxlength="30" clearable style="width: 240px"/>
-                </el-form-item>
+                </el-form-item> -->
             </el-form>
         </div> 
         <div style="width: 100%;height: 450px;padding: 10px;border-radius: 10px;margin-bottom: 10px;background: #FFF;">
@@ -284,14 +284,18 @@ export default {
             //查询查询食堂下拉结构
             getWarehouseInInfoApi(param).then((response) => {
                 this.baseInfo = response.data; 
-                this.materialList = this.baseInfo.imsIntoInventoryDetailAddList; 
+                this.materialList = this.baseInfo.imsIntoInventoryDetailVOList; 
+                this.$set(this.baseInfo,'areaId',Number(this.baseInfo.areaId)) 
                 this.materialList.forEach(item=>{
                     this.$set(item,"unitPrice",Number(item.unitPrice)/100) 
                 })  
                 drpWareHousePageApi({ areaId:this.baseInfo.areaId }).then((response) => {
                     this.wareHouseOptions = response.rows||[];
-                    this.$set(this.baseInfo,'warehouseId',this.baseInfo.warehouseId) 
+                    this.$set(this.baseInfo,'warehouseId',Number(this.baseInfo.warehouseId)) 
                 });  
+                supplierPageApi({ isPaging:1,areaIdList:[] }).then((response) => {
+                    this.supplierOptions = response.rows||[]; 
+                }); 
             }); 
         },
         //区域树
@@ -415,9 +419,9 @@ export default {
                 if (valid) { 
                     let param = Object.assign({},this.baseInfo); 
                     param.intoDate = this.formatDateTime(this.baseInfo.intoDate) 
-                    param.orderAmount=0
+                    param.totalAmount=0
                     param.totalNum=0
-                    param.status=1
+                    param.status=2
                     param.imsIntoInventoryDetailAddList = []   
                     this.noMaterial = false;
                     if(this.materialList.length>0){ 
@@ -428,7 +432,7 @@ export default {
                                 let obj = Object.assign({}, item)
                                 obj.unitPrice = Number(obj.unitPrice)*100 
                                 obj.totalPrice =  (Number(obj.unitPrice)*Number(obj.purNum))
-                                param.totalAmount = param.orderAmount+obj.totalPrice; 
+                                param.totalAmount = param.totalAmount+obj.totalPrice; 
                                 param.totalNum = param.totalNum+Number(obj.purNum)
                                 param.imsIntoInventoryDetailAddList.push(obj)
                             } 
@@ -475,7 +479,7 @@ export default {
                 if (valid) { 
                     let param = Object.assign({},this.baseInfo); 
                     param.intoDate = this.formatDateTime(this.baseInfo.intoDate) 
-                    param.orderAmount=0
+                    param.totalAmount=0
                     param.totalNum=0
                     param.status=2
                     param.imsIntoInventoryDetailAddList = []   
@@ -488,7 +492,7 @@ export default {
                                 let obj = Object.assign({}, item)
                                 obj.unitPrice = Number(obj.unitPrice)*100 
                                 obj.totalPrice =  (Number(obj.unitPrice)*Number(obj.purNum))
-                                param.totalAmount = param.orderAmount+obj.totalPrice; 
+                                param.totalAmount = param.totalAmount+obj.totalPrice; 
                                 param.totalNum = param.totalNum+Number(obj.purNum)
                                 param.imsIntoInventoryDetailAddList.push(obj)
                             } 
diff --git a/src/views/foodManage/stockManage/warehouseIn/index.vue b/src/views/foodManage/stockManage/warehouseIn/index.vue
index eb6f2ff9..857d3ac8 100644
--- a/src/views/foodManage/stockManage/warehouseIn/index.vue
+++ b/src/views/foodManage/stockManage/warehouseIn/index.vue
@@ -15,8 +15,8 @@
                 :picker-options="pickerOptions" >
             </el-date-picker>
         </el-form-item>
-        <el-form-item label="入库单号" prop="intoId">
-            <el-input v-model="queryParams.intoId" placeholder="请输入入库单号" maxlength="20" clearable style="width: 240px"/>
+        <el-form-item label="入库单号" prop="intoCode">
+            <el-input v-model="queryParams.intoCode" placeholder="请输入入库单号" maxlength="20" clearable style="width: 240px"/>
         </el-form-item>
         <el-form-item label="入库状态" prop="status"> 
             <el-select v-model="queryParams.status" placeholder="请选择入库状态" style="width: 240px;">
@@ -79,15 +79,15 @@
             <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
             </template>
         </el-table-column>
-        <el-table-column label="入库单号" align="center" prop="intoId" :show-overflow-tooltip="true" /> 
+        <el-table-column label="入库单号" align="center" prop="intoCode" :show-overflow-tooltip="true" /> 
         <el-table-column label="入库状态" align="center" prop="status" :show-overflow-tooltip="true" width="100">
             <template slot-scope="scope">
                 <span v-if="scope.row.status==1">待入库</span>
                 <span v-if="scope.row.status==2">已入库</span> 
             </template>  
         </el-table-column> 
-        <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/>
-        <el-table-column label="货品仓库" align="center" prop="canteenName" :show-overflow-tooltip="true" width="120"/> 
+        <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true"/>
+        <el-table-column label="货品仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true" /> 
         <el-table-column label="入库类型" align="center" prop="intoType" :show-overflow-tooltip="true" width="100">
             <template slot-scope="scope">
                 <span v-if="scope.row.intoType==1">采购入库</span>
@@ -99,22 +99,20 @@
                 <span v-if="scope.row.intoType==7">期初入库</span> 
             </template>  
         </el-table-column>
-        <el-table-column label="质检报告" align="center" prop="" :show-overflow-tooltip="true" width="100">
-            <!-- <template slot-scope="scope">
-                <span v-if="scope.row.status==1">待提交</span>
-                <span v-if="scope.row.status==2">已提交</span> 
-            </template>   -->
-        </el-table-column> 
-        <el-table-column label="总金额(元)" align="center" prop="orderAmount" :show-overflow-tooltip="true" width="120">
+        <!-- <el-table-column label="质检报告" align="center" prop="" :show-overflow-tooltip="true" width="100">
+            <template slot-scope="scope"> 
+            </template>  
+        </el-table-column>  -->
+        <el-table-column label="总金额(元)" align="center" prop="totalAmount" :show-overflow-tooltip="true" width="120">
             <template slot-scope="scope">
-               <span>{{ (scope.row.orderAmount/100).toFixed(2) }}</span>
+               <span>{{ (scope.row.totalAmount/100).toFixed(2) }}</span>
             </template>  
         </el-table-column>
-        <el-table-column label="总数量" align="center" prop="totalNum" :show-overflow-tooltip="true" width="100"/>   
-        <el-table-column label="入库时间" align="center" prop="requestArrivalTime" :show-overflow-tooltip="true" width="150"/>  
-        <el-table-column label="关联单号" align="center" prop="" :show-overflow-tooltip="true" width="120"/>
-        <el-table-column label="操作人" align="center" prop="" :show-overflow-tooltip="true" width="120"/>
-        <el-table-column label="操作时间" align="center" prop="" :show-overflow-tooltip="true" width="150"/>  
+        <el-table-column label="总数量" align="center" prop="totalNum" :show-overflow-tooltip="true" width="120"/>   
+        <el-table-column label="入库时间" align="center" prop="intoDate" :show-overflow-tooltip="true" width="150"/>  
+        <!-- <el-table-column label="关联单号" align="center" prop="" :show-overflow-tooltip="true" width="120"/> -->
+        <el-table-column label="操作人" align="center" prop="createBy" :show-overflow-tooltip="true" width="120"/>
+        <el-table-column label="操作时间" align="center" prop="createTime" :show-overflow-tooltip="true" width="150"/>  
         <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
             <template slot-scope="scope"> 
             <el-button
@@ -285,7 +283,7 @@ export default {
             let param = {
                 "pageNum": this.queryParams.pageNum, 
                 "pageSize": this.queryParams.pageSize,  
-                "intoId": this.queryParams.intoId,     
+                "intoCode": this.queryParams.intoCode,     
                 "areaId": this.queryParams.areaId,  
                 "canteenId": this.queryParams.canteenId,  
                 "stallId": this.queryParams.stallId,