diff --git a/src/api/foodManage/purchaseManage.js b/src/api/foodManage/purchaseManage.js
index 0281092d..de93726c 100644
--- a/src/api/foodManage/purchaseManage.js
+++ b/src/api/foodManage/purchaseManage.js
@@ -166,6 +166,17 @@ export function getGoodsInquiryInfoApi(data) {
     }
   })
 }
+//获取采购询价详情
+export function getGoodsInquiryInfoBySupplierIdApi(data) {
+  return request({
+    url: '/smart-canteen/ims_inquiry/getInfo',
+    method: 'post',
+    headers: {
+        //"merchant-id":"378915229716713472",
+    },
+    data: data
+  })
+}
 //获取报价供应商详情列表-查看报价
 export function getGoodsInquirySupplierInfoApi(data) {
   return request({
diff --git a/src/views/foodManage/pickManage/materialPicking/edit.vue b/src/views/foodManage/pickManage/materialPicking/edit.vue
index 7c4676ad..7a223b8d 100644
--- a/src/views/foodManage/pickManage/materialPicking/edit.vue
+++ b/src/views/foodManage/pickManage/materialPicking/edit.vue
@@ -49,7 +49,7 @@
                     </el-select> 
                 </el-form-item>  
                 <el-form-item label="领料仓库" prop="warehouseId">
-                    <el-select v-model="baseInfo.warehouseId" clearable :disabled="materialList.length>0" placeholder="请选择领料仓库" style="width: 100%;">
+                    <el-select v-model="baseInfo.warehouseId" :disabled="materialList.length>0" placeholder="请选择领料仓库" style="width: 100%;">
                         <el-option v-for="item in wareHouseOptions"
                             :key="item.warehouseId"
                             :label="item.warehouseName"
@@ -480,14 +480,15 @@ export default {
         },
         //添加货品
         addMaterial(){
-            if(this.baseInfo.areaId!=undefined||this.baseInfo.warehouseId!=undefined){
+            console.log(this.baseInfo.warehouseId)
+            if(this.baseInfo.areaId!=undefined&&this.baseInfo.warehouseId&&this.baseInfo.warehouseId!=undefined){
                  this.openDialog=true
                 this.resetQuery()
                 setTimeout(()=>{
                     this.$refs.multipleTable1.clearSelection() 
                 },300) 
             }else{
-                this.$modal.msgError("请先选择区域，仓库");
+                this.$modal.msgError("请先选择区域、仓库");
             }
         }, 
         /** 搜索按钮操作 */
@@ -647,14 +648,14 @@ export default {
         },
         //导入
         importPurchasePlan(){
-            if(this.baseInfo.areaId!=undefined||this.baseInfo.canteenId!=undefined||this.baseInfo.stallId!=undefined){
+            if(this.baseInfo.areaId!=undefined&&this.baseInfo.canteenId!=undefined&&this.baseInfo.stallId!=undefined&&this.baseInfo.warehouseId&&this.baseInfo.warehouseId!=undefined){
                 this.openImportDialog=true 
                 this.resetQuery2()
                 // setTimeout(()=>{
                 //     this.$refs.multipleTable2.clearSelection() 
                 // },300) 
             }else{
-                this.$modal.msgError("请先选择区域，食堂，档口");
+                this.$modal.msgError("请先选择区域、食堂、档口、仓库");
             }  
         },
         /** 搜索按钮操作 */
diff --git a/src/views/foodManage/purchaseManage/contractList/edit.vue b/src/views/foodManage/purchaseManage/contractList/edit.vue
index 70ac9474..84c05e55 100644
--- a/src/views/foodManage/purchaseManage/contractList/edit.vue
+++ b/src/views/foodManage/purchaseManage/contractList/edit.vue
@@ -737,14 +737,14 @@ export default {
         },
         //导入
         importPurchaseOrder(){
-            if(this.baseInfo.areaId!=undefined||this.baseInfo.deliveryWarehouseId!=undefined||this.baseInfo.supplierId!=undefined){
+            if(this.baseInfo.areaId!=undefined&&this.baseInfo.supplierId&&this.baseInfo.supplierId!=undefined){
                 this.openImportDialog=true
                 this.resetQuery2()
                 // setTimeout(()=>{
                 //     this.$refs.multipleTable2.clearSelection()
                 // },300)
             }else{
-                this.$modal.msgError("请先选择区域，供应商");
+                this.$modal.msgError("请先选择区域、供应商");
             }
         },
         /** 搜索按钮操作 */
@@ -770,8 +770,7 @@ export default {
                 "orderGoodsCode": this.queryParams2.orderGoodsCode,
                 "orderStatus":2,
                 "isContract":1,
-                "areaId": this.baseInfo.areaId,
-                // "warehouseId": this.baseInfo.deliveryWarehouseId,
+                "areaId": this.baseInfo.areaId, 
                 "supplierId": this.baseInfo.supplierId,
             }
             purchaseOrderPageApi(param).then(response => {
diff --git a/src/views/foodManage/purchaseManage/goodsInquiry/checkPrice.vue b/src/views/foodManage/purchaseManage/goodsInquiry/checkPrice.vue
index 4923c386..0a7f86b1 100644
--- a/src/views/foodManage/purchaseManage/goodsInquiry/checkPrice.vue
+++ b/src/views/foodManage/purchaseManage/goodsInquiry/checkPrice.vue
@@ -231,7 +231,8 @@ export default {
             console.log(row)
             let param = {
                 "inquiryId": this.baseInfo.inquiryId,
-                "supplierId":row.supplierId
+                "supplierId":row.supplierId,
+                "quoteAmount":row.quoteAmount
             }
             editInquirySupplierApi(param).then((response) => {
                 console.log('response',response); 
diff --git a/src/views/foodManage/purchaseManage/goodsInquiry/index.vue b/src/views/foodManage/purchaseManage/goodsInquiry/index.vue
index acc426e9..6c7b15d1 100644
--- a/src/views/foodManage/purchaseManage/goodsInquiry/index.vue
+++ b/src/views/foodManage/purchaseManage/goodsInquiry/index.vue
@@ -103,11 +103,11 @@
                 <span v-if="scope.row.status!=2">未中选</span>
             </template>
         </el-table-column> -->
-        <el-table-column label="中选供应商" align="center" prop="" :show-overflow-tooltip="true" />
-        <el-table-column label="中选金额(元)" align="center" prop="" :show-overflow-tooltip="true" width="120">
-            <!-- <template slot-scope="scope">
-               <span>{{ (scope.row.totalAmount/100).toFixed(2) }}</span>
-            </template>   -->
+        <el-table-column label="中选供应商" align="center" prop="supplierName" :show-overflow-tooltip="true" />
+        <el-table-column label="中选金额(元)" align="center" prop="bidTotalPrice" :show-overflow-tooltip="true" width="120">
+            <template slot-scope="scope">
+               <span>{{ (scope.row.bidTotalPrice/100).toFixed(2) }}</span>
+            </template>  
         </el-table-column>
         <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
             <template slot-scope="scope">
diff --git a/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue b/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue
index 5f2edc68..78cc50e2 100644
--- a/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue
+++ b/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue
@@ -25,7 +25,7 @@
                     </el-cascader>
                 </el-form-item>
                 <el-form-item label="送货仓库" prop="deliveryWarehouseId">
-                    <el-select v-model="baseInfo.deliveryWarehouseId" clearable placeholder="请选择送货仓库" :disabled="materialList.length>0" style="width: 100%;">
+                    <el-select v-model="baseInfo.deliveryWarehouseId" placeholder="请选择送货仓库" :disabled="materialList.length>0" style="width: 100%;">
                         <el-option v-for="item in wareHouseOptions"
                             :key="item.warehouseId"
                             :label="item.warehouseName"
@@ -731,7 +731,7 @@ export default {
         },
         //导入
         importPurchaseOrder(){
-            if(this.baseInfo.areaId!=undefined||this.baseInfo.deliveryWarehouseId!=undefined||this.baseInfo.deliverySupplierId!=undefined){
+            if(this.baseInfo.areaId!=undefined&&this.baseInfo.deliveryWarehouseId!=undefined&&this.baseInfo.deliverySupplierId!=undefined){
                 this.openImportDialog=true
                 this.resetQuery2()
                 // setTimeout(()=>{
diff --git a/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue b/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue
index ce072e64..2f4c760e 100644
--- a/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue
+++ b/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue
@@ -799,14 +799,14 @@ export default {
 
         //导入
         importPurchasePlan(){
-            if(this.baseInfo.areaId!=undefined||this.baseInfo.canteenId!=undefined||this.baseInfo.stallId!=undefined){
+            if(this.baseInfo.areaId!=undefined&&this.baseInfo.canteenId&&this.baseInfo.canteenId!=undefined){
                 this.openImportDialog=true
                 this.resetQuery2()
                 // setTimeout(()=>{
                 //     this.$refs.multipleTable2.clearSelection()
                 // },300)
             }else{
-                this.$modal.msgError("请先选择区域，食堂，档口");
+                this.$modal.msgError("请先选择区域、食堂");
             }
         },
         /** 搜索按钮操作 */
diff --git a/src/views/foodManage/purchaseManage/purchaseOrder/index.vue b/src/views/foodManage/purchaseManage/purchaseOrder/index.vue
index 40879cab..ea752c77 100644
--- a/src/views/foodManage/purchaseManage/purchaseOrder/index.vue
+++ b/src/views/foodManage/purchaseManage/purchaseOrder/index.vue
@@ -177,7 +177,7 @@
             <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit" v-if="scope.row.orderStatus==2||(scope.row.orderStatus==3&&scope.row.totalQualifiedNum<scope.row.totalNum)"
+                icon="el-icon-edit" v-if="scope.row.orderStatus==2||(scope.row.orderStatus==3&&scope.row.totalQualifiedNum<scope.row.totalNum&&scope.row.ifAllInspect==2)"
                 @click="handlePurchaseInspection(scope.row)"
             >生成采购验货</el-button>
             <el-button
diff --git a/src/views/foodManage/stockManage/warehouseIn/edit.vue b/src/views/foodManage/stockManage/warehouseIn/edit.vue
index cda6866c..6cd98005 100644
--- a/src/views/foodManage/stockManage/warehouseIn/edit.vue
+++ b/src/views/foodManage/stockManage/warehouseIn/edit.vue
@@ -17,7 +17,7 @@
                     </el-cascader>
                 </el-form-item>
                 <el-form-item label="货品仓库" prop="warehouseId">
-                    <el-select v-model="baseInfo.warehouseId" clearable :disabled="materialList.length>0" placeholder="请选择货品仓库" style="width: 100%;">
+                    <el-select v-model="baseInfo.warehouseId" :disabled="materialList.length>0" placeholder="请选择货品仓库" style="width: 100%;">
                         <el-option v-for="item in wareHouseOptions"
                             :key="item.warehouseId"
                             :label="item.warehouseName"
@@ -312,7 +312,7 @@ export default {
         
         pickerOptions2: {
             disabledDate(v) {
-                return v.getTime() < (new Date().getTime() - 86400000) ||v.getTime() > (new Date().getTime() + 3600 * 1000 * 24 * 60);//  - 86400000是否包括当天
+                return v.getTime() < (new Date().getTime() - 86400000) ||v.getTime() > (new Date().getTime() + 3600 * 1000 * 24 * 180);//  - 86400000是否包括当天
             }
         },
         pickerOptions3: {
@@ -462,7 +462,7 @@ export default {
                     this.$refs.multipleTable1.clearSelection() 
                 },300) 
             }else{
-                this.$modal.msgError("请先选择区域，仓库");
+                this.$modal.msgError("请先选择区域、仓库");
             } 
         }, 
         /** 搜索按钮操作 */
@@ -668,7 +668,7 @@ export default {
                 //     this.$refs.multipleTable2.clearSelection() 
                 // },300) 
             }else{
-                this.$modal.msgError("请先选择区域，仓库");
+                this.$modal.msgError("请先选择区域、仓库");
             }  
         },
         /** 搜索按钮操作 */
diff --git a/src/views/foodManage/stockManage/warehouseOut/edit.vue b/src/views/foodManage/stockManage/warehouseOut/edit.vue
index de689704..b187bd27 100644
--- a/src/views/foodManage/stockManage/warehouseOut/edit.vue
+++ b/src/views/foodManage/stockManage/warehouseOut/edit.vue
@@ -17,7 +17,7 @@
                     </el-cascader>
                 </el-form-item> 
                 <el-form-item label="货品仓库" prop="warehouseId">
-                    <el-select v-model="baseInfo.warehouseId" clearable :disabled="materialList.length>0" placeholder="请选择货品仓库" style="width: 100%;">
+                    <el-select v-model="baseInfo.warehouseId" :disabled="materialList.length>0" placeholder="请选择货品仓库" style="width: 100%;">
                         <el-option v-for="item in wareHouseOptions"
                             :key="item.warehouseId"
                             :label="item.warehouseName"
@@ -388,14 +388,14 @@ export default {
         },
         //添加货品
         addMaterial(){
-            if(this.baseInfo.areaId!=undefined||this.baseInfo.warehouseId!=undefined){
+            if(this.baseInfo.areaId!=undefined&&this.baseInfo.warehouseId&&this.baseInfo.warehouseId!=undefined){
                 this.openDialog=true
                 this.resetQuery()
                 setTimeout(()=>{
                     this.$refs.multipleTable1.clearSelection() 
                 },300) 
             }else{
-                this.$modal.msgError("请先选择区域，仓库");
+                this.$modal.msgError("请先选择区域、仓库");
             } 
         }, 
         /** 搜索按钮操作 */
@@ -579,14 +579,14 @@ export default {
 
 
         importMaterial(){
-            if(this.baseInfo.areaId!=undefined||this.baseInfo.warehouseId!=undefined){
+            if(this.baseInfo.areaId!=undefined&&this.baseInfo.warehouseId&&this.baseInfo.warehouseId!=undefined){
                 this.openImportDialog=true 
                 this.resetQuery2()
                 setTimeout(()=>{
                     this.$refs.multipleTable2.clearSelection() 
                 },300) 
             }else{
-                this.$modal.msgError("请先选择区域，仓库");
+                this.$modal.msgError("请先选择区域、仓库");
             }  
         },
           /** 搜索按钮操作 */
diff --git a/src/views/foodManage/stockManage/warehouseOut/index.vue b/src/views/foodManage/stockManage/warehouseOut/index.vue
index 41c0ee5c..4edb650e 100644
--- a/src/views/foodManage/stockManage/warehouseOut/index.vue
+++ b/src/views/foodManage/stockManage/warehouseOut/index.vue
@@ -49,6 +49,7 @@
                 <el-option label="报损出库" :value="2"></el-option> 
                 <el-option label="退货出库" :value="3"></el-option> 
                 <el-option label="调拨出库" :value="4"></el-option> 
+                <el-option label="即入即出" :value="5"></el-option> 
             </el-select> 
         </el-form-item>
         <el-form-item>
@@ -92,6 +93,7 @@
                 <span v-if="scope.row.outType==2">报损出库</span>
                 <span v-if="scope.row.outType==3">退货出库</span> 
                 <span v-if="scope.row.outType==4">调拨出库</span> 
+                <span v-if="scope.row.outType==5">即入即出</span> 
             </template>  
         </el-table-column>
         <!-- <el-table-column label="质检报告" align="center" prop="status" :show-overflow-tooltip="true" width="100">
diff --git a/src/views/foodManage/stockReport/inoutDetails/index.vue b/src/views/foodManage/stockReport/inoutDetails/index.vue
index 9ceb3f68..2a633026 100644
--- a/src/views/foodManage/stockReport/inoutDetails/index.vue
+++ b/src/views/foodManage/stockReport/inoutDetails/index.vue
@@ -58,6 +58,7 @@
                             <span v-if="scope.row.recordType==2&&scope.row.outType==2">报损出库</span>
                             <span v-if="scope.row.recordType==2&&scope.row.outType==3">退货出库</span>
                             <span v-if="scope.row.recordType==2&&scope.row.outType==4">调拨出库</span> 
+                            <span v-if="scope.row.recordType==2&&scope.row.outType==5">即入即出</span> 
                         </template> 
                     </el-table-column> 
                     <el-table-column label="业务单据" align="center" prop="recordId" :show-overflow-tooltip="true" width="180"/> 
diff --git a/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue b/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue
index 3e121249..f250efdf 100644
--- a/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue
+++ b/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue
@@ -178,7 +178,7 @@
 import { imgUpLoadTwo } from '@/api/system/upload'
 import { systemAreaTreeApi } from "@/api/base/stall";
 import { systemMaterialTreeApi,getMaterialListApi,supplierPageApi } from "@/api/foodManage/stockManage";
-import { getGoodsInquiryInfoApi,addGoodsInquiryApi,editGoodsQuotationApi,getGoodsInquiryDetailInfoApi } from "@/api/foodManage/purchaseManage";
+import { getGoodsInquiryInfoBySupplierIdApi,addGoodsInquiryApi,editGoodsQuotationApi,getGoodsInquiryDetailInfoApi } from "@/api/foodManage/purchaseManage";
 export default {
     name: "SupplierQuotationEdit",
     dicts: [],
@@ -281,10 +281,11 @@ export default {
         },
         getContractInfo(){
             let param = {
-                inquiryId:this.supplierQuotationData.inquiryId
+                inquiryId:this.supplierQuotationData.inquiryId,
+                supplierId:this.supplierQuotationData.supplierId
             }
             //查询
-            getGoodsInquiryInfoApi(param).then((response) => {
+            getGoodsInquiryInfoBySupplierIdApi(param).then((response) => {
                 this.baseInfo = response.data;
                 this.$set(this.baseInfo,'dateRange',[this.baseInfo.startTime,this.baseInfo.endTime])
                 this.materialList = this.baseInfo.detailList;
@@ -320,7 +321,7 @@ export default {
         handleSupplierChange(e){
             let param = {
                 inquiryId:this.supplierQuotationData.inquiryId,
-                supplierId:this.baseInfo.supplierId
+                supplierId:this.supplierQuotationData.supplierId
             }
             console.log("detailparam",param)
             //查询
diff --git a/src/views/foodManage/supplierFunction/supplierQuotation/index.vue b/src/views/foodManage/supplierFunction/supplierQuotation/index.vue
index b41ab662..616d8186 100644
--- a/src/views/foodManage/supplierFunction/supplierQuotation/index.vue
+++ b/src/views/foodManage/supplierFunction/supplierQuotation/index.vue
@@ -43,6 +43,7 @@
                 <span v-if="scope.row.bidStatus==4">未中标</span>
             </template>
         </el-table-column>
+        <el-table-column label="报价供应商" align="center" prop="supplierName" :show-overflow-tooltip="true" />
         <el-table-column label="报价开始时间" align="center" prop="startTime" :show-overflow-tooltip="true" />
         <el-table-column label="报价结束时间" align="center" prop="endTime" :show-overflow-tooltip="true" />
         <!-- <el-table-column label="决标时间" align="center" prop="bidTime" :show-overflow-tooltip="true"/> -->
diff --git a/vue.config.js b/vue.config.js
index 99209745..d6c814a7 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,7 +36,7 @@ module.exports = {
             // detail: https://cli.vuejs.org/config/#devserver-proxy
             [process.env.VUE_APP_BASE_API]: {
                 // target: `http://192.168.2.75:48380`,//旭
-                target: `http://192.168.0.34:48380`,//测试
+                target: `http://192.168.20.241:48380`,//测试
                 // target: `http://192.168.2.108:48380`,//测试
                 // target: `http://192.168.0.34:48380`,//测试
                 // target: `http://192.168.0.176:48380`,//