diff --git a/src/views/basic/collectPoint/selectWorkplace.vue b/src/views/basic/collectPoint/selectWorkplace.vue
index 8c702b99..cb9701b1 100644
--- a/src/views/basic/collectPoint/selectWorkplace.vue
+++ b/src/views/basic/collectPoint/selectWorkplace.vue
@@ -86,6 +86,13 @@
         </template>
       </el-table-column>
     </el-table>
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="query.page"
+      :limit.sync="query.limit"
+      @pagination="getList"
+    />
 
     <el-dialog
       title="工位详情"
@@ -270,7 +277,7 @@ export default {
     return {
       query: {
         page: 1,
-        limit: 20,
+        limit: 10,
         code: null
       },
       workQuery: {
@@ -342,6 +349,7 @@ export default {
       rowData: {},
       rowList: [],
       deptList: [],
+      total:0,
     }
   },
   methods: {
@@ -368,6 +376,7 @@ export default {
           return this.$message.error('错误错误')
         }
         this.list = res.data.list || []
+        this.total = res.data.total || 0
       })
     },
     addWorkplace() {
diff --git a/src/views/basic/product/drug/drugMaintain.vue b/src/views/basic/product/drug/drugMaintain.vue
index e740c9fc..cdbe7162 100644
--- a/src/views/basic/product/drug/drugMaintain.vue
+++ b/src/views/basic/product/drug/drugMaintain.vue
@@ -144,6 +144,7 @@
         :close-on-press-escape="false"
         width="85%"
         v-if="addDrugVisible"
+        @close="closeDialog"
       >
         <drugAdd
           :closeDialog="closeDialog"
diff --git a/src/views/basic/workplace/busTypeManage.vue b/src/views/basic/workplace/busTypeManage.vue
index 79199b60..f3ddffa3 100644
--- a/src/views/basic/workplace/busTypeManage.vue
+++ b/src/views/basic/workplace/busTypeManage.vue
@@ -136,6 +136,7 @@
       v-if="chooseBusTypeDialogVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
+      @close="closeDialog"
     >
       <!--<selectBusType-->
       <!--  :closeDialog="closeDialog"-->
diff --git a/src/views/basic/workplace/workplaceManage.vue b/src/views/basic/workplace/workplaceManage.vue
index 4b21b336..6fdbe4a9 100644
--- a/src/views/basic/workplace/workplaceManage.vue
+++ b/src/views/basic/workplace/workplaceManage.vue
@@ -903,13 +903,15 @@ export default {
       this.getList()
     },
     onReset() {
+      this.userList = []
       this.$router.push({
         path: ''
       })
       this.query = {
         page: 1,
         limit: 20,
-        workplaceStatus: null
+        workplaceStatus: 1,
+        deptCode: this.$store.getters.locDeptCode,
       }
       this.getList()
     },
diff --git a/src/views/collect/CollectOrderAllotCardComponents.vue b/src/views/collect/CollectOrderAllotCardComponents.vue
index 59f176f8..0a85d041 100644
--- a/src/views/collect/CollectOrderAllotCardComponents.vue
+++ b/src/views/collect/CollectOrderAllotCardComponents.vue
@@ -317,7 +317,7 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="24">
-                    <el-form-item class="query-form-item" label-width="35%" label="业务类型:">
+                    <el-form-item class="query-form-item" label-width="35%" label="业务名称:">
                       <el-input
                         v-model="info.busTypeName"
                         placeholder=""
@@ -423,7 +423,7 @@ import CollectOrderAllotDetail from "./CollectOrderAllotDetail";
 import {filterWorkOptimize} from "@/api/basic/workPlace/sysWorkplaceManage";
 import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
 import {decideOrder, deleteByOrder, orderPage, orderTop} from '@/api/collect/collectOrder'
-import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
+import {getWorkBindBusTypes, removeBusTypeById,filterListByWorkplace} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 import {isBlank} from '@/utils/strUtil'
 
 export default {
@@ -463,6 +463,38 @@ export default {
         companyName: this.$store.getters.companyName,
       },
       //界面配置相关
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      actDateRange: [],
       //患者处方
       tableHeader: [],
       queryList: [],
@@ -525,7 +557,8 @@ export default {
       },
       showType: 1,
       routerParam: this.$route.query.routerParam,
-      timer: null
+      timer: null,
+      selectLoading: false
     }
   },
 
