diff --git a/pages/news3/ManualEntry.vue b/pages/news3/ManualEntry.vue
index a137791..cef09ad 100644
--- a/pages/news3/ManualEntry.vue
+++ b/pages/news3/ManualEntry.vue
@@ -22,13 +22,13 @@
 		<view class="section">
 			<u-field v-model="form.receiver" label="收货人" placeholder="请输入收货人姓名">
 			</u-field>
-			<u-field v-model="form.receiver_phone" label="手机号" @input="handleInput" maxlength="11" type="number"
+			<u-field v-model="form.receiver_phone" label="手机号" @blur="handleInput" maxlength="11" type="number"
 				placeholder="请输入收货人手机号">
 			</u-field>
 			<u-field @click="cityShow=true" v-model="city" :disabled="true" label="所属城市" placeholder="请选择所属城市"
 				right-icon="arrow-right">
 			</u-field>
-			<u-picker mode="region" v-model="cityShow" @confirm="regionChage">{{form.city}}</u-picker>
+			<u-picker mode="region" v-model="cityShow" @confirm="regionChage">{{city}}</u-picker>
 			<view class="addrDetail">
 				<view class="addrTitle">
 					详细地址
@@ -46,11 +46,11 @@
 			</u-field>
 			<u-field v-model="form.sender" label="发货人" placeholder="请输入发货人">
 			</u-field>
-			<u-field v-model="form.send_phone" label="发货人电话" type="number" @input="handleSendInput" maxlength="11"
+			<u-field v-model="form.send_phone" label="发货人电话" type="number" @blur="handleSendInput" maxlength="11"
 				placeholder="请输入发货人电话">
 			</u-field>
 			<picker @change="changeOption" mode="selector" range-key="express_name" :value="index" :range="expressList">
-				<u-field v-model="form.express_name" :disabled="true" label="物流公司" placeholder="请选择物流公司"
+				<u-field v-model="express_name" :disabled="true" label="物流公司" placeholder="请选择物流公司"
 					right-icon="arrow-right">
 				</u-field>
 			</picker>
@@ -121,7 +121,8 @@
 					goods_name: '',
 					province_id: '',
 					city_id: '',
-					region_id: ''
+					region_id: '',
+					order_id: '',
 				},
 				content: '',
 				modeList: [{
@@ -139,6 +140,9 @@
 				header: '',
 			}
 		},
