From d68100a57e8992319fab09af1ce6dd1804c5fc24 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Mon, 3 Jun 2024 17:52:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=B0=E8=B4=A7=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E3=80=81=E6=94=B6=E8=B4=A7=E5=8D=95=E3=80=81=E4=B8=8A?=
 =?UTF-8?q?=E6=9E=B6=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Common/dictcommons.js                 |   34 +
 src/api/baseinfo/warehouse/warehouse.js       |    7 +-
 .../baseinfo/warehouseArea/warehouseArea.js   |    6 +-
 .../warehouseAreaType/warehouseAreaType.js    |    9 +-
 src/api/goods/goods.js                        |   12 +
 src/api/inStorage/deliveryNotice.js           |   59 +
 src/api/inStorage/receivingGoods.js           |  104 ++
 src/api/inStorage/upShelf.js                  |   44 +
 src/router/index.js                           |   30 +
 src/utils/index.js                            |   13 +-
 src/views/goods/goods/index.vue               |  311 +++--
 src/views/inStorage/deliveryNotice/index.vue  |  448 +++++++
 .../inStorage/deliveryNotice/receiptAdd.vue   |  724 +++++++++++
 .../inStorage/deliveryNotice/receiptInfo.vue  |  171 +++
 src/views/inStorage/receivingGoods/index.vue  |  433 +++++++
 .../receivingGoods/receivingGoodsAdd.vue      | 1055 +++++++++++++++++
 .../receivingGoods/receivingGoodsInfo.vue     |  206 ++++
 .../relation/chooseproducts.vue               |  164 +++
 .../receivingGoods/upShelfAddRecord.vue       |  418 +++++++
 src/views/inStorage/upShelf/index.vue         |  352 ++++++
 src/views/inStorage/upShelf/upShelfAdd.vue    |  425 +++++++
 src/views/inStorage/upShelf/upShelfInfo.vue   |  161 +++
 22 files changed, 5007 insertions(+), 179 deletions(-)
 create mode 100644 src/api/inStorage/deliveryNotice.js
 create mode 100644 src/api/inStorage/receivingGoods.js
 create mode 100644 src/api/inStorage/upShelf.js
 create mode 100644 src/views/inStorage/deliveryNotice/index.vue
 create mode 100644 src/views/inStorage/deliveryNotice/receiptAdd.vue
 create mode 100644 src/views/inStorage/deliveryNotice/receiptInfo.vue
 create mode 100644 src/views/inStorage/receivingGoods/index.vue
 create mode 100644 src/views/inStorage/receivingGoods/receivingGoodsAdd.vue
 create mode 100644 src/views/inStorage/receivingGoods/receivingGoodsInfo.vue
 create mode 100644 src/views/inStorage/receivingGoods/relation/chooseproducts.vue
 create mode 100644 src/views/inStorage/receivingGoods/upShelfAddRecord.vue
 create mode 100644 src/views/inStorage/upShelf/index.vue
 create mode 100644 src/views/inStorage/upShelf/upShelfAdd.vue
 create mode 100644 src/views/inStorage/upShelf/upShelfInfo.vue

diff --git a/src/api/Common/dictcommons.js b/src/api/Common/dictcommons.js
index 91d3279..cc8a7c1 100644
--- a/src/api/Common/dictcommons.js
+++ b/src/api/Common/dictcommons.js
@@ -8,6 +8,15 @@ export function typeValues(data) {
   })
 }
 
