diff --git a/src/views/basic/workplace/editQueueDialog.vue b/src/views/basic/workplace/editQueueDialog.vue
new file mode 100644
index 00000000..dd0fc149
--- /dev/null
+++ b/src/views/basic/workplace/editQueueDialog.vue
@@ -0,0 +1,146 @@
+<template>
+  <div>
+    <el-form :model="formData" style="width: 100%;" ref="dataForm" :rules="formRules"
+             label-width="auto"
+    >
+      <el-row :gutter="24">
+        <el-col :span="12" class="el-col">
+          <el-form-item label="槽位编码:" prop="code" class="query-form-item">
+            <el-input
+              v-model="formData.code" style="width: 80%"
+              auto-complete="off"
+              disabled
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="槽位名称:" class="query-form-item">
+            <el-input
+              v-model="formData.name" style="width: 80%"
+              auto-complete="off"
+              placeholder="请输入槽位名称"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <!--<el-row :gutter="24">-->
+      <!--  <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-->
+      <!--        style="width: 80%"-->
+      <!--        placeholder="请输入选择所属工位"-->
+      <!--      >-->
+      <!--        <el-option-->
+      <!--          v-for="item in workPlaces"-->
+      <!--          :key="item.code"-->
+      <!--          :label="item.label"-->
+      <!--          :value="item.code"-->
+      <!--        />-->
+      <!--      </el-select>-->
+      <!--    </el-form-item>-->
+      <!--  </el-col>-->
+      <!--</el-row>-->
+    </el-form>
+    <div slot="footer" class="dialog-footer" style="margin-top: 50px">
+      <el-button @click.native="hideForm">取消</el-button>
+      <el-button
+        type="primary"
+        @click.native="formSubmit()"
+      >提交
+      </el-button
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage'
+import { updateQueue} from '@/api/basic/workPlace/SysWorkplaceQueue'
+import { isBlank } from '@/utils/strUtil'
+
+export default {
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true
+    },
+    rowData: {
+      type: Object,
+      required: true
+    },
+    workplaceId: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      formData: {
+        code: '',
+        name: '',
+        remark: '',
+        workPlaceIdFk: ''
+      },
+      freightData: null,
+      workPlaces: [],
+      formRules: {
+        // name: [
+        //   { required: true, message: '请输入货架说明', trigger: 'blur' }
+        // ],
+        workPlaceIdFk: [
+          { required: true, message: '请选择所属工位', trigger: 'blur' }
+        ]
+      },
+
+
+    }
+  },
+  methods: {
+    findWorkPlace(val) {
+      let query = {
+        // chargeUser: _this.$store.getters.userId,
+        userIdFlag: true,
+        key: val,
+        page: 1,
+        limit: 10,
+        workPlaceClass: 2
+      }
+      filterWorkOptimize(query)
+        .then((response) => {
+          this.workPlaces = response.data || []
+        })
+        .catch(() => {
+          this.options.getWorkPlaceList = []
+        })
+    },
+    formSubmit(){
+      updateQueue(this.formData).then(res => {
+        if (res.code == 20000){
+          this.$message.success("更新成功")
+        }else {
+          this.$message.error("更新失败")
+        }
+        this.closeDialog()
+      })
+    }
+  },
+  created() {
+    if (this.rowData != null){
+      this.formData = this.rowData
+    }
+    this.findWorkPlace('')
+
+  }
+}
+</script>
+
+<style scoped>
+.dialog-footer {
+  display: flex;
+  justify-content: center;
+}
+</style>
diff --git a/src/views/basic/workplace/freightManage.vue b/src/views/basic/workplace/freightManage.vue
index 341e8dc2..21b7f734 100644
--- a/src/views/basic/workplace/freightManage.vue
+++ b/src/views/basic/workplace/freightManage.vue
@@ -8,6 +8,8 @@
         <el-card style="width: 100%;height: 100%">
           <div slot="header" class="clearfix" style="margin-bottom: 10px;">
             <span style="font-weight: 700;">取货架列表
+            </span>
+            <span>
               <el-button-group style="float: right">
               <el-button style="margin-bottom: -5px " @click="printFreight(1,null)" type="primary">打印全部
               </el-button>
@@ -27,23 +29,21 @@
             <el-table-column type="index" label="序号">
             </el-table-column>
             <el-table-column
-              width="100"
               prop="code"
               label="取货架编码"
             >
             </el-table-column>
             <el-table-column
-              width="140"
               prop="remark"
               label="取货架说明"
             >
             </el-table-column>
-            <el-table-column
-              width="140"
-              prop="layerCount"
-              label="摆货层数量"
-            >
-            </el-table-column>
+            <!--<el-table-column-->
+            <!--  width="140"-->
+            <!--  prop="layerCount"-->
+            <!--  label="摆货层数量"-->
+            <!--&gt;-->
+            <!--</el-table-column>-->
             <!--<el-table-column-->
             <!--  width="140"-->
             <!--  prop="name"-->
@@ -82,7 +82,7 @@
 
         </el-card>
       </div>
-      <div style="width: 322px;height: 340px;margin-bottom: 10px">
+      <div style="width: 280px;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>
@@ -94,17 +94,16 @@
             @row-click="handChangeLayer"
           >
             <el-table-column
-              width="100"
               prop="code"
               label="摆货层编码"
             >
             </el-table-column>
-            <el-table-column
-              width="120"
-              prop="queueNum"
-              label="出货槽数量"
-            >
-            </el-table-column>
+            <!--<el-table-column-->
+            <!--  width="120"-->
+            <!--  prop="queueNum"-->
+            <!--  label="出货槽数量"-->
+            <!--&gt;-->
+            <!--</el-table-column>-->
             <el-table-column label="操作" width="60">
               <template slot-scope="scope">
                 <el-button