@@ -558,15 +591,16 @@ export default {
         return
       })
     },
-    timerAuto() {
-      //启动定时器
-      this.timer = setInterval(() => {
-        this.getList()
-      }, 10000)
-
-      //清楚定时器的方法
-      // clearInterval(this.timer)
-    },
+    //todo 改完之后要取消注释定时器
+    // timerAuto() {
+    //   //启动定时器
+    //   this.timer = setInterval(() => {
+    //     this.getList()
+    //   }, 10000)
+    //
+    //   //清楚定时器的方法
+    //   // clearInterval(this.timer)
+    // },
     changeInvRemind(val) {
       let post = {
         workPlaceCode: val
@@ -713,13 +747,28 @@ export default {
       if (_this == null)
         _this = this
       _this.filterQuery.page = 1;
+      _this.selectLoading = true;
+      const loading = _this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
       _this.getList();
+      loading.close();
     },
 
     getList() {
       this.loading = true;
+      if (this.actDateRange !== null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
+      }
       let query = JSON.parse(JSON.stringify(this.filterQuery));
-      query.workPlaceCode = null
+      // query.workPlaceCode = null
       orderPage(query).then(res => {
         this.loading = false
         this.list = res.data.list || []
@@ -823,6 +872,7 @@ export default {
       this.showType = 2
     }
     this.findWorkPlace(this, "");
+    this.getWorkBindBusTypes(this, "");
     getHead("prescribeAllot", "1").then((re) => {
       // 处理返回的数据
       this.tableObj = re.data;
diff --git a/src/views/collect/CollectOrderNew.vue b/src/views/collect/CollectOrderNew.vue
index 3f341add..2c40a7c0 100644
--- a/src/views/collect/CollectOrderNew.vue
+++ b/src/views/collect/CollectOrderNew.vue
@@ -880,7 +880,8 @@ export default {
           errorHandleSubmit(params)
             .then((response) => {
               if (response.code == 20000) {
-                this.getErrorList(_this);
+                _this.getErrorList(_this);
+                _this.getList();
                 _this.$message.success("处理成功！")
               } else if (response.code == 520) {
                 _this.$message.error(response.message);
diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue
index cb072417..bf544777 100644
--- a/src/views/collect/CollectOrderTabs.vue
+++ b/src/views/collect/CollectOrderTabs.vue
@@ -16,7 +16,7 @@
                 <!--                <el-button type="primary" @click="toggleWorkplaceStatus" style="margin-left: 10px;" >切换状态</el-button>-->
               </span>
 
-            <span style="font-size: 14px;color: #909399;margin-left: 20px">当前业务类型:&nbsp&nbsp&nbsp&nbsp<span
+            <span style="font-size: 14px;color: #909399;margin-left: 20px">当前业务名称:&nbsp&nbsp&nbsp&nbsp<span
               style="font-size: 16px;color: #000000">{{ this.formData.busName }}</span>
               &nbsp&nbsp&nbsp&nbsp <el-button type="primary" icon="el-icon-sort" @click="toggleBusType"
                                               style="margin-left: 10px;">切换业务</el-button>
diff --git a/src/views/collect/IoDestroyLog.vue b/src/views/collect/IoDestroyLog.vue
index d8c1a5a8..0bbfb7ee 100644
--- a/src/views/collect/IoDestroyLog.vue
+++ b/src/views/collect/IoDestroyLog.vue
@@ -1223,8 +1223,9 @@ export default {
   },
   created() {
     this.getInvList(this);
-    this.getBusType(this);
+    // this.getBusType(this);
     this.findWorkPlace(this, "");
+    this.getWorkBindBusTypes(this, "");
 
 
     getHead("IoDestroyLog", "1").then((re) => {
diff --git a/src/views/collect/IoDestroyOrder.vue b/src/views/collect/IoDestroyOrder.vue
index f0c3c29e..26374e33 100644
--- a/src/views/collect/IoDestroyOrder.vue
+++ b/src/views/collect/IoDestroyOrder.vue
@@ -485,6 +485,7 @@ export default {
       this.showType = 2
     }
     this.findWorkPlace(this, "")
+    this.getWorkBindBusTypes(this, "")
 
     getHead("ioSplitCode", "1").then((re) => {
       // 处理返回的数据
diff --git a/src/views/collect/IoSplitFifoCodePanel.vue b/src/views/collect/IoSplitFifoCodePanel.vue
index 8d8817a0..9d38849d 100644
--- a/src/views/collect/IoSplitFifoCodePanel.vue
+++ b/src/views/collect/IoSplitFifoCodePanel.vue
@@ -1028,6 +1028,7 @@ export default {
       this.isLinkDisabled = true
     }
     this.findWorkPlace(this, "")
+    this.getWorkBindBusTypes(this, "")
     // console.log(this.panelType)
     getHead("ioSplitFifoCode", "1").then((re) => {
       // 处理返回的数据
diff --git a/src/views/collect/IoSplitFifoRemind.vue b/src/views/collect/IoSplitFifoRemind.vue
index 04ff3119..08029ebe 100644
--- a/src/views/collect/IoSplitFifoRemind.vue
+++ b/src/views/collect/IoSplitFifoRemind.vue
@@ -446,6 +446,7 @@ export default {
       this.isLinkDisabled = true
     }
     this.findWorkPlace(this, "")
+    this.getWorkBindBusTypes(this, "")
     getHead("ioSplitFifoRemind", "1").then((re) => {
       // 处理返回的数据
       this.tableObj = re.data;
diff --git a/src/views/collect/IoSplitOperateCode.vue b/src/views/collect/IoSplitOperateCode.vue
index 61e8433d..a8f98c55 100644
--- a/src/views/collect/IoSplitOperateCode.vue
+++ b/src/views/collect/IoSplitOperateCode.vue
@@ -700,9 +700,9 @@
 
 <script>
 import {
-  deleteByOrderId,
+  deleteByOrderId, errorCodeList,
   getOrderList, submitCodes
-} from "@/api/inout/order";
+} from '@/api/inout/order'
 import addOrder from "@/views/inout/DialogCreateOrder";
 import errOrder from "@/views/inout/IoCreateErrorOrder";
 import {getInvListByUserOptimize} from "@/api/system/invWarehouse";
@@ -720,6 +720,7 @@ import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
 import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 import IoCreateOrder from '@/views/collect/IoCreateOrder.vue'
 import {filterWorkOptimize} from '@/api/basic/workPlace/sysWorkplaceManage'
+import { getDetailCodes } from '@/api/inout/orderDetailCode'
 
 export default {
   props: {
@@ -1042,9 +1043,11 @@ export default {
       this.deleteData.billNo = data;
       deleteByOrderId(this.deleteData)
         .then((response) => {
-
           if (response.code == 20000) {
             this.getList();
+            this.currentRow.billNo = ""
+            this.resultDetailList= []
+            this.codeDetailList = []
             this.$message({
               type: "success",
               message: "删除成功！",
@@ -1209,8 +1212,8 @@ export default {
       this.bizDetailLoading = true;
       this.bizQuery.page = null;
       this.bizQuery.limit = null;
-      this.bizQuery.orderIdFk = this.currentRow.billNo;
-      getBizDetailList(this.bizQuery).then((res) => {
+      this.bizQuery.orderId = this.currentRow.billNo;
+      getDetailCodes(this.bizQuery).then((res) => {
         this.bizDetailLoading = false;
         if (res.code === 20000) {
           this.codeDetailList = res.data.list || [];
@@ -1247,7 +1250,7 @@ export default {
 
       this.resultQuery.orderId = this.currentRow.billNo;
       this.resultDetailLoading = true;
-      getCodeList(this.resultQuery).then((res) => {
+      errorCodeList(this.resultQuery).then((res) => {
         this.resultDetailLoading = false;
         if (res.code === 20000) {
           this.resultDetailList = res.data.list || [];
diff --git a/src/views/collect/PanelOrderDeal.vue b/src/views/collect/PanelOrderDeal.vue
index f3864c6b..008d065e 100644
--- a/src/views/collect/PanelOrderDeal.vue
+++ b/src/views/collect/PanelOrderDeal.vue
@@ -307,6 +307,38 @@ export default {
       tableObj: [],
       fromList: [],
       convertDateFun: convertDate,
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      actDateRange: [],
       //界面配置-------------end
 
       showSearch: false,
@@ -465,6 +497,13 @@ export default {
 
     getList() {
       this.loading = true;
+      if (this.actDateRange !== null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
+      }
       orderPage(this.filterQuery).then(res => {
         this.loading = false
         this.list = res.data.list || []
@@ -565,6 +604,7 @@ export default {
       this.fromList = re.data.fromList;
       this.getList();
       this.findWorkPlace(this, "");
+      this.getWorkBindBusTypes(this, "")
     });
     this.timerAuto()
   },
diff --git a/src/views/collect/PanelOrderEndSearch.vue b/src/views/collect/PanelOrderEndSearch.vue
index 862a8df4..93367432 100644
--- a/src/views/collect/PanelOrderEndSearch.vue
+++ b/src/views/collect/PanelOrderEndSearch.vue
@@ -326,6 +326,38 @@ export default {
       fromList1: [],
 
       convertDateFun: convertDate,
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      actDateRange: [],
       //界面配置-------------end
 
       showSearch: false,
@@ -446,6 +478,13 @@ export default {
 
     getList() {
       this.loading = true
+      if (this.actDateRange !== null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
+      }
       orderFinish(this.filterQuery).then(res => {
         this.loading = false
         this.list = res.data.list || []
@@ -503,6 +542,7 @@ export default {
       this.showType = 2
     }
     this.findWorkPlace(this, '')
+    this.getWorkBindBusTypes(this, "")
     getHead('prescribePanel', '1').then((re) => {
       // 处理返回的数据
       this.tableObj = re.data
diff --git a/src/views/collect/prescribe/prescribeDownloadDialog.vue b/src/views/collect/prescribe/prescribeDownloadDialog.vue
index a4aa0ced..858d7738 100644
--- a/src/views/collect/prescribe/prescribeDownloadDialog.vue
+++ b/src/views/collect/prescribe/prescribeDownloadDialog.vue
@@ -386,11 +386,18 @@ export default {
         startTime: this.filterQuery.startTime,
         list: this.selectList,
       }
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
         //请求后端 进行 保存 处方
         prescribeSave(post).then(res => {
           if (res.code == 20000) {
             this.closeDialog()
             this.$message.success("操作成功")
+            loading.close();
           } else {
             this.$message.error(res.message)
           }
diff --git a/src/views/inout/DialogEditCode.vue b/src/views/inout/DialogEditCode.vue
index 7691e964..7430c853 100644
--- a/src/views/inout/DialogEditCode.vue
+++ b/src/views/inout/DialogEditCode.vue
@@ -3,7 +3,7 @@
     <el-form :model="editData" :rules="formRules" ref="dataForm" label-width="100px">
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="UDI码:" prop="code">
+          <el-form-item label="追溯码:" prop="code">
             <el-input
               v-model="editData.code"
               clearable