diff --git a/src/views/foodManage/pickManage/materialPicking/index.vue b/src/views/foodManage/pickManage/materialPicking/index.vue
index 9be3ac65..c5f97265 100644
--- a/src/views/foodManage/pickManage/materialPicking/index.vue
+++ b/src/views/foodManage/pickManage/materialPicking/index.vue
@@ -90,8 +90,7 @@
         </el-table-column>
         <el-table-column label="单据编号" align="center" prop="fetchMaterialCode" :show-overflow-tooltip="true" />
         <el-table-column label="采购领料标题" align="center" prop="title" :show-overflow-tooltip="true" /> 
-
-        <!-- <el-table-column label="领料单状态" align="center" prop="commitStatus" :show-overflow-tooltip="true" width="100">
+        <el-table-column label="领料单状态" align="center" prop="commitStatus" :show-overflow-tooltip="true" width="100">
             <template slot-scope="scope">
                 <span v-if="scope.row.commitStatus==1">待提交</span>
                 <span v-if="scope.row.commitStatus==2">已提交</span> 
@@ -99,10 +98,12 @@
         </el-table-column>
         <el-table-column label="领取状态" align="center" prop="fetchStatus" :show-overflow-tooltip="true" width="100">
             <template slot-scope="scope">
-                <span v-if="scope.row.fetchStatus==1">未领取</span>
-                <span v-if="scope.row.fetchStatus==2">已领取</span> 
+                <span v-if="scope.row.fetchStatus==1">已领取</span>
+                <span v-if="scope.row.fetchStatus==2">未领取</span> 
             </template>  
         </el-table-column>
+        <!-- 
+      
         <el-table-column label="领料单审核" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="100">
             <template slot-scope="scope"> 
                 <span v-if="scope.row.approveStatus==1">待审批</span>
diff --git a/src/views/foodManage/purchaseManage/contractList/edit.vue b/src/views/foodManage/purchaseManage/contractList/edit.vue
index df6a1647..65a7ce0a 100644
--- a/src/views/foodManage/purchaseManage/contractList/edit.vue
+++ b/src/views/foodManage/purchaseManage/contractList/edit.vue
@@ -11,6 +11,7 @@
                 <el-form-item label="所属区域" prop="areaId">
                     <el-cascader v-model="baseInfo.areaId"
                         :options="treeAreaOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
+                        :disabled="contractMaterialList.length>0"
                         :props="{  
                         emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
                         checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
diff --git a/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue b/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue
index ebb364b7..3cbd3dae 100644
--- a/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue
+++ b/src/views/foodManage/purchaseManage/goodsInquiry/edit.vue
@@ -33,6 +33,7 @@
                 <el-form-item label="所属区域" prop="areaId">
                     <el-cascader v-model="baseInfo.areaId"
                         :options="treeAreaOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
+                        :disabled="materialList.length>0"
                         :props="{
                         emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
                         checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
