diff --git a/src/views/basic/workplace/addWorkplaceFreightDialog.vue b/src/views/basic/workplace/addWorkplaceFreightDialog.vue
index 6dfd2f72..455ee029 100644
--- a/src/views/basic/workplace/addWorkplaceFreightDialog.vue
+++ b/src/views/basic/workplace/addWorkplaceFreightDialog.vue
@@ -14,8 +14,9 @@
           </el-form-item>
         </el-col>
         <el-col :span="12" class="el-col">
-          <el-form-item label="货架说明:"  class="query-form-item">
+          <el-form-item label="货架说明:" class="query-form-item">
             <el-input
+              :disabled="remarkStatus"
               v-model="formData.remark" style="width: 80%"
               auto-complete="off"
               placeholder="请输入货架名称"
@@ -27,6 +28,7 @@
         <el-col :span="12" class="el-col">
           <el-form-item label="所属工位:" class="query-form-item" prop="workPlaceIdFk">
             <el-select
+              disabled
               v-model="formData.workPlaceIdFk"
               filterable
               remote
@@ -64,7 +66,7 @@
               highlight-current-row @current-change="handCurrentChange"
     >
       <el-table-column type="index" label="序号"></el-table-column>
-      <el-table-column label="摆货层编号" prop="code" ></el-table-column>
+      <el-table-column label="摆货层编号" prop="code"></el-table-column>
       <el-table-column label="出货槽数量" prop="queueNum">
         <template slot-scope="scope">
           <div style="display: flex; justify-content: center; align-items: center; width: 100%;">
@@ -132,6 +134,7 @@ import {
   updateWorkplaceFreight
 } from '@/api/basic/workPlace/SysWorkplaceFreight'
 import { getLayerCode, getLayerList, saveLayer } from '@/api/basic/workPlace/SysWorkplaceLayer'
+import { isBlank } from '@/utils/strUtil'
 
 export default {
   props: {
@@ -142,15 +145,19 @@ export default {
     rowData: {
       type: Object,
       required: true
+    },
+    workplaceId: {
+      type: Object,
+      required: true
     }
   },
   data() {
     return {
       formData: {
-        code: "",
-        name: "",
-        remark: "",
-        workPlaceIdFk: "",
+        code: '',
+        name: '',
+        remark: '',
+        workPlaceIdFk: ''
       },
       freightData: null,
       workPlaces: [],
@@ -160,21 +167,21 @@ export default {
         // ],
         workPlaceIdFk: [
           { required: true, message: '请选择所属工位', trigger: 'blur' }
-        ],
+        ]
       },
-      LayerQuery:{
+      LayerQuery: {
         page: 1,
         limit: 10,
-        freightCode:""
+        freightCode: ''
       },
-      layerList:[],
+      layerList: [],
       saveStatus: false, //记录保存状态
-      addStatus: false, //记录保存状态
       selectedIndex: null,//记录下标位置
-    // {
-    //   code:null,
-    //     queueNum:null,
-    // }
+      remarkStatus: false,
+      // {
+      //   code:null,
+      //     queueNum:null,
+      // }
     }
   },
   methods: {
@@ -185,44 +192,44 @@ export default {
         key: val,
         page: 1,
         limit: 10,
-        workPlaceClass:2
+        workPlaceClass: 2
       }
       filterWorkOptimize(query)
         .then((response) => {
-          this.workPlaces = response.data || [];
+          this.workPlaces = response.data || []
         })
         .catch(() => {
-          this.options.getWorkPlaceList = [];
-        });
+          this.options.getWorkPlaceList = []
+        })
     },
