diff --git a/src/api/basic/workPlace/SysWorkplaceFreight.js b/src/api/basic/workPlace/SysWorkplaceFreight.js
index 1ac6246e..6757473d 100644
--- a/src/api/basic/workPlace/SysWorkplaceFreight.js
+++ b/src/api/basic/workPlace/SysWorkplaceFreight.js
@@ -62,6 +62,16 @@ export function printAllFreight(query) {
     responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
   });
 }
+
+export function printRegion(query) {
+  return axios({
+    url: "/udiwms/WorkplaceFreight/printRegion",
+    method: "post",
+    data: query,
+    headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
+    responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
+  });
+}
 // export function printAllFreight(query) {
 //   return axios({
 //     url: "/udiwms/WorkplaceFreight/printAllFreight",
diff --git a/src/api/basic/workPlace/regionManage.js b/src/api/basic/workPlace/regionManage.js
index 32efdc76..892fc35b 100644
--- a/src/api/basic/workPlace/regionManage.js
+++ b/src/api/basic/workPlace/regionManage.js
@@ -9,3 +9,30 @@ export function getRegions(query) {
     params: query
   })
 }
+
+
+
+//新增槽位区域
+export function addRegion(query) {
+  return axios({
+    url: "/udiwms/sysWorkplaceRegion/addRegion",
+    method: "post",
+    data: query
+  });
+}
+
+export function editRegion(query) {
+  return axios({
+    url: "/udiwms/sysWorkplaceRegion/editRegion",
+    method: "post",
+    data: query
+  });
+}
+
+export function delRegion(query) {
+  return axios({
+    url: "/udiwms/sysWorkplaceRegion/delRegion",
+    method: "post",
+    data: query
+  });
+}
diff --git a/src/views/basic/workplace/addRegionDialog.vue b/src/views/basic/workplace/addRegionDialog.vue
index 295fef69..6572d824 100644
--- a/src/views/basic/workplace/addRegionDialog.vue
+++ b/src/views/basic/workplace/addRegionDialog.vue
@@ -7,6 +7,7 @@
         <el-col :span="12" class="el-col">
           <el-form-item label="区域编号:" prop="mac" class="query-form-item">
             <el-input
+              :disabled="type == 2"
               v-model="formData.regionCode" style="width: 80%"
               auto-complete="off"
               placeholder="请输入区域编号"
@@ -26,7 +27,7 @@
 
 
     </el-form>
-    <div slot="footer" class="dialog-footer">
+    <div slot="footer" class="dialog-footer" style="margin-top: 50px">
       <el-button @click.native="hideForm">取消</el-button>
       <el-button
         type="primary"
@@ -41,6 +42,8 @@
 <script>
 
 