+// 获取数据字典（根据分组）
+export function getTypeValueList(data) {
+  return request({
+    url: '/portal/v1/dictcommons/getTypeValueList',
+    method: 'get',
+    params: data
+  })
+}
+
 // 根据当前登录人orgSidPath(全路径sid)查询分公司
 export function getOrgSidByPath(data) {
   return request({
@@ -142,3 +151,28 @@ export function chooseproducts(params) {
     headers: { 'Content-Type': 'application/json' }
   })
 }
+
+// 查询所有仓库
+export function getWarehouses(params) {
+  return request({
+    url: '/wms/apiadmin/base/wmswarehouseinfo/listAll',
+    method: 'post',
+    data: params,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
+
+// 根据仓库查询库位
+export function getWarehouseareas(data) {
+  return request({
+    url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
+    method: 'get',
+    params: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
diff --git a/src/api/baseinfo/warehouse/warehouse.js b/src/api/baseinfo/warehouse/warehouse.js
index 390f74d..bbf32cd 100644
--- a/src/api/baseinfo/warehouse/warehouse.js
+++ b/src/api/baseinfo/warehouse/warehouse.js
@@ -11,12 +11,15 @@ export default {
       headers: { 'Content-Type': 'application/json' }
     })
   },
-
   // 仓库查询
   getAllWarehouse: function(params) {
     return request({
       url: '/wms/apiadmin/base/wmswarehouseinfo/listAll',
-      method: 'get'
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
     })
   },
 
diff --git a/src/api/baseinfo/warehouseArea/warehouseArea.js b/src/api/baseinfo/warehouseArea/warehouseArea.js
index afff3ce..f6fb1c5 100644
--- a/src/api/baseinfo/warehouseArea/warehouseArea.js
+++ b/src/api/baseinfo/warehouseArea/warehouseArea.js
@@ -15,7 +15,11 @@ export default {
   getAllWarehousearea: function(params) {
     return request({
       url: '/wms/apiadmin/base/wmswarehousearea/listAll',
-      method: 'get'
+     method: 'post',
+     data: params,
+     headers: {
+       'Content-Type': 'application/json'
+     }
     })
   },
 
diff --git a/src/api/baseinfo/warehouseAreaType/warehouseAreaType.js b/src/api/baseinfo/warehouseAreaType/warehouseAreaType.js
index 6ecf1e5..7dc5860 100644
--- a/src/api/baseinfo/warehouseAreaType/warehouseAreaType.js
+++ b/src/api/baseinfo/warehouseAreaType/warehouseAreaType.js
@@ -12,15 +12,20 @@ export default {
     })
   },
 
-  // 库位查询
+  // 库去类型查询
   getAllWarehouseareatype: function(params) {
     return request({
       url: '/wms/apiadmin/base/wmswarehouseareatype/listAll',
-      method: 'get'
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
     })
   },
 
 
+
   // 修改是否可用状态
   updateIsEnable: function(sid,isEnable) {
   	return request({
diff --git a/src/api/goods/goods.js b/src/api/goods/goods.js
index acb7196..2ddf2da 100644
--- a/src/api/goods/goods.js
+++ b/src/api/goods/goods.js
@@ -58,4 +58,16 @@ export default {
     })
   },
 
+ // 下载模板
+  downloadExcel: function() {
+    return request({
+      url: '/wms/apiadmin/base/basegoodsspu/download',
+      method: 'post',
+      responseType: 'blob', // 表明返回服务器返回的数据类型
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  }
+
 }
diff --git a/src/api/inStorage/deliveryNotice.js b/src/api/inStorage/deliveryNotice.js
new file mode 100644
index 0000000..fc11c91
--- /dev/null
+++ b/src/api/inStorage/deliveryNotice.js
@@ -0,0 +1,59 @@
+import request from '@/utils/request'
+
+export default {
+
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/wms/apiadmin/WmsAnsBill/listPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  // 详情初始化
+  init: function(data) {
+    return request({
+      url: '/wms/apiadmin/WmsAnsBill/details?sid=' + data,
+      method: 'get'
+    });
+  },
+
+  // 收货初始化
+  getInitDetails: function(data) {
+    return request({
+      url: '/wms/apiadmin/inventory/WmsReceiptBill/getInitDetails?sourceSid=' + data,
+      method: 'get'
+    });
+  },
+
+
+  // 新增收货单
+  save: function(data) {
+    return request({
+      url: '/wms/apiadmin/inventory/WmsReceiptBill/saveOrUpdate',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+
+  // 确认收货单
+  submit: function(data) {
+    return request({
+      url: '/wms/apiadmin/inventory/WmsReceiptBill/confirm',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+
+
+}
diff --git a/src/api/inStorage/receivingGoods.js b/src/api/inStorage/receivingGoods.js
new file mode 100644
index 0000000..89decb2
--- /dev/null
+++ b/src/api/inStorage/receivingGoods.js
@@ -0,0 +1,104 @@
+import request from '@/utils/request'
+
+export default {
+
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/wms/apiadmin/inventory/WmsReceiptBill/listPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  // 初始化
+  init: function(data) {
+    return request({
+      url: '/wms/apiadmin/inventory/WmsReceiptBill/getDetailsInit?sid=' + data,
+      method: 'get'
+    });
+  },
+
+
+  // 新增、保存
+  save: function(data) {
+    return request({
+      url: '/wms/apiadmin/inventory/WmsReceiptBill/saveOrUpdate',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+
+  // 确认
+  submit: function(data) {
+    return request({
+      url: '/wms/apiadmin/inventory/WmsReceiptBill/confirm',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+
+
+  // 保存 上架单
+  saveUpShelf: function(data) {
+    return request({
+      url: '/wms/apiadmin/WmsShelfBill/saveOrUpdate',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+
+
+  // 查询所有商品
+  getGoodsListPage: function(params) {
+    return request({
+      url: '/yxtbase/apiadmin/base/basegoodssku/getGoodsListPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+
+
+  deleteBySids: function(data) {
+    return request({
+      url: '/wms/apiadmin/inventory/WmsReceiptBill/delBySids',
+      method: 'DELETE',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+
+
+  // 初始化新增上架单
+  initUpshelf: function(params) {
+    return request({
+      url: '/wms/apiadmin/WmsShelfBill/getInit?sid=' + params.sid + "&orgPath=" + params.orgPath + "&userSid=" +
+        params.userSid,
+      method: 'get',
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+
+  },
+
+}
diff --git a/src/api/inStorage/upShelf.js b/src/api/inStorage/upShelf.js
new file mode 100644
index 0000000..e13a9ad
--- /dev/null
+++ b/src/api/inStorage/upShelf.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+export default {
+
+// 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/wms/apiadmin/WmsShelfBill/listPage',
+      method: 'post',
+      data: params,
+       headers: { 'Content-Type': 'application/json' }
+    })
+  },
+
+  // 初始化
+  init: function(data) {
+    return request({
+      url: '/wms/apiadmin/WmsShelfBill/details?sid='+data,
+      method: 'get'
+    });
+  },
+
+
+  // 新增、保存
+  save: function(data) {
+    return request({
+      url: '/wms/apiadmin/WmsShelfBill/saveOrUpdate',
+      method: 'post',
+      data: data,
+       headers: { 'Content-Type': 'application/json' }
+    });
+  },
+
+
+  deleteBySids: function(data) {
+    return request({
+      url: '/wms/apiadmin/WmsShelfBill/delBySids',
+      method: 'DELETE',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+
+}
diff --git a/src/router/index.js b/src/router/index.js
index 78f8e93..5320303 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -179,6 +179,36 @@ export const constantRoutes = [
 
     ]
   },
+  {
+    path: '/inStorage',
+    component: Layout,
+    redirect: '/inStorage',
+    meta: {
+      title: '入库管理'
+    },
+    children: [
+      {
+        path: '/deliveryNotice/index',
+        component: () => import('@/views/inStorage/deliveryNotice/index'),
+        name: 'DeliveryNotice',
+        meta: { title: '到货通知单', noCache: true }
+      },
+      {
+        path: '/receivingGoods/index',
+        component: () => import('@/views/inStorage/receivingGoods/index'),
+        name: 'ReceivingGoods',
+        meta: { title: '收货单管理', noCache: true }
+      },
+      {
+        path: '/upShelf/index',
+        component: () => import('@/views/inStorage/upShelf/index'),
+        name: 'UpShelf',
+        meta: { title: '上架单管理', noCache: true }
+      },
+
+    ]
+  },
+
   {
     path: '/system',
     component: Layout,
diff --git a/src/utils/index.js b/src/utils/index.js
index 40d3448..61a78ef 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -202,4 +202,15 @@ export function getBeforeDate(num, time) {
 	day = d.getDate();
 	let s = year + "-" + (mon < 10 ? ('0' + mon) : mon) + "-" + (day < 10 ? ('0' + day) : day);
 	return s;
-}
\ No newline at end of file
+}
+
+/**
+ * 获取当前日期
+ */
+export function getCurrentDate() {
+  let now = new Date();
+  let year = now.getFullYear();
+  let month = now.getMonth() + 1;
+  let day = now.getDate();
+  return year + "-" + month + "-" + day;
+}
diff --git a/src/views/goods/goods/index.vue b/src/views/goods/goods/index.vue
index f952e38..38aa86c 100644
--- a/src/views/goods/goods/index.vue
+++ b/src/views/goods/goods/index.vue
@@ -9,42 +9,9 @@
           </el-button>
           <div v-show="isSearchShow" class="search">
             <el-form :inline="true" class="tab-header">
-              <el-form-item label="分公司">
-                <el-input v-model="queryParams.params.createOrgName" placeholder="" clearable />
-              </el-form-item>
-              <el-form-item label="部门">
-                <el-input v-model="queryParams.params.useOrgName" placeholder="" clearable />
-              </el-form-item>
               <el-form-item label="商品名称">
-                <el-input v-model="queryParams.params.goodsName" placeholder="" clearable />
-              </el-form-item>
-              <el-form-item label="商品编码">
-                <el-input v-model="queryParams.params.goodsCode" placeholder="" clearable />
-              </el-form-item>
-              <el-form-item label="拼音缩写">
-                <el-input v-model="queryParams.params.goodsPY" placeholder="" clearable />
-              </el-form-item>
-              <el-form-item label="商品类别">
-                <el-select v-model="queryParams.params.goodsTypeName" placeholder="请选择" class="addinputw addinputInfo"
-                  @change="selectCateChange">
-                  <el-option v-for="item in goodsTypeList" :key="item.sid" :label="item.goodsTypeName"
-                    :value="item.sid" />
-                </el-select>
+                <el-input v-model="queryParams.params.name" placeholder="" clearable />
               </el-form-item>
-              <el-form-item label="品牌">
-                <el-select v-model="queryParams.params.brandName" placeholder="请选择" class="addinputw addinputInfo"
-                  @change="selectBrandChange">
-                  <el-option v-for="item in brandList" :key="item.sid" :label="item.brandName" :value="item.sid" />
-                </el-select>
-              </el-form-item>
-              <el-form-item label="厂家">
-                <el-select v-model="queryParams.params.manufacturerName" placeholder="请选择"
-                  class="addinputw addinputInfo" @change="selectfacturerChange">
-                  <el-option v-for="item in facturerList" :key="item.sid" :label="item.manufacturerName"
-                    :value="item.sid" />
-                </el-select>
-              </el-form-item>
-
 
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -62,44 +29,14 @@
         <div class="">
           <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
             @selection-change="selectionLineChangeHandle">
-            <el-table-column fixed width="50" type="selection" align="center" />
-            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-            <el-table-column fixed label="操作" align="center" width="100">
+            <el-table-column width="50" type="selection" align="center" />
+            <el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center" />
+            <el-table-column label="操作" align="center" width="80">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">详情</el-button>
                 <!-- <el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button> -->
               </template>
             </el-table-column>
-            <!-- <el-table-column label="是否可用" align="center" width="140">
-              <template slot-scope="scope">
-                <el-switch v-model="scope.row.isEnable" active-text="是" inactive-text="否" active-value="1"
-                  inactive-value="2" @change="enableChange(scope.row.sid,scope.row.isEnable)" />
-              </template>
-            </el-table-column> -->
-            <!--   <el-table-column fixed prop="goodsName" label="商品名称" width="120" align="center" />
-            <el-table-column prop="goodsCode" label="商品编码" width="120" align="center" />
-            <el-table-column prop="goodsPY" label="拼音缩写" width="100" align="center" />
-            <el-table-column prop="barCode" label="商品条码" width="100" align="center" />
-            <el-table-column prop="goodsUnitName" label="计量单位" width="100" align="center" />
-            <el-table-column prop="goodsTypeName" label="商品类别" width="100" align="center" />
-            <el-table-column prop="indexes" label="规格" width="100" align="center" />
-            <el-table-column prop="shelfLife" label="保质期(天)" width="100" align="center" />
-            <el-table-column prop="brandName" label="品牌" width="100" align="center" />
-            <el-table-column prop="manufacturerName" label="厂家" width="120" align="center" />
-            <el-table-column prop="isOriginalFactoryValue" label="原厂标志" width="100" align="center" />
-            <el-table-column prop="inventoryAlertUpperLimit" label="库存上限" width="100" align="center" />
-            <el-table-column prop="inventoryAlertLowerLimit" label="库存下限" width="100" align="center" />
-            <el-table-column prop="isLockingSalesPriceValue" label="锁定销售价" width="100" align="center" />
-            <el-table-column prop="minimumSalesPrice" label="销售底价" width="100" align="center" />
-            <el-table-column prop="standardPurchasePrice" label="三包价格" width="100" align="center" />
-            <el-table-column prop="agencyPrice" label="首保价格" width="100" align="center" />
-            <el-table-column label="商品图片" align="center" width="100">
-              <template slot-scope="scope">
-                <div style="color: #1890FF; text-decoration: underline ;" @click="showImage(scope.row.picPath)">查看
-                </div>
-              </template>
-            </el-table-column> -->
-
             <el-table-column label="是否可用" align="center" width="140">
               <template slot-scope="scope">
                 <el-switch v-model="scope.row.isEnable" active-text="是" inactive-text="否" active-value="1"
@@ -115,7 +52,6 @@
             <el-table-column prop="manufacturerName" label="商品厂家" align="center" />
             <el-table-column prop="nationalStandardCode" label="国标码" align="center" />
             <el-table-column prop="taxRate" label="税率" align="center" />
-
           </el-table>
         </div>
         <!-- End 项目列表 -->
@@ -133,21 +69,35 @@
     <!-- 详情部分组件 -->
     <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" />
 
-    <el-dialog title="商品图片" :visible.sync="dialogVisible" :before-close="handleClose">
-
-      <el-form ref="dataForm1" class="formadd" style="margin-top: -30px;">
-
-        <el-row class="first_row">
-          <el-col :span="24" class="trightb">
-            <el-image style="width: 120px;height: 120px; margin: 10px; background: #f0f;"
-              v-for="(item,index) in fileList" :src="item.url" :preview-src-list="[item.url]">
-            </el-image>
-          </el-col>
-        </el-row>
-
-      </el-form>
-
+    <!-- 导入 -->
+    <el-dialog :visible.sync="dialogVisible" width="60%" :show-close="false">
+      <div style="margin-top: -40px;">
+        <el-button size="medium" type="text" style="font-weight: bold" @click="downLoad">下载商品导入明细模板</el-button>
 
+      </div>
+      <div style="margin-top: 10px;font-weight: bold">导入的EXCEL中的抬头的顺序和名字请保持一致!否则导入数据不正确。</div>
+      <div style="margin-top: 5px;font-weight: bold">导入之前，请仔细检查数据中不能存在"\这些特殊字符。</div>
+      <div style="margin-top: 5px;font-weight: bold">只能导入xls或者xlsx文件，如果导入内容较多，请耐心等待响应。</div>
+      <el-card class="box-card" style="margin-top: 10px;">
+        <div>
+          <el-upload ref="upload" class="upload-demo" accept=".xls,.xlsx" name="file" :action="updateAction"
+            :on-success="handleSuccess" :file-list="fileList" :auto-upload="false" :multiple="false" :limit="1"
+            :data="uploadData" :headers="headers">
+            <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+            <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传</el-button>
+          </el-upload>
+        </div>
+        <div>
+          <h3>文件上传结果</h3>
+          <el-card class="box-card">
+            <div>{{ uploadResultMesssage }}</div>
+          </el-card>
+        </div>
+      </el-card>
+      <div slot="footer" class="dialog-footer" style="text-align: center">
+        <el-button type="primary" size="small" @click="handleConfirm">确定</el-button>
+        <el-button size="small" @click="dialogVisible = false">取消</el-button>
+      </div>
     </el-dialog>
 
 
@@ -156,9 +106,6 @@
 
 <script>
   import req from '@/api/goods/goods.js'
-  import req2 from '@/api/goods/brand.js'
-  import req3 from '@/api/goods/category.js'
-  import req4 from '@/api/goods/factory.js'
   import ButtonBar from '@/components/ButtonBar'
   import Pagination from '@/components/pagination'
   import pageye from '@/components/pagination/pageye'
@@ -177,12 +124,28 @@
       return {
         dialogVisible: false,
         btndisabled: false,
+        updateAction: process.env.VUE_APP_BASE_API + '/wms/apiadmin/base/basegoodsspu/importExcel',
+        fileList: [],
+        uploadSuccess: false,
+        uploadResultMesssage: '',
+        uploadData: {
+          sid: ''
+        },
+        headers: {
+          token: window.sessionStorage.getItem('token')
+        },
         viewState: 1, // 1、列表 2、添加 3、修改 4、查看
         isSearchShow: false,
         searchxianshitit: '显示查询条件',
         tableLoading: false,
         dataList: [],
         btnList: [{
+            type: 'success',
+            size: 'small',
+            icon: '',
+            btnKey: 'doImport',
+            btnLabel: '导入商品'
+          }, {
             type: 'primary',
             size: 'small',
             icon: 'plus',
@@ -216,26 +179,11 @@
           size: 10,
           total: 0,
           params: {
-            orgPath: '',
-            useOrgName: '',
-            createOrgName: '',
-            goodsName: '',
-            goodsCode: '',
-            goodsPY: '',
-            goodsTypeSid: '',
-            goodsTypeName: '',
-            brandSid: '',
-            brandName: '',
-            manufacturerSid: '',
-            manufacturerName: '',
+            name: ''
           }
         },
         sids: [],
-        selectionList: [],
-        brandList: [],
-        goodsTypeList: [],
-        facturerList: [],
-        fileList: []
+        selectionList: []
       }
     },
     mounted() {
@@ -243,52 +191,54 @@
     },
     created() {
       this.loadList()
-      this.initData()
     },
     methods: {
-      initData() {
-        var parpams = {
-          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
-        }
-        // 品牌
-        req2.getAllBrand(parpams).then(resp => {
-          console.log('>>>>>>>>>getAllBrand', resp)
-          this.brandList = resp.data
-        }).catch(() => {})
-
-        // 类别
-        req3.getAllType(parpams).then(resp => {
-          console.log('>>>>>>>>>getAllType', resp)
-          this.goodsTypeList = resp.data
-        }).catch(() => {})
-
-        // 厂家
-        req4.getAllFacturer(parpams).then(resp => {
-          console.log('>>>>>>>>>getAllFacturer', resp)
-          this.facturerList = resp.data
-        }).catch(() => {})
-
+      downLoad() {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        req.downloadExcel().then((resp) => {
+          loading.close()
+          const blob = new Blob([resp], {
+            type: 'application/vnd.ms-excel'
+          })
+          const fileName = '商品导入明细模版' + '.xls'
+          const elink = document.createElement('a')
+          elink.download = fileName
+          elink.style.display = 'nonde'
+          elink.href = URL.createObjectURL(blob)
+          document.body.appendChild(elink)
+          elink.click()
+          URL.revokeObjectURL(elink.href)
+          document.body.removeChild(elink)
+        }).catch(() => {
+          loading.close()
+        })
       },
-
-      selectBrandChange(val) {
-        const choose = this.brandList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectBrandChange', choose)
-        this.queryParams.params.brandSid = choose[0].sid
-        this.queryParams.params.brandName = choose[0].brandName
+      submitUpload() {
+        this.$refs.upload.submit()
       },
-      selectCateChange(val) {
-        const choose = this.goodsTypeList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectCateChange', choose)
-        this.queryParams.params.goodsTypeSid = choose[0].sid
-        this.queryParams.params.goodsTypeName = choose[0].goodsTypeName
+      handleSuccess(resp, file, fileList) {
+        const _this = this
+        _this.uploadResultMesssage = resp.msg
+        _this.uploadSuccess = resp.success
+
       },
-      selectfacturerChange(val) {
-        const choose = this.facturerList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectfacturerChange', choose)
-        this.queryParams.params.manufacturerSid = choose[0].sid
-        this.queryParams.params.manufacturerName = choose[0].manufacturerName
+      handleConfirm() {
+        if (!this.uploadSuccess) {
+          this.$message({
+            showClose: true,
+            type: 'error',
+            message: '请先上传商品导入明细'
+          })
+          return
+        }
+        this.dialogVisible = false
+        this.loadList()
       },
-
       // 搜索条件效果
       clicksearchShow() {
         this.isSearchShow = !this.isSearchShow
@@ -300,6 +250,9 @@
       },
       btnHandle(btnKey) {
         switch (btnKey) {
+          case "doImport":
+            this.doImport()
+            break
           case 'toAdd':
             this.toAdd()
             break
@@ -320,7 +273,6 @@
         console.log("val", val);
 
         this.selectionList = val
-
         const aa = []
         val.forEach(element => {
           aa.push(element.sid)
@@ -329,9 +281,6 @@
       },
       loadList() {
         this.tableLoading = true
-        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
-        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
-        this.queryParams.params.menuUrl = this.$route.path
         req.listPage(this.queryParams).then((resp) => {
           this.tableLoading = false
           if (resp.success) {
@@ -364,22 +313,14 @@
           size: 10,
           total: 0,
           params: {
-            orgPath: '',
-            useOrgName: '',
-            createOrgName: '',
-            goodsName: '',
-            goodsCode: '',
-            goodsPY: '',
-            goodsTypeSid: '',
-            goodsTypeName: '',
-            brandSid: '',
-            brandName: '',
-            manufacturerSid: '',
-            manufacturerName: '',
+            name: ''
           }
         }
         this.loadList()
       },
+      doImport() {
+        this.dialogVisible = true
+      },
       toAdd() {
         this.viewState = 2
         this.$refs['divadd'].showAdd()
@@ -399,14 +340,6 @@
         this.$refs['divadd'].showEdit(this.selectionList[0])
       },
 
-      doClose() {
-        this.$store.dispatch('tagsView/delView', this.$route)
-        this.$router.go(-1)
-      },
-      toRelevancy(row) {
-        this.viewState = 4
-        this.$refs['divinfo'].showEdit(row)
-      },
       doDel() {
 
         if (this.sids.length > 0) {
@@ -445,6 +378,45 @@
           })
         }
       },
+
+      doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+      },
+      toRelevancy(row) {
+        this.viewState = 4
+        this.$refs['divinfo'].showEdit(row)
+      },
+      toRelevancyInfo(row) {
+        const tip = '请确认是否删除所选品牌?'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          req.deleteGoods(row.sid).then((resp) => {
+            loading.close()
+            if (resp.success) {
+              this.$message({
+                type: 'success',
+                message: resp.msg,
+                showClose: true
+              })
+              this.loadList()
+            } else {
+              // 根据resp.code进行异常情况处理
+            }
+          }).catch(e => {
+            loading.close()
+          })
+        }).catch(() => {})
+      },
       resetState() {
         this.viewState = 1
       },
@@ -464,13 +436,6 @@
           console.log(e)
         })
       },
-      showImage(paths) {
-        this.fileList = paths
-        this.dialogVisible = true
-      },
-      handleClose() {
-        this.dialogVisible = false
-      },
     }
   }
 </script>
diff --git a/src/views/inStorage/deliveryNotice/index.vue b/src/views/inStorage/deliveryNotice/index.vue
new file mode 100644
index 0000000..d2da7aa
--- /dev/null
+++ b/src/views/inStorage/deliveryNotice/index.vue
@@ -0,0 +1,448 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <button-bar ref="btnbar" view-title="预期到货通知单管理" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">
+            {{ searchxianshitit }}
+          </el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form :inline="true" class="tab-header">
+              <el-form-item label="单据编号">
+                <el-input v-model="queryParams.params.billNo" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="单据日期">
+                <el-date-picker v-model="queryParams.params.createTimeStart" type="date" placeholder="选择日期"
+                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
+                </el-date-picker>至
+                <el-date-picker v-model="queryParams.params.createTimeEnd" type="date" placeholder="选择日期"
+                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item label="采购单号">
+                <el-input v-model="queryParams.params.sourceBillNo" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="业务类型">
+                <el-select v-model="queryParams.params.busTypeKey" placeholder="请选择">
+                  <el-option v-for="(item,i) in busTypeList" :key="item.sid" :label="item.name" :value="item.name">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="供应商">
+                <el-input v-model="queryParams.params.supplierName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="预计到货日期">
+                <el-date-picker v-model="queryParams.params.deliveryDateStart" type="date" placeholder="选择日期"
+                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
+                </el-date-picker>
+                至
+                <el-date-picker v-model="queryParams.params.deliveryDateEnd" type="date" placeholder="选择日期"
+                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item label="单据状态">
+                <el-select v-model="queryParams.params.billState" placeholder="请选择">
+                  <el-option v-for="(item,i) in billStateList" :key="item.sid" :label="item.name" :value="item.name">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="审核状态">
+                <el-select v-model="queryParams.params.reviewStatus" placeholder="请选择">
+                  <el-option v-for="(item,i) in reviewStatusList" :key="item.sid" :label="item.name" :value="item.name">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!-- Start 项目列表头部 -->
+        <div class="listtop">
+          <div class="tit">预期到货通知单列表</div>
+        </div>
+        <!-- End 项目列表头部 -->
+        <!-- Start 项目列表 -->
+        <div class="">
+          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
+            @selection-change="selectionLineChangeHandle">
+            <el-table-column fixed width="50" type="selection" align="center" />
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+            <el-table-column fixed label="操作" align="center" width="120">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="billNo" label="单据编号" align="center" width="220" />
+            <el-table-column prop="createTime" label="单据日期" align="center" width="150" />
+            <el-table-column prop="createByName" label="制单人" align="center" width="150" />
+            <el-table-column prop="sourceBillNo" label="采购单号" align="center" width="180" />
+            <el-table-column prop="busTypeValue" label="业务类型" align="center" width="150" />
+            <el-table-column prop="supplierName" label="供应商" align="center" width="150" />
+            <el-table-column prop="contact" label="联系人" align="center" width="150" />
+            <el-table-column prop="mobile" label="联系人电话" align="center" width="150" />
+            <el-table-column prop="deliveryDate" label="预计到货日期" align="center" width="150" />
+            <el-table-column prop="billState" label="单据状态" align="center" width="150" />
+            <el-table-column prop="reviewStatus" label="审核状态" align="center" width="150" />
+            <el-table-column prop="refuseReason" label="拒绝原因" align="center" width="150" />
+
+
+          </el-table>
+        </div>
+        <!-- End 项目列表 -->
+        <div class="pages">
+          <div class="tit" />
+          <!--  翻页  -->
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
+            :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+        </div>
+      </div>
+    </div>
+    <!-- End 查询和其列表部分 -->
+    <!-- 新增修改部分组件 -->
+    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+    <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" />
+
+    <el-dialog title="审核单据" :visible.sync="dialogVisible" :before-close="handleClose">
+      <el-form ref="dataForm" class="formadd" style="margin-top: -40px;" :model="formobj">
+        <el-row class="first_row">
+          <el-col :span="8" class="trightb">
+            <el-form-item class="trightb_item">
+              <span slot="label">审核结果</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item class="trightb_item">
+              <el-radio-group v-model="formobj.reviewStatus" size="small" @change="changeTheme">
+                <el-radio :label="1">合格</el-radio>
+                <el-radio :label="2">不合格</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8" class="trightb">
+            <el-form-item class="trightb_item">
+              <span slot="label">审核意见</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item class="trightb_item">
+              <el-input v-model="formobj.remarks" placeholder="请填写审核意见" class="addinputw" style="width:100%"
+                clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+
+      <div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
+        <el-button type="primary" style="margin-top: 20px;" @click="saveExamine">确 定</el-button>
+      </div>
+
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/inStorage/deliveryNotice.js'
+  import ButtonBar from '@/components/ButtonBar'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import divAdd from './receiptAdd.vue'
+  import divInfo from './receiptInfo.vue'
+  export default {
+    components: {
+      ButtonBar,
+      Pagination,
+      pageye,
+      divAdd,
+      divInfo
+    },
+    data() {
+      return {
+        dialogVisible: false,
+        formobj: {
+          sid: "",
+          reviewStatus: "",
+          remarks: ''
+        },
+        btndisabled: false,
+        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        tableLoading: false,
+        dataList: [],
+        btnList: [{
+            type: 'primary',
+            size: 'small',
+            icon: 'plus',
+            btnKey: 'toAudit',
+            btnLabel: '审核'
+          }, {
+            type: 'primary',
+            size: 'small',
+            icon: 'plus',
+            btnKey: 'toAdd',
+            btnLabel: '收货'
+          },
+          {
+            type: 'info',
+            size: 'small',
+            icon: 'cross',
+            btnKey: 'doClose',
+            btnLabel: '关闭'
+          }
+        ],
+        queryParams: {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            name: ''
+          }
+        },
+        sids: [],
+        selectionList: [],
+        busTypeList: [{
+            name: "采购预约",
+            sid: "0"
+          },
+          {
+            name: "调拨预约",
+            sid: "1"
+          },
+          {
+            name: "其他预约",
+            sid: "2"
+          }
+        ],
+        billStateList: [{
+            name: "在途",
+            sid: "0"
+          },
+          {
+            name: "部分收货",
+            sid: "1"
+          },
+          {
+            name: "已收货",
+            sid: "2"
+          },
+          {
+            name: "已取消",
+            sid: "3"
+          }
+        ],
+        reviewStatusList: [{
+            name: "待审核",
+            sid: "1"
+          },
+          {
+            name: "审核通过",
+            sid: "2"
+          },
+          {
+            name: "审核拒绝",
+            sid: "3"
+          }
+        ]
+      }
+    },
+    mounted() {
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    created() {
+      this.loadList()
+    },
+    methods: {
+      saveExamine() {
+
+      },
+      changeTheme() {
+
+      },
+      toAudit() {
+        if (this.selectionList.length != 1) {
+          this.$message({
+            type: 'warning',
+            message: "请选择一条数据。",
+            showClose: true
+          })
+          return
+        }
+
+        this.dialogVisible = true
+      },
+      handleClose() {
+        this.dialogVisible = false
+      },
+      selectTime1() {
+
+      },
+      selectTime2() {
+
+      },
+      selectionLineChangeHandle(val) {
+        console.log("val", val);
+
+        this.selectionList = val
+
+      },
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        switch (btnKey) {
+          case 'toAudit':
+            this.toAudit()
+            break
+          case 'toAdd':
+            this.toAdd()
+            break
+          case 'doClose':
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+      loadList() {
+        this.tableLoading = true
+        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        this.queryParams.params.menuUrl = this.$route.path
+        req.listPage(this.queryParams).then((resp) => {
+          this.tableLoading = false
+          if (resp.success) {
+            const data = resp.data
+            this.queryParams.total = data.total
+            this.dataList = data.records
+          } else {
+            // 根据resp.code进行异常情况处理
+            this.dataList = []
+            this.queryParams.total = 0
+          }
+        }).catch(() => {
+          this.tableLoading = false
+        })
+      },
+
+      // 序号
+      indexMethod(index) {
+        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      dosearch() {
+        this.queryParams.current = 1
+        this.loadList()
+      },
+      resetQuery() {
+        this.queryParams = {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            name: ''
+          }
+        }
+        this.loadList()
+      },
+      toAdd() {
+
+        if (this.selectionList.length != 1) {
+          this.$message({
+            type: 'warning',
+            message: "请选择一条数据。",
+            showClose: true
+          })
+          return
+        }
+
+        if(this.selectionList[0].billState=='已收货'){
+          this.$message({
+            type: 'warning',
+            message: "此记录已完成,不可重复操作。",
+            showClose: true
+          })
+          return
+        }
+
+        this.viewState = 2
+        this.$refs['divadd'].showEdit(this.selectionList[0])
+
+      },
+
+      doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+      },
+      toRelevancy(row) {
+        this.viewState = 4
+        this.$refs['divinfo'].showEdit(row)
+      },
+      toRelevancyInfo(row) {
+        const tip = '请确认是否删除所选品牌?'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          req.deleteGoods(row.sid).then((resp) => {
+            loading.close()
+            if (resp.success) {
+              this.$message({
+                type: 'success',
+                message: resp.msg,
+                showClose: true
+              })
+              this.loadList()
+            } else {
+              // 根据resp.code进行异常情况处理
+            }
+          }).catch(e => {
+            loading.close()
+          })
+        }).catch(() => {})
+      },
+      resetState() {
+        this.viewState = 1
+      },
+      enableChange(sid, state) {
+        console.log('sid', sid)
+        console.log('state', state)
+        req.updateIsEnable(sid, state).then((resp) => {
+          if (resp.success) {
+            this.$message({
+              type: 'success',
+              message: '状态已更新',
+              showClose: true
+            })
+          } else { // 根据resp.code进行异常情况处理
+          }
+        }).catch(e => {
+          console.log(e)
+        })
+      }
+    }
+  }
+</script>
+<style scoped>
+</style>
diff --git a/src/views/inStorage/deliveryNotice/receiptAdd.vue b/src/views/inStorage/deliveryNotice/receiptAdd.vue
new file mode 100644
index 0000000..5d85d54
--- /dev/null
+++ b/src/views/inStorage/deliveryNotice/receiptAdd.vue
@@ -0,0 +1,724 @@
+<template>
+  <div>
+
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>【新增】收货单</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="submintdate">确认</el-button>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+
+    <div class="listconadd">
+
+      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+        <!-- <div class="title">
+          <div>基础信息</div>
+        </div> -->
+        <el-row class="first_row">
+
+          <el-col :span="8">
+            <div class="span-sty">制单人</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">制单部门</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">单据日期</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">采购单号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">业务类型</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.busTypeValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">供应商</div>
+            <el-select v-model="formobj.supplierName" placeholder="请选择" clearable @change="selectSupplierName"
+              class="addinputInfo">
+              <el-option v-for="(item,i) in supplierNameList" :key="item.sid" :label="item.supplierName"
+                :value="item.sid">
+              </el-option>
+            </el-select>
+
+            <!-- <el-form-item><span class="addinputInfo">{{ formobj.supplierName }}</span></el-form-item> -->
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty"><span class="must">*</span> 到货日期</div>
+            <el-form-item prop="deliveryDate">
+              <el-date-picker v-model="formobj.deliveryDate" type="date" class="addinputInfo" value-format="yyyy-MM-dd"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <div class="span-sty">单据状态</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">备注</div>
+            <el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
+                type="textarea" :rows="4" clearable /></el-form-item>
+          </el-col>
+        </el-row>
+
+        <div class="title titleOne">
+          <div>商品列表</div>
+          <!-- <el-button type="primary" size="mini" class="btntopblueline" @click="batchAddAll()">批次收货</el-button> -->
+        </div>
+        <el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;">
+          <el-table-column fixed width="50" type="selection" align="center" />
+          <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+          <el-table-column fixed label="操作" wid align="center" width="100">
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini" @click="doGoods(scope.row)">删除</el-button>
+              <!-- <el-button type="primary" size="mini" @click="doAddBatch(scope.row)">批次+</el-button> -->
+            </template>
+          </el-table-column>
+          <el-table-column label="商品名称" prop="goodsSpuName" align="center" width="200" />
+          <el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
+          <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
+          <el-table-column label="单位" prop="unit" align="center" width="120" />
+          <!-- <el-table-column label="仓库" align="center" width="180">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.warehouseName" placeholder="请选择" clearable
+                @change="selectWarehouseName(scope.row,$event)">
+                <el-option v-for="(item,i) in warehouseList" :key="i" :label="item.warehouseName" :value="item.sid">
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="库位" align="center" width="180">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.warehouseRackName" :disabled="scope.row.warehouseName==''" clearable
+                @focus="getWarehouseAreaList(scope.row.warehouseSid)" placeholder="请选择"
+                @change="selectWarehouseAreaCode">
+                <el-option v-for="(item,i) in warehouseRackList" :key="i" :label="item.areaCode" :value="item.sid">
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column> -->
+          <!-- <el-table-column label="预约数量" prop="orderCount" align="center" width="120" /> -->
+          <el-table-column label="实收数量" align="center" width="120">
+            <template slot-scope="scope">
+              <el-input ref="focusAssumptionInput" @input="commodityComputeYHAndXSJE(scope.row,$event)"
+                v-model="scope.row.actualInCount" clearable placeholder=""
+                oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+            </template>
+          </el-table-column>
+          <el-table-column label="拒收数量" align="center" width="120">
+            <template slot-scope="scope">
+              <el-input ref="focusAssumptionInput" v-model="scope.row.rejectCount" clearable placeholder=""
+                @input="commodityComputeYHAndXSJE2(scope.row,$event)"
+                oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+            </template>
+          </el-table-column>
+          <el-table-column label="拒收原因" align="center" width="180">
+            <template slot-scope="scope">
+              <el-input ref="focusAssumptionInput" v-model="scope.row.rejectReason" clearable placeholder="" />
+            </template>
+          </el-table-column>
+          <el-table-column label="是否质检" align="center" width="180">
+            <template slot-scope="scope">
+              <el-radio-group v-model="scope.row.isQuality" size="small" @change="changeTheme">
+                <el-radio :label="0">是</el-radio>
+                <el-radio :label="1">否</el-radio>
+              </el-radio-group>
+            </template>
+          </el-table-column>
+          <el-table-column label="质检状态" align="center" width="180">
+            <template slot-scope="scope">
+              <el-radio-group v-model="scope.row.qualityState" size="small" @change="changeTheme2">
+                <el-radio :label="0">合格</el-radio>
+                <el-radio :label="1">不合格</el-radio>
+              </el-radio-group>
+            </template>
+          </el-table-column>
+          <el-table-column label="载具说明" align="center" width="180">
+            <template slot-scope="scope">
+              <el-input ref="focusAssumptionInput" v-model="scope.row.packageRemark" clearable placeholder="" />
+            </template>
+          </el-table-column>
+          <el-table-column label="入库单价" prop="cost" align="center" width="100" />
+          <el-table-column label="税率" prop="taxAmount" align="center" width="100" />
+          <!-- <el-table-column label="含税单价" prop="taxPrice" align="center" width="100" /> -->
+          <el-table-column label="入库金额" prop="amount" align="center" width="100" />
+        </el-table>
+
+
+        <!--  <div class="title">
+          <div>商品-批次</div>
+        </div>
+        <el-table v-loading="listLoading" :data="formobj.pcList" border style="width: 100%;">
+          <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+          <el-table-column fixed label="操作" wid align="center" width="120">
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini" @click="doGoodsBatch(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column label="商品列表序号" prop="xh" align="center" width="120" />
+          <el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
+          <el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
+          <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
+          <el-table-column label="单位" prop="unit" align="center" width="120" />
+          <el-table-column label="仓库" prop="unit" align="center" width="150" />
+          <el-table-column label="库位" prop="unit" align="center" width="150" />
+          <el-table-column label="批次号" prop="batchNumber" align="center" width="300" />
+          <el-table-column label="生产日期" align="center" width="180">
+            <template slot-scope="scope">
+              <el-date-picker v-model="scope.row.manufactureDate" type="date" value-format="yyyy-MM-dd"
+                placeholder="选择日期" @change="manufactureDateChange(scope.row,$event)" />
+            </template>
+          </el-table-column>
+          <el-table-column label="有效期" prop="expirationDate" align="center" width="180" />
+          <el-table-column label="数量" align="center" width="120">
+            <template slot-scope="scope">
+              <el-input ref="focusAssumptionInput" v-model="scope.row.batchCount" clearable placeholder=""
+                oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+            </template>
+          </el-table-column>
+        </el-table> -->
+
+      </el-form>
+
+    </div>
+  </div>
+</template>
+
+<script>
+  import req from '@/api/inStorage/deliveryNotice.js'
+  import {
+    getCurrentDate
+  } from '@/utils/index.js'
+  import {
+    choiceSupplierInfo,
+    getOrgSidByPath,
+    getWarehouses,
+    getWarehouseareas
+  } from '@/api/Common/dictcommons'
+
+  export default {
+    components: {},
+    data() {
+      return {
+        listLoading: false,
+        activeNames: ['1'],
+        submitdisabled: false,
+        formobj: {
+          sourceBillNo: "",
+          busTypeKey: "",
+          busTypeValue: "",
+          createTime: '',
+          createByName: window.sessionStorage.getItem('name'),
+          deptName: '',
+          deptSid: '',
+          createBySid: window.sessionStorage.getItem('userSid'),
+          useOrgSid: '',
+          createOrgSid: '',
+          billState: '新建',
+          billStateKey: 0,
+          reviewStatus: "",
+          refuseReason: "",
+          contact: "",
+          mobile: "",
+          supplierSid: "",
+          supplierName: "",
+          goodsOwnerSid: "",
+          goodsOwner: "",
+          deliveryDate: getCurrentDate(),
+          list: [],
+          pcList: []
+        },
+        hideUploadBtn: false,
+        warehouseList: [],
+        warehouseRackList: [],
+        supplierNameList: [],
+        rules: {
+          deliveryDate: [{
+            required: true,
+            message: '到货日期不能为空',
+            trigger: 'change'
+          }],
+        }
+      }
+    },
+    created() {
+      getOrgSidByPath({
+        orgPath: window.sessionStorage.getItem('defaultOrgPath')
+      }).then((res) => {
+        if (res.success) {
+          this.formobj.createOrgSid = res.data
+          this.formobj.useOrgSid = res.data
+        }
+      })
+    },
+    methods: {
+      // getOrgPathSid() {
+      //   getOrgSidByPath({
+      //     orgPath: window.sessionStorage.getItem('defaultOrgPath')
+      //   }).then((res) => {
+      //     if (res.success) {
+      //       this.formobj.createOrgSid = res.data
+      //       this.formobj.useOrgSid = res.data
+      //     }
+      //   })
+      // },
+      selectSupplierName(val) {
+
+        console.log("supplierNameSelect", val);
+        const choose = this.supplierNameList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>supplierNameSelect', choose)
+        this.formobj.supplierName = choose[0].supplierName
+        this.formobj.supplierSid = choose[0].sid
+
+      },
+      getsupplierLust() {
+
+        // getOrgSidByPath({
+        //   orgPath: window.sessionStorage.getItem('defaultOrgPath')
+        // }).then((res) => {
+        //   if (res.success) {
+        //     this.formobj.createOrgSid = res.data
+        //     this.formobj.useOrgSid = res.data
+        //     req.choiceSupplierInfo(res.data).then((resp) => {
+        //       if (resp.success) {
+        //         this.supplierNameList = resp.data
+        //         console.log("aaaaaa", this.supplierNameList);
+        //       }
+        //     })
+
+        //   }
+        // })
+
+
+        choiceSupplierInfo({
+          deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+            .getItem('defaultOrgPath').lastIndexOf('/') + 1)
+        }).then((resp) => {
+          if (resp.success) {
+            this.supplierNameList = resp.data
+            console.log("aaaaaa", this.supplierNameList);
+          }
+        })
+
+
+      },
+      getWarehouseList() {
+        var parpams = {
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        }
+        getWarehouses(parpams).then((res) => {
+          if (res.success) {
+            this.warehouseList = res.data
+
+            console.log("aaaaaa", this.warehouseList);
+
+          }
+        })
+      },
+      getWarehouseAreaList(sid) {
+        var query = {
+          ckSid: sid
+        }
+        getWarehouseareas(query).then((res) => {
+          if (res.success) {
+            this.warehouseRackList = res.data
+
+            console.log("aaaaaa", this.warehouseRackList);
+
+          }
+        })
+      },
+      selectWarehouseName(row, val) {
+        console.log("selectWarehouseName", row);
+        console.log("selectWarehouseName", val);
+        const choose = this.warehouseList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectWarehouseName', choose)
+        row.warehouseName = choose[0].warehouseName
+        row.warehouseSid = choose[0].sid
+
+      },
+      selectWarehouseAreaCode(val) {
+        console.log("selectWarehouseAreaCode", val);
+
+        const choose = this.warehouseRackList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectWarehouseAreaCode', choose)
+        row.warehouseRackName = choose[0].areaCode
+        row.warehouseRackSid = choose[0].sid
+
+      },
+
+      batchAddAll() {
+
+        for (var i = 0; i < this.formobj.list.length; i++) {
+          var item = this.formobj.list[i]
+
+          var info = {
+            xh: i + 1,
+            goodsSkuSid: item.goodsSkuSid,
+            goodsSkuTitle: item.goodsSkuTitle,
+            goodsSkuCode: item.goodsSkuCode,
+            goodsSkuOwnSpec: item.goodsSkuOwnSpec,
+            unit: item.unit,
+            warehouseSid: item.warehouseSid,
+            warehouseName: item.warehouseName,
+            warehouseRackSid: item.warehouseRackSid,
+            warehouseRackName: item.warehouseRackName,
+            shelfLife: item.shelfLife,
+            orderCount: item.orderCount,
+            batchNumber: '',
+            manufactureDate: '',
+            batchCount: 0,
+          }
+
+          this.formobj.pcList.push(info)
+
+        }
+
+      },
+      doGoods(row) {
+        console.log("doGoodsDel》》》》", row)
+
+        this.$confirm("是否确定删除此商品？", '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const index = this.formobj.list.findIndex((item) => item === row)
+          console.log("index》》》》", index)
+          this.formobj.list.splice(index, 1)
+
+          for (var i = this.formobj.pcList.length - 1; i >= 0; i--) {
+            if (this.formobj.pcList[i].xh === (index + 1)) {
+              this.formobj.pcList.splice(i, 1);
+            }
+          }
+
+        })
+      },
+
+      doGoodsBatch(row) {
+        console.log("doGoodsDel》》》》", row)
+
+        this.$confirm("是否确定删除此商品？", '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const index = this.formobj.pcList.findIndex((item) => item === row)
+          console.log("index》》》》", index)
+          this.formobj.pcList.splice(index, 1)
+
+        })
+
+      },
+
+      manufactureDateChange(row, val) {
+
+        console.log("manufactureDateChange》》》》", val)
+
+        row.manufactureDate = val
+        row.expirationDate = this.addDate(val, row.shelfLife)
+
+        let reg = new RegExp('-', 'g') //g代表全部
+
+        row.batchNumber = this.formobj.deliveryDate.replace(reg, '') + " - " + row.expirationDate.replace(reg, '')
+
+
+
+        this.$forceUpdate(); // 强制更新
+        console.log("manufactureDateChange》》》》", row)
+
+      },
+
+      addDate(date, days) {
+        var dates = new Date(date)
+        dates.setDate(dates.getDate() + days)
+        var year = dates.getFullYear()
+        var month = dates.getMonth() + 1
+        var day = dates.getDate()
+        if (month < 9) {
+          month = "0" + month
+        }
+        if (day < 9) {
+          day = "0" + day
+        }
+        var time = year + '-' + month + '-' + day
+        return time
+      },
+
+      doAddBatch(row) {
+        const index = (this.formobj.list.findIndex((item) => item === row)) + 1
+        console.log("doAddBatch》》》》", index)
+        console.log("doAddBatch》》》》", row)
+
+        var info = {
+          xh: index,
+          goodsSkuSid: row.goodsSkuSid,
+          goodsSkuTitle: row.goodsSkuTitle,
+          goodsSkuCode: row.goodsSkuCode,
+          goodsSkuOwnSpec: row.goodsSkuOwnSpec,
+          unit: row.unit,
+          warehouseSid: row.warehouseSid,
+          warehouseName: row.warehouseName,
+          warehouseRackSid: row.warehouseRackSid,
+          warehouseRackName: row.warehouseRackName,
+          shelfLife: row.shelfLife,
+          orderCount: row.orderCount,
+          batchNumber: '',
+          manufactureDate: '',
+          batchCount: 0,
+        }
+
+        console.log("aaaaaaaaaaa", info);
+
+        this.formobj.pcList.push(info)
+
+      },
+      commodityComputeYHAndXSJE(row, val) {
+        console.log("aaa", row);
+        console.log("aaa", val);
+
+        // if (Number(row.actualInCount) > Number(row.orderCount)) {
+        row.actualInCount = val
+        // }
+
+        row.amount = (Number(row.actualInCount) * Number(row.cost)).toFixed(2)
+
+
+      },
+
+      commodityComputeYHAndXSJE2(row, val) {
+        console.log("aaa", row);
+        console.log("aaa", val);
+        row.rejectCount = val
+        // if ((Number(row.rejectCount) + Number(row.actualInCount)) > Number(row.orderCount)) {
+        //   row.rejectCount = Number(row.orderCount) - Number(row.actualInCount)
+        // }
+
+      },
+
+      changeTheme() {
+
+      },
+
+      changeTheme2() {
+
+      },
+
+
+      indexMethod(index) {
+        return index + 1
+      },
+      saveOrUpdate() {
+        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+
+        // if (this.formobj.deliveryDate == '') {
+        //   this.$message({
+        //     showClose: true,
+        //     type: 'error',
+        //     message: '到货日期不能为空'
+        //   })
+
+        //   return
+        // }
+
+        for (var i = 0; i < this.formobj.list.length; i++) {
+
+          if (Number(this.formobj.list[i].actualInCount) == 0) {
+            this.$message({
+              showClose: true,
+              type: 'error',
+              message: '商品实收数量不能为空'
+            })
+
+            return
+          }
+
+        }
+
+
+        this.$refs['form_obj'].validate((valid) => {
+          if (valid) {
+            this.submitdisabled = true
+            req.save(this.formobj).then((res) => {
+              if (res.success) {
+                this.$message({
+                  showClose: true,
+                  type: 'success',
+                  message: '保存成功'
+                })
+                this.handleReturn('true')
+              } else {
+                this.submitdisabled = false
+              }
+            }).catch(() => {
+              this.submitdisabled = false
+            })
+          }
+        })
+      },
+      submintdate() {
+        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+
+
+        // if (this.formobj.deliveryDate == '') {
+        //   this.$message({
+        //     showClose: true,
+        //     type: 'error',
+        //     message: '到货日期不能为空'
+        //   })
+
+        //   return
+        // }
+
+        for (var i = 0; i < this.formobj.list.length; i++) {
+
+          if (Number(this.formobj.list[i].actualInCount) == 0) {
+            this.$message({
+              showClose: true,
+              type: 'error',
+              message: '商品实收数量不能为空'
+            })
+
+            return
+          }
+
+        }
+
+
+        this.$refs['form_obj'].validate((valid) => {
+          if (valid) {
+            this.submitdisabled = true
+            req.submit(this.formobj).then((res) => {
+              if (res.success) {
+                this.$message({
+                  showClose: true,
+                  type: 'success',
+                  message: '保存成功'
+                })
+                this.handleReturn('true')
+              } else {
+                this.submitdisabled = false
+              }
+            }).catch(() => {
+              this.submitdisabled = false
+            })
+          }
+        })
+      },
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.submitdisabled = false
+        this.formobj = {
+          sourceBillNo: "",
+          busTypeKey: "",
+          busTypeValue: "",
+          createByName: "",
+          billState: 0,
+          reviewStatus: "",
+          refuseReason: "",
+          contact: "",
+          mobile: "",
+          supplierSid: "",
+          supplierName: "",
+          goodsOwnerSid: "",
+          goodsOwner: "",
+          deliveryDate: "",
+          list: [],
+          pcList: []
+        }
+        this.$emit('doback')
+      },
+
+      showAdd() {
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
+
+      },
+      showEdit(row) {
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
+
+        // this.getWarehouseList()
+        this.getsupplierLust()
+        // this.getOrgPathSid()
+        var params = {
+          sourceSid: row.sid
+        }
+
+        req.getInitDetails(row.sid)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+              this.formobj.deliveryDate = getCurrentDate()
+
+              this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window
+                .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
+              this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+                .getItem('defaultOrgPath').lastIndexOf('/') + 1)
+
+            }
+          })
+          .catch(e => {
+            this.formobj = {}
+          })
+      }
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+</style>
diff --git a/src/views/inStorage/deliveryNotice/receiptInfo.vue b/src/views/inStorage/deliveryNotice/receiptInfo.vue
new file mode 100644
index 0000000..d0647c4
--- /dev/null
+++ b/src/views/inStorage/deliveryNotice/receiptInfo.vue
@@ -0,0 +1,171 @@
+<template>
+  <div>
+
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>预期到货通知单</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+
+    <div class="listconadd">
+
+      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+     <!--   <div class="title">
+          <div>基础信息</div>
+        </div> -->
+          <el-row class="first_row">
+
+          <el-col :span="8">
+            <div class="span-sty">单据编号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">制单人</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">单据日期</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="8">
+            <div class="span-sty">采购单号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">业务类型</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.busTypeValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">供应商</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.supplierName }}</span></el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="8">
+            <div class="span-sty">预期到货日期</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.deliveryDate }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">单据状态</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">审核状态</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.reviewStatus }}</span></el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="24">
+            <div class="span-sty">拒绝原因</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.refuseReason }}</span></el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <div class="title titleOne">
+          <div>商品列表</div>
+        </div>
+        <el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;">
+          <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80" />
+          <el-table-column fixed label="商品名称" prop="goodsSpuName" align="center"  />
+          <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
+          <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
+          <el-table-column label="单位" prop="unit" align="center" width="120" />
+        <!--  <el-table-column label="仓库" prop="warehouseName" align="center" width="120" />
+          <el-table-column label="库位" prop="warehouseRack" align="center" width="120" /> -->
+          <el-table-column label="预约数量" prop="orderCount" align="center" width="120" />
+          <el-table-column label="待收货数量" prop="waitInCount" align="center" />
+          <el-table-column label="已收货数量" prop="actualInCount" align="center" />
+          <el-table-column label="入库单价" prop="cost" align="center" width="100" />
+          <el-table-column label="税率" prop="taxAmount" align="center" width="100" />
+          <!-- <el-table-column label="含税单价" prop="taxPrice" align="center" width="100" /> -->
+          <el-table-column label="采购金额" prop="amount" align="center"  />
+        </el-table>
+
+      </el-form>
+
+    </div>
+
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/inStorage/deliveryNotice.js'
+
+  export default {
+    components: {},
+    data() {
+      return {
+        listLoading: false,
+        submitdisabled: false,
+        formobj: {},
+      }
+    },
+    methods: {
+      indexMethod(index) {
+        return index + 1
+      },
+
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.$emit('doback')
+      },
+
+      showAdd() {
+
+      },
+      showEdit(row) {
+
+        var params = {
+          sid: row.sid
+        }
+        req.init(row.sid)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+            }
+          })
+          .catch(e => {
+            this.formobj = {}
+          })
+      }
+    }
+  }
+</script>
+<style scoped>
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+</style>
diff --git a/src/views/inStorage/receivingGoods/index.vue b/src/views/inStorage/receivingGoods/index.vue
new file mode 100644
index 0000000..15e0f50
--- /dev/null
+++ b/src/views/inStorage/receivingGoods/index.vue
@@ -0,0 +1,433 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <button-bar ref="btnbar" view-title="收货单管理" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">
+            {{ searchxianshitit }}
+          </el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form :inline="true" class="tab-header">
+              <el-form-item label="单据编号">
+                <el-input v-model="queryParams.params.billNo" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="单据日期">
+                <el-date-picker v-model="queryParams.params.createTimeStart" type="date" placeholder="选择日期"
+                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
+                </el-date-picker>至
+                <el-date-picker v-model="queryParams.params.createTimeEnd" type="date" placeholder="选择日期"
+                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item label="预期到货通知单号">
+                <el-input v-model="queryParams.params.sourceBillNo" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="业务类型">
+                <el-select v-model="queryParams.params.busTypeKey" placeholder="请选择">
+                  <el-option v-for="(item,i) in busTypeList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="供应商">
+                <el-input v-model="queryParams.params.supplierName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="到货日期">
+                <el-date-picker v-model="queryParams.params.deliveryDateStart" type="date" placeholder="选择日期"
+                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
+                </el-date-picker>
+                至
+                <el-date-picker v-model="queryParams.params.deliveryDateEnd" type="date" placeholder="选择日期"
+                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item label="单据状态">
+                <el-select v-model="queryParams.params.billState" placeholder="请选择">
+                  <el-option v-for="(item,i) in billStateList" :key="i" :label="item.name" :value="item.sid">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!-- Start 项目列表头部 -->
+        <div class="listtop">
+          <div class="tit">收货单列表</div>
+        </div>
+        <!-- End 项目列表头部 -->
+        <!-- Start 项目列表 -->
+        <div class="">
+          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
+            @selection-change="selectionLineChangeHandle">
+            <el-table-column fixed width="50" type="selection" align="center" />
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+            <el-table-column fixed label="操作" align="center" width="180">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" :disabled="scope.row.billState=='已完成'"
+                  @click="toEdit(scope.row)">办理</el-button>
+                <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="billNo" width="220" label="单据编号" align="center" />
+            <el-table-column prop="createTime" label="单据日期" align="center" />
+            <el-table-column prop="createByName" label="制单人" align="center" />
+            <el-table-column prop="sourceBillNo" label="预期到货通知单号" width="220"align="center" />
+            <el-table-column prop="busTypeValue" label="业务类型" align="center" />
+            <el-table-column prop="supplierName" label="供应商" align="center" />
+            <el-table-column prop="deliveryDate" label="到货日期" align="center" />
+            <el-table-column prop="billState" label="单据状态" align="center" />
+
+          </el-table>
+        </div>
+        <!-- End 项目列表 -->
+        <div class="pages">
+          <div class="tit" />
+          <!--  翻页  -->
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
+            :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+        </div>
+      </div>
+    </div>
+    <!-- End 查询和其列表部分 -->
+    <!-- 新增修改部分组件 -->
+    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+    <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" />
+    <divAddupShelfRecord v-show="viewState == 5" ref="divAddupShelfRecord" @doback="resetState"
+      @reloadlist="loadList" />
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/inStorage/receivingGoods.js'
+  import ButtonBar from '@/components/ButtonBar'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import divAdd from './receivingGoodsAdd.vue'
+  import divInfo from './receivingGoodsInfo.vue'
+  import divAddupShelfRecord from './upShelfAddRecord.vue'
+  import {
+    getTypeValueList
+  } from '@/api/Common/dictcommons'
+  export default {
+    components: {
+      ButtonBar,
+      Pagination,
+      pageye,
+      divAdd,
+      divInfo,
+      divAddupShelfRecord
+    },
+    data() {
+      return {
+        dialogVisible: false,
+        formobj: {
+          sid: "",
+          reviewStatus: "",
+          remarks: ''
+        },
+        btndisabled: false,
+        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        tableLoading: false,
+        dataList: [],
+        btnList: [{
+            type: 'primary',
+            size: 'small',
+            icon: 'plus',
+            btnKey: 'toAudit',
+            btnLabel: '新增'
+          },
+          {
+            type: 'danger',
+            size: 'small',
+            icon: 'del',
+            btnKey: 'doDel',
+            btnLabel: '删除'
+          },
+          {
+            type: 'primary',
+            size: 'small',
+            icon: 'plus',
+            btnKey: 'toAdd',
+            btnLabel: '上架'
+          },
+          {
+            type: 'info',
+            size: 'small',
+            icon: 'cross',
+            btnKey: 'doClose',
+            btnLabel: '关闭'
+          }
+        ],
+        queryParams: {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            name: ''
+          }
+        },
+        sids: [],
+        selectionList: [],
+        busTypeList: [
+        ],
+        billStateList: [{
+            name: "新建",
+            sid: "0"
+          },
+          {
+            name: "已完成",
+            sid: "1"
+          },
+
+        ],
+      }
+    },
+    mounted() {
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    created() {
+      this.loadList()
+
+      getTypeValueList({ type: 'wms_busType', groupNum: 'wms_rk' }).then((res) => {
+        if (res.success) {
+          this.busTypeList = res.data
+        }
+      })
+
+    },
+    methods: {
+      saveExamine() {
+
+      },
+      changeTheme() {
+
+      },
+      toAudit() {
+
+        this.viewState = 2
+        this.$refs['divadd'].showAdd()
+
+      },
+      selectTime1() {
+
+      },
+      selectTime2() {
+
+      },
+      selectionLineChangeHandle(val) {
+        console.log("val", val);
+
+        this.selectionList = val
+        const aa = []
+        val.forEach(element => {
+          aa.push(element.sid)
+        })
+        this.sids = aa
+
+      },
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        switch (btnKey) {
+          case 'toAudit':
+            this.toAudit()
+            break
+          case 'doDel':
+            this.doDel()
+            break
+          case 'toAdd':
+            this.toAdd()
+            break
+          case 'doClose':
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+      loadList() {
+        this.tableLoading = true
+        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        this.queryParams.params.menuUrl = this.$route.path
+        req.listPage(this.queryParams).then((resp) => {
+          this.tableLoading = false
+          if (resp.success) {
+            const data = resp.data
+            this.queryParams.total = data.total
+            this.dataList = data.records
+          } else {
+            // 根据resp.code进行异常情况处理
+            this.dataList = []
+            this.queryParams.total = 0
+          }
+        }).catch(() => {
+          this.tableLoading = false
+        })
+      },
+
+      // 序号
+      indexMethod(index) {
+        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      dosearch() {
+        this.queryParams.current = 1
+        this.loadList()
+      },
+      resetQuery() {
+        this.queryParams = {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            name: ''
+          }
+        }
+        this.loadList()
+      },
+      doDel() {
+
+        if (this.sids.length > 0) {
+          const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+          this.$confirm(tip, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
+            req.deleteBySids(this.sids).then((resp) => {
+              loading.close()
+              if (resp.success) {
+                this.$message({
+                  type: 'success',
+                  message: resp.msg,
+                  showClose: true
+                })
+                this.loadList()
+              } else {
+                // 根据resp.code进行异常情况处理
+              }
+            }).catch(e => {
+              loading.close()
+            })
+          }).catch(() => {})
+        } else {
+          this.$message({
+            showClose: true,
+            message: '请至少选择一条记录进行删除操作'
+          })
+        }
+      },
+      toAdd() {
+        if (this.selectionList.length != 1) {
+          this.$message({
+            type: 'warning',
+            message: "请选择一条数据。",
+            showClose: true
+          })
+          return
+        }
+
+        if (this.selectionList[0].billState == '新建') {
+          this.$message({
+            type: 'warning',
+            message: "此记录未完成,不可操作。",
+            showClose: true
+          })
+          return
+        }
+
+        this.viewState = 5
+        this.$refs['divAddupShelfRecord'].showEdit(this.selectionList[0])
+      },
+      toEdit(row) {
+
+
+        this.viewState = 3
+        this.$refs['divadd'].showEdit(row)
+
+      },
+
+      doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+      },
+      toRelevancy(row) {
+        this.viewState = 4
+        this.$refs['divinfo'].showEdit(row)
+      },
+      toRelevancyInfo(row) {
+        const tip = '请确认是否删除所选品牌?'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          req.deleteGoods(row.sid).then((resp) => {
+            loading.close()
+            if (resp.success) {
+              this.$message({
+                type: 'success',
+                message: resp.msg,
+                showClose: true
+              })
+              this.loadList()
+            } else {
+              // 根据resp.code进行异常情况处理
+            }
+          }).catch(e => {
+            loading.close()
+          })
+        }).catch(() => {})
+      },
+      resetState() {
+        this.viewState = 1
+      },
+      enableChange(sid, state) {
+        console.log('sid', sid)
+        console.log('state', state)
+        req.updateIsEnable(sid, state).then((resp) => {
+          if (resp.success) {
+            this.$message({
+              type: 'success',
+              message: '状态已更新',
+              showClose: true
+            })
+          } else { // 根据resp.code进行异常情况处理
+          }
+        }).catch(e => {
+          console.log(e)
+        })
+      }
+    }
+  }
+</script>
+<style scoped>
+</style>
diff --git a/src/views/inStorage/receivingGoods/receivingGoodsAdd.vue b/src/views/inStorage/receivingGoods/receivingGoodsAdd.vue
new file mode 100644
index 0000000..fe91827
--- /dev/null
+++ b/src/views/inStorage/receivingGoods/receivingGoodsAdd.vue
@@ -0,0 +1,1055 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <!-- 标题 -->
+        <div>{{title}}收货单</div>
+        <!-- start 添加修改按钮 -->
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit">确认</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+        <!-- end 添加修改按钮 -->
+        <!-- end 详情按钮 -->
+      </div>
+      <div class="listconadd">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <!-- <div class="title">
+          <div>基础信息</div>
+        </div> -->
+          <el-row class="first_row">
+
+            <el-col :span="8">
+              <div class="span-sty">制单人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">制单部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <!-- <el-col :span="8">
+            <div class="span-sty">制单人</div>
+            <el-form-item> <el-input v-model="formobj.createByName" placeholder="" class="addinputw addinputInfo"
+                clearable /></el-form-item>
+          </el-col> -->
+            <el-col :span="8">
+              <div class="span-sty"><span class="must">*</span> 单据日期</div>
+              <el-form-item prop="createTime"> <el-date-picker v-model="formobj.createTime" type="date"
+                  class="addinputInfo" value-format="yyyy-MM-dd" placeholder="选择日期">
+                </el-date-picker></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+
+            <el-col :span="8">
+              <div class="span-sty">预期到货通知单号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty"><span class="must">*</span> 业务类型</div>
+              <el-form-item prop="busTypeValue"><el-select v-model="formobj.busTypeValue" filterable clearable
+                  placeholder="请选择" class="addinputInfo" @change="busTypeSelect">
+                 <el-option v-for="(item,i) in busTypeList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  </el-option>
+                </el-select></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty"><span class="must">*</span> 供应商</div>
+              <el-form-item prop="supplierName"> <el-select v-model="formobj.supplierName" filterable clearable
+                  placeholder="请选择" class="addinputInfo" @change="supplierNameSelect">
+                  <el-option v-for="item in supplierList" :key="item.sid" :label="item.supplierName" :value="item.sid">
+                  </el-option>
+                </el-select></el-form-item>
+            </el-col>
+
+          </el-row>
+
+          <el-row>
+
+            <el-col :span="8">
+              <div class="span-sty"><span class="must">*</span> 到货日期</div>
+              <el-form-item prop="deliveryDate"><el-date-picker v-model="formobj.deliveryDate" type="date"
+                  class="addinputInfo" value-format="yyyy-MM-dd" placeholder="选择日期">
+                </el-date-picker></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">单据状态</div>
+              <el-form-item> <span class="addinputInfo">{{formobj.billState}}</span></el-form-item>
+            </el-col>
+
+          </el-row>
+
+          <el-row>
+
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
+                  type="textarea" :rows="4" clearable /></el-form-item>
+            </el-col>
+
+          </el-row>
+
+          <div class="title titleOne">
+            <div>商品列表</div>
+            <el-button type="primary" size="mini" class="btntopblueline" @click="seleMaintenance()">选择商品</el-button>
+            <!-- <el-button type="primary" size="mini" class="btntopblueline" @click="batchAddAll()">批次收货</el-button> -->
+          </div>
+          <el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;" ref="dataTable">
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+            <!--  <el-table-column align="center" width="180">
+            <template slot="header" slot-scope="scope">
+              <i v-if="!isUpdata" class="add-btn-icon el-icon-plus" style="color: red;font-size:20px"
+                @click="commodityAdd(scope.row)"></i>
+              <span v-else>操作</span>
+            </template>
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini" @click="doGoods(scope.row)">删除</el-button>
+              <el-button type="primary" size="mini" @click="doAddBatch(scope.row)">批次+</el-button>
+              <i v-if="!isUpdata" class="el-icon-delete" @click="commodityDelete(scope.$index)"></i>
+            </template>
+          </el-table-column> -->
+
+            <el-table-column label="操作" align="center" width="120">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="doGoods(scope.row)">删除</el-button>
+              </template>
+            </el-table-column>
+
+            <el-table-column label="商品名称" prop="goodsSpuName" align="center" width="200" />
+
+            <!--      <el-table-column label="商品名称" align="center" min-width="200" v-if="!isUpdata">
+            <template slot-scope="scope" v-if="!isUpdata">
+              <el-popover placement="right" width="900" trigger="click" v-if="!isUpdata">
+                <div>
+                  <el-table :data="commodityData" v-loading="commodityLoading" highlight-current-row
+                    @current-change="commodityCurrentChange($event, scope.row)">
+                    <el-table-column prop="goodsSpuName" label="商品名称" align="center" />
+                    <el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
+                    <el-table-column prop="goodsSkuOwnSpec" label="型号" align="center" />
+                    <el-table-column prop="unit" label="单位" align="center" />
+                    <el-table-column prop="warehouseName" label="仓库" align="center" />
+                    <el-table-column prop="warehouseRackName" label="库位" align="center" />
+                  </el-table>
+                  <el-pagination :page.sync="commodityQuery.current" :page-size="commodityQuery.size"
+                    layout="total, pager" :total="commodityQuery.total" />
+                </div>
+                <el-input slot="reference" v-model="scope.row.goodsSpuName"
+                  @input="commodityInput(scope.row.goodsSpuName)" clearable placeholder="商品名称" />
+              </el-popover>
+            </template>
+          </el-table-column> -->
+            <el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
+            <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
+            <el-table-column label="单位" prop="unit" align="center" width="120" />
+            <!-- <el-table-column label="仓库" align="center" width="180">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.warehouseName" placeholder="请选择" clearable
+                @change="selectWarehouseName(scope.row,$event)">
+                <el-option v-for="(item,i) in warehouseList" :key="i" :label="item.warehouseName" :value="item.sid">
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="库位" align="center" width="180">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.warehouseRackName" :disabled="scope.row.warehouseName==''" clearable
+                @focus="getWarehouseAreaList(scope.row.warehouseSid)" placeholder="请选择"
+                @change="selectWarehouseAreaCode(scope.row,$event)">
+                <el-option v-for="(item,i) in warehouseRackList" :key="i" :label="item.areaCode" :value="item.sid">
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column> -->
+            <!-- <el-table-column label="预约数量" prop="orderCount" align="center" width="120" v-if="isUpdata" /> -->
+            <el-table-column label="实收数量" align="center" width="120">
+              <template slot-scope="scope">
+                <el-input ref="focusAssumptionInput" @input="commodityComputeYHAndXSJE(scope.row,$event)"
+                  v-model="scope.row.actualInCount" clearable placeholder=""
+                  oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+              </template>
+            </el-table-column>
+            <el-table-column label="拒收数量" align="center" width="120">
+              <template slot-scope="scope">
+                <el-input ref="focusAssumptionInput" v-model="scope.row.rejectCount" clearable placeholder=""
+                  @input="commodityComputeYHAndXSJE2(scope.row,$event)"
+                  oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+              </template>
+            </el-table-column>
+            <el-table-column label="拒收原因" align="center" width="180">
+              <template slot-scope="scope">
+                <el-input ref="focusAssumptionInput" v-model="scope.row.rejectReason" clearable placeholder="" />
+              </template>
+            </el-table-column>
+            <el-table-column label="是否质检" align="center" width="180">
+              <template slot-scope="scope">
+                <el-radio-group v-model="scope.row.isQuality" size="small">
+                  <el-radio :label="0">是</el-radio>
+                  <el-radio :label="1">否</el-radio>
+                </el-radio-group>
+              </template>
+            </el-table-column>
+            <el-table-column label="质检状态" align="center" width="180">
+              <template slot-scope="scope">
+                <el-radio-group v-model="scope.row.qualityState" size="small">
+                  <el-radio :label="0">合格</el-radio>
+                  <el-radio :label="1">不合格</el-radio>
+                </el-radio-group>
+              </template>
+            </el-table-column>
+            <el-table-column label="载具说明" align="center" width="180">
+              <template slot-scope="scope">
+                <el-input ref="focusAssumptionInput" v-model="scope.row.packageRemark" clearable placeholder="" />
+              </template>
+            </el-table-column>
+            <el-table-column label="入库单价" align="center" width="150">
+              <template slot-scope="scope">
+                <el-input ref="focusAssumptionInput" @input="commodityComputeYHAndXSJE3(scope.row,$event)"
+                  v-model="scope.row.cost" clearable placeholder=""
+                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+              </template>
+            </el-table-column>
+            <el-table-column label="税率" align="center" width="150">
+              <template slot-scope="scope">
+                <el-input ref="focusAssumptionInput" @input="commodityComputeYHAndXSJE4(scope.row,$event)"
+                  v-model="scope.row.taxAmount" clearable placeholder=""
+                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+              </template>
+            </el-table-column>
+            <!-- <el-table-column label="含税单价" prop="taxPrice" @input="commodityComputeYHAndXSJE5(scope.row,$event)"
+            align="center" width="150" /> -->
+            <el-table-column label="入库金额" prop="amount" align="center" width="150" />
+          </el-table>
+
+
+          <!-- <div class="title"
+          style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
+          <div>商品-批次</div>
+        </div>
+        <el-table v-loading="listLoading" :data="formobj.pcList" border style="width: 100%;"
+          :row-style="{height: '40px'}">
+          <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+          <el-table-column fixed label="操作" wid align="center" width="120">
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini" @click="doGoodsBatch(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column label="商品列表序号" prop="xh" align="center" width="120" />
+          <el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
+          <el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
+          <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
+          <el-table-column label="单位" prop="unit" align="center" width="120" />
+          <el-table-column label="仓库" prop="warehouseName" align="center" width="150" />
+          <el-table-column label="库位" prop="warehouseRackName" align="center" width="150" />
+          <el-table-column label="批次号" prop="batchNumber" align="center" width="300" />
+          <el-table-column label="生产日期" align="center" width="180">
+            <template slot-scope="scope">
+              <el-date-picker v-model="scope.row.manufactureDate" type="date" style="width:100%"
+                value-format="yyyy-MM-dd" placeholder="选择日期" @change="manufactureDateChange(scope.row,$event)" />
+            </template>
+          </el-table-column>
+          <el-table-column label="有效期" prop="expirationDate" align="center" width="180" />
+          <el-table-column label="数量" align="center" width="120">
+            <template slot-scope="scope">
+              <el-input ref="focusAssumptionInput" v-model="scope.row.batchCount" clearable placeholder=""
+                oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+            </template>
+          </el-table-column>
+        </el-table> -->
+
+        </el-form>
+
+      </div>
+    </div>
+    <!-- 选择商品 -->
+    <chooseproducts v-show="viewState == 2" ref="divSp" @backData="backData" @doback="resetState" />
+
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/inStorage/receivingGoods.js'
+  import {
+    getCurrentDate
+  } from '@/utils/index.js'
+  import chooseproducts from './relation/chooseproducts'
+  import {
+    choiceSupplierInfo,
+    getOrgSidByPath,
+    getTypeValueList,
+    getWarehouses,
+    getWarehouseareas
+  } from '@/api/Common/dictcommons'
+  export default {
+    components: {
+      chooseproducts,
+    },
+    data() {
+      return {
+        viewState: 1,
+        title: '【新增】',
+        listLoading: false,
+        submitdisabled: false,
+        formobj: {
+          "sid": "",
+          "billNo": "",
+          "sourceBillSid": "",
+          "sourceBillNo": "",
+          "createBySid": window.sessionStorage.getItem('userSid'),
+          "createByName": window.sessionStorage.getItem('name'),
+          "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
+            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
+          "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
+          "createTime": getCurrentDate(),
+          "busTypeKey": "",
+          "busTypeValue": "",
+          "supplierSid": "",
+          "supplierName": "",
+          "deliveryDate": getCurrentDate(),
+          "billState": "新建",
+          "remarks": "",
+          "useOrgSid": '',
+          "createOrgSid": '',
+          "list": [],
+          "pcList": []
+        },
+        hideUploadBtn: false,
+        busTypeList: [{
+            name: "采购预约",
+            sid: "0"
+          },
+          {
+            name: "调拨预约",
+            sid: "1"
+          },
+          {
+            name: "其他预约",
+            sid: "2"
+          }
+        ],
+        supplierList: [],
+        warehouseList: [],
+        warehouseRackList: [],
+        // commodity商品
+        commodityKey: 1,
+        commodityLoading: false,
+        commodityQuery: {
+          current: 1,
+          size: 2,
+          total: 0,
+          params: {
+            name: '',
+            inOrg: "",
+            outOrg: ""
+          }
+        },
+        commodityData: [],
+        isUpdata: false,
+        rules: {
+          createTime: [{
+            required: true,
+            message: '到货日期不能为空',
+            trigger: 'change'
+          }],
+          busTypeValue: [{
+            required: true,
+            message: '请选择业务类型',
+            trigger: 'change'
+          }],
+          supplierName: [{
+            required: true,
+            message: '请选择供应商',
+            trigger: 'change'
+          }],
+          deliveryDate: [{
+            required: true,
+            message: '到货日期不能为空',
+            trigger: 'change'
+          }],
+        }
+      }
+    },
+    created() {
+      getOrgSidByPath({
+        orgPath: window.sessionStorage.getItem('defaultOrgPath')
+      }).then((res) => {
+        if (res.success) {
+          this.formobj.createOrgSid = res.data
+          this.formobj.useOrgSid = res.data
+        }
+      })
+    },
+    methods: {
+
+      // commodityInput(value) {
+      //   this.commodityQuery.params.name = value
+      //   this.commodityLoading = true
+      //   req.getGoodsListPage(this.commodityQuery).then((response) => {
+      //     if (response.success) {
+      //       this.commodityLoading = false
+      //       this.commodityData = response.data.records
+      //       this.commodityQuery.total = response.data.total
+      //     } else {
+      //       this.serviceLoading = false
+      //       this.commodityData = []
+      //       this.commodityQuery.total = 0
+      //     }
+      //   })
+      // },
+      // commodityDelete(index) {
+      //   this.formobj.list.splice(index, 1)
+      // },
+      // commodityCurrentChange(value, row) {
+      //   console.log("commodityCurrentChange》》》》", value)
+      //   console.log("commodityCurrentChange》》》》", row)
+      //   row.goodsSkuSid = value.goodsSkuSid
+      //   row.goodsSkuTitle = value.goodsSpuName
+      //   row.goodsSpuName = value.goodsSpuName
+      //   row.goodsSkuCode = value.goodsSkuCode
+      //   row.goodsSkuOwnSpec = value.goodsSkuOwnSpec
+      //   row.unit = value.unit
+      //   row.warehouseSid = value.warehouseSid
+      //   row.warehouseName = value.warehouseName
+      //   row.warehouseRackSid = value.warehouseRackSid
+      //   row.warehouseRackName = value.warehouseRackName
+      //   row.actualInCount = 0
+      //   row.rejectCount = 0
+      //   row.rejectReason = ''
+      //   row.isQuality = 1
+      //   row.qualityState = 0
+      //   row.packageRemark = ''
+      //   row.cost = value.cost
+      //   row.taxAmount = value.taxAmount
+      //   row.taxPrice = value.taxPrice
+      //   row.amount = value.amount
+      //   row.shelfLife = value.shelfLife
+      //   document.body.click()
+      // },
+
+      // // 在头部标题上添加“新增”图标
+      // commodityHeader(h, {
+      //   column
+      // }) {
+      //   return h(
+      //     'div',
+      //     [
+      //       h('span', column.label),
+      //       h('i', {
+      //         class: 'add-btn-icon el-icon-plus',
+      //         style: 'color: red;font-size:20px',
+      //         on: {
+      //           click: this.commodityAdd // 点击执行函数
+      //         }
+      //       })
+      //     ]
+      //   )
+      // },
+      // commodityAdd() {
+      //   this.formobj.list.push({
+      //     "goodsSkuSid": "",
+      //     "goodsSkuTitle": "",
+      //     "goodsSkuCode": "",
+      //     "goodsSkuOwnSpec": "",
+      //     "unit": "",
+      //     "warehouseSid": "",
+      //     "warehouseName": "",
+      //     "warehouseRackSid": "",
+      //     "warehouseRackName": "",
+      //     "actualInCount": 0,
+      //     "rejectCount": 0,
+      //     "rejectReason": "",
+      //     "isQuality": 1,
+      //     "qualityState": 0,
+      //     "packageRemark": "",
+      //     "state": 0,
+      //     "xh": "",
+      //     "orderCount": 0,
+      //     "cost": 0,
+      //     "taxAmount": 0,
+      //     "taxPrice": 0,
+      //     "amount": 0,
+      //     'shelfLife': 0
+      //   })
+      // },
+
+
+      backData(value) {
+        this.viewState = 1
+        if (value.length > 0) {
+          value.forEach((e) => {
+
+            this.formobj.list.push({
+              // goodSpuSid: e.goodsSpuSid,
+              // goodsSpuName: e.goodsSpuName,
+              // goodsSkuSid: e.goodsSkuSid,
+              // goodsSkuTitle: e.goodsSkuTitle,
+              // goodsSkuCode: e.goodsSkuCode,
+              // goodsSkuOwnSpec: e.goodsSkuOwnSpec,
+              // unit: e.unit,
+              // warehouseSid: e.warehouseSid,
+              // warehouseName: e.warehouseName,
+              // warehouseRackSid: e.warehouseRackSid,
+              // warehouseRackCode: e.warehouseRackCode,
+              // money: e.money,
+              // moneyAll: '',
+              // outCount: '',
+              // inventorySid: e.inventorySid, // 库存商品sid
+
+
+              "goodsSkuSid": e.goodsSpuSid,
+              "goodsSpuName": e.goodsSpuName,
+              "goodsSkuTitle": e.goodsSkuTitle,
+              "goodsSkuCode": e.goodsSkuCode,
+              "goodsSkuOwnSpec": e.indexes,
+              "unit": e.goodsUnitName,
+              "warehouseSid": e.warehouseSid,
+              "warehouseName": e.warehouseName,
+              "warehouseRackSid": e.warehouseRackSid,
+              "warehouseRackName": e.warehouseRackCode,
+              "actualInCount": 0,
+              "rejectCount": 0,
+              "rejectReason": "",
+              "isQuality": 1,
+              "qualityState": 0,
+              "packageRemark": "",
+              "state": 0,
+              "xh": "",
+              "orderCount": 0,
+              "cost": 0,
+              "taxAmount": 0,
+              "taxPrice": 0,
+              "amount": 0,
+              'shelfLife': 0
+
+            })
+          })
+        }
+      },
+      resetState() {
+        this.viewState = 1
+      },
+      seleMaintenance() {
+        this.viewState = 2
+        const aa = []
+        this.$refs['divSp'].showData(aa, this.formobj.createOrgSid)
+      },
+
+      doGoodsDel(sid) {
+        console.log("doGoodsDel》》》》", sid)
+        this.$confirm("是否确定删除此商品？", '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const index = this.formobj.list.findIndex((item) => item === row)
+          console.log("index》》》》", index)
+          this.formobj.list.splice(index, 1)
+
+          for (var i = this.formobj.pcList.length - 1; i >= 0; i--) {
+            if (this.formobj.pcList[i].xh === (index + 1)) {
+              this.formobj.pcList.splice(i, 1);
+            }
+          }
+
+        })
+      },
+
+      indexMethod(index) {
+        return index + 1
+      },
+      saveOrUpdate() {
+        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+
+        this.$refs['form_obj'].validate((valid) => {
+          if (valid) {
+            this.submitdisabled = true
+            req.save(this.formobj).then((res) => {
+              if (res.success) {
+                this.$message({
+                  showClose: true,
+                  type: 'success',
+                  message: '保存成功'
+                })
+                this.handleReturn('true')
+              } else {
+                this.submitdisabled = false
+              }
+            }).catch(() => {
+              this.submitdisabled = false
+            })
+          }
+        })
+      },
+      submit() {
+
+        if (this.formobj.list.length == 0) {
+          this.$message({
+            showClose: true,
+            type: 'error',
+            message: '请添加商品'
+          })
+
+          return
+        }
+
+        for (var i = 0; i < this.formobj.list.length; i++) {
+          var item = this.formobj.list[i]
+          if (item.goodsSkuSid == '') {
+            this.$message({
+              showClose: true,
+              type: 'error',
+              message: '请添加商品'
+            })
+
+            return
+          }
+
+          if (item.actualInCount == 0) {
+            this.$message({
+              showClose: true,
+              type: 'error',
+              message: '实收数量不能为空'
+            })
+
+            return
+          }
+
+        }
+
+        this.$refs['form_obj'].validate((valid) => {
+          if (valid) {
+            this.submitdisabled = true
+            req.submit(this.formobj).then((res) => {
+              if (res.success) {
+                this.$message({
+                  showClose: true,
+                  type: 'success',
+                  message: '保存成功'
+                })
+                this.handleReturn('true')
+              } else {
+                this.submitdisabled = false
+              }
+            }).catch(() => {
+              this.submitdisabled = false
+            })
+          }
+        })
+
+      },
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {
+          "sid": "",
+          "billNo": "",
+          "sourceBillSid": "",
+          "sourceBillNo": "",
+          "createBySid": window.sessionStorage.getItem('userSid'),
+          "createByName": window.sessionStorage.getItem('name'),
+          "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
+            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
+          "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
+          "createTime": getCurrentDate(),
+          "busTypeKey": "",
+          "busTypeValue": "",
+          "supplierSid": "",
+          "supplierName": "",
+          "deliveryDate": getCurrentDate(),
+          "billState": "新建",
+          "remarks": "",
+          "useOrgSid": '',
+          "createOrgSid": '',
+          "list": [],
+          "pcList": []
+        }
+        this.submitdisabled = false
+        this.isUpdata = false
+        this.$emit('doback')
+      },
+
+      showAdd() {
+        this.title = "【新增】"
+        this.isUpdata = false
+        console.log("showAdd", this.isUpdata);
+
+        this.getsupplierLust()
+        this.getWarehouseList()
+
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
+
+        getTypeValueList({ type: 'wms_busType', groupNum: 'wms_rk' }).then((res) => {
+          if (res.success) {
+            this.busTypeList = res.data
+          }
+        })
+
+
+      },
+      showEdit(row) {
+        this.title = "【修改】"
+        this.isUpdata = true
+        this.getsupplierLust()
+        this.getWarehouseList()
+        console.log("showEdit", this.isUpdata);
+
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
+
+        getTypeValueList({ type: 'wms_busType', groupNum: 'wms_rk' }).then((res) => {
+          if (res.success) {
+            this.busTypeList = res.data
+          }
+        })
+
+
+
+        var params = {
+          sid: row.sid
+        }
+
+        req.init(row.sid)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+
+              this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window
+                .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
+              this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+                .getItem('defaultOrgPath').lastIndexOf('/') + 1)
+
+
+
+            }
+          })
+          .catch(e => {
+            this.formobj = {}
+          })
+      },
+      busTypeSelect(val) {
+        const choose = this.busTypeList.filter((item) => item.dictKey == val)
+        console.log('>>>>>>>>>busTypeSelect', choose)
+        this.formobj.busTypeKey = choose[0].dictKey
+        this.formobj.busTypeValue = choose[0].dictValue
+
+      },
+      supplierNameSelect(val) {
+
+        console.log("supplierNameSelect", val);
+        const choose = this.supplierList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>supplierNameSelect', choose)
+        this.formobj.supplierName = choose[0].supplierName
+        this.formobj.supplierSid = choose[0].sid
+
+      },
+      getsupplierLust() {
+        // var params = {
+        //   depSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+        //         .getItem('defaultOrgPath').lastIndexOf('/') + 1),
+        // }
+
+        // var depSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+        //         .getItem('defaultOrgPath').lastIndexOf('/') + 1)
+
+        // req.choiceSupplier(depSid).then((res) => {
+        //   if (res.success) {
+        //     this.supplierList = res.data
+
+        //     console.log("aaaaaa", this.supplierList);
+
+        //   }
+        // })
+
+        choiceSupplierInfo({
+          deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+            .getItem('defaultOrgPath').lastIndexOf('/') + 1)
+        }).then((resp) => {
+          if (resp.success) {
+            this.supplierList = resp.data
+            console.log("aaaaaa", this.supplierList);
+          }
+        })
+
+        // getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
+        //   if (res.success) {
+        //     this.formobj.createOrgSid = res.data
+        //     this.formobj.useOrgSid = res.data
+        //     choiceSupplierInfo({ deptSid: res.data }).then((resp) => {
+        //       if (resp.success) {
+        //         this.supplierList = resp.data
+        //          console.log("aaaaaa", this.supplierNameList);
+        //       }
+        //     })
+        //   }
+        // })
+
+      },
+      getWarehouseList() {
+        var parpams = {
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        }
+
+        getWarehouses(parpams).then((res) => {
+          if (res.success) {
+            this.warehouseList = res.data
+
+            console.log("aaaaaa", this.warehouseList);
+
+          }
+        })
+      },
+      getWarehouseAreaList(sid) {
+        var query = {
+          ckSid: sid
+        }
+        getWarehouseareas(query).then((res) => {
+          if (res.success) {
+            this.warehouseRackList = res.data
+
+            console.log("aaaaaa", this.warehouseRackList);
+
+          }
+        })
+      },
+      selectWarehouseName(row, val) {
+        console.log("selectWarehouseName", row);
+        console.log("selectWarehouseName", val);
+        const choose = this.warehouseList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectWarehouseName', choose)
+        row.warehouseName = choose[0].warehouseName
+        row.warehouseSid = choose[0].sid
+
+      },
+      selectWarehouseAreaCode(row, val) {
+        console.log("selectWarehouseAreaCode", val);
+
+        const choose = this.warehouseRackList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectWarehouseAreaCode', choose)
+        row.warehouseRackName = choose[0].areaCode
+        row.warehouseRackSid = choose[0].sid
+
+      },
+
+      batchAddAll() {
+
+        for (var i = 0; i < this.formobj.list.length; i++) {
+          var item = this.formobj.list[i]
+
+          var info = {
+            xh: i + 1,
+            goodsSkuSid: item.goodsSkuSid,
+            goodsSkuTitle: item.goodsSkuTitle,
+            goodsSkuCode: item.goodsSkuCode,
+            goodsSkuOwnSpec: item.goodsSkuOwnSpec,
+            unit: item.unit,
+            warehouseSid: item.warehouseSid,
+            warehouseName: item.warehouseName,
+            warehouseRackSid: item.warehouseRackSid,
+            warehouseRackName: item.warehouseRackName,
+            shelfLife: item.shelfLife,
+            orderCount: item.orderCount,
+            batchNumber: '',
+            manufactureDate: '',
+            batchCount: 0,
+          }
+
+          this.formobj.pcList.push(info)
+
+        }
+
+      },
+      doGoods(row) {
+        console.log("doGoodsDel》》》》", row)
+
+        this.$confirm("是否确定删除此商品？", '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const index = this.formobj.list.findIndex((item) => item === row)
+          console.log("index》》》》", index)
+          this.formobj.list.splice(index, 1)
+
+          for (var i = this.formobj.pcList.length - 1; i >= 0; i--) {
+            if (this.formobj.pcList[i].xh === (index + 1)) {
+              this.formobj.pcList.splice(i, 1);
+            }
+          }
+
+        })
+      },
+
+      doGoodsBatch(row) {
+        console.log("doGoodsDel》》》》", row)
+
+        this.$confirm("是否确定删除此商品批次？", '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const index = this.formobj.pcList.findIndex((item) => item === row)
+          console.log("index》》》》", index)
+          this.formobj.pcList.splice(index, 1)
+
+        })
+
+      },
+
+      manufactureDateChange(row, val) {
+
+        console.log("manufactureDateChange》》》》", val)
+        console.log("manufactureDateChange》》》》", row)
+
+        row.manufactureDate = val
+        row.expirationDate = this.addDate(val, row.shelfLife)
+
+        let reg = new RegExp('-', 'g') //g代表全部
+
+        row.batchNumber = this.formobj.deliveryDate.replace(reg, '') + " - " + row.expirationDate.replace(reg, '')
+
+
+
+        this.$forceUpdate(); // 强制更新
+        console.log("manufactureDateChange》》》》", row)
+
+      },
+
+      addDate(date, days) {
+        var dates = new Date(date)
+        dates.setDate(dates.getDate() + days)
+        var year = dates.getFullYear()
+        var month = dates.getMonth() + 1
+        var day = dates.getDate()
+        if (month < 9) {
+          month = "0" + month
+        }
+        if (day < 9) {
+          day = "0" + day
+        }
+        var time = year + '-' + month + '-' + day
+        return time
+      },
+
+      doAddBatch(row) {
+        const index = (this.formobj.list.findIndex((item) => item === row)) + 1
+        console.log("doAddBatch》》》》", index)
+        console.log("doAddBatch》》》》", row)
+
+        var info = {
+          xh: index,
+          goodsSkuSid: row.goodsSkuSid,
+          goodsSkuTitle: row.goodsSkuTitle,
+          goodsSkuCode: row.goodsSkuCode,
+          goodsSkuOwnSpec: row.goodsSkuOwnSpec,
+          unit: row.unit,
+          warehouseSid: row.warehouseSid,
+          warehouseName: row.warehouseName,
+          warehouseRackSid: row.warehouseRackSid,
+          warehouseRackName: row.warehouseRackName,
+          shelfLife: row.shelfLife,
+          orderCount: row.orderCount,
+          batchNumber: '',
+          manufactureDate: '',
+          batchCount: 0,
+        }
+
+        console.log("aaaaaaaaaaa", info);
+
+        this.formobj.pcList.push(info)
+
+      },
+      commodityComputeYHAndXSJE(row, val) {
+        console.log("aaa", row);
+        console.log("aaa", val);
+
+        // if (this.isUpdata) {
+        //   if (Number(row.actualInCount) > Number(row.orderCount)) {
+        //     row.actualInCount = row.orderCount
+
+        //   }
+
+        // }
+        // row.amount = (Number(row.actualInCount) * Number(row.taxPrice)).toFixed(2)
+
+        row.actualInCount = val
+
+        row.amount = (Number(row.actualInCount) * Number(row.cost)).toFixed(2)
+
+
+      },
+
+      commodityComputeYHAndXSJE2(row, val) {
+        console.log("aaa", row);
+        console.log("aaa", val);
+        row.rejectCount = val
+
+        // if (this.isUpdata) {
+        //   if ((Number(row.rejectCount) + Number(row.actualInCount)) > Number(row.orderCount)) {
+        //     row.rejectCount = Number(row.orderCount) - Number(row.actualInCount)
+        //   }
+        // }
+      },
+
+      commodityComputeYHAndXSJE3(row, val) {
+        console.log("aaa", row);
+        console.log("aaa", val);
+
+        // row.taxPrice = (Number(row.cost) * Number(row.taxAmount)).toFixed(2)
+        // row.amount = (Number(row.actualInCount) * Number(row.taxPrice)).toFixed(2)
+
+        row.cost = val
+        row.amount = (Number(row.actualInCount) * Number(row.cost)).toFixed(2)
+
+      },
+
+      commodityComputeYHAndXSJE4(row, val) {
+        console.log("aaa", row);
+        console.log("aaa", val);
+
+        row.taxAmount = val
+
+        // row.taxPrice = (Number(row.cost) * Number(row.taxAmount)).toFixed(2)
+        // row.amount = (Number(row.actualInCount) * Number(row.taxPrice)).toFixed(2)
+      },
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+</style>
diff --git a/src/views/inStorage/receivingGoods/receivingGoodsInfo.vue b/src/views/inStorage/receivingGoods/receivingGoodsInfo.vue
new file mode 100644
index 0000000..ada7b67
--- /dev/null
+++ b/src/views/inStorage/receivingGoods/receivingGoodsInfo.vue
@@ -0,0 +1,206 @@
+<template>
+  <div>
+
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>收货单</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+
+    <div class="listconadd">
+
+      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+        <!-- <div class="title">
+          <div>基础信息</div>
+        </div> -->
+         <el-row class="first_row">
+          <el-col :span="8">
+            <div class="span-sty">制单人</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">制单部门</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <div class="span-sty">单据日期</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="8">
+            <div class="span-sty">来源单号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <div class="span-sty">业务类型</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.busTypeValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">供应商</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.supplierName }}</span></el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="8">
+            <div class="span-sty">到货日期</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.deliveryDate }}</span></el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <div class="span-sty">单据状态</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="24">
+            <div class="span-sty">备注</div>
+            <el-form-item><span class="addinputInfo">{{formobj.remarks}}</span></el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <div class="title titleOne">
+          <div>商品列表</div>
+        </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="goodsSpuName" align="center" width="200" />
+          <el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
+          <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
+          <el-table-column label="单位" prop="unit" align="center" width="120" />
+          <!-- <el-table-column label="仓库" prop="warehouseName" align="center" width="180" />
+          <el-table-column label="库位" prop="warehouseRackName" align="center" width="180" />
+          <el-table-column label="预约数量" prop="orderCount" align="center" width="120" /> -->
+          <el-table-column label="实收数量" prop="actualInCount" align="center" width="120" />
+          <el-table-column label="拒收数量" prop="rejectCount" align="center" width="120" />
+          <el-table-column label="拒收原因" prop="rejectReason" align="center" width="180" />
+          <el-table-column label="是否质检" align="center" width="180">
+            <template slot-scope="scope">
+              <el-radio-group v-model="scope.row.isQuality" :disabled="true" size="small">
+                <el-radio :label="0">是</el-radio>
+                <el-radio :label="1">否</el-radio>
+              </el-radio-group>
+            </template>
+          </el-table-column>
+          <el-table-column label="质检状态" align="center" width="180">
+            <template slot-scope="scope">
+              <el-radio-group v-model="scope.row.qualityState" :disabled="true" size="small">
+                <el-radio :label="0">合格</el-radio>
+                <el-radio :label="1">不合格</el-radio>
+              </el-radio-group>
+            </template>
+          </el-table-column>
+          <el-table-column label="载具说明" prop="packageRemark" align="center" width="180" />
+          <el-table-column label="入库单价" prop="cost" align="center" width="100" />
+          <el-table-column label="税率" prop="taxAmount" align="center" width="100" />
+          <!-- <el-table-column label="含税单价" prop="taxPrice" align="center" width="100" /> -->
+          <el-table-column label="入库金额" prop="amount" align="center" width="100" />
+        </el-table>
+
+
+        <!--      <div class="title titleOne">
+          <div>商品-批次</div>
+        </div>
+        <el-table v-loading="listLoading" :data="formobj.pcList" border style="width: 100%;">
+          <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+          <el-table-column label="商品列表序号" prop="xh" align="center" width="120" />
+          <el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
+          <el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
+          <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
+          <el-table-column label="单位" prop="unit" align="center" width="120" />
+          <el-table-column label="仓库" prop="warehouseName" align="center" width="150" />
+          <el-table-column label="库位" prop="warehouseRackName" align="center" width="150" />
+          <el-table-column label="批次号" prop="batchNumber" align="center" width="300" />
+          <el-table-column label="生产日期" prop="manufactureDate" align="center" width="180" />
+          <el-table-column label="有效期" prop="expirationDate" align="center" width="180" />
+          <el-table-column label="数量" prop="batchCount" align="center" width="120" />
+        </el-table> -->
+
+      </el-form>
+
+    </div>
+
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/inStorage/receivingGoods.js'
+
+  export default {
+    components: {},
+    data() {
+      return {
+        listLoading: false,
+        submitdisabled: false,
+        formobj: {},
+      }
+    },
+    methods: {
+      indexMethod(index) {
+        return index + 1
+      },
+
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.$emit('doback')
+      },
+
+      showAdd() {
+
+      },
+      showEdit(row) {
+
+        var params = {
+          sid: row.sid
+        }
+        req.init(row.sid)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+            }
+          })
+          .catch(e => {
+            this.formobj = {}
+          })
+      }
+    }
+  }
+</script>
+<style scoped>
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+</style>
diff --git a/src/views/inStorage/receivingGoods/relation/chooseproducts.vue b/src/views/inStorage/receivingGoods/relation/chooseproducts.vue
new file mode 100644
index 0000000..60ea91c
--- /dev/null
+++ b/src/views/inStorage/receivingGoods/relation/chooseproducts.vue
@@ -0,0 +1,164 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>选择商品</div>
+        <div>
+          <el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header">
+              <el-form-item label="商品名称" class="searchlist">
+                <el-input v-model="listQuery.params.goodsSpuName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="商品编码" class="searchlist">
+                <el-input v-model="listQuery.params.goodsSkuCode" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="供应商" class="searchlist">
+                <el-input v-model="listQuery.params.manufacturerName" placeholder="" clearable />
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <div class="listtop">
+          <div class="tit">商品列表</div>
+          <!--          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>-->
+        </div>
+        <div class="">
+          <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
+            <el-table-column width="50px" type="selection" align="center"/>
+            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column prop="goodsSpuName" label="商品名称" align="center" />
+            <el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
+            <el-table-column prop="indexes" label="规格" align="center" />
+            <el-table-column prop="goodsUnitName" label="单位" align="center" />
+            <el-table-column prop="manufacturerName" label="供应商" align="center" />
+          </el-table>
+        </div>
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import { chooseproducts } from '@/api/Common/dictcommons'
+
+export default {
+  name: 'SelectVehicle',
+  components: {
+    Pagination
+  },
+  data() {
+    return {
+      isSearchShow: false,
+      searchxianshitit: '隐藏查询条件',
+      tableKey: 0,
+      sids: [],
+      list: [],
+      number: '',
+      listLoading: false,
+      listQuery: {
+        current: 1,
+        size: 5,
+        params: {
+          createOrgSid: '',
+          goodsSpuName: '',
+          goodsSkuCode: '',
+          manufacturerName: ''
+        },
+        total: 0
+      }
+    }
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      chooseproducts(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.success) {
+          this.listQuery.total = response.data.total
+          this.list = response.data.records
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 重置按钮
+    handleReset() {
+      this.listQuery.current = 1
+      this.listQuery.size = 5
+      this.listQuery.total = 0
+      this.listQuery.params.goodsSpuName = ''
+      this.listQuery.params.goodsSkuCode = ''
+      this.listQuery.params.manufacturerName = ''
+      this.getList()
+    },
+    handleSelectionChange(row) {
+      this.sids = row
+    },
+    showData(value, createOrgSid) {
+      // const aa = []
+      // if (value.length > 0) {
+      //   for (var i = 0; i < value.length; i++) {
+      //     aa.push(value[i].saleVehSid)
+      //   }
+      //   this.listQuery.params.saleVehSids = aa
+      // } else {
+      //   this.listQuery.params.saleVehSids = []
+      // }``
+      this.listQuery.params.createOrgSid = createOrgSid
+      this.listQuery.current = 1
+      this.listQuery.size = 5
+      this.listQuery.total = 0
+      this.getList()
+    },
+    // 添加修改返回
+    AddUpdateReturn() {
+      if (this.sids.length > 0) {
+        this.$emit('backData', this.sids)
+      } else {
+        this.$notify({ title: '提示', message: '请至少选择一条记录进行操作', type: 'error', duration: 2000 })
+      }
+    },
+    // 返回
+    handleReturn() {
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+<style scoped>
+</style>
diff --git a/src/views/inStorage/receivingGoods/upShelfAddRecord.vue b/src/views/inStorage/receivingGoods/upShelfAddRecord.vue
new file mode 100644
index 0000000..eee55f5
--- /dev/null
+++ b/src/views/inStorage/receivingGoods/upShelfAddRecord.vue
@@ -0,0 +1,418 @@
+<template>
+  <div>
+
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>【新增】上架单</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+
+    <div class="listconadd">
+
+      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+       <!-- <div class="title">
+          <div>基础信息</div>
+        </div> -->
+         <el-row class="first_row">
+          <el-col :span="8">
+            <div class="span-sty">制单人</div>
+            <el-form-item>
+              <span class="addinputw addinputInfo">{{ formobj.createByName }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">制单部门</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty"><span class="must">*</span> 单据日期</div>
+            <el-form-item prop="createTime"> <el-date-picker v-model="formobj.createTime" type="date"
+                class="addinputw addinputInfo" value-format="yyyy-MM-dd" placeholder="选择日期">
+              </el-date-picker></el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="8">
+            <div class="span-sty">来源单号</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">单据状态</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.billState }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty"><span class="must">*</span> 上架人</div>
+            <el-form-item prop="upShelfName">
+              <el-select v-model="formobj.upShelfName" filterable clearable placeholder="请选择"
+                class="addinputw addinputInfo" @change="allOrgperSelect">
+                <el-option v-for="item in allOrgperList" :key="item.sid" :label="item.name" :value="item.sid">
+                </el-option>
+              </el-select>
+
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="24">
+            <div class="span-sty">备注</div>
+            <el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
+                type="textarea" :rows="1" clearable /></el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <div class="title">
+          <div>商品列表</div>
+        </div>
+
+        <el-table v-loading="listLoading" :data="formobj.list" border>
+          <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+          <el-table-column fixed label="操作" wid align="center" width="120">
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini" @click="doGoodsDel(scope.row.goodsSkuSid)">删除</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column label="商品名称" prop="goodsSpuName" align="center" />
+          <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
+          <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
+          <el-table-column label="单位" prop="unit" align="center" />
+          <!-- <el-table-column label="仓库" align="center" width="180">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.warehouseName" placeholder="请选择" clearable
+                @change="selectWarehouseName(scope.row,$event)">
+                <el-option v-for="(item,i) in warehouseList" :key="i" :label="item.warehouseName" :value="item.sid">
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="库位" align="center" width="180">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.warehouseRackName" :disabled="scope.row.warehouseName==''" clearable
+                @focus="getWarehouseAreaList(scope.row.warehouseSid)" placeholder="请选择"
+                @change="selectWarehouseAreaCode(scope.row,$event)">
+                <el-option v-for="(item,i) in warehouseRackList" :key="i" :label="item.areaCode" :value="item.sid">
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="批次号" prop="batchNumber" align="center" width="300" /> -->
+          <el-table-column label="需上架数量" align="center">
+            <template slot-scope="scope">
+              <el-input ref="focusAssumptionInput" v-model="scope.row.count" clearable placeholder=""
+                oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+            </template>
+          </el-table-column>
+          <el-table-column label="载具编号" align="center">
+            <template slot-scope="scope">
+              <el-input ref="focusAssumptionInput" v-model="scope.row.packageNo" clearable placeholder="" />
+            </template>
+          </el-table-column>
+        </el-table>
+
+      </el-form>
+
+    </div>
+
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/inStorage/receivingGoods.js'
+  import {
+    getCurrentDate
+  } from '@/utils/index.js'
+  import {
+    selAllByOrgSidPath,
+    getOrgSidByPath,
+    getWarehouses,
+    getWarehouseareas
+  } from '@/api/Common/dictcommons'
+
+  export default {
+    components: {},
+    data() {
+      return {
+        listLoading: false,
+        submitdisabled: false,
+        formobj: {
+          "sid": "",
+          "billNo": "",
+          "createBySid": window.sessionStorage.getItem('userSid'),
+          "createByName": window.sessionStorage.getItem('name'),
+          "deptName": '',
+          "deptSid": '',
+          "sourceBillNo": "",
+          "sourceBillSid": "",
+          "billState": "新建",
+          "upShelfSid": "",
+          "upShelfName": '',
+          "list": [
+
+          ],
+          "remarks": "",
+          'createOrgSid': "",
+          'useOrgSid': ""
+        },
+        hideUploadBtn: false,
+        busTypeList: [{
+            name: "业务类型1",
+            sid: "1"
+          },
+          {
+            name: "业务类型2",
+            sid: "2"
+          }
+        ],
+        supplierList: [],
+        warehouseList: [],
+        warehouseRackList: [],
+        allOrgperList: [],
+        rules: {
+          createTime: [{
+            required: true,
+            message: '到货日期不能为空',
+            trigger: 'change'
+          }],
+          upShelfName: [{
+            required: true,
+            message: '请选择上架人员',
+            trigger: 'change'
+          }],
+
+        }
+      }
+    },
+    created() {
+
+    },
+    methods: {
+      getOrgPathSid() {
+        getOrgSidByPath({
+          orgPath: window.sessionStorage.getItem('defaultOrgPath')
+        }).then((res) => {
+          if (res.success) {
+            this.formobj.createOrgSid = res.data
+            this.formobj.useOrgSid = res.data
+          }
+        })
+      },
+      doGoodsDel(sid) {
+        console.log("doGoodsDel》》》》", sid)
+
+        this.$confirm("是否确定删除此商品？", '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const index = this.formobj.list.findIndex((item) => item.goodsSkuSid === sid)
+          console.log("index》》》》", index)
+          this.formobj.list.splice(index, 1)
+
+        })
+      },
+
+      indexMethod(index) {
+        return index + 1
+      },
+      saveOrUpdate() {
+        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+
+        this.submitdisabled = true
+        this.$refs['form_obj'].validate((valid) => {
+          if (valid) {
+            req.saveUpShelf(this.formobj)
+              .then(resp => {
+                if (resp.success) {
+                  this.submitdisabled = false
+                  this.$message({
+                    showClose: true,
+                    type: 'success',
+                    message: resp.msg
+                  })
+                  this.handleReturn('true')
+                } else {
+                  this.submitdisabled = false
+                  // 根据resp.code进行异常情况处理
+                }
+              })
+              .catch(() => {
+                this.submitdisabled = false
+              })
+          }
+        })
+      },
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {
+          "sid": "",
+          "billNo": "",
+          "createBySid": window.sessionStorage.getItem('userSid'),
+          "createByName": window.sessionStorage.getItem('name'),
+          "createTime": getCurrentDate(),
+          "deptName": '',
+          "deptSid": '',
+          "sourceBillNo": "",
+          "sourceBillSid": "",
+          "billState": "新建",
+          "upShelfSid": "",
+          "upShelfName": '',
+          "list": [
+
+          ],
+          "remarks": "",
+          'createOrgSid': "",
+          'useOrgSid': ""
+        }
+        this.$emit('doback')
+      },
+
+      showAdd() {
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
+
+      },
+      showEdit(row) {
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
+
+        this.getWarehouseList()
+        this.getAllOrgper()
+        this.getOrgPathSid()
+        var params = {
+          sid: row.sid,
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+          userSid: window.sessionStorage.getItem('userSid')
+        }
+
+        req.initUpshelf(params)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+
+              this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window
+                .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
+              this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+                .getItem('defaultOrgPath').lastIndexOf('/') + 1)
+            }
+          })
+          .catch(e => {
+            this.formobj = {}
+          })
+      },
+      getAllOrgper() {
+        selAllByOrgSidPath({
+          orgSidPath: window.sessionStorage.getItem('defaultOrgPath')
+        }).then((res) => {
+          if (res.success) {
+            this.allOrgperList = res.data
+
+            console.log("aaaaaa", this.allOrgperList);
+
+          }
+        })
+      },
+      allOrgperSelect(val) {
+        console.log("allOrgperSelect", val);
+
+        const choose = this.allOrgperList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectWarehouseName', choose)
+        this.formobj.upShelfName = choose[0].name
+        this.formobj.upShelfSid = choose[0].sid
+
+      },
+
+      getWarehouseList() {
+        var parpams = {
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        }
+        getWarehouses(parpams).then((res) => {
+          if (res.success) {
+            this.warehouseList = res.data
+
+            console.log("aaaaaa", this.warehouseList);
+
+          }
+        })
+      },
+      getWarehouseAreaList(sid) {
+        var query = {
+          ckSid: sid
+        }
+        getWarehouseareas(query).then((res) => {
+          if (res.success) {
+            this.warehouseRackList = res.data
+
+            console.log("aaaaaa", this.warehouseRackList);
+
+          }
+        })
+      },
+      selectWarehouseName(row, val) {
+        console.log("selectWarehouseName", row);
+        console.log("selectWarehouseName", val);
+        const choose = this.warehouseList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectWarehouseName', choose)
+        row.warehouseName = choose[0].warehouseName
+        row.warehouseSid = choose[0].sid
+
+      },
+      selectWarehouseAreaCode(row, val) {
+        console.log("selectWarehouseAreaCode", val);
+
+        const choose = this.warehouseRackList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectWarehouseAreaCode', choose)
+        row.warehouseRackName = choose[0].areaCode
+        row.warehouseRackSid = choose[0].sid
+
+      },
+
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+</style>
diff --git a/src/views/inStorage/upShelf/index.vue b/src/views/inStorage/upShelf/index.vue
new file mode 100644
index 0000000..313bb60
--- /dev/null
+++ b/src/views/inStorage/upShelf/index.vue
@@ -0,0 +1,352 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <button-bar ref="btnbar" view-title="上架单管理" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">
+            {{ searchxianshitit }}
+          </el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form :inline="true" class="tab-header">
+              <el-form-item label="单据编号">
+                <el-input v-model="queryParams.params.billNo" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="单据日期">
+                <el-date-picker v-model="queryParams.params.createTimeStart" type="date" placeholder="选择日期"
+                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
+                </el-date-picker>至
+                <el-date-picker v-model="queryParams.params.createTimeEnd" type="date" placeholder="选择日期"
+                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item label="来源单号">
+                <el-input v-model="queryParams.params.sourceBillNo" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="单据状态">
+                <el-select v-model="queryParams.params.billState" placeholder="请选择">
+                  <el-option v-for="(item,i) in billStateList" :key="item.sid" :label="item.name" :value="item.name">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!-- Start 项目列表头部 -->
+        <div class="listtop">
+          <div class="tit">上架单列表</div>
+        </div>
+        <!-- End 项目列表头部 -->
+        <!-- Start 项目列表 -->
+        <div class="">
+          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
+            @selection-change="selectionLineChangeHandle">
+            <el-table-column fixed width="50" type="selection" align="center" />
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+            <el-table-column fixed label="操作" align="center" width="100">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="billNo" label="单据编号" align="center" />
+            <el-table-column prop="createTime" label="单据日期" align="center" />
+            <el-table-column prop="createByName" label="制单人" align="center" />
+            <el-table-column prop="sourceBillNo" label="来源单号" align="center" />
+            <el-table-column prop="billState" label="单据状态" align="center" />
+
+          </el-table>
+        </div>
+        <!-- End 项目列表 -->
+        <div class="pages">
+          <div class="tit" />
+          <!--  翻页  -->
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
+            :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+        </div>
+      </div>
+    </div>
+    <!-- End 查询和其列表部分 -->
+    <!-- 新增修改部分组件 -->
+    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+    <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" />
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/inStorage/upShelf.js'
+  import ButtonBar from '@/components/ButtonBar'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import divAdd from './upShelfAdd.vue'
+  import divInfo from './upShelfInfo.vue'
+  export default {
+    components: {
+      ButtonBar,
+      Pagination,
+      pageye,
+      divAdd,
+      divInfo
+    },
+    data() {
+      return {
+        formobj: {
+          sid: "",
+          reviewStatus: "",
+          remarks: ''
+        },
+        btndisabled: false,
+        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        tableLoading: false,
+        dataList: [],
+        btnList: [{
+            type: 'danger',
+            size: 'small',
+            icon: 'del',
+            btnKey: 'doDel',
+            btnLabel: '删除'
+          },
+          {
+            type: 'primary',
+            size: 'small',
+            icon: 'plus',
+            btnKey: 'toPrintLabel',
+            btnLabel: '打印标签'
+          },
+          // {
+          //   type: 'primary',
+          //   size: 'small',
+          //   icon: 'plus',
+          //   btnKey: 'toAdd',
+          //   btnLabel: '上架'
+          // },
+          {
+            type: 'info',
+            size: 'small',
+            icon: 'cross',
+            btnKey: 'doClose',
+            btnLabel: '关闭'
+          }
+        ],
+        queryParams: {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            name: '',
+            billNo: "",
+            sourceBillNo: "",
+            createTimestart: '',
+            createTimeEnd: '',
+            billstate: '',
+            menuUrl: '',
+            orgPath: '',
+            usersid: ""
+          }
+        },
+        sids: [],
+        selectionList: [],
+        billStateList: [{
+            name: "新建",
+            sid: "0"
+          },
+          {
+            name: "已完成",
+            sid: "1"
+          }
+        ],
+        sids: []
+      }
+    },
+    mounted() {
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    created() {
+      this.loadList()
+    },
+    methods: {
+      toPrintLabel() {
+        if (this.selectionList.length != 1) {
+          this.$message({
+            type: 'warning',
+            message: "请选择一条数据。",
+            showClose: true
+          })
+          return
+        }
+      },
+      selectionLineChangeHandle(val) {
+        console.log("val", val);
+
+        this.selectionList = val
+        const aa = []
+        val.forEach(element => {
+          aa.push(element.sid)
+        })
+        this.sids = aa
+
+
+      },
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        switch (btnKey) {
+          case 'toPrintLabel':
+            this.toPrintLabel()
+            break
+          case 'doDel':
+            this.doDel()
+            break
+          case 'toAdd':
+            this.toAdd()
+            break
+          case 'doClose':
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+      doDel() {
+        if (this.sids.length > 0) {
+          const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+          this.$confirm(tip, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
+            req.deleteBySids(this.sids).then((resp) => {
+              loading.close()
+              if (resp.success) {
+                this.$message({
+                  type: 'success',
+                  message: resp.msg,
+                  showClose: true
+                })
+                this.loadList()
+              } else {
+                // 根据resp.code进行异常情况处理
+              }
+            }).catch(e => {
+              loading.close()
+            })
+          }).catch(() => {})
+        } else {
+          this.$message({
+            showClose: true,
+            message: '请至少选择一条记录进行删除操作'
+          })
+        }
+      },
+      loadList() {
+        this.tableLoading = true
+        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        this.queryParams.params.menuUrl = this.$route.path
+        req.listPage(this.queryParams).then((resp) => {
+          this.tableLoading = false
+          if (resp.success) {
+            const data = resp.data
+            this.queryParams.total = data.total
+            this.dataList = data.records
+          } else {
+            // 根据resp.code进行异常情况处理
+            this.dataList = []
+            this.queryParams.total = 0
+          }
+        }).catch(() => {
+          this.tableLoading = false
+        })
+      },
+
+      // 序号
+      indexMethod(index) {
+        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      dosearch() {
+        this.queryParams.current = 1
+        this.loadList()
+      },
+      resetQuery() {
+        this.queryParams = {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+           name: '',
+           billNo: "",
+           sourceBillNo: "",
+           createTimestart: '',
+           createTimeEnd: '',
+           billstate: '',
+           menuUrl: '',
+           orgPath: '',
+           usersid: ""
+          }
+        }
+        this.loadList()
+      },
+      toAdd(row) {
+
+        if (this.selectionList.length != 1) {
+          this.$message({
+            type: 'warning',
+            message: "请选择一条数据。",
+            showClose: true
+          })
+          return
+        }
+
+        if (this.selectionList[0].billState == '完成') {
+          this.$message({
+            type: 'warning',
+            message: "此记录已完成,不可操作。",
+            showClose: true
+          })
+          return
+        }
+
+        this.viewState = 2
+        this.$refs['divadd'].showEdit(this.selectionList[0])
+
+      },
+
+      doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+      },
+      toRelevancy(row) {
+        this.viewState = 4
+        this.$refs['divinfo'].showEdit(row)
+      },
+
+      resetState() {
+        this.viewState = 1
+      },
+
+    }
+  }
+</script>
+<style scoped>
+</style>
diff --git a/src/views/inStorage/upShelf/upShelfAdd.vue b/src/views/inStorage/upShelf/upShelfAdd.vue
new file mode 100644
index 0000000..2ef8638
--- /dev/null
+++ b/src/views/inStorage/upShelf/upShelfAdd.vue
@@ -0,0 +1,425 @@
+<template>
+  <div>
+
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>{{title}}上架单</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+
+    <div class="listconadd">
+
+      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+        <div class="title">
+          <div>基础信息</div>
+        </div>
+        <el-row class="first_row">
+          <el-col :span="8">
+            <div class="span-sty">制单人</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">制单部门</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">制单人</div>
+            <el-form-item><el-input v-model="formobj.createByName" placeholder="" class="addinputw addinputInfo"
+                clearable /></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty"><span class="must">*</span> 单据日期</div>
+            <el-form-item prop="createTime"> <el-date-picker v-model="formobj.createTime" type="date"
+                class="addinputw addinputInfo" value-format="yyyy-MM-dd" placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="8">
+            <div class="span-sty">来源单号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">单据状态</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty"><span class="must">*</span> 上架人</div>
+            <el-form-item prop="upShelfName">
+              <el-select v-model="formobj.upShelfName" filterable clearable placeholder="请选择"
+                class="addinputw addinputInfo" @change="allOrgperSelect">
+                <el-option v-for="item in allOrgperList" :key="item.sid" :label="item.name" :value="item.sid">
+                </el-option>
+              </el-select>
+
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+
+
+          <el-col :span="24">
+            <div class="span-sty">备注</div>
+            <el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
+                clearable /></el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <div class="title">
+          <div>商品列表</div>
+        </div>
+
+        <el-table v-loading="listLoading" :data="formobj.list" border>
+          <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+          <el-table-column fixed label="操作" wid align="center" width="120">
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini" @click="doGoodsBatch(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
+          <el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
+          <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
+          <el-table-column label="单位" prop="unit" align="center" width="120" />
+          <!--  <el-table-column label="仓库" align="center" width="180">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.warehouseName" placeholder="请选择" clearable
+                @change="selectWarehouseName(scope.row,$event)">
+                <el-option v-for="(item,i) in warehouseList" :key="i" :label="item.warehouseName" :value="item.sid">
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="库位" align="center" width="180">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.warehouseRackName" :disabled="scope.row.warehouseName==''" clearable
+                @focus="getWarehouseAreaList(scope.row.warehouseSid)" placeholder="请选择"
+                @change="selectWarehouseAreaCode">
+                <el-option v-for="(item,i) in warehouseRackList" :key="i" :label="item.areaCode" :value="item.sid">
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="批次号" prop="batchNumber" align="center" width="300" /> -->
+          <el-table-column label="需要上架数量" align="center" width="120">
+            <template slot-scope="scope">
+              <el-input ref="focusAssumptionInput" v-model="scope.row.count" clearable placeholder=""
+                oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+            </template>
+          </el-table-column>
+          <el-table-column label="载具编号" align="center" width="180">
+            <template slot-scope="scope">
+              <el-input ref="focusAssumptionInput" v-model="scope.row.packageNo" clearable placeholder="" />
+            </template>
+          </el-table-column>
+        </el-table>
+
+      </el-form>
+
+    </div>
+
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/inStorage/upShelf.js'
+  import {
+    getCurrentDate
+  } from '@/utils/index.js'
+  import {
+    selAllByOrgSidPath,
+    getWarehouses,
+    getWarehouseareas
+  } from '@/api/Common/dictcommons'
+
+  export default {
+    components: {},
+    data() {
+      return {
+        title: "【新增】",
+        listLoading: false,
+        submitdisabled: false,
+        formobj: {
+          "sid": "",
+          "billNo": "",
+          "createBySid": window.sessionStorage.getItem('userSid'),
+          "createByName": window.sessionStorage.getItem('name'),
+          "createTime": getCurrentDate(),
+          "deptName": '',
+          "deptSid": '',
+          "sourceBillNo": "",
+          "sourceBillSid": "",
+          "billState": "新建",
+          "upShelfSid": "",
+          "upShelfName": '',
+          "list": [
+
+          ],
+          "remarks": ""
+        },
+        hideUploadBtn: false,
+        supplierList: [],
+        warehouseList: [],
+        warehouseRackList: [],
+        // commodity商品
+        commodityKey: 1,
+        commodityLoading: false,
+        commodityQuery: {
+          current: 1,
+          size: 2,
+          total: 0,
+          params: {
+            name: '',
+            inOrg: "",
+            outOrg: ""
+          }
+        },
+        commodityData: [],
+        isUpdata: false,
+        allOrgperList: [],
+        rules: {
+          createTime: [{
+            required: true,
+            message: '到货日期不能为空',
+            trigger: 'change'
+          }],
+          upShelfName: [{
+            required: true,
+            message: '请选择上架人员',
+            trigger: 'change'
+          }],
+
+        }
+      }
+    },
+    created() {},
+
+    methods: {
+
+      indexMethod(index) {
+        return index + 1
+      },
+      saveOrUpdate() {
+        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+
+
+        if (this.formobj.list.length == 0) {
+          this.$message({
+            showClose: true,
+            type: 'error',
+            message: '请添加商品'
+          })
+
+          return
+        }
+
+        for (var i = 0; i < this.formobj.list.length; i++) {
+          var item = this.formobj.list[i]
+          if (item.actualCount == 0) {
+            this.$message({
+              showClose: true,
+              type: 'error',
+              message: '商品上架数量不能为空'
+            })
+
+            return
+          }
+
+        }
+
+        this.$refs['form_obj'].validate((valid) => {
+          if (valid) {
+            this.submitdisabled = true
+            req.save(this.formobj).then((res) => {
+              if (res.success) {
+                this.$message({
+                  showClose: true,
+                  type: 'success',
+                  message: '保存成功'
+                })
+                this.handleReturn('true')
+              } else {
+                this.submitdisabled = false
+              }
+            }).catch(() => {
+              this.submitdisabled = false
+            })
+          }
+        })
+
+      },
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {
+          "sid": "",
+          "billNo": "",
+          "createBySid": window.sessionStorage.getItem('userSid'),
+          "createByName": window.sessionStorage.getItem('name'),
+          "createTime": getCurrentDate(),
+          "deptName": '',
+          "deptSid": '',
+          "sourceBillNo": "",
+          "sourceBillSid": "",
+          "billState": "新建",
+          "upShelfSid": "",
+          "upShelfName": '',
+          "list": [
+
+          ],
+          "remarks": ""
+        }
+        this.submitdisabled = false
+        this.$emit('doback')
+      },
+
+      showAdd() {
+        this.title = "【新增】"
+        this.getWarehouseList()
+        this.getAllOrgper()
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
+
+      },
+      showEdit(row) {
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
+
+        this.getWarehouseList()
+        this.getAllOrgper()
+        this.title = "【修改】"
+        var params = {
+          sid: row.sid
+        }
+        req.init(params)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+
+              this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window
+                .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
+              this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+                .getItem('defaultOrgPath').lastIndexOf('/') + 1)
+
+            }
+          })
+          .catch(e => {
+            this.formobj = {}
+          })
+      },
+      getAllOrgper() {
+        selAllByOrgSidPath({
+          orgSidPath: window.sessionStorage.getItem('defaultOrgPath')
+        }).then((res) => {
+          if (res.success) {
+            this.allOrgperList = res.data
+
+            console.log("aaaaaa", this.allOrgperList);
+
+          }
+        })
+      },
+      allOrgperSelect(val) {
+        console.log("allOrgperSelect", val);
+
+        const choose = this.allOrgperList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectWarehouseName', choose)
+        this.formobj.upShelfName = choose[0].name
+        this.formobj.upShelfSid = choose[0].sid
+
+      },
+      getWarehouseList() {
+        var parpams = {
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        }
+        getWarehouses(parpams).then((res) => {
+          if (res.success) {
+            this.warehouseList = res.data
+
+            console.log("aaaaaa", this.warehouseList);
+
+          }
+        })
+      },
+      getWarehouseAreaList(sid) {
+        var query = {
+          ckSid: sid
+        }
+        getWarehouseareas(query).then((res) => {
+          if (res.success) {
+            this.warehouseRackList = res.data
+
+            console.log("aaaaaa", this.warehouseRackList);
+
+          }
+        })
+      },
+      selectWarehouseName(row, val) {
+        console.log("selectWarehouseName", row);
+        console.log("selectWarehouseName", val);
+        const choose = this.warehouseList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectWarehouseName', choose)
+        row.warehouseName = choose[0].warehouseName
+        row.warehouseSid = choose[0].sid
+
+      },
+      selectWarehouseAreaCode(val) {
+        console.log("selectWarehouseAreaCode", val);
+
+        const choose = this.warehouseRackList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectWarehouseAreaCode', choose)
+        row.warehouseRackName = choose[0].areaCode
+        row.warehouseRackSid = choose[0].sid
+
+      },
+
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+</style>
diff --git a/src/views/inStorage/upShelf/upShelfInfo.vue b/src/views/inStorage/upShelf/upShelfInfo.vue
new file mode 100644
index 0000000..870d402
--- /dev/null
+++ b/src/views/inStorage/upShelf/upShelfInfo.vue
@@ -0,0 +1,161 @@
+<template>
+  <div>
+
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>上架单</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+
+    <div class="listconadd">
+
+      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+        <div class="title">
+          <div>基础信息</div>
+        </div>
+        <el-row class="first_row">
+          <el-col :span="8">
+            <div class="span-sty">制单人</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+
+            <div class="span-sty">制单部门</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <div class="span-sty">单据日期</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="8">
+            <div class="span-sty">来源单号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">单据状态</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <div class="span-sty">上架人</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.upShelfName }}</span></el-form-item>
+          </el-col>
+
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="24">
+            <div class="span-sty">备注</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <div class="title">
+          <div>商品列表</div>
+        </div>
+
+        <el-table v-loading="listLoading" :data="formobj.list" border>
+          <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80" />
+          <el-table-column fixed label="商品名称" prop="goodsSpuName" align="center" width="200" />
+          <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
+          <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
+          <el-table-column label="单位" prop="unit" align="center" />
+          <!-- <el-table-column label="批次号" prop="batchNumber" align="center" />
+          <el-table-column label="仓库" prop="warehouseName" align="center" />
+          <el-table-column label="库位" prop="warehouseRackCode" align="center" /> -->
+          <el-table-column label="需上架数量" prop="count" align="center" />
+          <el-table-column label="已上架数量" prop="actualCount" align="center" />
+          <el-table-column label="未上架数量" prop="noShelfCount" align="center" />
+          <el-table-column label="载具编号" prop="packageNo" align="center" />
+        </el-table>
+
+      </el-form>
+
+    </div>
+
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/inStorage/upShelf.js'
+
+  export default {
+    components: {},
+    data() {
+      return {
+        listLoading: false,
+        submitdisabled: false,
+        formobj: {},
+      }
+    },
+    methods: {
+      indexMethod(index) {
+        return index + 1
+      },
+
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.$emit('doback')
+      },
+
+      showAdd() {
+
+      },
+      showEdit(row) {
+
+        var params = {
+          sid: row.sid
+        }
+        req.init(row.sid)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+            }
+          })
+          .catch(e => {
+            this.formobj = {}
+          })
+      }
+    }
+  }
+</script>
+<style scoped>
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+</style>