-    getCode(){
+    getCode() {
       createFreightCode().then(res => {
-        if (res.code == 20000){
+        if (res.code == 20000) {
           this.formData.code = res.data
-        }else {
-          this.formData = ""
+        } else {
+          this.formData = ''
         }
       })
     },
-    formSubmit(){
+    formSubmit() {
       // this.formData.workPlaceIdFk = this.workplaceId
       this.$refs['dataForm'].validate((rules) => {
         if (rules) {
-          if (this.rowData != null){
+          if (this.rowData != null) {
             updateWorkplaceFreight(this.formData).then(res => {
-              if (res.code == 20000){
-                this.$message.success("更新成功")
+              if (res.code == 20000) {
+                this.$message.success('更新成功')
                 this.closeDialog()
-              }else {
+              } else {
                 this.$message.error(res.message)
               }
             })
-          }else {
+          } else {
             addWorkplaceFreight(this.formData).then(res => {
-              if (res.code == 20000){
-                this.$message.success("新增成功")
+              if (res.code == 20000) {
+                this.$message.success('新增成功')
                 this.closeDialog()
-              }else {
+              } else {
                 this.$message.error(res.message)
               }
             })
@@ -231,73 +238,101 @@ export default {
         }
       })
     },
-    hideForm(){
+    hideForm() {
       this.closeDialog()
     },
 
     //新增摆货层
-    addWorkplaceLayer(){
-      if(this.addStatus == true ){
-        this.$message.error('请先保存当摆货层在进行添加')
-        return
+    addWorkplaceLayer() {
+      if (isBlank(this.formData.remark)){
+        return this.$message.error('请输入货架说明')
       }
-      getLayerCode({freightCode :  this.formData.code } ).then(res => {
-        if (res.code == 20000){
-          this.layerList.push({
-            code: res.data,
-            queueNum: null,
-            freightCode:this.formData.code,
-            workPlaceIdFk:this.formData.code.workPlaceIdFk,
-            remark:this.formData.remark
-          })
-        }else {
-          this.$message.error("系统繁忙")
+      if (this.saveStatus == true){
+        return this.$message.error('请完成编辑摆货层')
+      }
+      //摆货层列表
+      if (this.layerList.length == 0) {
+        getLayerCode({ freightCode: this.formData.code }).then(res => {
+          if (res.code == 20000) {
+            this.layerList.push({
+              code: res.data,
+              queueNum: null
+            })
+          } else {
+            this.$message.error('系统繁忙')
+          }
+        })
+      } else {
+        //不为空
+        let lastLayer = this.layerList[this.layerList.length - 1]
+        if (lastLayer.queueNum == null || lastLayer.queueNum == 0) {
+          return this.$message.error('请编辑上层摆货层出货槽数量')
         }
-      })
-      this.addStatus = true
+        let code = this.createLayerCode(lastLayer)
+        this.layerList.push({
+          code: code,
+          queueNum: null
+        })
+      }
+
+      // this.addStatus = true
+    },
+    createLayerCode(lastLayer) {
+      let code
+      code = lastLayer.code.replace(this.formData.code, '')
+      code = parseInt(code, 10) + 1
+      let incrementedValue = code.toString().padStart(2, '0')
+      code = this.formData.code + incrementedValue
+      return code
+
     },
     //编辑
-    handleEdit(index, val){
-      if(this.saveStatus == true ){
+    handleEdit(index, val) {
+      if (this.saveStatus == true) {
         this.$message.error('请先保存当前产品标识编辑')
         return
       }
       this.selectedIndex = index
       this.saveStatus = true
     },
-    handleSave(row){
-      if (row.queueNum == null || row.queueNum ==0){
-        return this.$message.error("请输入出货槽数量")
+    handleSave(row) {
+      if (row.queueNum == null || row.queueNum == 0) {
+        return this.$message.error('请输入出货槽数量')
       }
+      row.freightCode = this.formData.code
+      row.workPlaceIdFk = this.formData.workPlaceIdFk
+      row.remark = this.formData.remark
+      this.remarkStatus = true
       saveLayer(row).then(res => {
         if (res.code == 20000){
           this.selectedIndex = null
           this.saveStatus = false
-          this.closeDialog()
-          this.$message.success("新增成功!")
+          // this.closeDialog()
+          this.$message.success("保存成功!")
         }
       })
     },
-    getLayers(){
+    getLayers() {
       this.LayerQuery.freightCode = this.formData.code
       getLayerList(this.LayerQuery).then(res => {
-        if (res.code == 20000){
+        if (res.code == 20000) {
           this.layerList = res.data.list || []
-        }else {
+        } else {
           this.layerList = []
         }
       })
-    },
+    }
   },
   created() {
-    if (this.rowData != null){
+    if (this.rowData != null) {
       this.formData = this.rowData
       this.formData.workPlaceIdFk = String(this.rowData.workPlaceIdFk)
       this.getLayers()
-    }else {
+    } else {
+      this.formData.workPlaceIdFk = String(this.workplaceId)
       this.getCode()
     }
-    this.findWorkPlace("")
+    this.findWorkPlace('')
 
   }
 }
diff --git a/src/views/basic/workplace/freightManage.vue b/src/views/basic/workplace/freightManage.vue
index f0bda717..f7f9f553 100644
--- a/src/views/basic/workplace/freightManage.vue
+++ b/src/views/basic/workplace/freightManage.vue
@@ -1,16 +1,19 @@
 <template>
   <div>
     <!--<el-card class="el-card">-->
-    <div style="display: flex;margin-top: 20px;width: 100%;height: 100%">
+    <div style="display: flex;width: 100%;height: 100%">
 
       <!--<div style="display: flex;width: 20%;height: 130%">-->
       <div style="width: 45%;height: 340px;margin-bottom: 10px">
         <el-card style="width: 100%;height: 100%">
           <div slot="header" class="clearfix" style="margin-bottom: 10px;">
-            <span style="font-weight: 700;">取货架列表</span>
+            <span style="font-weight: 700;">取货架列表
+              <el-button style="float: right;margin-bottom: -5px " @click="onAddFreight" type="primary">新增取货架
+              </el-button>
+            </span>
+
           </div>
-          <el-button style="float: right; margin-bottom: 5px" @click="onAddFreight" type="primary">新增取货架
-          </el-button>
+
           <el-table
             :data="freightList"
             :row-style="{ height: '32px' }"
@@ -61,19 +64,14 @@
 
             </el-table-column>
           </el-table>
-          <!--<pagination-->
-          <!--  :total="total"-->
-          <!--  :limit.sync="query.limit"-->
-          <!--  :page.sync="query.page"-->
-          <!--  @pagination="getList"-->
-          <!--&gt;-->
-          <!--</pagination>-->
           <el-pagination
-            layout="prev, pager, next"
-            style="float: right"
+            style="width: 100px"
             small
-            :total="queueTotal"
-          >
+            @current-change="handleFreightCurrentChange"
+            :current-page.sync="query.page"
+            :page-size="query.limit"
+            layout="total,prev, pager, next"
+            :total="total">
           </el-pagination>
         </el-card>
       </div>
@@ -112,11 +110,13 @@
             </el-table-column>
           </el-table>
           <el-pagination
-            layout="prev, pager, next"
-            style="float: right"
+            style="width: 100px"
             small
-            :total="LayerTotal"
-          >
+            @current-change="handleLayerCurrentChange"
+            :current-page.sync="LayerQuery.page"
+            :page-size="LayerQuery.limit"
+            layout="prev, pager, next"
+            :total="LayerTotal">
           </el-pagination>
           <!--<pagination-->
           <!--  :total="LayerTotal"-->
@@ -146,12 +146,19 @@
             </el-table-column>
           </el-table>
           <el-pagination
-            layout="prev, pager, next"
-            style="float: right"
             small
-            :total="queueTotal"
-          >
+            @current-change="handleQueueCurrentChange"
+            :current-page.sync="queueQuery.page"
+            :page-size="queueQuery.limit"
+            layout="prev, pager, next"
+            :total="queueTotal">
           </el-pagination>
+          <!--<el-pagination-->
+          <!--  layout="prev, pager, next"-->
+          <!--  style="float: right"-->
+          <!--  small-->
+          <!--&gt;-->
+          <!--</el-pagination>-->
         </el-card>
       </div>
     </div>
@@ -163,11 +170,12 @@
       v-if="WorkplaceFreightDialogVisible"
       :close-on-press-escape="false"
       :close-on-click-modal="false"
-      @close=""
+      @close="closeDialog"
     >
       <addWorkplaceFreightDialog
         :closeDialog="closeDialog"
         :rowData="rowData"
+        :workplaceId="workplaceId"
       >
       </addWorkplaceFreightDialog>
     </el-dialog>
@@ -256,6 +264,18 @@ export default {
         }
       })
     },
+    handleFreightCurrentChange(newPage){
+      this.query.page = newPage
+      this.getList()
+    },
+    handleQueueCurrentChange(newPage){
+      this.queueQuery.page = newPage
+      this.getQueues()
+    },
+    handleLayerCurrentChange(newPage){
+      this.LayerQuery.page = newPage
+      this.getLayers()
+    },
     handChangeFreight(row) {
       this.LayerQuery.freightCode = row.code
       this.getLayers()