diff --git a/common/style/layout.css b/common/style/layout.css
index c539697..391ea1a 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -184,6 +184,10 @@ uni-toast .uni-toast {
 	border-bottom: 1px solid #9fd3ff;
 	white-space: nowrap;
 }
+.grid-table .fontcol1 {
+	color: #58e9ff;
+	font-weight: 700;
+}
 .grid-table th:first-child, .grid-table td:first-child {
 	position: sticky;
 	left: 0;
@@ -354,7 +358,13 @@ uni-toast .uni-toast {
 .zd-checkbox {
 	width: 18px;
 	height: 18px;
-	background: center / 100% 100% url(./static/images/icon-check1.png) no-repeat;
+	background-color: rgba(255, 255, 255, 20%);
+	border: 1px solid #fff;
+	/* background: center / 100% 100% url(./static/images/icon-check1.png) no-repeat; */
+}
+.zd-checkbox_i {
+	border: 1px solid #ffffff;
+	background: rgba(255, 255, 255, 1);
 }
 .zd-checkbox_active {
 	background: center / 100% 100% url(./static/images/icon-check2.png) no-repeat;
diff --git a/common/style/reset.css b/common/style/reset.css
index 22d0195..8b4a624 100644
--- a/common/style/reset.css
+++ b/common/style/reset.css
@@ -51,6 +51,9 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
 	text-overflow: ellipsis;
 	white-space: nowrap;
 }
+.underline {
+	text-decoration: underline;
+}
 .flexcol {
 	flex-direction: column;
 }
diff --git a/pages.json b/pages.json
index 0e9f316..258b83e 100644
--- a/pages.json
+++ b/pages.json
@@ -19,6 +19,14 @@
                 "navigationStyle": "custom"
             }
             
+        }
+		,{
+            "path" : "pages/management/in-storage_new",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
         }
         ,{
             "path" : "pages/management/alloc-maintenance",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 9f19742..ceea47b 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -72,7 +72,7 @@
 				} else if (e.ywlx === 'SH') {
 					url = '/pages/management/receive-confirm'
 				} else {
-					url = '/pages/management/in-storage?id=' + e.djlx + '&name=' + e.name + '&type=' + e.ywlx
+					url = '/pages/management/in-storage_new?id=' + e.djlx + '&name=' + e.name + '&type=' + e.ywlx
 				}
 				uni.redirectTo({
 					url: url
diff --git a/pages/management/in-storage_new.vue b/pages/management/in-storage_new.vue
new file mode 100644
index 0000000..0a49465
--- /dev/null
+++ b/pages/management/in-storage_new.vue
@@ -0,0 +1,527 @@
+<template>
+	<view class="content">
+		<nav-bar :title="crType === 'IN' ? '入库' : '出库'"></nav-bar>
+		<view class="search-confirm-wrap">
+			<view class="zd-row">
+				<view class="zd-col-24 zd-row jcflexstart">
+					<view :class="crType === 'OUT' ? 'zd-col-8' : 'zd-col-16'"><search-box placeholder="请输入查询条件" v-model="val1" /></view>
+					<view class="select_wraper mgl10":class="crType === 'OUT' ? 'zd-col-8' : 'zd-col-16'">
+						<zxz-uni-data-select placeholder="请选择仓库名称" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
+					</view>
+					<view v-if="crType === 'OUT'" class="zd-col-8 select_wraper mgl10">
+						<zxz-uni-data-select placeholder="请选择仓管员" v-model="value2" filterable :localdata="range2"></zxz-uni-data-select>
+					</view>
+				</view>
+				<button class="confirm-button" @tap="toSearch">查询</button>
+				<button class="confirm-button" :class="{'confirm-button_disabled': !subCheckData.length}" @tap="showPop(2, '', '')">分配库位</button>
+				<button class="confirm-button" :class="{'confirm-button_disabled': !subCheckData.length}" @tap="inWarehouseSure">库存提交</button>
+				<button class="confirm-button" :class="{'confirm-button_disabled': checkData.length === 0}" :disabled="disabled1" @tap="_easOutInBillUpdate">单据审核</button>
+			</view>
+		</view>
+		<view class="zd-row jcflexstart table-title_wraper">{{title}}</view>
+		<view class="grid-wrap">
+			<view class="zdrow-wrap">
+				<view class="zd-row sticky zd-th-wraper">
+					<view class="zd-col-1 zd-th"><text>序号</text></view>
+					<view class="zd-col-1 zd-th"><text>选择</text></view>
+					<view class="zd-col-2 zd-th"><text class="fontcol1">{{crType === 'IN'? '入库单号':'出库单号'}}</text></view>
+					<view class="zd-col-2 zd-th nowrap"><text>来源部门</text></view>
+					<view class="zd-col-2 zd-th nowrap"><text>去向部门</text></view>
+					<view class="zd-col-2 zd-th nowrap"><text>仓库名称</text></view>
+					<view class="zd-col-2 zd-th"><text>状态</text></view>
+					<view class="zd-col-2 zd-th nowrap"><text>制单日期</text></view>
+					<view class="zd-col-2 zd-th nowrap"><text>制单人</text></view>
+					<view class="zd-col-2 zd-th nowrap"><text>业务日期</text></view>
+					<view v-if="crType === 'OUT'" class="zd-col-2 zd-th"><text>仓管员</text></view>
+					<view class="zd-col-4 zd-th"><text>审核结果</text></view>
+					<view class="zd-th" :class="crType === 'OUT' ? 'zd-col-1' : 'zd-col-2'">更多</view>
+				</view>
+				<view class="zd-td-wraper" v-for="(e, i) in dataList" :key="e.id">
+					<view class="zd-row" @tap="loadSubData(e)">
+						<view class="zd-col-1 zd-td"><text>{{i+1}}</text></view>
+						<view class="zd-col-1 zd-td" @tap.stop="toCheckbox(e)">
+							<view class="zd-checkbox" :class="{'zd-checkbox_active': e.checked}"></view>
+						</view>
+						<view class="zd-col-2 zd-td fontcol1"><text>{{e.djbh}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.bmmc}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.zzmc}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.ckmc}}</text></view>
+						<view class="zd-col-2 zd-td"><text class="fontbg1">{{e.djzt}}</text></view>
+						<view class="zd-col-2 zd-td nowrap"><text>{{e.cjsj}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.cjr}}</text></view>
+						<view class="zd-col-2 zd-td nowrap"><text>{{e.ywrq}}</text></view>
+						<view v-if="crType === 'OUT'" class="zd-col-2 zd-td"><text>{{e.cgymc}}</text></view>
+						<view class="zd-col-4 zd-td"><text>{{e.shjg}}</text></view>
+						<view class="zd-td" :class="crType === 'OUT' ? 'zd-col-1' : 'zd-col-2'" @tap.stop="getDetails(1,e)">
+							<uni-icons type="more-filled" size="14" color="#fff"></uni-icons>
+						</view>
+					</view>
+					<!-- 二级表格start -->
+					<view v-if="e.subData.length > 0" class="zd-sec-wraper pd0">
+						<view class="table-wrap">
+							<table class="grid-table">
+								<thead>
+									<tr>
+										<th>序号</th>
+										<th>
+											<view class="zd-row jcenter">
+												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': e.subAllChecked}" @tap="toSubAllCheckbox(e)"></view>
+											</view>
+										</th>
+										<th class="fontcol1" v-if="id === 'CGRKD' || id === 'LLCKD'">物料编号</th>
+										<th>仓库名称</th>
+										<th>物料名称</th>
+										<th class="fontcol1" v-if="id !== 'CGRKD' && id !== 'LLCKD'">物料编号</th>
+										<th>单位</th>
+										<th>库位</th>
+										<th>数量</th>
+										<th>总数</th>
+										<th>{{crType === 'IN'? '已入数量':'已出数量'}}</th>
+										<th>剩余数量</th>
+										<th>库存</th>
+										<th>跟踪号</th>
+										<th>操作人</th>
+										<th v-if="crType === 'OUT'">仓管员</th>
+										<th>操作日期</th>
+										<th>更多</th>
+									</tr>
+								</thead>
+								<tbody>
+									<tr v-for="(el, j) in e.subData" :key="el.id">
+										<td>{{j+1}}</td>
+										<td @tap="toSubCheckbox(e, el)">
+											<view class="zd-row jcenter">
+												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': el.checked}"></view>
+											</view>
+										</td>
+										<td class="underline fontcol1" v-if="id === 'CGRKD' || id === 'LLCKD'" @tap="showPop(1, e, el)">{{el.wlbm}}</td>
+										<td>{{el.ckmc}}</td>
+										<td>{{el.wlmc}}</td>
+										<td class="underline fontcol1" v-if="id !== 'CGRKD' && id !== 'LLCKD'" @tap="showPop(1, e, el)">{{el.wlbm}}</td>
+										<td>{{el.jldw}}</td>
+										<td>{{el.kwbm}}</td>
+										<td>{{el.sl}}</td>
+										<td>{{el.wlzs}}</td>
+										<td>{{el.czsl}}</td>
+										<td>{{el.sysl}}</td>
+										<td>{{el.kcsl}}</td>
+										<td>{{el.gzhbm}}</td>
+										<td>{{el.update_name}}</td>
+										<td v-if="crType === 'OUT'">{{el.cgymc}}</td>
+										<td>{{el.update_time}}</td>
+										<td @tap.stop="getDetails(2,el)">
+											<uni-icons type="more-filled" size="14" color="#fff"></uni-icons>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+						</view>
+					</view>
+					<!-- 二级表格end -->
+				</view>
+			</view>
+			<view class="zd-row jcenter pd20">
+				<pagination v-show="dataList.length > 0" :total="totalCount1" :page-size="queryParams1.pageSize" :current-page="currentPage1" @page-change="handlePageChange1" />
+			</view>
+		</view>
+		<view class="footer"></view>
+		<grid-detail :show="delShow" :data="detailObj" :crType="crType" @closeDetail="delShow=false"></grid-detail>
+		<view class="pop-wraper" :class="{'popshow': show, 'pophide': !show}">
+			<view class="allwidth pop-title">分配明细</view>
+			<view class="pop-grid-wraper">
+				<view class="zd-row sticky zd-sec-th-wraper zd-pop-th-wraper">
+					<view class="zd-col-2 zd-sec-th"><text>序号</text></view>
+					<view class="zd-col-4 zd-sec-th"><text>物料编号</text></view>
+					<view class="zd-col-5 zd-sec-th"><text>物料名称</text></view>
+					<view class="zd-col-5 zd-sec-th"><text>库位编码</text></view>
+					<view class="zd-col-4 zd-sec-th"><text>数量</text></view>
+					<view class="zd-col-4 zd-sec-th"><text>库存数量</text></view>
+				</view>
+				<view class="zd-row zd-td-wraper" v-for="(ele, t) in popData" :key="ele.id">
+					<view class="zd-col-2 zd-sec-td zd-pop-td"><text>{{t+1}}</text></view>
+					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.wlbm}}</text></view>
+					<view class="zd-col-5 zd-sec-td zd-pop-td"><text>{{ele.wlmc}}</text></view>
+					<view v-show="ele.status" class="zd-col-5 zd-sec-td zd-pop-td"><text>{{ele.kwbm}}</text></view>
+					<view v-show="!ele.status" class="zd-col-5 zd-sec-td zd-pop-td">
+						<scan-input
+						v-model="ele.kwbm"
+						/>
+					</view>
+					<view v-show="ele.status" class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.sysl}}</text></view>
+					<view v-show="!ele.status" class="zd-col-4 zd-sec-td zd-pop-td">
+						<input type="number" class="pop-input" v-model="ele.sysl">
+					</view>
+					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.kcsl}}</text></view>
+				</view>
+			</view>
+			<view class="mgb20 zd-row jcenter">
+				<view class="zd-col-10 zd-row">
+					<button class="confirm-button confirm-button_cancle mgl0" @tap="show = false">取消</button>
+					<button v-show="type === 1" class="confirm-button mgl0" :class="{'confirm-button_disabled': popData.length === 0}" :disabled="popdisabled" @tap="_updateAssignDtl">确定</button>
+					<button v-show="type === 2" class="confirm-button mgl0" :class="{'confirm-button_disabled': popData.length === 0}" :disabled="popdisabled" @tap="_addAssignDtl">确定</button>
+				</view>
+			</view>
+		</view>
+		<view v-if="show" class="modal" @click.stop="show = false"></view>
+		<uni-popup ref="alertDialog" type="dialog">
+			<uni-popup-dialog type="info" cancelText="关闭" confirmText="确定" title="提示" content="是否提交库存？" @confirm="_inWarehouseCommit" @close="dialogClose"></uni-popup-dialog>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import ScanInput from '@/components/ScanInput.vue'
+	import Pagination from '@/components/Pagination.vue'
+	import GridDetail from '@/components/GridDetail.vue'
+	import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, viewAssignDtl, inWarehouseAssignLocation, updateAssignDtl, addAssignDtl, inWarehouseCommit, easOutInBillUpdate} from '@/utils/getData2.js'
+	// import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, viewAssignDtl, inWarehouseAssignLocation} from '@/utils/mork2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox,
+			ScanInput,
+			Pagination,
+			GridDetail
+		},
+		data() {
+			return {
+				title: '',
+				id: '',
+				crType: '',
+				val1: '', // 模糊查询
+				value1: '', // 仓库名称
+				range1: [],
+				value2: '', // 仓管员
+				range2: [],
+				totalCount1: 0, // 分页
+				queryParams1:{
+					pageSize: 10,
+					pageNum: 1
+				},
+				currentPage1: 1,
+				dataList: [], // 一级表格数据
+				checkData: [], // 一级表格多选数组
+				subData: [], // 二级表格数据
+				subCheckData: [], // 二级表格多选数组
+				popData: [], // 二级表格点击物料编码弹出弹窗
+				popdisabled: false,
+				popObj: {}, // 弹窗当前主表格内容
+				show: false, // 弹窗显示布尔值
+				type: '', // 弹窗类型
+				delShow: false, // 详情弹窗布尔值
+				detailObj: {}, // 详情弹窗
+				disabled1: false
+			}
+		},
+		onLoad (options) {
+			this.id = options.id
+			this.title = options.name
+			this.crType = options.type
+			if (this.crType === 'IN') {
+				this.toSearch()
+			} else {
+				this._getUserInfo()
+			}
+		},
+		methods: {
+			// 仓库下拉框
+			async _getWarehouseInfo () {
+				let res = await getWarehouseInfo()
+				if (res.code === 1) {
+					this.range1 = [...res.result]
+					this.range1.map(e => {
+						this.$set(e, 'text', e.ckmc)
+						this.$set(e, 'value', e.ckbm)
+					})
+				}
+			},
+			// 仓管员下拉框
+			async _getUserInfo () {
+				let res = await getUserInfo()
+				if (res.code === 1) {
+					this.range2 = [...res.result]
+					if (this.$store.getters.userInfo !== '') {
+						let flag = this.range2.includes({text: JSON.parse(this.$store.getters.userInfo).person_name, value: JSON.parse(this.$store.getters.userInfo).username})
+						if (!flag) {
+							this.range2.push({text: JSON.parse(this.$store.getters.userInfo).person_name, value: JSON.parse(this.$store.getters.userInfo).username})
+						}
+						this.value2 = JSON.parse(this.$store.getters.userInfo).username
+					}
+					this.toSearch()
+				}
+			},
+			// 查询一级表格
+			toSearch () {
+				this.queryParams1 = {
+					pageSize: 10,
+					pageNum: 1
+				}
+				this.currentPage1 = 1
+				this.checkData = []
+				this.subCheckData = []
+				this._easOutInBillPage()
+			},
+			// 一级表格接口
+			async _easOutInBillPage () {
+				let res = await easOutInBillPage(this.val1, this.id, this.value1, this.value2, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
+				if (res.code === 1) {
+					res.result.map(el => {
+						this.$set(el, 'checked', false)
+						this.$set(el, 'subData', [])
+						this.$set(el, 'subAllChecked', false)
+					})
+					this.dataList = [...res.result]
+					this.totalCount1 = Number(res.totalElements)
+					this.queryParams1.pageSize = Number(res.pageSize)
+					this.queryParams1.pageNum = Number(res.pageNum)
+				} else {
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				}
+				this._getWarehouseInfo()
+			},
+			// 一级表格切换分页
+			handlePageChange1(page) {
+				this.queryParams1.pageNum = page
+				this.currentPage1 = page
+				this.checkData = []
+				this.subCheckData = []
+				this._easOutInBillPage()
+			},
+			// 一级表格多选
+			toCheckbox (e) {
+				e.checked = !e.checked
+				let arr = this.dataList.filter(el => el.checked === true)
+				this.checkData = arr.map(el => {return el.djid})
+			},
+			// 点击一级表格一行加载二级表格
+			loadSubData (e) {
+				this.subCheckData = this.subCheckData.filter(item1 => !e.subData.some(item2 => item2.id === item1.id))
+				console.log(this.subCheckData.length)
+				if (e.subData.length > 0) {
+					e.subData = []
+				} else if (e.subData.length === 0) {
+					this._easOutInBillDetailPage(e)
+				}
+				e.subAllChecked = false
+			},
+			// 二级表格接口
+			async _easOutInBillDetailPage (e) {
+				let res = await easOutInBillDetailPage(e.djid, '1', '500')
+				if (res.code === 1) {
+					res.result.map(el => {
+						this.$set(el, 'subChecked', false)
+					})
+					this.dataList.map(el => {
+						if (el.djid === e.djid) {
+							el.subData = [...res.result]
+						}
+					})
+				} else {
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				}
+			},
+			// 二级表格全选
+			toSubAllCheckbox (e) {
+				e.subAllChecked = !e.subAllChecked
+				e.subData.map(el => {
+					el.checked = e.subAllChecked 
+				})
+				if (e.subAllChecked) {
+					this.subCheckData = this.subCheckData.concat(e.subData)
+				} else if (!e.subAllChecked) {
+					this.subCheckData = this.subCheckData.filter(item1 => !e.subData.some(item2 => item2.id === item1.id))
+				}
+			},
+			// 二级表格多选
+			toSubCheckbox (e,el) {
+				if (el.checked) {
+					this.$set(el, 'checked', false)
+					this.subCheckData = this.subCheckData.filter(item => item.id !== el.id)
+				} else if (!el.checked)  {
+					this.$set(el, 'checked', true)
+					this.subCheckData.push(el)
+				}
+				console.log(this.subCheckData.length)
+				let arr = e.subData.filter(ele => ele.checked === true)
+				e.subAllChecked = arr.length === e.subData.length
+			},
+			showPop (type, e, obj) {
+				this.type = type
+				if (type === 1) {
+					this._viewAssignDtl(e, obj)
+				} else if (type === 2) {
+					if (!this.subCheckData.length) return
+					this._inWarehouseAssignLocation()
+				}
+			},
+			// 点击二级表格行中的物料编号，弹窗加载表格
+			async _viewAssignDtl (e, obj) {
+				let res = await viewAssignDtl(obj.id)
+				if (res.code ===1) {
+					res.result.map(el => {
+						this.$set(el, 'status', obj.status)
+					})
+					this.popData = [...res.result]
+					this.popObj = e
+					this.show = true
+				} else {
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				}
+			},
+			// 点击二级表格行中的物料编号，弹窗加载表格 -> 点击确定按钮
+			async _updateAssignDtl () {
+				this.popdisabled = true
+				if (this.popData.length === 0) {
+					this.popdisabled = false
+					return
+				}
+			  try {
+				let res = await updateAssignDtl(this.popData)
+				if (res.code === 1) {
+					this.show = false
+					this._easOutInBillDetailPage(this.popObj)
+				}
+				uni.showToast({
+					title: res.desc,
+					icon: 'none'
+				})
+				this.popdisabled = false
+			  } catch (e) {
+				this.popdisabled = false
+			  }
+			},
+			// 分配库位弹窗表格
+			async _inWarehouseAssignLocation () {
+				let res = await inWarehouseAssignLocation(this.subCheckData)
+				if (res.code ===1) {
+					res.result.map(el => {
+						this.$set(el, 'status', true)
+					})
+					this.popData = [...res.result]
+					this.show = true
+				} else {
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				}
+			},
+			// 分配库位弹窗表格 -> 点击确定按钮
+			async _addAssignDtl () {
+				this.popdisabled = true
+				if (this.popData.length === 0) {
+					this.popdisabled = false
+					return
+				}
+			  try {
+				let res = await addAssignDtl(this.popData)
+				if (res.code === 1) {
+					this.show = false
+					this._easOutInBillPage()
+				}
+				uni.showToast({
+					title: res.desc,
+					icon: 'none'
+				})
+				this.popdisabled = false
+			  } catch (e) {
+				this.popdisabled = false
+			  }
+			},
+			// 库存提交
+			inWarehouseSure () {
+				if (!this.subCheckData.length) {
+					return
+				}
+				this.$refs.alertDialog.open()
+			},
+			 // 库存提交-确认接口
+			 async _inWarehouseCommit () {
+				try {
+					let res = await inWarehouseCommit(this.subCheckData)
+					if (res.code === 1) {
+						this._easOutInBillPage()
+					}
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+					this.popdisabled = false
+				} catch (e) {
+				} 
+			 },
+			// 点击单据审核按钮
+			async _easOutInBillUpdate () {
+				this.disabled1 = true
+				if (!this.checkData.length) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await easOutInBillUpdate(this.checkData)
+					if (res.code === 1) {
+						this.disabled1 = false
+						this.checkData = []
+						this._easOutInBillPage()
+					} else {
+						this.disabled1 = false
+						uni.showToast({
+							title: res.desc,
+							icon: 'none'
+						})
+					}
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			// 详情弹窗
+			getDetails (type,e) {
+				this.delShow = !this.delShow
+				this.detailObj = {type: type, data:e}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+@import '../../common/style/mixin.styl';
+.table-wrap
+	padding: 15px 0 15px 0
+.mgr30
+	margin-right 30rpx
+.select_wraper
+	/deep/ .uni-select__input-box
+		height 30px
+	/deep/ .uni-select__selector
+		z-index 11
+	/deep/ .uni-select
+		height: 30px;
+		min-height: 30px;
+		line-height: 30px;
+		padding: 0 2px 0 12px;
+		border: 1px solid #4980bd;
+		background-color: rgba(45,88,184,0.1);
+		border-radius: 6px;
+	/deep/ .uni-select__input-placeholder, /deep/ .uni-select__input-text
+		font-size 13px
+	/deep/ .uni-select__selector
+		background-color #071F3E
+		border-color #0c3162
+	/deep/ .uni-popper__arrow
+		border-bottom-color #0c3162
+		&:after
+			border-bottom-color #071F3E
+	/deep/ .uni-select__selector-item
+		color #fff
+</style>
diff --git a/utils/getData2.js b/utils/getData2.js
index 6f340a0..1a383af 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -171,3 +171,33 @@ export const receiptBillConfirm = (arr) => request({
 	type: 1,
 	data: arr
 })
+
+/**
+ * 入库新接口
+ * 2024.10.24
+ */
+// 查看分配明细
+export const viewAssignDtl = (id) => request({
+	url:'api/stIvtStockAssignDtl/viewAssignDtl',
+	data: {flid: id}
+})
+// 查看分配明细->确认
+export const updateAssignDtl = (arr) => request({
+	url:'api/stIvtStockAssignDtl/updateAssignDtl',
+	data: arr
+})
+// 分配库位查看详情
+export const inWarehouseAssignLocation = (arr) => request({
+	url:'api/easOutInBillDetail/inWarehouseAssignLocation',
+	data: arr
+})
+// 分配库位查看详情确认
+export const addAssignDtl = (arr) => request({
+	url:'api/stIvtStockAssignDtl/addAssignDtl',
+	data: arr
+})
+// 库存提交
+export const inWarehouseCommit = (arr) => request({
+	url:'api/easOutInBillDetail/inWarehouseCommit',
+	data: arr
+})
\ No newline at end of file
diff --git a/utils/mork2.js b/utils/mork2.js
index 4c90518..1c6e881 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -323,7 +323,7 @@ export const easOutInBillDetailPage = (djid, page, size) => {
     "result": [
         {
             "flid": "1",
-            "id": null,
+            "id": '1',
             "djid": "btAAAAW8Wd5QCrde",
             "djlx": "LLCKD",
             "ywlx": "OUT",
@@ -363,11 +363,12 @@ export const easOutInBillDetailPage = (djid, page, size) => {
             "update_id": null,
             "update_name": null,
             "update_time": null,
-            "czsl": 0.00
+            "czsl": 0.00,
+			"status": true
         },
 		{
 		    "flid": "2",
-		    "id": null,
+		    "id": '2',
 		    "djid": "btAAAAW8Wd5QCrde",
 		    "djlx": "LLCKD",
 		    "ywlx": "OUT",
@@ -407,7 +408,8 @@ export const easOutInBillDetailPage = (djid, page, size) => {
 		    "update_id": null,
 		    "update_name": null,
 		    "update_time": null,
-		    "czsl": 0.00
+		    "czsl": 0.00,
+			"status": false
 		}
     ],
     "code": 1,
@@ -1805,4 +1807,179 @@ export const receiptBillConfirm = () => {
 		desc: 'ok'
 	}
 	return res
+}
+export const easOutInBillDetailUpdate = () => {
+	let res = {
+		code: 1,
+		desc: 'ok'
+	}
+	return res
+}
+export const viewAssignDtl = () => {
+	let res = {
+    "pageNum": 1,
+    "pageSize": 10,
+    "totalPage": 1,
+    "totalElements": 1,
+    "result": [
+        {
+            "size": 10,
+            "page": 0,
+            "sort": null,
+            "isAsc": null,
+            "type": null,
+            "fuzzy": null,
+            "is_used": null,
+            "start_time": null,
+            "end_time": null,
+            "doP": {
+                "startTime": {
+                    "k": [
+                        "create_time"
+                    ],
+                    "type": "LT"
+                },
+                "endTime": {
+                    "k": [
+                        "create_time"
+                    ],
+                    "type": "LE"
+                },
+                "sort": {
+                    "k": [
+                        "sort"
+                    ],
+                    "type": "BY"
+                },
+                "blurry": {
+                    "k": [
+                        "name"
+                    ],
+                    "type": "LK"
+                }
+            },
+            "id": null,
+            "djid": "btAAAAW8Wd5QCrde",
+            "djlx": "LLCKD",
+            "ywlx": "OUT",
+            "djbh": "SOUT04240408783",
+            "zzbm": "01.09.07",
+            "zzmc": "四期智能工厂",
+            "btbz": "04.2512804叉车线边库领料",
+            "djzt": "提交",
+            "cjsj": "2024-04-25",
+            "ywrq": "2024-04-25",
+            "cjr": "系统",
+            "flid": "btAAAAW8Wd8Rd0u0",
+            "flxh": "1",
+            "wlbm": "910200200098",
+            "wlmc": "螺钉GB70.1-M12x30-8.8",
+            "ggxh": "内六角圆柱头螺钉GB70.1-M12x30-8.8-c1B",
+            "pc": null,
+            "jldw": "PCS",
+            "jbjldw": "PCS",
+            "fzjldw": null,
+            "sl": 1050,
+            "jbsl": "1050",
+            "fzsl": "0",
+            "ckbm": "3.04.001",
+            "ckmc": "智能原材料库",
+            "kwbm": null,
+            "kwmc": null,
+            "flbz": null,
+            "sysl": 1050,
+            "czsl": 0,
+            "code": "1783279018838200320",
+            "cksj": null,
+            "llr": null
+        }
+    ],
+    "code": 1,
+    "desc": "查询成功"
+}
+	return res
+}
+export const inWarehouseAssignLocation = () => {
+	let res = {
+    "pageNum": 1,
+    "pageSize": 10,
+    "totalPage": 1,
+    "totalElements": 1,
+    "result": [
+        {
+            "size": 10,
+            "page": 0,
+            "sort": null,
+            "isAsc": null,
+            "type": null,
+            "fuzzy": null,
+            "is_used": null,
+            "start_time": null,
+            "end_time": null,
+            "doP": {
+                "startTime": {
+                    "k": [
+                        "create_time"
+                    ],
+                    "type": "LT"
+                },
+                "endTime": {
+                    "k": [
+                        "create_time"
+                    ],
+                    "type": "LE"
+                },
+                "sort": {
+                    "k": [
+                        "sort"
+                    ],
+                    "type": "BY"
+                },
+                "blurry": {
+                    "k": [
+                        "name"
+                    ],
+                    "type": "LK"
+                }
+            },
+            "id": null,
+            "djid": "btAAAAW8Wd5QCrde",
+            "djlx": "LLCKD",
+            "ywlx": "OUT",
+            "djbh": "SOUT04240408783",
+            "zzbm": "01.09.07",
+            "zzmc": "四期智能工厂",
+            "btbz": "04.2512804叉车线边库领料",
+            "djzt": "提交",
+            "cjsj": "2024-04-25",
+            "ywrq": "2024-04-25",
+            "cjr": "系统",
+            "flid": "btAAAAW8Wd8Rd0u0",
+            "flxh": "1",
+            "wlbm": "910200200098",
+            "wlmc": "螺钉GB70.1-M12x30-8.8",
+            "ggxh": "内六角圆柱头螺钉GB70.1-M12x30-8.8-c1B",
+            "pc": null,
+            "jldw": "PCS",
+            "jbjldw": "PCS",
+            "fzjldw": null,
+            "sl": 1050,
+            "jbsl": "1050",
+            "fzsl": "0",
+            "ckbm": "3.04.001",
+            "ckmc": "智能原材料库",
+            "kwbm": null,
+            "kwmc": null,
+            "flbz": null,
+            "sysl": 1050,
+            "czsl": 0,
+            "code": "1783279018838200320",
+            "cksj": null,
+            "llr": null
+        }
+    ],
+    "code": 1,
+    "desc": "查询成功"
+}
+	return res
 }
\ No newline at end of file