@@ -282,8 +283,7 @@ export default {
             getGoodsInquiryInfoApi(param).then((response) => {
                 this.baseInfo = response.data;
                 console.log("this.baseInfo",this.baseInfo);
-                this.$set(this.baseInfo,'dateRange',[this.baseInfo.startTime,this.baseInfo.endTime])
-                this.$set(this.baseInfo,'supplierIds',this.baseInfo.supplierIds.split(','))
+                this.$set(this.baseInfo,'dateRange',[this.baseInfo.startTime,this.baseInfo.endTime]) 
                 this.materialList = this.baseInfo.detailList;
                 supplierPageApi({ isPaging:1,areaIdList:[] }).then((response) => {
                     this.supplierOptions = response.rows||[];
diff --git a/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue b/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue
index e5707750..bb8f0106 100644
--- a/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue
+++ b/src/views/foodManage/purchaseManage/purchaseInspection/edit.vue
@@ -16,6 +16,7 @@
                 <el-form-item label="所属区域" prop="areaId">
                     <el-cascader v-model="baseInfo.areaId"
                         :options="treeAreaOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
+                        :disabled="materialList.length>0"
                         :props="{  
                         emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
                         checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
@@ -24,7 +25,7 @@
                     </el-cascader>
                 </el-form-item>
                 <el-form-item label="送货仓库" prop="deliveryWarehouseId">
-                    <el-select v-model="baseInfo.deliveryWarehouseId" clearable placeholder="请选择送货仓库" style="width: 100%;">
+                    <el-select v-model="baseInfo.deliveryWarehouseId" clearable placeholder="请选择送货仓库" :disabled="materialList.length>0" style="width: 100%;">
                         <el-option v-for="item in wareHouseOptions"
                             :key="item.warehouseId"
                             :label="item.warehouseName"
@@ -33,7 +34,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="送货供应商" prop="deliverySupplierId">
-                    <el-select v-model="baseInfo.deliverySupplierId" placeholder="请选择供应商" style="width: 240px;">
+                    <el-select v-model="baseInfo.deliverySupplierId" placeholder="请选择供应商" :disabled="materialList.length>0" style="width: 240px;">
                         <el-option v-for="item in supplierOptions"
                             :key="item.supplierId"
                             :label="item.supplierName"
diff --git a/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue b/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue
index e3407f3c..97a110a8 100644
--- a/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue
+++ b/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue
@@ -19,6 +19,7 @@
                 <el-form-item label="所属区域" prop="areaId">
                     <el-cascader v-model="baseInfo.areaId"
                         :options="treeAreaOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
+                        :disabled="materialList.length>0"
                         :props="{  
                         emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
                         checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
@@ -627,15 +628,25 @@ export default {
         confirmChosen(){
             if(this.batchChosenMaterial.length>0){
                 this.loading = true 
-                let items = [...this.materialList,...this.batchChosenMaterial] 
-                let uniqueItems = items.filter((item, index, array) => {
-                    return array.findIndex((t) => (t.materialId === item.materialId)) === index;
-                });
-                this.materialList = uniqueItems;
-                setTimeout(()=>{
-                    this.loading = false
-                    this.openDialog=false
-                },500) 
+                if(this.baseInfo.purchasePlanCode&&this.baseInfo.purchasePlanCode!=""){
+                    this.$modal.confirm('是否确认覆盖货品明细?').then(() => {
+                        this.baseInfo.purchasePlanCode = null
+                        this.materialList = this.batchChosenMaterial
+                        this.loading = false
+                        this.openDialog=false
+                    }).catch(() => {}); 
+                }else{
+                    let items = [...this.materialList,...this.batchChosenMaterial] 
+                    let uniqueItems = items.filter((item, index, array) => {
+                        return array.findIndex((t) => (t.materialId === item.materialId)) === index;
+                    });
+                    this.materialList = uniqueItems;
+                    setTimeout(()=>{
+                        this.loading = false
+                        this.openDialog=false
+                    },500) 
+                }
+                
             } 
         },
         //保存草稿
diff --git a/src/views/foodManage/purchaseManage/purchasePlan/edit.vue b/src/views/foodManage/purchaseManage/purchasePlan/edit.vue
index 39335b9b..43882dab 100644
--- a/src/views/foodManage/purchaseManage/purchasePlan/edit.vue
+++ b/src/views/foodManage/purchaseManage/purchasePlan/edit.vue
@@ -24,6 +24,7 @@
                 <el-form-item label="所属区域" prop="areaId">
                     <el-cascader v-model="baseInfo.areaId"
                         :options="treeAreaOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
+                        :disabled="materialList.length>0"
                         :props="{  
                         emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
                         checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
diff --git a/src/views/foodManage/stockManage/depotManage/materialStock.vue b/src/views/foodManage/stockManage/depotManage/materialStock.vue
index 13443ca2..5fb15c0e 100644
--- a/src/views/foodManage/stockManage/depotManage/materialStock.vue
+++ b/src/views/foodManage/stockManage/depotManage/materialStock.vue
@@ -82,7 +82,7 @@
       <el-table-column label="库存状态" align="center" prop="inventoryStatus" :show-overflow-tooltip="true" width="120">
         <template slot-scope="scope">
           <span v-if="scope.row.inventoryStatus==1">正常</span>
-          <span v-if="scope.row.inventoryStatus==2">即将缺货</span>
+          <span v-if="scope.row.inventoryStatus==2">不足</span>
           <span v-if="scope.row.inventoryStatus==3">超额</span>
         </template>
       </el-table-column>
diff --git a/src/views/foodManage/stockManage/totalStock/index.vue b/src/views/foodManage/stockManage/totalStock/index.vue
index 6b63c8a4..4f155717 100644
--- a/src/views/foodManage/stockManage/totalStock/index.vue
+++ b/src/views/foodManage/stockManage/totalStock/index.vue
@@ -82,7 +82,7 @@
       <el-table-column label="库存状态" align="center" prop="inventoryStatus" :show-overflow-tooltip="true" width="120">
         <template slot-scope="scope">
           <span v-if="scope.row.inventoryStatus==1" style="color: #1890ff;">正常</span>
-          <span v-if="scope.row.inventoryStatus==2" style="color: #ffc833;">即将缺货</span>
+          <span v-if="scope.row.inventoryStatus==2" style="color: #ffc833;">不足</span>
           <span v-if="scope.row.inventoryStatus==3" style="color: red;">超额</span>
         </template>
       </el-table-column>
diff --git a/src/views/foodManage/stockManage/warehouseIn/edit.vue b/src/views/foodManage/stockManage/warehouseIn/edit.vue
index e8df81d0..06e977e5 100644
--- a/src/views/foodManage/stockManage/warehouseIn/edit.vue
+++ b/src/views/foodManage/stockManage/warehouseIn/edit.vue
@@ -494,15 +494,24 @@ export default {
         confirmChosen(){
             if(this.batchChosenMaterial.length>0){
                 this.loading = true
-                let items = [...this.materialList,...this.batchChosenMaterial] 
-                let uniqueItems = items.filter((item, index, array) => {
-                    return array.findIndex((t) => (t.materialId === item.materialId)) === index;
-                });
-                this.materialList = uniqueItems;
-                setTimeout(()=>{
-                    this.loading = false
-                    this.openDialog=false
-                },500) 
+                if(this.baseInfo.relateOrderGoodsId&&this.baseInfo.relateOrderGoodsId!=""){
+                    this.$modal.confirm('是否确认覆盖货品明细?').then(() => {
+                        this.baseInfo.relateOrderGoodsId = null
+                        this.materialList = this.batchChosenMaterial
+                        this.loading = false
+                        this.openDialog=false
+                    }).catch(() => {}); 
+                }else{
+                    let items = [...this.materialList,...this.batchChosenMaterial] 
+                    let uniqueItems = items.filter((item, index, array) => {
+                        return array.findIndex((t) => (t.materialId === item.materialId)) === index;
+                    });
+                    this.materialList = uniqueItems;
+                    setTimeout(()=>{
+                        this.loading = false
+                        this.openDialog=false
+                    },500) 
+                } 
             } 
         },
         //保存草稿
@@ -684,8 +693,8 @@ export default {
                             this.$set(item,"unitPrice",Number(item.singlePrice)/100)
                             this.$set(item,"purNum",item.orderNum)
                         })
-                        // this.baseInfo.relateOrderGoodsId = this.importRow.orderGoodsCode; 
-                        // this.$set(this.baseInfo,"remark","导入采购订单")
+                        this.baseInfo.relateOrderGoodsId = this.importRow.orderGoodsCode; 
+                        this.$set(this.baseInfo,"remark","导入采购订单")
                         setTimeout(()=>{ 
                             this.openImportDialog=false
                         },500)  
diff --git a/src/views/foodManage/stockReport/stockWarning/index.vue b/src/views/foodManage/stockReport/stockWarning/index.vue
index 9b9bca93..dff8a398 100644
--- a/src/views/foodManage/stockReport/stockWarning/index.vue
+++ b/src/views/foodManage/stockReport/stockWarning/index.vue
@@ -51,7 +51,7 @@
         <el-table-column label="库存状态" align="center" prop="inventoryStatus" :show-overflow-tooltip="true" width="120">
             <template slot-scope="scope">
                 <span v-if="scope.row.inventoryStatus==1" style="color: #1890ff;">正常</span>
-                <span v-if="scope.row.inventoryStatus==2" style="color: #ffc833;">即将缺货</span>
+                <span v-if="scope.row.inventoryStatus==2" style="color: #ffc833;">不足</span>
                 <span v-if="scope.row.inventoryStatus==3" style="color: red;">超额</span>
             </template>
         </el-table-column>