diff --git a/pages/index/addHangOrder.vue b/pages/index/addHangOrder.vue
index 0589dd4..8480770 100644
--- a/pages/index/addHangOrder.vue
+++ b/pages/index/addHangOrder.vue
@@ -18,7 +18,7 @@
 						</view>
 					</view>
 					<view class="name-date">
-						<text>{{item.createByName}}</text>
+						<text style="padding-left: 20rpx;">{{item.createByName}}</text>
 						<text style="padding-left:40rpx;">{{item.createTime}}</text>
 					</view>
 					<uni-icons type="bottom" size="25" style="position: absolute;bottom:0;right:30rpx;"></uni-icons>
diff --git a/pages/index/downarrears.vue b/pages/index/downarrears.vue
index eb13e3f..4cc9d29 100644
--- a/pages/index/downarrears.vue
+++ b/pages/index/downarrears.vue
@@ -1,25 +1,9 @@
 <template>
 	<view>
-		<u-alert description="点击可跳转至出库单" type="primary"></u-alert>
-		<!-- <u-cell-group :title="nickname" :customStyle="{'background-color':'#ffffff'}">
-			<u-cell clickable v-for="(item,indx) in list" :key="indx">
-				<view slot="title" class="u-slot-title">
-					<view class="u-cell-text">销售总金额：{{ item.totalAmount }}</view>
-					<view class="u-cell-text"> 应收总金额：{{ item.realAmount }}</view>
-					<view class="u-cell-text-time">{{item.createTime}}</view>
-				</view>
-				<view slot="value" class="right">
-					<view class="u-cell-text">已收金额：{{ item.alreadyEarn }}</view>
-					<view class="u-cell-text"> 未收金额：{{ item.noEarn }}</view>
-					<view style="opacity: 0">123</view>
-				</view>
-			</u-cell>
-		</u-cell-group>
-		<u-empty mode="list" v-if="list.length === 0">
-		</u-empty> -->
+		<u-alert description="点击可跳转至出库单" type="primary"></u-alert>
 		<view class="ulList" v-if="list.length > 0">
 			<ul>
-				<li v-for="item in list" @tap="gotoDetail(item.id)">
+				<li v-for="item in list" @tap="returnPrice(item)">
 					<uni-card :title="item.companyName == null ?'暂无':item.companyName" :sub-title="item.createTime == null ?'暂无':item.createTime" :extra="'订单金额:￥'+(item.totalAmount == null ?'暂无':item.totalAmount)"
 						thumbnail="/static/images/dingdan/dd1.png">
 						<view class="uni-body"><text class="cardText">销售员：</text> {{item.createByName == null ?'暂无':item.createByName}}</view>
diff --git a/pages/index/orderDetail.vue b/pages/index/orderDetail.vue
index 2ec4c44..abb5144 100644
--- a/pages/index/orderDetail.vue
+++ b/pages/index/orderDetail.vue
@@ -168,13 +168,13 @@
 				<view class="tui-order-flex">
 					<view class="tui-item-title">配送公司:</view>
 					<view class="tui-item-content">
-						{{ sales.transportType}}
+						{{ sales.companyName == null ?'暂无':sales.companyName}}
 					</view>
 				</view>
 				<view class="tui-order-flex">
 					<view class="tui-item-title">配送人员:</view>
 					<view class="tui-item-content">
-						{{ sales.transportType}}
+						{{ sales.transCompany == null ?'暂无':sales.transCompany}}
 					</view>
 				</view>
 				<view class="tui-order-flex">
diff --git a/pages/index/uparrears.vue b/pages/index/uparrears.vue
index a6c17a5..dcf2309 100644
--- a/pages/index/uparrears.vue
+++ b/pages/index/uparrears.vue
@@ -4,9 +4,9 @@
 		<view class="ulList" v-if="list.length > 0">
 			<ul>
 				<li v-for="item in list" @tap="gotoDetail(item.id)">
