diff --git a/src/views/inStorage/receivingGoods/inStorageAdd.vue b/src/views/inStorage/receivingGoods/inStorageAdd.vue
index 30ab524..45d6789 100644
--- a/src/views/inStorage/receivingGoods/inStorageAdd.vue
+++ b/src/views/inStorage/receivingGoods/inStorageAdd.vue
@@ -126,7 +126,6 @@
       },
 
       handleReturn(isreload) {
-        if (isreload === 'true') this.$emit('reloadlist')
         this.formobj = {
           useOrgSid: window.sessionStorage.getItem('orgSid'),
           createOrgSid: window.sessionStorage.getItem('orgSid'),
@@ -136,7 +135,7 @@
           list: []
         }
         this.submitdisabled = false
-        this.$emit('doback')
+        this.$emit('reloadlist')
       },
 
       showEdit(goodsList) {
diff --git a/src/views/inStorage/receivingGoods/inStorageInfo.vue b/src/views/inStorage/receivingGoods/inStorageInfo.vue
index 6e8a7a8..0712f61 100644
--- a/src/views/inStorage/receivingGoods/inStorageInfo.vue
+++ b/src/views/inStorage/receivingGoods/inStorageInfo.vue
@@ -47,7 +47,7 @@
           </el-col>
           <el-col :span="8">
             <div class="span-sty">入库仓库</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.supplierName }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.warehouseName }}</span></el-form-item>
           </el-col>
 
         </el-row>
@@ -72,7 +72,7 @@
         <el-row>
           <el-col :span="8">
             <div class="span-sty">商品总额</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.total }}</span></el-form-item>
           </el-col>
           <el-col :span="16">
             <div class="span-sty">备注</div>
@@ -86,10 +86,10 @@
         </div>
         <el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;">
           <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-          <el-table-column fixed label="商品名称" prop="goodsName" align="center" />
-          <el-table-column label="商品编码" prop="goodsCode" align="center" />
+          <el-table-column fixed label="商品名称" prop="goodsSkuTitle" align="center" />
+          <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
           <el-table-column label="规格" prop="specValue" align="center" />
-          <el-table-column label="单位" prop="unitName" align="center" />
+          <el-table-column label="单位" prop="unit" align="center" />
           <el-table-column label="成本单价" prop="price" align="center" />
           <el-table-column label="总价" prop="totalPrice" align="center" />
           <el-table-column label="数量" prop="count" align="center" />
diff --git a/src/views/inStorage/receivingGoods/index.vue b/src/views/inStorage/receivingGoods/index.vue
index 5bd92f6..16a96f8 100644
--- a/src/views/inStorage/receivingGoods/index.vue
+++ b/src/views/inStorage/receivingGoods/index.vue
@@ -108,20 +108,20 @@
             <el-tab-pane name="first" label="入库明细">
               <el-table :data="goodsDetailList" border style="width: 100%">
                 <el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center" />
-                <el-table-column prop="goodsName" label="商品名称" align="center" />
-                <el-table-column prop="goodsCode" label="商品编码" align="center" />
+                <el-table-column prop="goodsSkuTitle" label="商品名称" align="center" />
+                <el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
                 <el-table-column prop="goodsBarCode" label="商品条码" align="center" />
-                <el-table-column prop="goodsSpc" label="规格值" align="center" />
+                <el-table-column prop="specValue" label="规格值" align="center" />
                 <el-table-column prop="boxBarCode" label="箱条码" align="center" />
                 <el-table-column prop="boxSpc" label="箱规格" align="center" />
                 <el-table-column prop="unit" label="单位" align="center" />
-                <el-table-column prop="costPrice" label="成本单价" align="center" />
+                <el-table-column prop="price" label="成本单价" align="center" />
                 <el-table-column prop="totalPrice" label="总价" align="center" />
                 <el-table-column prop="count" label="数量" align="center" />
                 <el-table-column prop="auxiliaryUnit" label="辅助单位" align="center" />
                 <el-table-column prop="serialNumber" label="序列号" align="center" />
                 <el-table-column prop="batchNumber" label="生产批次号" align="center" />
-                <el-table-column prop="warehouserack" label="入库库位" align="center" />
+                <el-table-column prop="warehouseRackName" label="入库库位" align="center" />
                 <el-table-column prop="remarks" label="明细备注" align="center" />
               </el-table>
             </el-tab-pane>
@@ -147,9 +147,9 @@
             <el-tab-pane name="operationList" label="操作日志">
               <el-table :data="operationList" border style="width: 100%">
                 <el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center" />
-                <el-table-column prop="times" label="操作时间" width="250" align="center" />
-                <el-table-column prop="name" label="操作账号" width="180" align="center" />
-                <el-table-column prop="centent" label="操作内容" align="center" />
+                <el-table-column prop="createTime" label="操作时间" width="250" align="center" />
+                <el-table-column prop="userName" label="操作账号" width="180" align="center" />
+                <el-table-column prop="content" label="操作内容" align="center" />
               </el-table>
             </el-tab-pane>
 
@@ -479,8 +479,6 @@
 
 
       rowItemClick(row) {
-        console.log("row", row);
-
         console.log("row", row);
         this.rowItemSid = row.sid
 
@@ -884,7 +882,7 @@
       },
       loadList1() {
         this.viewState = 1
-        this.handleClose()
+        this.dialogVisible = false
         this.loadList()
       }