+import { addRegion, editRegion } from '@/api/basic/workPlace/regionManage'
+import { isBlank } from '@/utils/strUtil'
 
 export default {
   props: {
@@ -48,7 +51,11 @@ export default {
       type: Function,
       required: true
     },
-    rowData:{
+    rowData: {
+      type: Object,
+      required: true
+    },
+    type: {
       type: Object,
       required: true
     }
@@ -56,24 +63,60 @@ export default {
   data() {
     return {
       formData: {
-        timeout:0,
-      },
+        regionCode: null,
+        regionName: ''
+      }
     }
   },
   methods: {
-    formSubmit(){
+    formSubmit() {
+      if (isBlank(this.formData.regionCode) || isBlank(this.formData.regionName)) {
+        return this.$message.error('区域编码或区域名称为空')
+      }
+      if (this.type == 2) {
+        editRegion(this.formData).then(res => {
+          if (res.code == 20000) {
+            this.$message.success('修改成功')
+            this.closeDialog()
+          } else {
+            this.closeDialog()
+            return this.$message.error(res.message)
+          }
+        })
+      } else {
+        addRegion(this.formData).then(res => {
+          if (res.code == 20000) {
+            this.$message.success('新增成功')
+            this.closeDialog()
+          } else {
+            this.closeDialog()
+            return this.$message.error(res.message)
+          }
+        })
+      }
 
     },
-    hideForm(){
+    hideForm() {
       this.closeDialog()
     }
   },
   created() {
+    if (this.type == 2) {
+      this.formData = this.rowData
+    } else {
+      this.formData = {
+        regionCode: null,
+        regionName: ''
+      }
+    }
   }
 
 }
 </script>
 
 <style scoped>
-
+.dialog-footer {
+  display: flex;
+  justify-content: center;
+}
 </style>
diff --git a/src/views/basic/workplace/addWorkplaceFreightDialog.vue b/src/views/basic/workplace/addWorkplaceFreightDialog.vue
index f6059de4..60e8b11b 100644
--- a/src/views/basic/workplace/addWorkplaceFreightDialog.vue
+++ b/src/views/basic/workplace/addWorkplaceFreightDialog.vue
@@ -57,14 +57,25 @@
 
       <el-row :gutter="24">
       <el-col :span="12" class="el-col">
-       <el-form-item label="区域编码:" prop="freightRow" class="query-form-item">
-              <el-input-number
-                v-model="formData.freightRow" style="width: 80%"
-                auto-complete="off"
-                :min="1"
-                :max="30"
-              ></el-input-number>
-            </el-form-item>
+       <!--<el-form-item label="区域编码:" prop="freightRow" class="query-form-item">-->
+       <!--       <el-input-number-->
+       <!--         v-model="formData.freightRow" style="width: 80%"-->
+       <!--         auto-complete="off"-->
+       <!--         :min="1"-->
+       <!--         :max="30"-->
+       <!--       ></el-input-number>-->
+       <!--     </el-form-item>-->
+
+        <el-form-item label="区域编码:" prop="freightRow" class="query-form-item">
+          <el-select v-model="formData.freightRow" filterable placeholder="请选择"  style="width: 80%">
+            <el-option
+              v-for="item in regions"
+              :key="item.regionCode"
+              :label="item.regionName"
+              :value="item.regionCode">
+            </el-option>
+          </el-select>
+        </el-form-item>
       </el-col>
 
       <!--  <el-col :span="12" class="el-col">-->
@@ -87,6 +98,19 @@
     >
       <el-table-column type="index" label="序号"></el-table-column>
       <el-table-column label="摆货层编号" prop="code"></el-table-column>
+      <el-table-column label="摆货层名称" prop="layerName">
+        <template slot-scope="scope">
+          <div style="display: flex; justify-content: center; align-items: center; width: 100%;">
+            <el-input
+              size="small"
+              v-model="scope.row.layerName"
+              style="width: 100%"
+              :disabled="scope.$index !== selectedIndex"
+            ></el-input>
+          </div>
+        </template>
+      </el-table-column>
+
       <!--<el-table-column label="摆货层高度" prop="height">-->
       <!--  <template slot-scope="scope">-->
       <!--    <div style="display: flex; justify-content: center; align-items: center; width: 80%;">-->
@@ -169,6 +193,7 @@ import {
 } from '@/api/basic/workPlace/SysWorkplaceFreight'
 import { deleteLayer, getLayerCode, getLayerList, saveLayer } from '@/api/basic/workPlace/SysWorkplaceLayer'
 import { isBlank } from '@/utils/strUtil'
+import { getRegions } from '@/api/basic/workPlace/regionManage'
 
 export default {
   props: {
@@ -214,6 +239,12 @@ export default {
       saveStatus: false, //记录保存状态
       selectedIndex: null,//记录下标位置
       remarkStatus: false,
+      //区域
+      regions:[],
+      regionQuery:{
+        page:1,
+        limit:10
+      },
       // {
       //   code:null,
       //     queueNum:null,
@@ -298,7 +329,8 @@ export default {
           if (res.code == 20000) {
             this.layerList.push({
               code: res.data,
-              queueNum: null
+              queueNum: null,
+              layerName:""
             })
           } else {
             this.$message.error('系统繁忙')
@@ -313,7 +345,8 @@ export default {
         let code = this.createLayerCode(lastLayer)
         this.layerList.push({
           code: code,
-          queueNum: null
+          queueNum: null,
+          layerName:""
         })
       }
 
@@ -392,7 +425,14 @@ export default {
 
       })
 
-    }
+    },
+    getRegionList(){
+      getRegions(this.query).then(res => {
+        if (res.code == 20000){
+          this.regions = res.data.list
+        }
+      })
+    },
   },
   created() {
     if (this.rowData != null) {
@@ -407,6 +447,7 @@ export default {
       this.getCode()
     }
     this.findWorkPlace('')
+    this.getRegionList()
 
   }
 }
diff --git a/src/views/basic/workplace/freightManage.vue b/src/views/basic/workplace/freightManage.vue
index f27b0adf..516a094b 100644
--- a/src/views/basic/workplace/freightManage.vue
+++ b/src/views/basic/workplace/freightManage.vue
@@ -11,6 +11,8 @@
             </span>
             <span>
               <el-button-group style="float: right">
+              <el-button style="margin-bottom: -5px " @click="printRegion()" type="primary">打印区域
+              </el-button>
               <el-button style="margin-bottom: -5px " @click="printFreight(1,null)" type="primary">打印全部
               </el-button>
               <el-button style="margin-bottom: -5px " @click="onAddFreight" type="primary">新增取货架
@@ -94,17 +96,18 @@
             @row-click="handChangeLayer"
           >
             <el-table-column
+              width="100"
               prop="code"
               label="摆货层编码"
             >
             </el-table-column>
-            <!--<el-table-column-->
-            <!--  width="120"-->
-            <!--  prop="queueNum"-->
-            <!--  label="出货槽数量"-->
-            <!--&gt;-->
-            <!--</el-table-column>-->
-            <el-table-column label="操作" width="90">
+            <el-table-column
+              width="100"
+              prop="name"
+              label="摆货层名称"
+            >
+            </el-table-column>
+            <el-table-column label="操作" width="90" fixed="right">
               <template slot-scope="scope">
                 <el-button
                   type="text"
@@ -437,6 +440,10 @@ export default {
         window.open(url)
       })
     },
+    printRegion(){
+      //打印区域
+
+    },
     closeDialog() {
       this.getList()
       this.getLayers()
diff --git a/src/views/basic/workplace/regionManage.vue b/src/views/basic/workplace/regionManage.vue
index 02222932..acdf2e8e 100644
--- a/src/views/basic/workplace/regionManage.vue
+++ b/src/views/basic/workplace/regionManage.vue
@@ -19,15 +19,15 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="所属工位:" class="query-form-item">
-            <el-select v-model="query.workplaceStatus" placeholder="选择所属工位" clearable style="width: 65%">
-              <el-option label="暂停" :value="0"></el-option>
-              <el-option label="启用" :value="1"></el-option>
-            </el-select>
-          </el-form-item>
+        <!--<el-col :span="8">-->
+        <!--  <el-form-item label="所属工位:" class="query-form-item">-->
+        <!--    <el-select v-model="query.workplaceStatus" placeholder="选择所属工位" clearable style="width: 65%">-->
+        <!--      <el-option label="暂停" :value="0"></el-option>-->
+        <!--      <el-option label="启用" :value="1"></el-option>-->
+        <!--    </el-select>-->
+        <!--  </el-form-item>-->
 
-        </el-col>
+        <!--</el-col>-->
       </el-row>
     </el-form>
 
@@ -53,13 +53,13 @@
           <el-button
             type="text"
             size="small"
-            @click.native.stop="bingLed(scope.row)"
+            @click.native.stop="editRegion(scope.row)"
           >编辑
           </el-button>
           <el-button
             type="text"
             size="small"
-            @click.native.stop="bingLed(scope.row)"
+            @click.native.stop="delRegion(scope.row)"
           >删除
           </el-button>
           <el-button
@@ -89,7 +89,11 @@
     append-to-body
     @close=""
   >
-    <addRegionDialog>
+    <addRegionDialog
+      :closeDialog="closeDialog"
+      :type="type"
+      :rowData="rowData"
+    >
 
     </addRegionDialog>
   </el-dialog>
@@ -99,7 +103,7 @@
 
 <script>
 
-import { getRegions } from '@/api/basic/workPlace/regionManage'
+import { getRegions,delRegion } from '@/api/basic/workPlace/regionManage'
 import addRegionDialog from "./addRegionDialog"
 
 export default {
@@ -114,6 +118,8 @@ export default {
       loading: false,
       regionList:[],
       addRegionVisible: false,
+      type:1,
+      rowData:null
     }
   },
   methods: {
@@ -142,7 +148,35 @@ export default {
       })
     },
     addRegion(){
+      this.type = 1
+      this.addRegionVisible = true
+    },
+    editRegion(row){
+      this.type = 2
+      this.rowData = row
       this.addRegionVisible = true
+    },
+    delRegion(row){
+        this.$confirm("是否确定移除该槽位区域?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          delRegion(row).then(res => {
+            if (res.code == 20000){
+              this.getList()
+              return this.$message.success("删除成功")
+            }else {
+              return this.$message.error("删除失败")
+            }
+          })
+        }).catch(() => {
+
+        })
+    },
+    closeDialog(){
+      this.addRegionVisible = false
+      this.getList()
     }
   },
   mounted() {
diff --git a/src/views/inout/DialogNewReviewOrder.vue b/src/views/inout/DialogNewReviewOrder.vue
index b1882435..72cf0300 100644
--- a/src/views/inout/DialogNewReviewOrder.vue
+++ b/src/views/inout/DialogNewReviewOrder.vue
@@ -21,7 +21,7 @@
         <el-row>
           <el-col :span="18">
             <el-form-item prop="fromCorp" label="单据编号:">
-              <el-input v-model="formData.billNo" auto-complete="off"
+              <el-input v-model="formData.billNo" auto-complete="off"    ref='inputRef'
                         @keypress.enter.native="orderEnterKey($event)"
               ></el-input>
             </el-form-item>
@@ -88,7 +88,7 @@
                 placeholder="请输入UDI码"
                 @focus="getInputFocus($event)"
                 @keypress.enter.native="enterKey($event)"
-                ref='inputRef'
+                ref='inputRef1'
                 style="ime-mode:disabled"
                 type="tel"
                 v-model="udiCode"
@@ -216,8 +216,8 @@ export default {
       }
       enterCodeWeb(tQuery).then((response) => {
         if (response.code === 20000) {
-          this.$refs.inputRef.focus();
-          this.$refs.inputRef.select();
+          this.$refs.inputRef1.focus();
+          this.$refs.inputRef1.select();
           this.udiCode = response.data.code;
           this.originCode = '';
           this.addCode();
@@ -253,8 +253,8 @@ export default {
               type: 'warning',
               closeOnClickModal: true,
               callback: action => {
-                this.$refs.inputRef.focus();
-                this.$refs.inputRef.select();
+                this.$refs.inputRef1.focus();
+                this.$refs.inputRef1.select();
               }
             });
           }
@@ -264,6 +264,7 @@ export default {
     },
 
     searchOrder() {
+
       let query = {
         billNo: this.formData.billNo
       };
@@ -275,7 +276,10 @@ export default {
             this.formData = response.data.orderEntity;
             this.orderQuery = this.formData;
             this.isEntrust = response.data.entrust;
+            this.$refs.inputRef1.focus()
           } else {
+            this.formData.billNo = null
+            this.$refs.inputRef.focus()
             this.$message.error(response.message);
           }
 
@@ -323,14 +327,14 @@ export default {
               this.$message.success("匹配成功！");
               if (event == null) {
               } else event.target.select();
-              this.$refs.inputRef.select();
+              this.$refs.inputRef1.select();
             }
 
           } else {
             this.$message.error(response.message);
             if (event == null) {
             } else event.target.select();
-            this.$refs.inputRef.select();
+            this.$refs.inputRef1.select();
           }
 
 
@@ -498,6 +502,8 @@ export default {
       }
     };
     inputer.focus();
+    this.$refs.inputRef.focus();
+
   },
   created() {