-					<uni-card :title="item.id == null ?'暂无':item.id" :sub-title="item.createTime == null ?'暂无':item.createTime" :extra="'共'+(item.totalAmount == null ?'暂无':item.totalAmount) + '件'"
+					<uni-card :title="'供应商：'+(item.supplierName == null ?'暂无':item.supplierName)" :sub-title="item.createTime == null ?'暂无':item.createTime" :extra="'共'+(item.totalAmount == null ?'暂无':item.totalAmount) + '件'"
 						thumbnail="/static/images/dingdan/dd1.png">
-						<view class="uni-body"><text class="cardText">销售员：</text> {{item.createBy == null ?'暂无':item.createBy}}</view>
+						<view class="uni-body"><text class="cardText">入库人：</text> {{item.createBy == null ?'暂无':item.createBy}}</view>
 						<view class="uni-body"> <text class="cardText"> 总成本：</text> <text class="priceText">
 								{{item.shouldPay == null ?'暂无':item.shouldPay}} </text> <text decode class="cardText">
 								{{'&nbsp;&nbsp;&nbsp;&nbsp; 欠款： '}} </text> <text class="priceText">{{item.noPay == null ?'暂无':item.noPay}}
@@ -72,7 +72,7 @@
 			},
 			returnPrice(item){
 				uni.navigateTo({
-					url: '/pages/index/orderDetail?type=gys&id='+ item.id
+					url: '/pages/index/waitStorageDetail?id='+ item.id
 				})
 			}
 		}
diff --git a/pages/index/waitStorage.vue b/pages/index/waitStorage.vue
index df991e8..afd7642 100644
--- a/pages/index/waitStorage.vue
+++ b/pages/index/waitStorage.vue
@@ -1,15 +1,19 @@
 <template>
-	<view>
+	<view>
+		<view class="search">
+			<u-search placeholder="输入供应商/商品名称/货号查询" v-model="keyword" @search="searchList" bg-color="#fff"
+				:show-action="false" border-color="#afd9ee"></u-search>
+		</view>
 		<u-alert description="点击可跳转至入库单" type="primary"></u-alert>
 		<view class="ulList" v-if="list.length > 0">
 			<ul>
 				<li v-for="item in list" @tap="returnPrice(item)">
-					<uni-card :title="item.id == null ?'暂无':item.id"
+					<uni-card :title="'供应商：'+(item.supplierName == null ?'暂无':item.supplierName)"
 						:sub-title="item.createTime == null ?'暂无':item.createTime"
 						:extra="'共'+(item.totalAmount == null ?'暂无':item.totalAmount) + '件'"
 						thumbnail="/static/images/dingdan/dd1.png">
 						<view class="uni-body"><text class="cardText">
-							销售员：</text>{{item.createBy == null ?'暂无':item.createBy}}
+							入库人：</text>{{item.createBy == null ?'暂无':item.createBy}}
 						</view>
 						<view class="uni-body" v-if="type==0">
 							<text class="cardText">总成本：</text> 
@@ -40,13 +44,15 @@
 			}
 		},
 		data() {
-			return {
+			return {
+				keyword: '',
 				list: [],
 				inStorageStatus: '',
 				supplierName: '',
 				startDate: '',
 				endDate: '',
-				type: ''
+				type: '',
+				page: 1,
 				// status: 'loadmore',
 				// page: 1,
 				// totalPages: 0,
@@ -77,6 +83,12 @@
 						this.tui.toast(res.message)
 					}
 				})
