diff --git a/src/api/inStorage/receivingGoods.js b/src/api/inStorage/receivingGoods.js
index 0055285..9f9cbc9 100644
--- a/src/api/inStorage/receivingGoods.js
+++ b/src/api/inStorage/receivingGoods.js
@@ -6,7 +6,7 @@ export default {
   //  入库单列表
   listPage: function(params) {
     return request({
-      url: '/wms/apiadmin/purchaseInStorage/listPage',
+      url: '/wms/apiadmin/purchaseinventorybill/listPage',
       method: 'post',
       data: params,
       headers: {
@@ -18,7 +18,7 @@ export default {
   // 根据入库单sid获取明细
   selectByBillSid: function(data) {
     return request({
-      url: '/wms/apiadmin/purchaseInStorage/selectByBillSid/' + data,
+      url: '/wms/apiadmin/purchaseinventorybill/selectByBillSid/' + data,
       method: 'get'
     });
   },
@@ -26,7 +26,7 @@ export default {
   // 获取组织下所有的预约单
   getReservationBill: function(params) {
     return request({
-      url: '/wms/apiadmin/purchaseInStorage/getReservationBill',
+      url: '/wms/apiadmin/WmsAnsBill/listPageAns',
       method: 'post',
       data: params,
       headers: {
@@ -39,7 +39,7 @@ export default {
   // 生成入库单
   createInStorageBill: function(data) {
     return request({
-      url: '/wms/apiadmin/purchaseInStorage/createInStorageBill',
+      url: '/wms/apiadmin/purchaseinventorybill/confirm',
       method: 'post',
       data: data,
       headers: {
diff --git a/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue b/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue
index 22df2be..7bdf049 100644
--- a/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue
+++ b/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue
@@ -186,7 +186,7 @@
           manager: '',
           longitude: '',
           latitude: '',
-          usageStatus: "1",
+          usageStatus: 1,
           address: '',
           squareMeter: '',
           sortNo: '',
diff --git a/src/views/inStorage/deliveryNotice/index.vue b/src/views/inStorage/deliveryNotice/index.vue
index 418dc57..979da49 100644
--- a/src/views/inStorage/deliveryNotice/index.vue
+++ b/src/views/inStorage/deliveryNotice/index.vue
@@ -89,10 +89,10 @@
             <el-table-column prop="warehouseName" label="仓库" align="center" width="150" />
             <el-table-column label="入库库位" align="center" width="180">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.warehouseRackName" placeholder="请选择"
+                <el-select v-model="scope.row.warehouseRackCode" placeholder="请选择"
                   @focus="getWarehouseAreaList(scope.row.warehouseSid)"
                   @change="selectWarehouseAreaCode(scope.row,$event)">
-                  <el-option v-for="(item,i) in warehouseRackList2" :key="i" :label="item.rackName" :value="item.sid">
+                  <el-option v-for="(item,i) in warehouseRackList2" :key="i" :label="item.rackCode" :value="item.sid">
                   </el-option>
                 </el-select>
               </template>
@@ -123,7 +123,91 @@
             :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
         </div> -->
 
-        <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect"
+
+        <!-- 列表底部信息 -->
+        <div class="">
+          <el-tabs v-model="activeName" type="border-card">
+            <el-tab-pane name="first" label="商品明细">
+              <el-table :data="goodsDetailList" border style="width: 100%">
+                <el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center" />
+                <el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
+                <el-table-column prop="goodsSkuCode" label="商品条码" align="center" />
+                <el-table-column prop="goodsSkuTitle" label="商品名称" align="center" />
+                <el-table-column prop="goodsSkuOwnSpec" label="规格编码" align="center" />
+                <el-table-column prop="goodsSkuOwnSpec" label="规格值" align="center" />
+                <el-table-column prop="unit" label="单位" align="center" />
+                <el-table-column prop="orderCount" label="预约数量" align="center" />
+                <el-table-column prop="actualInCount" label="实际入库数量" align="center" />
+                <el-table-column prop="waitInCount" label="待收货数量" align="center" />
+              </el-table>
+            </el-tab-pane>
+            <el-tab-pane name="second" label="发货人信息">
+              <el-form ref="dataForm" class="formaddcopy02" :model="formobj">
+                <el-row class="first_row">
+                  <el-col :span="6">
+                    <div class="span-sty">姓名</div>
+                    <el-form-item> <span class="addinputInfo">{{ formobj.contactName }}</span></el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <div class="span-sty">省</div>
+                    <el-form-item> <span class="addinputInfo">{{ formobj.province }}</span></el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <div class="span-sty">市</div>
+                    <el-form-item> <span class="addinputInfo">{{ formobj.city }}</span></el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <div class="span-sty">县</div>
+                    <el-form-item> <span class="addinputInfo">{{ formobj.county }}</span></el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="6">
+                    <div class="span-sty">村镇</div>
+                    <el-form-item> <span class="addinputInfo"></span></el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <div class="span-sty">详细地址</div>
+                    <el-form-item> <span class="addinputInfo">{{ formobj.address }}</span></el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <div class="span-sty">邮编</div>
+                    <el-form-item> <span class="addinputInfo">{{ formobj.zipCode }}</span></el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="6">
+                    <div class="span-sty">手机</div>
+                    <el-form-item> <span class="addinputInfo">{{ formobj.contactMobile }}</span></el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <div class="span-sty">电话</div>
+                    <el-form-item> <span class="addinputInfo">{{ formobj.contactTelePhone }}</span></el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <div class="span-sty">邮箱</div>
+                    <el-form-item> <span class="addinputInfo">{{ formobj.email }}</span></el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <div class="span-sty"></div>
+                    <el-form-item> </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-form>
+            </el-tab-pane>
+            <el-tab-pane name="operateList" label="操作记录">
+              <el-table :data="operateList" border style="width: 100%">
+                <el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center" />
+                <el-table-column prop="createTime" label="操作时间" width="250" align="center" />
+                <el-table-column prop="userName" label="操作账号" width="180" align="center" />
+                <el-table-column prop="content" label="操作内容" align="center" />
+              </el-table>
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+
+
+        <!--  <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect"
           text-color="#666" active-text-color="white">
 
           <el-menu-item index="1">商品明细</el-menu-item>
@@ -132,18 +216,7 @@
         </el-menu>
 
         <div v-show="activeIndex=='1'" style="margin-bottom: 50px;">
-          <el-table :data="goodsDetailList" border style="width: 100%">
-            <el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center" />
-            <el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
-            <el-table-column prop="goodsSkuCode" label="商品条码" align="center" />
-            <el-table-column prop="goodsSkuTitle" label="商品名称" align="center" />
-            <el-table-column prop="goodsSkuOwnSpec" label="规格编码" align="center" />
-            <el-table-column prop="goodsSkuOwnSpec" label="规格值" align="center" />
-            <el-table-column prop="unit" label="单位" align="center" />
-            <el-table-column prop="orderCount" label="预约数量" align="center" />
-            <el-table-column prop="actualInCount" label="实际入库数量" align="center" />
-            <el-table-column prop="waitInCount" label="待收货数量" align="center" />
-          </el-table>
+
         </div>
 
         <div v-show="activeIndex=='2'" style="margin-bottom: 50px;">
@@ -209,7 +282,7 @@
             <el-table-column prop="userName" label="操作账号" width="180" align="center" />
             <el-table-column prop="content" label="操作内容" align="center" />
           </el-table>
-        </div>
+        </div> -->
 
       </div>
     </div>
@@ -244,6 +317,7 @@
     },
     data() {
       return {
+        activeName: "first",
         activeIndex: '1',
         dialogVisible: false,
         formobj: {},
@@ -384,35 +458,37 @@
       rowItemClick(row) {
         console.log("row", row);
         this.rowItemSid = row.sid
-        this.handleSelect(this.activeIndex)
-      },
 
-      handleSelect(val) {
-        console.log("val", val);
-        this.activeIndex = val
-
-        if (val == '1') { // 商品明细
-          req.selectByBillSid(this.rowItemSid).then((resp) => {
-            this.goodsDetailList = resp.data
-          }).catch(() => {})
+        if (this.rowItemSid == '') {
+          this.$message({
+            type: 'warning',
+            showClose: true,
+            message: '暂无数据'
+          })
+          return
         }
 
-        if (val == '2') { // 发货人信息
-          req.fetchDetailsBySid(this.rowItemSid).then((resp) => {
-            this.formobj = resp.data
-          }).catch(() => {})
-        }
+        req.selectByBillSid(this.rowItemSid).then((resp) => {
+          this.goodsDetailList = resp.data
+        }).catch(() => {})
 
-        if (val == '3') { // 操作记录
-          var parpams = {
-            sid: this.rowItemSid
-          }
-          req.operationrecordDetails(parpams).then((resp) => {
-            this.operateList = resp.data
-          }).catch(() => {})
+        req.fetchDetailsBySid(this.rowItemSid).then((resp) => {
+          this.formobj = resp.data
+        }).catch(() => {})
+
+        var parpams = {
+          sid: this.rowItemSid
         }
+        req.operationrecordDetails(parpams).then((resp) => {
+          this.operateList = resp.data
+        }).catch(() => {})
 
+        // this.handleSelect()
       },
+
+      // handleSelect() {
+
+      // },
       selectionLineChangeHandle(val) {
         console.log("val", val);
 
@@ -497,7 +573,7 @@
             this.formobj = {}
             this.operateList = []
             this.rowItemClick(data.records[0])
-            this.handleSelect('1')
+
           } else {
             // 根据resp.code进行异常情况处理
             this.dataList = []
@@ -561,7 +637,7 @@
 
         const choose = this.warehouseRackList2.filter((item) => item.sid == val)
         console.log('>>>>>>>>>selectWarehouseAreaCode', choose)
-        row.warehouseRackName = choose[0].rackName
+        row.warehouseRackCode = choose[0].rackCode
         row.warehouseRackSid = choose[0].sid
 
         var query = {
diff --git a/src/views/inStorage/receivingGoods/inStorageAdd.vue b/src/views/inStorage/receivingGoods/inStorageAdd.vue
new file mode 100644
index 0000000..30ab524
--- /dev/null
+++ b/src/views/inStorage/receivingGoods/inStorageAdd.vue
@@ -0,0 +1,280 @@
+<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"><span class="must">*</span> 入库日期</div>
+            <el-form-item prop="storageTime"> <el-date-picker v-model="formobj.storageTime" type="date"
+                class="addinputw 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><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
+                clearable /></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="操作" align="center" width="80">
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini" @click="toDelGoods(scope.$index)">删除</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column fixed label="商品名称" prop="goodsSkuTitle" 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="150">
+            <template slot-scope="scope">
+              <el-input ref="focusAssumptionInput" @input="commodityComputeYHAndXSJE1(scope.row)"
+                v-model="scope.row.price" 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="totalPrice" align="center" />
+          <el-table-column label="预约单号" prop="yyCode" align="center" />
+          <el-table-column label="预约数量" prop="orderCount" align="center" />
+          <el-table-column label="可入库数量" prop="waitInCount" align="center" />
+          <el-table-column label="入库数量" align="center" width="120">
+            <template slot-scope="scope">
+              <el-input ref="focusAssumptionInput" @input="commodityComputeYHAndXSJE2(scope.row)"
+                v-model="scope.row.count" clearable placeholder="" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+            </template>
+          </el-table-column>
+          <el-table-column label="生产批次号" prop="batch" align="center" />
+          <el-table-column label="入库库位" align="center" width="180">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.warehouseRackCode" clearable placeholder="请选择"
+                @focus="getWarehouseAreaList(scope.row.warehouseSid)"
+                @change="selectWarehouseAreaCode(scope.row,$event)">
+                <el-option v-for="(item,i) in warehouseRackList" :key="i" :label="item.rackCode" :value="item.sid">
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="明细备注" align="center" width="180">
+            <template slot-scope="scope">
+              <el-input ref="focusAssumptionInput" v-model="scope.row.remarks" clearable placeholder="" />
+            </template>
+          </el-table-column>
+        </el-table>
+
+      </el-form>
+
+    </div>
+
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/inStorage/receivingGoods.js'
+  import {
+    getWarehouserack,
+  } from '@/api/Common/dictcommons'
+  export default {
+    components: {},
+    data() {
+      return {
+        listLoading: false,
+        submitdisabled: false,
+        formobj: {
+          useOrgSid: window.sessionStorage.getItem('orgSid'),
+          createOrgSid: window.sessionStorage.getItem('orgSid'),
+          userSid: window.sessionStorage.getItem('userSid'),
+          storageTime: "",
+          remarks: "",
+          list: []
+        },
+        rules: {
+          storageTime: [{
+            required: true,
+            message: '入库日期不能为空',
+            trigger: 'change'
+          }],
+        },
+        warehouseRackList: []
+      }
+    },
+    methods: {
+      indexMethod(index) {
+        return index + 1
+      },
+
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {
+          useOrgSid: window.sessionStorage.getItem('orgSid'),
+          createOrgSid: window.sessionStorage.getItem('orgSid'),
+          userSid: window.sessionStorage.getItem('userSid'),
+          storageTime: "",
+          remarks: "",
+          list: []
+        }
+        this.submitdisabled = false
+        this.$emit('doback')
+      },
+
+      showEdit(goodsList) {
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
+
+        this.formobj.list = JSON.parse(JSON.stringify(goodsList))
+
+      },
+      toDelGoods(index) {
+        this.formobj.list.splice(index, 1)
+      },
+      commodityComputeYHAndXSJE1(row) {
+
+        row.totalPrice = (Number(row.price) * Number(row.orderCount)).toFixed(2)
+
+      },
+      commodityComputeYHAndXSJE2(row) {
+
+        if (Number(row.count) > Number(row.waitInCount)) {
+          row.count = Number(row.waitInCount)
+        }
+
+      },
+      getWarehouseAreaList(sid) {
+        var query = {
+          ckSid: sid
+        }
+        getWarehouserack(query).then((res) => {
+          if (res.success) {
+            this.warehouseRackList = res.data
+          }
+        })
+      },
+      selectWarehouseAreaCode(row, val) {
+        console.log("selectWarehouseAreaCode", val);
+
+        const choose = this.warehouseRackList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectWarehouseAreaCode', choose)
+        row.warehouseRackCode = choose[0].rackCode
+        row.warehouseRackSid = choose[0].sid
+
+      },
+      saveOrUpdate() {
+        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+
+
+        this.$refs['form_obj'].validate((valid) => {
+          if (valid) {
+
+            for (var i = this.formobj.list.length - 1; i >= 0; i--) {
+
+              var item = this.formobj.list[i]
+
+              if (Number(item.price) == 0) {
+                this.$message({
+                  showClose: true,
+                  type: 'warning',
+                  message: '商品单价不能为0'
+                })
+                return
+
+              }
+              if (Number(item.count) == 0) {
+                this.$message({
+                  showClose: true,
+                  type: 'warning',
+                  message: '商品入库数量不能为0'
+                })
+                return
+
+              }
+
+              if (item.warehouseRackSid == '' || item.warehouseRackCode == '') {
+                this.$message({
+                  showClose: true,
+                  type: 'warning',
+                  message: '商品入库库位不能为空'
+                })
+                return
+
+              }
+            }
+
+
+            req.createInStorageBill(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
+            })
+          }
+        })
+      }
+
+    }
+  }
+</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/inStorageInfo.vue b/src/views/inStorage/receivingGoods/inStorageInfo.vue
new file mode 100644
index 0000000..6e8a7a8
--- /dev/null
+++ b/src/views/inStorage/receivingGoods/inStorageInfo.vue
@@ -0,0 +1,181 @@
+<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.operatorName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">操作时间</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.operatorTime }}</span></el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <div class="span-sty">入库时间</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.storageTime }}</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.billNo }}</span></el-form-item>
+          </el-col>
+
+          <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.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.supplierName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">承运商</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.carrier }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">运单号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.waybillNumber }}</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.billState }}</span></el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <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="goodsName" align="center" />
+          <el-table-column label="商品编码" prop="goodsCode" align="center" />
+          <el-table-column label="规格" prop="specValue" align="center" />
+          <el-table-column label="单位" prop="unitName" align="center" />
+          <el-table-column label="成本单价" prop="price" align="center" />
+          <el-table-column label="总价" prop="totalPrice" align="center" />
+          <el-table-column label="数量" prop="count" align="center" />
+          <el-table-column label="生产批次号" prop="batchNumber" align="center" />
+          <el-table-column label="入库库位" prop="warehouseRackName" align="center" />
+          <el-table-column label="明细备注" prop="remarks" align="center" />
+        </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(row) {
+        var params = {
+          sid: row.sid
+        }
+        req.selectByBillSid(row.sid)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+            }
+          })
+          .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/receivingGoods/index.vue b/src/views/inStorage/receivingGoods/index.vue
index 7548f13..5bd92f6 100644
--- a/src/views/inStorage/receivingGoods/index.vue
+++ b/src/views/inStorage/receivingGoods/index.vue
@@ -10,34 +10,38 @@
           <div v-show="isSearchShow" class="search">
             <el-form :inline="true" class="tab-header">
               <el-form-item label="入库单号">
-                <el-input v-model="queryParams.params.inStotageBillNo" placeholder="" clearable />
+                <el-input v-model="queryParams.params.billNo" placeholder="" clearable />
               </el-form-item>
               <el-form-item label="外部单号">
-                <el-input v-model="queryParams.params.sourceBillNo" placeholder="" clearable />
+                <el-input v-model="queryParams.params.externalNo" placeholder="" clearable />
               </el-form-item>
               <el-form-item label="预约单号">
-                <el-input v-model="queryParams.params.preBillNo" placeholder="" clearable />
+                <el-input v-model="queryParams.params.sourceBillNo" placeholder="" clearable />
               </el-form-item>
-              <el-form-item label="入库库位">
-                <el-input v-model="queryParams.params.warehouseRackName" placeholder="" clearable />
+              <el-form-item label="库位">
+                <el-select v-model="queryParams.params.warehouseRackSid" placeholder="请选择库位" style="width: 200px;">
+                  <el-option v-for="item in  warehouseRackList" :key="item.sid" :label="item.rackCode"
+                    :value="item.sid">
+                  </el-option>
+                </el-select>
               </el-form-item>
               <el-form-item label="入库时间">
-                <el-date-picker v-model="queryParams.params.inStotageStartTime" type="date" placeholder="选择日期"
+                <el-date-picker v-model="queryParams.params.storageTimeStart" 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.inStotageEndTime" type="date" placeholder="选择日期"
+                <el-date-picker v-model="queryParams.params.storageTimeEnd" 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.carrierName" placeholder="" clearable />
+                <el-input v-model="queryParams.params.carrier" placeholder="" clearable />
               </el-form-item>
               <el-form-item label="运单号">
                 <el-input v-model="queryParams.params.waybillNumber" placeholder="" clearable />
               </el-form-item>
               <el-form-item label="商品">
                 <el-select v-model="queryParams.params.goodsSkuSid" placeholder="请选择" style="width: 200px;">
-                  <el-option v-for="(item,i) in goodsList" :key="i" :label="item.name" :value="item.sid">
+                  <el-option v-for="(item,i) in goodsList" :key="i" :label="item.title" :value="item.sid">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -72,21 +76,21 @@
                 <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="billStateValue" width="100" label="状态" align="center" />
+            <el-table-column prop="billState" width="100" label="状态" align="center" />
             <el-table-column prop="billNo" width="150" label="入库单号" align="center" />
-            <el-table-column prop="preBillNo" width="150" label="预约单号" align="center" />
-            <el-table-column prop="goodsTotal" width="100" label="商品总额" align="center" />
-            <el-table-column prop="goodsWeight" width="150" label="商品总重量(kg)" align="center" />
-            <el-table-column prop="goodsVolume" width="150" label="商品总体积(m³)" align="center" />
-            <el-table-column prop="goodsCount" width="100" label="商品总数" align="center" />
-            <el-table-column prop="warehouseName" width="180" label="供应商" align="center" />
-            <el-table-column prop="carrierName" width="180" label="承运商" align="center" />
+            <el-table-column prop="sourceBillNo" width="150" label="预约单号" align="center" />
+            <el-table-column prop="total" width="100" label="商品总额" align="center" />
+            <el-table-column prop="totalWeight" width="150" label="商品总重量(kg)" align="center" />
+            <el-table-column prop="totalVolume" width="150" label="商品总体积(m³)" align="center" />
+            <el-table-column prop="totalQuantity" width="100" label="商品总数" align="center" />
+            <el-table-column prop="supplierName" width="180" label="供应商" align="center" />
+            <el-table-column prop="carrier" width="180" label="承运商" align="center" />
             <el-table-column prop="waybillNumber" width="120" label="运单号" align="center" />
-            <el-table-column prop="sourceBillNo" width="150" label="外部单号" align="center" />
+            <el-table-column prop="externalNo" width="150" label="外部单号" align="center" />
             <el-table-column prop="remarks" min-width="180" label="单据备注" align="center" />
-            <el-table-column prop="inStotageTime" width="120" label="入库时间" align="center" />
-            <el-table-column prop="operationName" width="120" label="操作员" align="center" />
-            <el-table-column prop="operationTime" width="120" label="操作时间" align="center" />
+            <el-table-column prop="storageTime" width="120" label="入库时间" align="center" />
+            <el-table-column prop="operatorName" width="120" label="操作员" align="center" />
+            <el-table-column prop="operatorTime" width="120" label="操作时间" align="center" />
 
           </el-table>
         </div>
@@ -98,7 +102,62 @@
          :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
         </div> -->
 
-        <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect"
+        <!-- 列表底部信息 -->
+        <div class="">
+          <el-tabs v-model="activeName" type="border-card">
+            <el-tab-pane name="first" label="入库明细">
+              <el-table :data="goodsDetailList" border style="width: 100%">
+                <el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center" />
+                <el-table-column prop="goodsName" label="商品名称" align="center" />
+                <el-table-column prop="goodsCode" label="商品编码" align="center" />
+                <el-table-column prop="goodsBarCode" label="商品条码" align="center" />
+                <el-table-column prop="goodsSpc" label="规格值" align="center" />
+                <el-table-column prop="boxBarCode" label="箱条码" align="center" />
+                <el-table-column prop="boxSpc" label="箱规格" align="center" />
+                <el-table-column prop="unit" label="单位" align="center" />
+                <el-table-column prop="costPrice" label="成本单价" align="center" />
+                <el-table-column prop="totalPrice" label="总价" align="center" />
+                <el-table-column prop="count" label="数量" align="center" />
+                <el-table-column prop="auxiliaryUnit" label="辅助单位" align="center" />
+                <el-table-column prop="serialNumber" label="序列号" align="center" />
+                <el-table-column prop="batchNumber" label="生产批次号" align="center" />
+                <el-table-column prop="warehouserack" label="入库库位" align="center" />
+                <el-table-column prop="remarks" label="明细备注" align="center" />
+              </el-table>
+            </el-tab-pane>
+            <el-tab-pane name="second" label="单据备注">
+              <el-form ref="dataForm" class="formaddcopy02" :model="billRemarks">
+                <el-row class="first_row">
+                  <el-col :span="8">
+                    <div class="span-sty">买家留言</div>
+                    <el-form-item> <span class="addinputInfo">{{ billRemarks.buyerMessage }}</span></el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <div class="span-sty">备注</div>
+                    <el-form-item> <span class="addinputInfo">{{ billRemarks.reamrks }}</span></el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <div class="span-sty">系统备注</div>
+                    <el-form-item> <span class="addinputInfo">{{ billRemarks.systemRemarks }}</span></el-form-item>
+                  </el-col>
+                </el-row>
+              </el-form>
+
+            </el-tab-pane>
+            <el-tab-pane name="operationList" label="操作日志">
+              <el-table :data="operationList" border style="width: 100%">
+                <el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center" />
+                <el-table-column prop="times" label="操作时间" width="250" align="center" />
+                <el-table-column prop="name" label="操作账号" width="180" align="center" />
+                <el-table-column prop="centent" label="操作内容" align="center" />
+              </el-table>
+            </el-tab-pane>
+
+          </el-tabs>
+        </div>
+
+
+        <!--   <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect"
           text-color="#666" active-text-color="white">
 
           <el-menu-item index="1">入库明细</el-menu-item>
@@ -154,16 +213,14 @@
             <el-table-column prop="name" label="操作账号" width="180" align="center" />
             <el-table-column prop="centent" label="操作内容" align="center" />
           </el-table>
-        </div>
+        </div> -->
 
       </div>
     </div>
     <!-- End 查询和其列表部分 -->
     <!-- 新增修改部分组件 -->
-    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState1" @reloadlist="loadList1" />
     <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" />
-    <divAddupShelfRecord v-show="viewState == 5" ref="divAddupShelfRecord" @doback="resetState"
-      @reloadlist="loadList" />
 
     <el-dialog title="选择预约单" :visible.sync="dialogVisible" :before-close="handleClose"
       style="width:150%;margin-left: -20%;">
@@ -173,7 +230,8 @@
         </el-form-item>
         <el-form-item label="入库状态">
           <el-select v-model="dialogParams.params.billState" placeholder="请选择" style="width: 200px;">
-            <el-option v-for="(item,i) in billStateList" :key="item.sid" :label="item.name" :value="item.sid">
+            <el-option v-for="(item,i) in billStateList" :key="item.dictKey" :label="item.dictValue"
+              :value="item.dictKey">
             </el-option>
           </el-select>
         </el-form-item>
@@ -187,13 +245,13 @@
           <el-date-picker v-model="dialogParams.params.inStotageStartTime" 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.inStotageEndTime" type="date" placeholder="选择日期"
+          <el-date-picker v-model="dialogParams.params.inStotageEndTime" 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="dialogParams.params.goodsSkuSid" placeholder="请选择" style="width: 200px;">
-            <el-option v-for="(item,i) in goodsList" :key="i" :label="item.goodsName" :value="item.sid">
+            <el-option v-for="(item,i) in goodsList" :key="i" :label="item.title" :value="item.sid">
             </el-option>
           </el-select>
         </el-form-item>
@@ -214,33 +272,34 @@
         <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
         <el-table-column type="expand">
           <template slot-scope="scope">
-            <el-table :data="scope.row.goodsList" border stripe size="small" :ref="'sub' + scope.$index"
+            <el-table :data="scope.row.warehouseAnsBillDetails" border stripe size="small" :ref="'sub' + scope.$index"
               @select="subSelect" @select-all="subSelectAll(scope.$index,$event)">
-              <el-table-column type="selection" width="100" align="center" />
-              <el-table-column prop="goodsCode" label="商品编码" align="center" show-overflow-tooltip />
-              <el-table-column prop="goodsBarCode" label="商品条码" align="center" show-overflow-tooltip />
-              <el-table-column prop="goodsName" label="商品名称" align="center" show-overflow-tooltip />
-              <el-table-column prop="goodsSpcCode" label="规格编码" align="center" show-overflow-tooltip />
-              <el-table-column prop="goodsSpc" label="规格值" align="center" show-overflow-tooltip />
+              <el-table-column type="selection" width="100" align="center" :selectable="checkSelectable" />
+              <el-table-column prop="goodsSkuTitle" label="商品名称" align="center" show-overflow-tooltip />
+              <el-table-column prop="goodsSkuCode" label="商品编码" align="center" show-overflow-tooltip />
+              <!-- <el-table-column prop="goodsBarCode" label="商品条码" align="center" show-overflow-tooltip /> -->
+
+              <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" show-overflow-tooltip />
+              <!-- <el-table-column prop="goodsSpc" label="规格值" align="center" show-overflow-tooltip /> -->
               <el-table-column prop="unit" label="单位" align="center" show-overflow-tooltip />
-              <el-table-column prop="reservationNum" label="预约数量" align="center" show-overflow-tooltip />
-              <el-table-column prop="unInStorageNum" label="待入库数量" align="center" show-overflow-tooltip />
-              <el-table-column prop="actualInStorageNum" label="实际入库数量" align="center" show-overflow-tooltip />
+              <el-table-column prop="orderCount" label="预约数量" align="center" show-overflow-tooltip />
+              <el-table-column prop="waitInCount" label="待入库数量" align="center" show-overflow-tooltip />
+              <el-table-column prop="actualInCount" label="实际入库数量" align="center" show-overflow-tooltip />
             </el-table>
           </template>
         </el-table-column>
 
-        <el-table-column prop="stae" label="状态" align="center" />
-        <el-table-column prop="createTime" label="申请时间" align="center" />
+        <el-table-column prop="billStateValue" label="状态" align="center" />
+        <el-table-column prop="applicationTime" label="申请时间" align="center" />
         <el-table-column prop="billNo" label="单据编码" align="center" />
         <el-table-column prop="warehouseName" label="仓库" align="center" />
         <el-table-column prop="supplierName" label="供应商" align="center" />
-        <el-table-column prop="warehouseRackName" label="入库库位" align="center" />
+        <el-table-column prop="warehouseRackCode" label="入库库位" align="center" />
         <el-table-column prop="sourceBillNo" label="外部单号" align="center" />
         <el-table-column prop="remarks" label="单据备注" align="center" />
-        <el-table-column prop="createByName" label="申请人" align="center" />
-        <el-table-column prop="contacts" label="联系电话" align="center" />
-        <el-table-column prop="contactsNumber" label="联系人" align="center" />
+        <el-table-column prop="applicant" label="申请人" align="center" />
+        <el-table-column prop="contact" label="联系电话" align="center" />
+        <el-table-column prop="mobile" label="联系人" align="center" />
       </el-table>
 
       <div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
@@ -255,14 +314,14 @@
 
 <script>
   import req from '@/api/inStorage/receivingGoods.js'
-  // import req2 from '@/api/baseinfo/goodsShelves/goodsShelves.js'
+  import req4 from '@/api/inStorage/deliveryNotice.js'
+  import req2 from '@/api/baseinfo/goodsShelves/goodsShelves.js'
   import req3 from '@/api/goods/goods.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 divAdd from './inStorageAdd.vue'
+  import divInfo from './inStorageInfo.vue'
   import {
     // getTypeValueList,
     typeValues,
@@ -275,10 +334,10 @@
       pageye,
       divAdd,
       divInfo,
-      divAddupShelfRecord
     },
     data() {
       return {
+        activeName: "first",
         activeIndex: "1",
         dialogVisible: false,
         btndisabled: false,
@@ -345,6 +404,7 @@
         },
         sids: [],
         selectionList: [],
+        warehouseRackList: [],
         goodsList: [],
         supplierList: [],
         goodsDetailList: [],
@@ -352,7 +412,7 @@
         operationList: [],
         billStateList: [],
         billList: [],
-        subIds: [],
+        subGoods: [],
         dialogParams: {
           current: 1,
           size: 10,
@@ -389,6 +449,16 @@
           }
         })
 
+        req2.warehouserackListAll({
+          orgPath: window.sessionStorage.getItem('orgSidPath')
+        }).then((res) => {
+          if (res.success) {
+            this.warehouseRackList = res.data
+
+          }
+        })
+
+
         req3.getGoodsListAllByOrg({
           orgPath: window.sessionStorage.getItem('orgSidPath')
         }).then((res) => {
@@ -410,14 +480,32 @@
 
       rowItemClick(row) {
         console.log("row", row);
+
+        console.log("row", row);
+        this.rowItemSid = row.sid
+
+        if (this.rowItemSid == '') {
+          this.$message({
+            type: 'warning',
+            showClose: true,
+            message: '暂无数据'
+          })
+          return
+        }
+
         // this.rowItemSid = row.sid
         this.goodsDetailList = []
         this.billRemarks = {}
         this.operationList = []
         req.selectByBillSid(row.sid).then((resp) => {
-          this.goodsDetailList = resp.data.goodsList
-          this.billRemarks = resp.data.billRemarks
-          this.operationList = resp.data.operationList
+          this.goodsDetailList = resp.data.list
+        }).catch(() => {})
+
+        var parpams = {
+          sid: this.rowItemSid
+        }
+        req4.operationrecordDetails(parpams).then((resp) => {
+          this.operationList = resp.data
         }).catch(() => {})
 
         // this.handleSelect(this.activeIndex)
@@ -426,28 +514,6 @@
       handleSelect(val) {
         console.log("val", val);
         this.activeIndex = val
-
-        // if (val == '1') { // 商品明细
-        //   req.selectByBillSid(this.rowItemSid).then((resp) => {
-        //     this.goodsDetailList = resp.data
-        //   }).catch(() => {})
-        // }
-
-        // if (val == '2') { // 发货人信息
-        //   req.fetchDetailsBySid(this.rowItemSid).then((resp) => {
-        //     this.formobj = resp.data
-        //   }).catch(() => {})
-        // }
-
-        // if (val == '3') { // 操作记录
-        //   var parpams = {
-        //     sid: this.rowItemSid
-        //   }
-        //   req.operationrecordDetails(parpams).then((resp) => {
-        //     this.operateList = resp.data
-        //   }).catch(() => {})
-        // }
-
       },
 
       selectionLineChangeHandle(val) {
@@ -552,10 +618,11 @@
         this.dialogParams.params.orgPath = window.sessionStorage.getItem('orgSidPath')
         this.dialogParams.params.menuUrl = this.$route.path
         req.getReservationBill(this.dialogParams).then((resp) => {
+          console.log("rgetReservationBill>>>>>", resp)
           if (resp.success) {
-            this.billList = resp.data
+            this.billList = resp.data.records
             this.dialogVisible = true
-          } else {}
+          }
         }).catch(() => {})
 
 
@@ -595,8 +662,9 @@
         this.$store.dispatch('tagsView/delView', this.$route)
         this.$router.go(-1)
       },
-      toRelevancy() {
-
+      toRelevancy(row) {
+        this.viewState = 4
+        this.$refs['divinfo'].showAdd(row)
       },
       resetState() {
         this.viewState = 1
@@ -615,14 +683,16 @@
 
           item.check = selection.length != 0
 
-          item.goodsList.forEach((childItem) => {
-            childItem.check = selection.length != 0
+          item.warehouseAnsBillDetails.forEach((childItem) => {
 
-            this.$nextTick(() => {
-              this.$refs[`sub${index}`].toggleRowSelection(childItem, selection.length != 0);
+            if (Number(childItem.waitInCount) != 0) {
+              childItem.check = selection.length != 0
 
-            })
+              this.$nextTick(() => {
+                this.$refs[`sub${index}`].toggleRowSelection(childItem, selection.length != 0);
 
+              })
+            }
 
           })
 
@@ -635,26 +705,31 @@
         console.log("row", row)
 
         const selectIndex = this.billList.findIndex((choose) => choose.sid == row.sid)
-        let selected = selection.length && selection.indexOf(row) !== -1;
+        let selected = selection.length != 0 && selection.indexOf(row) != -1;
         //为true时选中，为 0 时（false）未选中
 
         row.check = selected
         this.$refs['main'].toggleRowExpansion(this.billList[selectIndex], true)
         this.$refs.main.toggleRowSelection(this.billList[selectIndex], selected)
 
-        row.goodsList.forEach((childItem) => {
+        row.warehouseAnsBillDetails.forEach((childItem) => {
+          if (Number(childItem.waitInCount) != 0) {
+            childItem.check = selected
+            this.$nextTick(() => {
+              this.$refs[`sub${selectIndex}`].toggleRowSelection(childItem, selected);
 
-          childItem.check = selected
+            })
+          }
 
-          this.$nextTick(() => {
-            this.$refs[`sub${selectIndex}`].toggleRowSelection(childItem, selected);
 
-          })
 
         })
 
       },
 
+      checkSelectable(row) {
+        return Number(row.waitInCount) !== 0
+      },
       //子表格勾选 --->联动一级表格
       subSelectAll(pIndex, selection) {
         console.log("pIndex", pIndex)
@@ -665,9 +740,12 @@
 
         this.$refs.main.toggleRowSelection(this.billList[pIndex], selected)
 
-        selection.forEach((childItem) => {
-          this.$refs[`sub${pIndex}`].toggleRowSelection(childItem, selected);
-          childItem.check = selected
+        this.billList[pIndex].warehouseAnsBillDetails.forEach((childItem) => {
+          if (Number(childItem.waitInCount) != 0) {
+            this.$refs[`sub${pIndex}`].toggleRowSelection(childItem, selected);
+            childItem.check = selected
+          }
+
         })
       },
 
@@ -676,15 +754,32 @@
 
         console.log("row", row)
         console.log("selection", selection)
+
+        const choose = this.billList.filter((choose) => choose.sid == row.sourceBillSid)
+
         let selected = selection.length && selection.indexOf(row) !== -1;
+
         row.check = selected
 
-        if (selection.length == 0) {
-          const selectIndex = this.billList.findIndex((choose) => choose.sid == row.billSid)
-          this.$refs.main.toggleRowSelection(this.billList[selectIndex], false)
-          this.billList[selectIndex].check = false
+
+        console.log("choose", choose)
+
+        var chenked = true
+
+        for (var i = 0; i < choose[0].warehouseAnsBillDetails.length; i++) {
+
+          if (!choose[0].warehouseAnsBillDetails[i].check) {
+            chenked = false
+          }
+
         }
 
+        // if (selection.length == 0) {
+        const selectIndex = this.billList.findIndex((item) => item.sid == row.sourceBillSid)
+
+        this.$refs.main.toggleRowSelection(this.billList[selectIndex], chenked)
+        this.billList[selectIndex].check = chenked
+        // }
 
       },
 
@@ -735,45 +830,63 @@
         }
 
         var datas = this.$refs.main.data;
-        this.$refs[`main`].clearSelection()
-        datas.forEach((item, index) => {
-          item.check = false
-          this.$refs['main'].toggleRowExpansion(item, true)
-          this.$nextTick(() => {
-            this.$refs[`sub${index}`].clearSelection()
-          })
-          item.goodsList.forEach((childItem) => {
-            childItem.check = false
-          })
-        })
+        if (datas.length > 0) {
+          this.$refs[`main`].clearSelection()
+          datas.forEach((item, index) => {
+            item.check = false
+            this.$refs['main'].toggleRowExpansion(item, true)
+            this.$nextTick(() => {
+              this.$refs[`sub${index}`].clearSelection()
+            })
+            if (item.warehouseAnsBillDetails != null || item.warehouseAnsBillDetails.length > 0) {
+              item.warehouseAnsBillDetails.forEach((childItem) => {
+                childItem.check = false
+              })
+            }
 
-        this.dialogVisible = false
+          })
+        }
 
 
+        this.dialogVisible = false
 
       },
       saveData() {
 
-        this.subIds = []
+        this.subGoods = []
         var datas = this.$refs.main.data;
-        datas.forEach((item, index) => {
-          item.goodsList.forEach((childItem) => {
-            if (childItem.check && Number(childItem.unInStorageNum) != 0) {
-              this.subIds.push(childItem.goodsSid)
+        datas.forEach((item) => {
+          item.warehouseAnsBillDetails.forEach((childItem) => {
+            if (childItem.check && Number(childItem.waitInCount) != 0) {
+              this.subGoods.push(childItem)
             }
 
           })
         })
-        console.log(" dosearch1", this.subIds);
+        console.log(" dosearch1", this.subGoods);
 
-        req.createInStorageBill(this.subIds).then((resp) => {
-          if (resp.success) {
-            this.dialogVisible = false
-            this.loadList()
-          } else {}
-        }).catch(() => {})
+        if (this.subGoods.length == 0) {
+          this.$message({
+            type: 'warning',
+            message: "请先选择商品",
+            showClose: true
+          })
+          return
+        }
+        this.dialogVisible = false
+        this.viewState = 2
+        this.$refs['divadd'].showEdit(this.subGoods)
 
       },
+      resetState1() {
+        this.viewState = 1
+        this.dialogVisible = true
+      },
+      loadList1() {
+        this.viewState = 1
+        this.handleClose()
+        this.loadList()
+      }
 
     }
   }
diff --git a/src/views/system/userManage/userManageAdd.vue b/src/views/system/userManage/userManageAdd.vue
index da4d8fa..0d30641 100644
--- a/src/views/system/userManage/userManageAdd.vue
+++ b/src/views/system/userManage/userManageAdd.vue
@@ -131,8 +131,6 @@
 
         this.form.accountType = val ? "2" : "3"
 
-
-
       },
       manageTypeChange(val) {
         console.log("manageTypeChange", val);
@@ -364,4 +362,4 @@
   .must {
     color: #f00;
   }
-</style>
+</style>
\ No newline at end of file