Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z

src/views/collect/CollectOrderAllotCardComponents.vue

@@ -396,6 +396,7 @@ import prescribeOriginPanel from "./PannelOrderBiz";
 import CollectOrderAllotDetail from "./CollectOrderAllotDetail";
 import {filterWorkOptimize} from "@/api/basic/workPlace/sysWorkplaceManage";
 import {deleteByOrder, orderPage, orderTop} from "@/api/collect/collectOrder";
+import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 
 export default {
   name: "prescribePanel",
@@ -418,6 +419,12 @@ export default {
   },
   data() {
     return {
+      busQuery: {
+        busKey: '',
+        workplaceCode: null,
+        page: 1,
+        limit: 100
+      },
       msgTip: "库存预警提醒：",
       isLinkDisabled: false,
       changeViewDisabled: false,
@@ -448,6 +455,7 @@ export default {
 
       showSearch: true,
       filterQuery: {
+        busType: null,
         billNo: null,
         workPlaceCode: null,
         tagStatus: null,
@@ -485,6 +493,7 @@ export default {
 
       options: {
         findWorkPlace: [],
+        getBusType: [],
       },
       showType: 1
     }
@@ -494,6 +503,31 @@ export default {
     addOrder, errOrder, bindWorkDialog, prescribeOriginPanel, CollectOrderAllotDetail
   },
   methods: {
+    changePlace(_this,query) {
+      _this.getWorkBindBusTypes(_this,query)
+    },
+    getWorkBindBusTypes(_this, query) {
+      _this.busQuery.workplaceCode = query
+      getWorkBindBusTypes(this.busQuery).then(res => {
+        if (res.code == 20000) {
+          let busTypes = res.data.list || [];
+          // _this.options.getWorkPlace = res.data.list || [];
+          let getWorkPlace = busTypes.map(busType => {
+            return {
+              code: busType.documentTypeCode,
+              label: busType.busName
+            };
+          });
+          _this.options.getBusType  = getWorkPlace
+          if (_this.options.getBusType.length == 1) {
+            _this.filterQuery.busType = _this.options.getBusType[0].code
+          } else {
+            _this.filterQuery.busType = null
+          }
+        }
+        return
+      })
+    },
     changeInvRemind(val) {
       let post = {
         workPlaceCode: val

src/views/collect/IoDestroyLog.vue

@@ -659,12 +659,18 @@ import {convertDate} from "@/utils/date";
 import {isBlank} from "@/utils/strUtil";
 import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
 import { desOrderPage,getBizDetailList,getCodeList } from '@/api/collect/IoDestroy'
+import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 
 export default {
   name: "IoDestroyLog",
   data() {
     return {
-
+      busQuery: {
+        busKey: '',
+        workplaceCode: null,
+        page: 1,
+        limit: 100
+      },
       //界面配置---------------------
       tableObj: [],
       queryList: [],
@@ -700,6 +706,7 @@ export default {
       },
       title: "add",
       filterQuery: {
+        busType: null,
         billNo: null,
         mainAction: null,
         action: null,
@@ -830,6 +837,31 @@ export default {
     addOrder, errOrder
   },
   methods: {
+    changePlace(_this,query) {
+      _this.getWorkBindBusTypes(_this,query)
+    },
+    getWorkBindBusTypes(_this, query) {
+      _this.busQuery.workplaceCode = query
+      getWorkBindBusTypes(this.busQuery).then(res => {
+        if (res.code == 20000) {
+          let busTypes = res.data.list || [];
+          // _this.options.getWorkPlace = res.data.list || [];
+          let getWorkPlace = busTypes.map(busType => {
+            return {
+              code: busType.documentTypeCode,
+              label: busType.busName
+            };
+          });
+          _this.options.getBusType  = getWorkPlace
+          if (_this.options.getBusType.length == 1) {
+            _this.filterQuery.busType = _this.options.getBusType[0].code
+          } else {
+            _this.filterQuery.busType = null
+          }
+        }
+        return
+      })
+    },
     onReset() {
       this.filterQuery = {
         ...this.filterQuery,

src/views/collect/IoDestroyOrder.vue

@@ -256,11 +256,19 @@ import chooseDraftOrderDialog from './chooseDraftOrderDialog'
 import dialogInvProduct from '@/views/inout/DialogSelectInvProduct'
 import {executeFuc, getHead} from '@/utils/customConfig'
 import {getSplitCode} from '@/api/collect/collectOrder'
+import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 
 export default {
   name: 'IoDestroyOrder',
   data() {
     return {
+      busQuery: {
+        busKey: '',
+        workplaceCode: null,
+        page: 1,
+        limit: 100
+      },
+      viewType: null,
       tableHeader: [],
       queryList: [],
       tableObj: [],
@@ -269,6 +277,7 @@ export default {
       showSearch: true,
       filterQuery: {
         workPlaceCode: null,
+        busType: null,
         page: 1,
         limit: 10,
         startTime: null,
@@ -276,6 +285,7 @@ export default {
       },
       options: {
         getWorkPlaceList: [],
+        getBusType: [],
       },
       actDateRange: [],
       pickerOptions: {
@@ -319,6 +329,31 @@ export default {
   },
   components: {},
   methods: {
+    changePlace(_this,query) {
+      _this.getWorkBindBusTypes(_this,query)
+    },
+    getWorkBindBusTypes(_this, query) {
+      _this.busQuery.workplaceCode = query
+      getWorkBindBusTypes(this.busQuery).then(res => {
+        if (res.code == 20000) {
+          let busTypes = res.data.list || [];
+          // _this.options.getWorkPlace = res.data.list || [];
+          let getWorkPlace = busTypes.map(busType => {
+            return {
+              code: busType.documentTypeCode,
+              label: busType.busName
+            };
+          });
+          _this.options.getBusType  = getWorkPlace
+          if (_this.options.getBusType.length == 1) {
+            _this.filterQuery.busType = _this.options.getBusType[0].code
+          } else {
+            _this.filterQuery.busType = null
+          }
+        }
+        return
+      })
+    },
     executeFuc(row, type, clickFuc, value) {
       return executeFuc(this, row, type, clickFuc, value);
     },

src/views/collect/IoSplitFifoCodePanel.vue

@@ -675,6 +675,7 @@ import destroyOutDialog from "./destroyOutDialog.vue";
 import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 import { getSplitCode } from '@/api/collect/collectOrder'
 
+
 export default {
   name: "IoSplitFifoCodePanel",
   props: {

src/views/collect/IoSplitFifoRemind.vue

@@ -216,6 +216,7 @@ import {convertDate} from "@/utils/date";
 import {splitFifoPage} from "@/api/inout/splitInv";
 import {getInvListByUserOptimize} from "@/api/system/invWarehouse";
 import { listPage } from '@/api/basic/workPlace/sysWorkplaceManage'
+import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 
 export default {
   name: "IoSplitFifoRemind",
@@ -228,6 +229,12 @@ export default {
   },
   data() {
     return {
+      busQuery: {
+        busKey: '',
+        workplaceCode: null,
+        page: 1,
+        limit: 100
+      },
       viewType: null,
       isLinkDisabled: false,
       //界面配置相关
@@ -251,6 +258,7 @@ export default {
 
       showSearch: true,
       filterQuery: {
+        busType: null,
         fifoSplit: null,
         workPlaceCode: null,
         code: null,
@@ -283,7 +291,31 @@ export default {
 
   },
   methods: {
-
+    changePlace(_this,query) {
+      _this.getWorkBindBusTypes(_this,query)
+    },
+    getWorkBindBusTypes(_this, query) {
+      _this.busQuery.workplaceCode = query
+      getWorkBindBusTypes(this.busQuery).then(res => {
+        if (res.code == 20000) {
+          let busTypes = res.data.list || [];
+          // _this.options.getWorkPlace = res.data.list || [];
+          let getWorkPlace = busTypes.map(busType => {
+            return {
+              code: busType.documentTypeCode,
+              label: busType.busName
+            };
+          });
+          _this.options.getBusType  = getWorkPlace
+          if (_this.options.getBusType.length == 1) {
+            _this.filterQuery.busType = _this.options.getBusType[0].code
+          } else {
+            _this.filterQuery.busType = null
+          }
+        }
+        return
+      })
+    },
     //界面配置相关------------
     executeFuc(row, type, clickFuc, value) {
       return executeFuc(this, row, type, clickFuc, value);

src/views/collect/IoSplitFinishCode.vue

@@ -688,12 +688,18 @@ import {isBlank} from "@/utils/strUtil";
 import {getBizDetailList} from "@/api/inout/orderDetailBiz";
 import {getCodeList} from "@/api/inout/code";
 import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
+import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 
 export default {
   name: "IoSplitFinishCode",
   data() {
     return {
-
+      busQuery: {
+        busKey: '',
+        workplaceCode: null,
+        page: 1,
+        limit: 100
+      },
       //界面配置---------------------
       tableObj: [],
       queryList: [],
@@ -729,6 +735,7 @@ export default {
       },
       title: "add",
       filterQuery: {
+        busType: null,
         id: "",
         billNo: null,
         mainAction: null,
@@ -863,6 +870,31 @@ export default {
     addOrder, errOrder
   },
   methods: {
+    changePlace(_this,query) {
+      _this.getWorkBindBusTypes(_this,query)
+    },
+    getWorkBindBusTypes(_this, query) {
+      _this.busQuery.workplaceCode = query
+      getWorkBindBusTypes(this.busQuery).then(res => {
+        if (res.code == 20000) {
+          let busTypes = res.data.list || [];
+          // _this.options.getWorkPlace = res.data.list || [];
+          let getWorkPlace = busTypes.map(busType => {
+            return {
+              code: busType.documentTypeCode,
+              label: busType.busName
+            };
+          });
+          _this.options.getBusType  = getWorkPlace
+          if (_this.options.getBusType.length == 1) {
+            _this.filterQuery.busType = _this.options.getBusType[0].code
+          } else {
+            _this.filterQuery.busType = null
+          }
+        }
+        return
+      })
+    },
     onReset() {
       this.filterQuery = {
         ...this.filterQuery,

src/views/collect/PanelOrderDeal.vue

@@ -257,6 +257,7 @@ import prescribeCodePanel from "@/views/collect/PanelOrderTagCode";
 import {deleteByOrder, orderPage} from "@/api/collect/collectOrder";
 import PanelOrderManuTagCode from "./PanelOrderManuTagCode";
 import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage'
+import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 
 export default {
   name: "prescribeAllotIngPanel",
@@ -269,6 +270,12 @@ export default {
   },
   data() {
     return {
+      busQuery: {
+        busKey: '',
+        workplaceCode: null,
+        page: 1,
+        limit: 100
+      },
       //界面配置相关
       //患者处方
       tableHeader: [],
@@ -280,6 +287,7 @@ export default {
 
       showSearch: true,
       filterQuery: {
+        busType: null,
         billNo: null,
         tagStatusList: [-1, 2],
         page: 1,
@@ -314,6 +322,7 @@ export default {
       timer: null, // 定时器
       options: {
         findWorkPlace: [],
+        getBusType: [],
       },
     }
   },
@@ -322,6 +331,31 @@ export default {
     addOrder, errOrder, prescribeOriginPanel, prescribeCodePanel, PanelOrderManuTagCode,PanelOrderAllDetail
   },
   methods: {
+    changePlace(_this,query) {
+      _this.getWorkBindBusTypes(_this,query)
+    },
+    getWorkBindBusTypes(_this, query) {
+      _this.busQuery.workplaceCode = query
+      getWorkBindBusTypes(this.busQuery).then(res => {
+        if (res.code == 20000) {
+          let busTypes = res.data.list || [];
+          // _this.options.getWorkPlace = res.data.list || [];
+          let getWorkPlace = busTypes.map(busType => {
+            return {
+              code: busType.documentTypeCode,
+              label: busType.busName
+            };
+          });
+          _this.options.getBusType  = getWorkPlace
+          if (_this.options.getBusType.length == 1) {
+            _this.filterQuery.busType = _this.options.getBusType[0].code
+          } else {
+            _this.filterQuery.busType = null
+          }
+        }
+        return
+      })
+    },
     //启动定时器
     timerAuto() {
       //启动定时器

src/views/collect/PanelOrderEndSearch.vue

@@ -265,6 +265,7 @@ import CollectFinishOrderDetail from '@/views/collect/CollectFinishOrderDetail'
 
 import { orderPage } from '@/api/collect/collectOrder'
 import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage'
+import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 
 export default {
   name: 'prescribePanel',
@@ -282,7 +283,12 @@ export default {
   },
   data() {
     return {
-
+      busQuery: {
+        busKey: '',
+        workplaceCode: null,
+        page: 1,
+        limit: 100
+      },
       //界面配置相关
       //患者处方
       tableHeader: [],
@@ -300,6 +306,7 @@ export default {
 
       showSearch: true,
       filterQuery: {
+        busType: null,
         tagStatus: 3,
         billNo: null,
         workPlaceCode: null,
@@ -323,7 +330,8 @@ export default {
       curRow: null,
       panelALive: false,
       options: {
-        findWorkPlace: []
+        findWorkPlace: [],
+        getBusType: [],
       },
       showType: 1,
       isLinkDisabled: false,
@@ -335,7 +343,31 @@ export default {
     addOrder, errOrder, prescribeCodePanel, prescribeOriginPanel, PanelOrderManuTagCode, CollectFinishOrderDetail
   },
   methods: {
-
+    changePlace(_this,query) {
+      _this.getWorkBindBusTypes(_this,query)
+    },
+    getWorkBindBusTypes(_this, query) {
+      _this.busQuery.workplaceCode = query
+      getWorkBindBusTypes(this.busQuery).then(res => {
+        if (res.code == 20000) {
+          let busTypes = res.data.list || [];
+          // _this.options.getWorkPlace = res.data.list || [];
+          let getWorkPlace = busTypes.map(busType => {
+            return {
+              code: busType.documentTypeCode,
+              label: busType.busName
+            };
+          });
+          _this.options.getBusType  = getWorkPlace
+          if (_this.options.getBusType.length == 1) {
+            _this.filterQuery.busType = _this.options.getBusType[0].code
+          } else {
+            _this.filterQuery.busType = null
+          }
+        }
+        return
+      })
+    },
     //界面配置相关------------
     executeFuc(row, type, clickFuc, value) {
       return executeFuc(this, row, type, clickFuc, value)

src/views/collect/PanelOrderUpload.vue

@@ -265,6 +265,7 @@ import PanelOrderAllDetail from '@/views/collect/PanelOrderAllDetail'
 
 import { orderPage } from '@/api/collect/collectOrder'
 import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage'
+import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 
 export default {
   name: 'panelOrderUpload',
@@ -287,7 +288,12 @@ export default {
   },
   data() {
     return {
-
+      busQuery: {
+        busKey: '',
+        workplaceCode: null,
+        page: 1,
+        limit: 100
+      },
       //界面配置相关
       //患者处方
       tableHeader: [],
@@ -305,6 +311,7 @@ export default {
 
       showSearch: true,
       filterQuery: {
+        busType: null,
         tagStatus: null,
         billNo: null,
         workPlaceCode: null,
@@ -329,7 +336,8 @@ export default {
       panelALive: false,
       isLinkDisabled: false,
       options: {
-        findWorkPlace: []
+        findWorkPlace: [],
+        getBusType: [],
       },
       showType: 1
     }
@@ -339,7 +347,31 @@ export default {
     addOrder, errOrder, prescribeCodePanel, prescribeOriginPanel, PanelOrderManuTagCode, PanelOrderAllDetail
   },
   methods: {
-
+    changePlace(_this,query) {
+      _this.getWorkBindBusTypes(_this,query)
+    },
+    getWorkBindBusTypes(_this, query) {
+      _this.busQuery.workplaceCode = query
+      getWorkBindBusTypes(this.busQuery).then(res => {
+        if (res.code == 20000) {
+          let busTypes = res.data.list || [];
+          // _this.options.getWorkPlace = res.data.list || [];
+          let getWorkPlace = busTypes.map(busType => {
+            return {
+              code: busType.documentTypeCode,
+              label: busType.busName
+            };
+          });
+          _this.options.getBusType  = getWorkPlace
+          if (_this.options.getBusType.length == 1) {
+            _this.filterQuery.busType = _this.options.getBusType[0].code
+          } else {
+            _this.filterQuery.busType = null
+          }
+        }
+        return
+      })
+    },
     //界面配置相关------------
     executeFuc(row, type, clickFuc, value) {
       return executeFuc(this, row, type, clickFuc, value)