+		onLoad(o) {
+			this.form.order_id = o.order_id
+		},
 		onReady() {
 			this.action = (Config.get('apiUrl') + 'upload/image').replace("index.php?s=/", "")
 			this.header = {
@@ -160,7 +164,10 @@
 					.then(res => {
 						if (res.status) {
 							let data = res.data.detail
-							this.form.city = data.region.province + data.region.city + data.region.region;
+							this.city = data.region.province + data.region.city + data.region.region;
+							this.form.province_id = data.province_id
+							this.form.city_id = data.city_id
+							this.form.region_id = data.region_id
 							this.form.receiver = data.name
 							this.form.receiver_phone = data.phone
 							this.form.detail = data.detail
@@ -236,6 +243,7 @@
 					uni.showToast({
 						title: "录入成功"
 					})
+					return
 					setTimeout(function() {
 						uni.$emit('refreshData');
 						uni.navigateBack({
@@ -273,6 +281,7 @@
 			},
 			// 选择物流
 			changeOption(e) {
+				console.log(e)
 				this.express_name = this.expressList[e.detail.value].express_name;
 				this.form.express_id = this.expressList[e.detail.value].express_id
 			},
@@ -354,7 +363,7 @@
 		margin-top: 16upx;
 
 		.realAddr {
-			padding: 40upx 0 !important;
+			// padding: 40upx 0 !important;
 
 			::v-deep .uni-input-wrapper {
 				text-align: left !important;
diff --git a/pages/news3/seasoningCondimentsRecord.vue b/pages/news3/seasoningCondimentsRecord.vue
index b1faa71..62454da 100644
--- a/pages/news3/seasoningCondimentsRecord.vue
+++ b/pages/news3/seasoningCondimentsRecord.vue
@@ -87,6 +87,7 @@
 				handleList: [],
 				chatList: [],
 				handChatList: [],
+				type: ''
 			}
 		},
 		onLoad(o) {
@@ -94,7 +95,7 @@
 			this.send_name = this.modeList[this.form.send_type].text;
 			this.transferList = this.form.transfer_image_ids;
 			this.chatList = this.form.chat_image_ids;
-			console.log(this.form)
+			this.type = o.type
 			if (this.form.transfer_image_ids) {
 				let list = this.form.transfer_image_ids
 				list.forEach(item => {
@@ -185,6 +186,7 @@
 					express_id: that.form.express_id,
 					chat_image_id: that.form.chat_image_id,
 					transfer_image_id: that.form.transfer_image_id,
+					order_id: that.form.order_id
 				}
 				let {
 					status,
@@ -222,7 +224,9 @@
 				} = await newFunApi.expressAll();
 				if (status == 200) {
 					this.expressList = data.list;
-					this.express_name = this.findNameById(this.expressList, this.form.express_id)
+					if (this.form.express_id) {
+						this.express_name = this.findNameById(this.expressList, this.form.express_id)
+					}
 				}
 			},
 			// 通过ID查找名称
diff --git a/pages/news3/setOutRecords.vue b/pages/news3/setOutRecords.vue
index 7496c32..0f428ca 100644
--- a/pages/news3/setOutRecords.vue
+++ b/pages/news3/setOutRecords.vue
@@ -25,8 +25,45 @@
 					只属于非商城订单
 				</view>
 			</view> -->
-			<view style="padding-bottom: 120upx;" v-if="goodsList.length>0">
-				<view class="dispatchContent" v-for="(item, index) in goodsList" :key="index">
+			<!-- v-if="goodsList.length>0" -->
+			<view style="padding-bottom: 120upx;">
+				<view class="dispatchContent" v-if="classifyShow==1" v-for="(item, index) in goodsList" :key="index">
+					<view class="orderNum">
+						订单号：{{item.order_no}}
+					</view>
+					<view class="dispatchItem" v-for="(item1, index) in item.goods">
+						<image :src="item1.goods_image" mode="aspectFill"></image>
+						<view class="right">
+							<view class="title">
+								{{item1.goods_name}}
+							</view>
+							<view style="display: flex;align-items: center;justify-content: space-between;">
+								<view class="num">
+									x{{item1.total_num}}
+								</view>
+								<view class="price">
+									<text style="font-size: 26upx;">¥</text>
+									<text>{{item1.total_price?Number(item1.total_price):item1.total_price}}</text>
+								</view>
+							</view>
+
+						</view>
+					</view>
+					<view class="totalNum">
+						<text>共计:</text>
+						<text style="color: #F21A1C;">¥{{item.pay_price?Number(item.pay_price):item.pay_price}}</text>
+					</view>
+					<view class="footerBtn">
+						<view class="wuliuBtn" v-if="classifyShow==1&&!item.transfer" @click="manualEntry(item)">
+							调货记录
+						</view>
+						<view class="wuliuBtn" v-if="classifyShow==1&&item.transfer"
+							@click="onCondiments(item.transfer)">
+							调货记录
+						</view>
+					</view>
+				</view>
+				<view class="dispatchContent" v-if="classifyShow==2" v-for="(item, index) in goodsList" :key="index">
 					<view class="orderNum">
 						订单号：{{item.express_no}}
 					</view>
@@ -53,18 +90,23 @@
 						<text style="color: #F21A1C;">¥{{item.total_price}}</text>
 					</view>
 					<view class="footerBtn">
-						<view class="wuliuBtn" @click="onCondiments(item)">
+						<view class="wuliuBtn" v-if="classifyShow==2&&item.goods_sn&&item.goods_num"
+							@click="onCondiments(item)">
+							调货记录
+						</view>
+						<view class="wuliuBtn" v-if="classifyShow==2&&!item.goods_sn&&!item.goods_num"
+							@click="manualEntry(item)">
 							调货记录
 						</view>
 					</view>
 				</view>
 			</view>
-			<view v-else style="margin-top: 250rpx;">
-				<u-empty text="暂无发货记录～" mode="list"></u-empty>
+			<view v-if="goodsList.length==0" style="margin-top: 250rpx;">
+				<u-empty text="暂无记录～" mode="list"></u-empty>
 			</view>
-			<view class="goods-fd">
+			<!-- <view class="goods-fd">
 				<view class="btn" @click="manualEntry">手动录入</view>
-			</view>
+			</view> -->
 		</view>
 	</view>
 </template>
@@ -118,16 +160,16 @@
 				this.classifyShow = item.id;
 				this.pageNum = 1;
 				this.goodsList = []
-				if(index==1){
+				if (index == 1) {
 					this.getOrderList(1);
-				}else{
+				} else {
 					this.getList(1)
 				}
 			},
 			// 手动录入
-			manualEntry() {
+			manualEntry(item) {
 				uni.navigateTo({
-					url: "/pages/news3/ManualEntry"
+					url: "/pages/news3/ManualEntry?type=" + this.classifyShow + '&order_id=' + item.order_id
 				})
 			},
 			// 调货记录
@@ -149,15 +191,21 @@
 					message,
 					data
 				} = await newFunApi.shopOrderList({
-					dataType: 'complete',
+					dataType: 'all',
+					// dataType: 'complete',
 					page: this.pageNum,
 					searchValue: this.searchText,
+					searchValue: '',
+					payMethod: '',
+					orderSource: '',
+					betweenTime: '',
+					delivery_type: '',
+					user_id: '',
 				});
 				if (status == 200) {
 					uni.hideLoading();
 					this.total = data.list.total
 					this.goodsList = this.goodsList.concat(data.list.data)
-					this.total = data.list.total
 				}
 			},
 			/**