+			},
+			//搜索
+			searchList() {
+				this.page = 1;
+				// this.inventoryList = [];
+				// this.getOrderInfoList()
 			},
 			returnPrice(item) {
 				uni.navigateTo({
@@ -122,5 +134,10 @@
 		line-height: 60rpx;
 		text-align: center;
 		border-radius: 10px;
+	}
+	.search {
+		padding: 20upx;
+		background-color: #fff;
+		width: 100%;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/index/waitStorageDetail.vue b/pages/index/waitStorageDetail.vue
index e86fa2c..c901a98 100644
--- a/pages/index/waitStorageDetail.vue
+++ b/pages/index/waitStorageDetail.vue
@@ -13,7 +13,7 @@
 						<view>货号：{{item.productSn == null ?'暂无':item.productSn}}</view>
 						<view>总价：{{item.price == null ?'暂无':item.price}} 数量：{{item.productCount == null ?'暂无':item.productCount}}</view>
 					</view>
-					<view style="position: absolute;top: 130rpx;right: 40rpx;color: blue;text-decoration: underline;"
+					<view v-if="type==0 && sales.inStorageStatus == 0" style="position: absolute;top: 130rpx;right: 40rpx;color: blue;text-decoration: underline;"
 						@tap="clickCollapse(index)">
 						维护采购价
 					</view>
@@ -25,8 +25,44 @@
 						<text>数量：{{items.productCount == null ?'暂无':item.productCount}}</text>
 					</view>
 				</view>
+			</view>
+			<view class="tui-goods-info" style="width: 95%;margin: 0 auto;" v-if="type==0 && sales.inStorageStatus != 0">
+				<view class="tui-price-flex tui-size32" style="height: 80rpx;line-height: 80rpx;">
+					<view class="tui-flex-shrink">应付金额</view>
+					<view class="tui-goods-price">
+						<view class="tui-size-24">￥</view>
+						<view class="tui-price-large">{{ sales.shouldPay == null ?'暂无':sales.shouldPay }}</view>
+					</view>
+				</view>
+				<view class="tui-price-flex tui-size32" style="height: 80rpx;line-height: 80rpx;">
+					<view class="tui-flex-shrink">已付金额</view>
+					<view class="tui-goods-price">
+						<view class="tui-size-24">￥</view>
+						<view class="tui-price-large">{{ sales.alreadyPay == null ?'暂无':sales.alreadyPay }}</view>
+					</view>
+				</view>
+				<view class="tui-price-flex tui-size32" style="height: 80rpx;line-height: 80rpx;">
+					<view class="tui-flex-shrink">欠款</view>
+					<view class="tui-goods-price tui-primary-color">
+						<view class="tui-size-24">￥</view>
+						<view class="tui-price-large">{{ sales.noPay == null ?'暂无':sales.noPay}}</view>
+					</view>
+				</view>
+				<view class="tui-price-flex tui-size32" style="height: 80rpx;line-height: 80rpx;">
+					<view class="tui-flex-shrink">其他费用</view>
+					<view class="tui-goods-price">
+						<view class="tui-size-24">￥</view>
+						<view class="tui-price-large">{{ sales.otherPay == null ?'暂无':sales.otherPay}}</view>
+					</view>
+				</view>
+				<view class="tui-price-flex tui-size32" style="height: 80rpx;line-height: 80rpx;">
+					<view class="tui-flex-shrink">备注</view>
+					<view class="tui-goods-price">
+						<view class="tui-price-large">{{ sales.remark == null ?'暂无':sales.remark}}</view>
+					</view>
+				</view>
 			</view>
-			<view class="tui-goods-info">
+			<view class="tui-goods-info" v-if="type==0 && sales.inStorageStatus == 0">
 				<!-- 账号权限是否可以维护成本价格（主账号和被授权的账号可以维护），参数名：shop_admin_cost，维护在用户表中，存在前后端缓存里，把备注栏挪出来，谁都可以备注 -->
 				<view class="price-box-list">
 					<view class="content-list">
@@ -62,13 +98,19 @@
 				</view>
 			</view>
 		</view>
-		<view class="tui-tabbar">
-			<view class="tui-btn-mr" @click="inventorySubmit">确认提交</view>
+		<view class="tui-tabbar">
+			<view class="tui-btn-mr" v-if="type==0 && sales.inStorageStatus == 1" @tap="inputDialogToggle">回款</view>
+			<view class="tui-btn-mr" v-if="type==0 && sales.inStorageStatus == 0" @click="inventorySubmit">确认提交</view>
 		</view>
 		<!-- 弹出输入框 -->
-		<uni-popup ref="inputDialog" type="dialog">
+		<uni-popup ref="priceDialog" type="dialog">
 			<uni-popup-dialog ref="inputClose" mode="input" title="采购价" placeholder="请输入采购价"
 				@confirm="changePrice"></uni-popup-dialog>
+		</uni-popup>
+		<!-- 回款金额输入框 -->
+		<uni-popup ref="inputDialog" type="dialog">
+			<uni-popup-dialog ref="inputClose" mode="input" title="回款金额" placeholder="请输入回款金额"
+				@confirm="sureNpPay"></uni-popup-dialog>
 		</uni-popup>
 	</view>
 </template>
@@ -85,7 +127,8 @@
 				alreadyPay:0,
 				otherPay:0,
 				remark:'',
-				id:''
+				id:'',
+				type:''
 			}
 		},
 		filters: {
@@ -102,7 +145,8 @@
 		},
 		onLoad(option) {
 			this.id = option.id
-			this.getWaitStorage(option.id)
+			this.getWaitStorage(option.id)
+			this.type = uni.getStorageSync('type')
 		},
 		methods: {
 			getWaitStorage(id) {
@@ -123,6 +167,10 @@
 			changePay() {
 				this.noPay = this.shouldPay - this.alreadyPay
 			},
+			//回款金额输入框
+			inputDialogToggle() {
+				this.$refs.inputDialog.open()
+			},
 			inventorySubmit() {
 				if (this.noPay == 0 || this.alreadyPay == 0 || this.shouldPay == 0) {
 					uni.showToast({
@@ -175,8 +223,8 @@
 			//编辑每一个的单价
 			clickCollapse(index) {
 				this.index = index
-				this.$refs.inputDialog.val = ''
-				this.$refs.inputDialog.open()
+				this.$refs.priceDialog.val = ''
+				this.$refs.priceDialog.open()
 			},
 			//计算价格
 			changePrice(val) {
diff --git a/pages/inventory/goodsList1.vue b/pages/inventory/goodsList1.vue
index 4c93aae..347717c 100644
--- a/pages/inventory/goodsList1.vue
+++ b/pages/inventory/goodsList1.vue
@@ -8,13 +8,13 @@
 					<view class="list-val">
 						<input type="text" placeholder="请选择客户" disabled
 							style="border-bottom: 1px solid #fff;text-align: center;" :value="khName.name"
-							@tap="goPopleList('khName')">
+							@tap.stop="goPopleList('khName')">
 						<uni-icons type="right" size="16" style="margin-left: 80rpx;line-height: 80rpx;"></uni-icons>
 					</view>
 				</view>
 				<view class="content-list">
 					<view class="list-name">销售员</view>
-					<uni-data-select class="uni-data-select" :localdata="categoryList" v-model="value"
+					<uni-data-select class="uni-data-select" :localdata="categoryList" v-model="valuexsy"
 						placeholder="请选择销售员" @change="categoryChange"></uni-data-select>
 				</view>
 			</view>
@@ -39,7 +39,7 @@
 								<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in priceItems"
 									:key="item.value">
 									<view>
-										<radio :value="item.value" @tap="priceChange(item.value)" :checked="index === priceCurrent" />
+										<radio :value="item.value" @tap.stop="priceChange(item.value)" :checked="index === priceCurrent" />
 									</view>
 									<view style="width: 100rpx;">{{item.name}}</view>
 								</label>
@@ -77,7 +77,7 @@
 							<view v-if="value[1].supplierName !=undefined">供应商：{{value[1].supplierName}}</view>
 						</view>
 						<view style="position: absolute;top: 110rpx;right: 40rpx;color: blue;text-decoration: underline;"
-							@tap="clickPrice(value[0])">
+							@tap.stop="clickPrice(value[0])">
 							选择售价
 						</view>
 						<view style="position: absolute;top: 30rpx;right: 30rpx;" @tap.stop="delShop(value[0])">
@@ -104,7 +104,7 @@
 							</view>
 						</view>
 						<view class="shop-collapse"  v-for="(values,keys) in Array.from(value[1].stockLogList)" :key='keys'>
-							<view style="margin-right:5%;" @tap="delShopSpec(value[0],values[0])">
+							<view style="margin-right:5%;" @tap.stop="delShopSpec(value[0],values[0])">
 								<uni-icons color="red" type="minus" size="26"></uni-icons>
 							</view>
 							<text>{{values[0] | sliceMsg}}</text>
@@ -180,7 +180,7 @@
 							<view class="list-val">
 								<input type="text" placeholder="请选择" disabled :value="wlName.companyName"
 									style="border-bottom: 1px solid #fff;text-align: center;padding-right: 54rpx;"
-									@tap="goPopleList(radioType == '0'? 'wlName' :'kdName')">
+									@tap.stop="goPopleList(radioType == '0'? 'wlName' :'kdName')">
 								<uni-icons type="right" size="16"
 									style="margin-left: 80rpx;line-height: 80rpx;"></uni-icons>
 							</view>
@@ -190,7 +190,7 @@
 							<view class="list-val">
 								<input type="text" placeholder="请选择" disabled
 									style="border-bottom: 1px solid #fff;text-align: center;"
-									@tap="goPopleList('fcName')">
+									@tap.stop="goPopleList('fcName')">
 								<uni-icons type="right" size="16"
 									style="margin-left: 80rpx;line-height: 80rpx;"></uni-icons>
 							</view>
@@ -201,11 +201,6 @@
 								<uni-data-checkbox v-model="value" :localdata="sex"
 									@change="checkBoxChange"></uni-data-checkbox>
 							</view>
-							<!-- <view class="content-list" style="width: 100%;">
-								<view class="list-name" style="padding-left: 0;">配送方式</view>
-								<uni-data-select class="uni-data-select" :localdata="sex" v-model="value"
-									placeholder="请选择配送方式" :clear="false" @change="checkBoxChange"></uni-data-select>
-							</view> -->
 						</view>
 						<view class="content-list" v-if="radioType1 != '1' && radioType !=''">
 							<view class="list-name" style="width:150rpx;padding-left:0;">{{radioType == '1'? '快递员' :'拉包工'}}</view>
@@ -213,7 +208,7 @@
 								<input type="text" placeholder="可指定人员" disabled 
 									:value="radioType == '1'? kdyName.workerName : lbgName.workerName"
 									style="border-bottom: 1px solid #fff;text-align: center;"
-									@tap="goPopleList(radioType == '1'? 'kdyName' :'lbgName')">
+									@tap.stop="goPopleList(radioType == '1'? 'kdyName' :'lbgName')">
 								<uni-icons type="right" size="16"
 									style="margin-left: 80rpx;line-height: 80rpx;"></uni-icons>
 							</view>
@@ -234,8 +229,8 @@
 				<text style="color: #ffa200;">￥{{shouldPay}}</text>
 			</view>
 			<view class="bottom-right">
-				<button class="bottom-btn" @tap="clearAll">清空全部</button>
-				<button class="bottom-btn" @tap="goSell">开单</button>
+				<button class="bottom-btn" @tap.stop="clearAll">清空商品</button>
+				<button class="bottom-btn" @tap.stop="goSell">开单</button>
 			</view>
 		</view>
 		<!-- 弹出输入框 -->
@@ -244,15 +239,15 @@
 				<view class="popup-pay-title">
 					<text>选择商品价格</text>
 				</view>
-				<view class="popup-pay-container" @tap="checkPay(lsprice)">
+				<view class="popup-pay-container" @tap.stop="checkPay(lsprice)">
 					<text style="display: inline-block">零售价：￥{{lsprice}}</text>
 				</view>
-				<view class="popup-pay-container" @tap="checkPay(wholesalePrice)">
+				<view class="popup-pay-container" @tap.stop="checkPay(wholesalePrice)">
 					<text style="display: inline-block">批发价：￥{{wholesalePrice}}</text>
 				</view>
 				<view class="popup-pay-container" style="background: #fff;display: flex;">
 					<input type="number" style="height: 100rpx;line-height: 100rpx;color:#000;" placeholder="请输入价格" @blur="changePay">
-					<view style="flex: 1;color: #fff;background: #088FEB;border-radius: 10px;" @tap="checkPay(customPrice)">确定</view>
+					<view style="flex: 1;color: #fff;background: #088FEB;border-radius: 10px;" @tap.stop="checkPay(customPrice)">确定</view>
 				</view>
 			</view>
 		</uni-popup>
@@ -276,7 +271,7 @@
 									<view class="shop-title-name">{{items.name}}</view>
 								</view>
 								<view class="shop-attrs">
-									<uni-data-checkbox v-model="value" :localdata="range"></uni-data-checkbox>
+									<uni-data-checkbox :localdata="range"></uni-data-checkbox>
 									<text v-for="(itemTag, index1) in items.value" :key="index1"
 										@tap.stop="attrNameChange(index,index1) "
 										:class="itemTag.isChecked ? 'checkedText' : '' "> {{itemTag.value}}</text>
@@ -296,7 +291,7 @@
 							<text>￥{{zPrice}}</text>
 						</view>
 						<view class="shop-popup-bottom-right">
-							<view class="bottom-btn" @tap="temporaryCheck">选好了</view>
+							<view class="bottom-btn" @tap.stop="temporaryCheck">选好了</view>
 						</view>
 					</view>
 				</view>
@@ -326,6 +321,7 @@
 				zPrice:0,
 				priceOk:'', //已收金额
 				value: 0,
+				valuexsy:'',
 				sex: [{
 					text: '平台配送',
 					value: 0
@@ -392,7 +388,7 @@
 				remark:'',
 				pbAddress:'',
 				carList1:[],
-				radioType1:'',
+				radioType1:0,
 				saleId:''
 			}
 		},
@@ -898,9 +894,53 @@
 			},
 			//点击底部开单按钮
 			goSell() {
-				console.log(this.khName)
-				console.log(this.lbgName)
-				console.log(this.wlName)
+				// console.log(this.khName)
+				// console.log(this.lbgName)
+				// console.log(this.wlName)
+				if(this.khName == ''){
+					this.tui.toast('请选择客户！')
+					return
+				}
+				if(this.xsyId ==''){
+					this.tui.toast('请选择销售员！')
+					return
+				}
+				if(this.relPrice == (0 || '')){
+					this.tui.toast('请输入实收金额！')
+					return
+				}else if(this.priceOk==(0 || '')){
+					this.tui.toast('请输入已收金额！')
+					return
+				}
+				if(this.carList.size == 0){
+					this.tui.toast('请添加商品！')
+					return
+				}
+				if(this.radioType != ''){
+					if(this.radioType == 0 || this.radioType == 1 || this.radioType== 4){
+						if(this.wlName == ''){
+							this.tui.toast('请选择配送公司！')
+							return
+						}else if(this.radioType1 == 0){
+							if(this.lbgName == ''){
+								this.tui.toast('请选择配送人员！')
+								return
+							}
+						}
+					}else if(this.radioType== 3){
+						console.log(this.radioType1)
+						if(this.radioType1 == 0){
+							if(this.lbgName == ''){
+								this.tui.toast('请选择配送人员！')
+								return
+							}
+							
+						}
+					}
+				}else{
+					this.tui.toast('请选择发货方式！')
+					return
+				}
 				let obj = {
 					orderByWorker: this.lbgName.workerId,
 					saleId:this.saleId,
@@ -1054,7 +1094,7 @@
 				let that = this;
 				uni.showModal({
 					title: "提示",
-					content: "确定清空全部数据吗？",
+					content: "确定清空全部已选商品吗？",
 					success: function(res) {
 						that.carList.clear()
 						that.remark = ''