@@ -138,7 +137,7 @@
           <!--</pagination>-->
         </el-card>
       </div>
-      <div style="width: 260px;height: 340px;margin-bottom: 10px">
+      <div style="width: 400px;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>
@@ -154,7 +153,12 @@
               label="出货槽编号"
             >
             </el-table-column>
-            <el-table-column label="操作" width="60">
+            <el-table-column
+              prop="name"
+              label="槽位名称"
+            >
+            </el-table-column>
+            <el-table-column label="操作" width="120">
               <template slot-scope="scope">
                 <el-button
                   type="text"
@@ -162,6 +166,19 @@
                   @click.native.stop="printFreight(3,scope.row)"
                 >打印
                 </el-button>
+                <el-button
+                  type="text"
+                  size="small"
+                  @click.native.stop="editQueue(scope.row)"
+                >编辑
+                </el-button>
+                <el-button
+                  type="text"
+                  size="small"
+                  @click.native.stop="deleteQueue(scope.row)"
+                >删除
+                </el-button>
+
               </template>
             </el-table-column>
           </el-table>
@@ -205,6 +222,24 @@
       >
       </addWorkplaceFreightDialog>
     </el-dialog>
+
+    <!--</el-card>-->
+    <el-dialog
+      title="槽位编辑"
+      :visible.sync="WorkplaceQueueDialogVisible"
+      width="60%"
+      v-if="WorkplaceQueueDialogVisible"
+      :close-on-press-escape="false"
+      :close-on-click-modal="false"
+      @close="QueuecloseDialog"
+    >
+      <editQueueDialog
+        :closeDialog="QueuecloseDialog"
+        :rowData="queueRowData"
+        :workplaceId="workplaceId"
+      >
+      </editQueueDialog>
+    </el-dialog>
   </div>
 
 </template>
@@ -212,8 +247,9 @@
 <script>
 import { deleteFreight, getWorkplaceFreightList, printAllFreight } from '@/api/basic/workPlace/SysWorkplaceFreight'
 import addWorkplaceFreightDialog from './addWorkplaceFreightDialog'
+import editQueueDialog from "./editQueueDialog"
 import { getLayerList } from '@/api/basic/workPlace/SysWorkplaceLayer'
-import { getQueueListPage } from '@/api/basic/workPlace/SysWorkplaceQueue'
+import { deleteQueue, getQueueListPage } from '@/api/basic/workPlace/SysWorkplaceQueue'
 import { isBlank } from '@/utils/strUtil'
 
 export default {
@@ -223,7 +259,7 @@ export default {
       required: true
     }
   },
-  components: { addWorkplaceFreightDialog },
+  components: { addWorkplaceFreightDialog,editQueueDialog },
   data() {
     return {
       query: {
@@ -251,11 +287,13 @@ export default {
         layerCodes: []
       },
       rowData: null,
+      queueRowData:null,
       freightList: [],
       layerList: [],
       queueList: [],
       queueTotal: 0,
-      WorkplaceFreightDialogVisible: false
+      WorkplaceFreightDialogVisible: false,
+      WorkplaceQueueDialogVisible: false,
     }
   },
   methods: {
@@ -392,14 +430,49 @@ export default {
       this.getQueues()
       this.WorkplaceFreightDialogVisible = false
     },
+    QueuecloseDialog() {
+      this.getList()
+      this.getLayers()
+      this.getQueues()
+      this.WorkplaceQueueDialogVisible = false
+    },
     getAllList(workPlaceIdFk) {
       if (!isBlank(workPlaceIdFk)) {
         this.query.workPlaceIdFk = workPlaceIdFk
+        this.getList()
       }
       // this.LayerQuery.freightCode = ""
-      this.getList()
+
       // this.getLayers()
       // this.getQueues()
+    },
+    editQueue(row){
+      this.queueRowData = row
+      this.WorkplaceQueueDialogVisible = true
+    },
+    deleteQueue(row){
+      this.$confirm('此操作将永久删除该槽位, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteQueue(row).then(res => {
+          if (res.code == 20000){
+            this.getList()
+            this.getLayers()
+            this.getQueues()
+            this.$message.success("删除成功")
+          }else {
+            this.$message.error("删除失败")
+          }
+        }).catch(() => {
+
+        })
+
+        // deleteQueueByCode(){
+        //
+        // }
+      })
     }
   },
   created() {
diff --git a/src/views/inout/InvoiceRegByOrder.vue b/src/views/inout/InvoiceRegByOrder.vue
index 3f13c189..c04d3995 100644
--- a/src/views/inout/InvoiceRegByOrder.vue
+++ b/src/views/inout/InvoiceRegByOrder.vue
@@ -1254,7 +1254,7 @@ export default {
     },
     // 获取单据 业务详情、扫码详情、扫码明细
     getOrderDetails() {
-      this.codeQuery.page = 1;
+      // this.codeQuery.page = 1;
       //this.resultQuery.page = 1;
 
       this.getCodeDetailList();
diff --git a/src/views/inoutDrug/InvoiceRegByOrder.vue b/src/views/inoutDrug/InvoiceRegByOrder.vue
index 71fed077..87218f12 100644
--- a/src/views/inoutDrug/InvoiceRegByOrder.vue
+++ b/src/views/inoutDrug/InvoiceRegByOrder.vue
@@ -894,7 +894,7 @@ export default {
     },
     // 获取单据 业务详情、扫码详情、扫码明细
     getOrderDetails() {
-      this.codeQuery.page = 1;
+      // this.codeQuery.page = 1;
       //this.resultQuery.page = 1;
 
       this.getCodeDetailList();