diff --git a/api/enterExit.js b/api/enterExit.js
index ed4df3c..55a5430 100644
--- a/api/enterExit.js
+++ b/api/enterExit.js
@@ -156,10 +156,11 @@ export function getPurchaseOrder(data) {
  * @data 获取领料单
  * @returns {Promise | Promise<unknown>}
  */
-export function getMaterialRequisitionForm(data,param) {
+export function getMaterialRequisitionForm(data) {
   return request({
-    url: '/smart-canteen/ims_fetch_material/list?pageNum='+data.pageNum+'&pageSize=' + data.pageSize + param,
+    url: '/smart-canteen/ims_fetch_material/list',
     method: 'get',
+    params:data
   })
 }
 /**
diff --git a/pages/enterAndExit/enter/add.vue b/pages/enterAndExit/enter/add.vue
index 02c3134..ec4b53e 100644
--- a/pages/enterAndExit/enter/add.vue
+++ b/pages/enterAndExit/enter/add.vue
@@ -37,14 +37,14 @@
             style="text-align: left;"
           ></uni-data-select>
         </u-form-item>
-<!--        <u-form-item label="入库人" prop="personEnter" required labelWidth="180rpx">-->
-<!--          <uni-data-select-->
-<!--            v-model="form.personEnter"-->
-<!--            :localdata="selectors.personEnter.options"-->
-<!--            placeholder="请选择入库人"-->
-<!--            style="text-align: left;"-->
-<!--          ></uni-data-select>-->
-<!--        </u-form-item>-->
+        <u-form-item label="入库人" prop="personEnter" required labelWidth="180rpx">
+          <uni-data-select
+            v-model="form.personEnter"
+            :localdata="selectors.personEnter.options"
+            placeholder="请选择入库人"
+            style="text-align: left;"
+          ></uni-data-select>
+        </u-form-item>
 
         <u-form-item label="备注说明" prop="remark" labelWidth="180rpx" style="height: 200rpx">
           <uni-easyinput type="textarea" v-model="form.remark" placeholder="请输入备注" maxlength="100" />
@@ -295,7 +295,7 @@ export default {
     },
     async getPersonEnterControlList() {
       // 假设有一个获取入库人列表的API
-      const res = await getPersonApi(125) // 这里可以替换为实际的API
+      const res = await getPersonApi() // 这里可以替换为实际的API
       this.selectors.personEnter.options = res.rows.map(item => ({
         name: item.userName,
         text: item.userName,
@@ -465,13 +465,13 @@ export default {
         })
         return
       }
-      // else if (this.checkIsExist(this.form.personEnter)) {
-      //   uni.showToast({
-      //     title: '请选择入库人',
-      //     icon: 'none'
-      //   })
-      //   return
-      // }
+      else if (this.checkIsExist(this.form.personEnter)) {
+        uni.showToast({
+          title: '请选择入库人',
+          icon: 'none'
+        })
+        return
+      }
       else if (this.imsIntoInventoryDetailVOList.length === 0) {
         this.isUploading = false
         uni.showToast({
diff --git a/pages/enterAndExit/enter/selectDocument.vue b/pages/enterAndExit/enter/selectDocument.vue
index 72bd261..38ef93a 100644
--- a/pages/enterAndExit/enter/selectDocument.vue
+++ b/pages/enterAndExit/enter/selectDocument.vue
@@ -103,12 +103,17 @@ export default {
       let params = {
         pageNum: this.pageNum,
         pageSize: this.pageSize,
-        materialName: this.searchValue
+        materialName: this.searchValue,
+        ifAllInto: 2,
+        isInspect: 0
       }
       try {
         const res = await getPurchaseOrder(params)
         console.log('?? ~ getList ~ res:', res)
         this.total = Number(res.total)
+        if (this.total === 0) {
+          uni.$u.toast('暂无数据')
+        }
         if (this.pageNum == 1) {
           this.tableList = res.rows
         } else {
@@ -150,6 +155,8 @@ export default {
         item.supplierId = this.selectList[0].supplierId
         this.form.remark = this.form.remark || ''
       })
+      this.form.isDisabled = true
+      this.form.orderGoodsId = this.selectList[0].orderGoodsId
       let pages = getCurrentPages();
       let prePage = pages[pages.length - 2]; //上一个页面
       prePage.$vm["getGoodData"]({
diff --git a/pages/enterAndExit/enter/selectGoods.vue b/pages/enterAndExit/enter/selectGoods.vue
index 9f9702e..f950db1 100644
--- a/pages/enterAndExit/enter/selectGoods.vue
+++ b/pages/enterAndExit/enter/selectGoods.vue
@@ -162,6 +162,7 @@ export default {
       // url += '?selectList=' + encodeURIComponent(JSON.stringify(this.selectList)) + '&form=' + JSON.stringify(this.form)
       let pages = getCurrentPages();
       let prePage = pages[pages.length - 2]; //上一个页面
+      this.form.isDisabled = false
       prePage.$vm["getGoodData"]({
         selectList:  encodeURIComponent(JSON.stringify(this.selectList)),
         form: JSON.stringify(this.form)
diff --git a/pages/enterAndExit/exit/add.vue b/pages/enterAndExit/exit/add.vue
index 8f47c47..99cb6fe 100644
--- a/pages/enterAndExit/exit/add.vue
+++ b/pages/enterAndExit/exit/add.vue
@@ -76,7 +76,7 @@
 									<view style="width: 100%;display: flex;align-items: center">
 										<view class="scroll_title_input"><i style="color:red;">*</i>领取数量：</view>
 										<view class="scroll_content_input">
-											<uni-easyinput placeholder="输入数量" type="number" v-model="item.fetchNum"
+											<uni-easyinput placeholder="输入数量" type="number" v-model="item.fetchNum" :disabled="form.isDisabled"
 												@blur="calculateTotal(item)"></uni-easyinput>
 										</view>
 									</view>
@@ -170,6 +170,7 @@
 				},
 				imsOutInventoryDetailAddList: [],
 				form: {
+          isDisabled : false, // 输入框是否禁用
 					areaName: null,
 					areaId: null,
 					warehouseId: null,
@@ -411,7 +412,7 @@
 					...this.form,
 					imsOutInventoryDetailAddList: list,
 					totalNum: this.totalNum,
-					outDate: dateTime
+					outDate: dateTime,
 				}
 				const res = await addOutRecord(param)
 				console.log("res===========",res)
diff --git a/pages/enterAndExit/exit/selectDocument.vue b/pages/enterAndExit/exit/selectDocument.vue
index 1042cd8..ea2d5ad 100644
--- a/pages/enterAndExit/exit/selectDocument.vue
+++ b/pages/enterAndExit/exit/selectDocument.vue
@@ -96,15 +96,15 @@ export default {
         materialName: this.searchValue,
         areaId: this.form.areaId,
         warehouseId: this.form.warehouseId,
-      }
-      var param = ""
-      if (this.form.areaId){
-        param = "&areaId=" + this.form.areaId + "&warehouseId=" + this.form.warehouseId
+        fetchStatus : 2
       }
       try {
-        const res = await getMaterialRequisitionForm(params,param)
+        const res = await getMaterialRequisitionForm(params)
         console.log('?? ~ getList ~ res:', res)
         this.total = Number(res.total)
+        if (this.total === 0) {
+          uni.$u.toast('暂无数据')
+        }
         if (this.pageNum == 1) {
           this.tableList = res.rows
         } else {
@@ -142,6 +142,8 @@ export default {
         item.materialNum = item.fetchNum
         this.form.remark = this.form.remark || ''
       })
+      this.form.fetchMaterialId = this.selectList[0].fetchMaterialId
+      this.form.isDisabled = true
       let pages = getCurrentPages();
       let prePage = pages[pages.length - 2]; //上一个页面
       prePage.$vm["getGoodData"]({
diff --git a/pages/enterAndExit/exit/selectGoods.vue b/pages/enterAndExit/exit/selectGoods.vue
index aa84edf..0c66eff 100644
--- a/pages/enterAndExit/exit/selectGoods.vue
+++ b/pages/enterAndExit/exit/selectGoods.vue
@@ -150,6 +150,7 @@ export default {
     navigateTo(url) {
       let pages = getCurrentPages();
       let prePage = pages[pages.length - 2]; //上一个页面
+      this.form.isDisabled = false
       prePage.$vm["getGoodData"]({
         selectList:  encodeURIComponent(JSON.stringify(this.selectList)),
         form: JSON.stringify(this.form)