diff --git a/src/api/basic/workPlace/sysWorkplaceDocuments.js b/src/api/basic/workPlace/sysWorkplaceDocuments.js new file mode 100644 index 00000000..f62ed75e --- /dev/null +++ b/src/api/basic/workPlace/sysWorkplaceDocuments.js @@ -0,0 +1,23 @@ +import axios from "@/utils/request"; +import request from "@/utils/request"; + + +//绑定单据类型 +export function bindBusType(query) { + return axios({ + url: "/udiwms/sysWorkplace/workBindBusType", + method: "post", + data: query + }); +} + + +export function getWorkBindBusTypes(query) { + return axios({ + url: '/udiwms/sysWorkplace/getWorkBindBusTypes', + method: 'get', + params: query + }) +} + + diff --git a/src/api/basic/sysWorkplaceManage.js b/src/api/basic/workPlace/sysWorkplaceManage.js similarity index 90% rename from src/api/basic/sysWorkplaceManage.js rename to src/api/basic/workPlace/sysWorkplaceManage.js index ec50a090..ebdfb7db 100644 --- a/src/api/basic/sysWorkplaceManage.js +++ b/src/api/basic/workPlace/sysWorkplaceManage.js @@ -87,3 +87,12 @@ export function getUsers(query) { }); } +//绑定单据类型 +export function bindBusType(query) { + return axios({ + url: "/udiwms/sysWorkplace/workBindBusType", + method: "post", + data: query + }); +} + diff --git a/src/views/basic/collectPoint/selectWorkplace.vue b/src/views/basic/collectPoint/selectWorkplace.vue index 00d95620..e6e336b8 100644 --- a/src/views/basic/collectPoint/selectWorkplace.vue +++ b/src/views/basic/collectPoint/selectWorkplace.vue @@ -289,7 +289,7 @@ import { updateWorkplace, deleteWorkplace, createWorkplaceId, printWorkLabel,getUsers -} from '@/api/basic/sysWorkplaceManage' +} from '@/api/basic/workPlace/sysWorkplaceManage' import { getInvListByUser } from '@/api/system/invWarehouse' import { getTree } from '@/api/basic/collectPoint/collectPointManage' import { getCollectBusType } from '@/api/basic/collectPoint/gatherOrderType' diff --git a/src/views/basic/workplace/selectBusType.vue b/src/views/basic/workplace/selectBusType.vue new file mode 100644 index 00000000..177cfc31 --- /dev/null +++ b/src/views/basic/workplace/selectBusType.vue @@ -0,0 +1,271 @@ + + + + + diff --git a/src/views/basic/workplace/workplaceManage.vue b/src/views/basic/workplace/workplaceManage.vue index 17eb1b04..eb4cdbb5 100644 --- a/src/views/basic/workplace/workplaceManage.vue +++ b/src/views/basic/workplace/workplaceManage.vue @@ -80,20 +80,17 @@ - - - - - - - - - - - - + + + + + + + + +
@@ -111,8 +108,8 @@ - - + + @@ -172,74 +169,123 @@ > - -
{{ workplaceName }}-用户列表
+ + + + {{ workplaceName }}-用户列表 + + + + + + + 重置 + + 查询 + + + + - - - - - - - 重置 - - 查询 - - - - + + + + + + + + + + + + + + {{ workplaceName }}-单据类型 + + + + + + + 重置 + + 查询 + + 选入单据 + + + + + + + + + + + + + + + + + - - - - - - - - - - - - @@ -279,7 +325,9 @@ - + @@ -290,7 +338,9 @@ - + @@ -299,7 +349,6 @@ - @@ -314,12 +363,14 @@ + @change="deptChange" + > + :value="item.code" + > {{ item.name }} @@ -365,23 +416,23 @@ - - - - - {{ item.name }} - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -530,6 +589,23 @@ >
+ + + + + + @@ -540,21 +616,25 @@ import { updateWorkplace, deleteWorkplace, createWorkplaceId, printWorkLabel, getUsers -} from '@/api/basic/sysWorkplaceManage' +} from '@/api/basic/workPlace/sysWorkplaceManage' import { filterAllByUser, getInvListByUser } from '@/api/system/invWarehouse' import { addTree, deleteTree, getTree, updateTree } from '@/api/basic/collectPoint/collectPointManage' import { getCollectBusType } from '@/api/basic/collectPoint/gatherOrderType' import panelGroup from '@/views/dashboard/PanelGroup' import { delUserBindWork, getUserBindWork } from '@/api/basic/collectPoint/userWorkplace' +import selectBusType from './selectBusType' +import { getWorkBindBusTypes } from '@/api/basic/workPlace/sysWorkplaceDocuments' export default { + components: { selectBusType }, data() { return { query: { invCode: this.$store.getters.locInvCode, page: 1, limit: 10, - code: null + code: null, + workplaceStatus: 1 }, showSearch: true, Dictionary: false, @@ -568,6 +648,7 @@ export default { } ], addWorkplaceDialogVisible: false, + chooseBusTypeDialogVisible: false, fromName: 'add', fromMap: { 'add': '新增工位', @@ -606,7 +687,7 @@ export default { ], unitTittle: [ { required: true, message: '请输入往来类型标题', trigger: 'blur' } - ], + ] }, invQuery: { invCode: '' @@ -622,7 +703,7 @@ export default { 1: '客户', 2: '供应商', 3: '内部科室', - 4: '特殊往来', + 4: '特殊往来' }, checkInserts: { 1: '插入', @@ -656,7 +737,19 @@ export default { total: 0, userTotal: 0, workplaceName: '用户', - deptList:[] + workplaceBusType: '工位', + deptList: [], + //单据类型数据 + workplaceId: null, + busQuery: { + busKey: '', + workplaceCode: null, + page: 1, + limit: 10 + }, + busTypeList: [], + busTypeTotal: 0, + busTypeCodes: [] } }, computed: {}, @@ -885,11 +978,24 @@ export default { this.workplaceName = row.workplaceName this.userQuery.workplaceCode = row.workplaceId this.getUserBindWork(this.userQuery) + this.getWorkBindBusTypes() }, loadUserList() { this.userQuery.workplaceCode = this.rowData.workplaceId this.getUserBindWork(this.userQuery) }, + loadBusList() { + this.getWorkBindBusTypes() + }, + chooseBusType() { + if (this.rowData.workplaceId == null) { + return this.$message.error('请先选择工位') + } + this.workplaceId = this.rowData.workplaceId + this.userId = this.rowData.id + this.busTypeCodes = this.busTypeList.map(item => item.code) + this.chooseBusTypeDialogVisible = true + }, onUserReset() { this.userQuery = { page: 1, @@ -995,23 +1101,38 @@ export default { }, getDeptList() { - this.deptList = []; + this.deptList = [] filterAllByUser() .then((response) => { - this.deptList = response.data || []; - this.getInvList(); + this.deptList = response.data || [] + this.getInvList() }) .catch(() => { - }); + }) }, deptChange() { - this.getInvList(); - this.formData.invCode = ""; + this.getInvList() + this.formData.invCode = '' }, - changeCheckInsert(){ - if (this.formData.operationType == 1){ + changeCheckInsert() { + if (this.formData.operationType == 1) { this.formData.checkInsert = 1 } + }, + getWorkBindBusTypes() { + this.busQuery.workplaceCode = this.rowData.workplaceId + getWorkBindBusTypes(this.busQuery).then(res => { + if (res.code == 20000) { + this.busTypeList = res.data.list + this.busTypeTotal = res.data.total + } else { + return this.$message.error('获取错误') + } + }) + }, + closeDialog(){ + this.chooseBusTypeDialogVisible = false + this.getWorkBindBusTypes() } }, created() { diff --git a/src/views/collect/CollectOrderAllotComponents.vue b/src/views/collect/CollectOrderAllotComponents.vue index d0369583..0fb8f43b 100644 --- a/src/views/collect/CollectOrderAllotComponents.vue +++ b/src/views/collect/CollectOrderAllotComponents.vue @@ -254,7 +254,7 @@ import {page as prescribePage, deleteDataByCode} from "@/api/basic/sicker/prescr import bindWorkDialog from "@/views/collect/bindWorkDialog"; import prescribeOriginPanel from "./PannelOrderBiz"; import prescribeOriginDiPanel from "./PannelOrderBiz"; -import {filterWorkOptimize} from "@/api/basic/sysWorkplaceManage"; +import {filterWorkOptimize} from "@/api/basic/workPlace/sysWorkplaceManage"; import {deleteByOrder, orderPage} from "@/api/collect/collectOrder"; export default { diff --git a/src/views/collect/CollectOrderNew.vue b/src/views/collect/CollectOrderNew.vue index 879ff737..becb6b84 100644 --- a/src/views/collect/CollectOrderNew.vue +++ b/src/views/collect/CollectOrderNew.vue @@ -248,7 +248,7 @@ import prescribeDownloadDialog from "@/views/collect/prescribe/prescribeDownload import prescribeOriginPanel from "./PannelOrderBiz"; import {clearAllOrder, deleteByOrder, importOrder, orderPage} from "@/api/collect/collectOrder"; import {filterSubAllOptimize} from "@/api/system/invSubWarehouse"; -import {filterWorkOptimize} from "@/api/basic/sysWorkplaceManage"; +import {filterWorkOptimize} from "@/api/basic/workPlace/sysWorkplaceManage"; export default { name: "prescribePanel", diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue index 233299ed..b0a56185 100644 --- a/src/views/collect/DealOrder.vue +++ b/src/views/collect/DealOrder.vue @@ -248,7 +248,7 @@ import PanelOrderManuTagCode from "./PanelOrderManuTagCode"; import prescribeOriginPanel from "./PannelOrderBiz"; import prescribeCodePanel from "./PanelOrderTagCode"; import PannelOrderBiz from "./PannelOrderBiz"; -import {listPage} from "@/api/basic/sysWorkplaceManage"; +import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage"; import {enterCodeWeb} from "@/api/inout/order"; import {draftOrder, finishOrder, startSplit, tagCode, updateOrder} from "@/api/collect/splitCreateOrder"; import {selectCorpList} from "@/api/basic/basicUnitMaintain"; diff --git a/src/views/collect/DealOrderBlank.vue b/src/views/collect/DealOrderBlank.vue index 233299ed..b0a56185 100644 --- a/src/views/collect/DealOrderBlank.vue +++ b/src/views/collect/DealOrderBlank.vue @@ -248,7 +248,7 @@ import PanelOrderManuTagCode from "./PanelOrderManuTagCode"; import prescribeOriginPanel from "./PannelOrderBiz"; import prescribeCodePanel from "./PanelOrderTagCode"; import PannelOrderBiz from "./PannelOrderBiz"; -import {listPage} from "@/api/basic/sysWorkplaceManage"; +import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage"; import {enterCodeWeb} from "@/api/inout/order"; import {draftOrder, finishOrder, startSplit, tagCode, updateOrder} from "@/api/collect/splitCreateOrder"; import {selectCorpList} from "@/api/basic/basicUnitMaintain"; diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue index c3d3d625..d9381649 100644 --- a/src/views/collect/IoCreateOrder.vue +++ b/src/views/collect/IoCreateOrder.vue @@ -283,7 +283,7 @@ import DialogSelectSpace from "@/views/inout/DialogSelectSpace"; import {isBlank} from "@/utils/strUtil"; import {filterNoPage, remoteFilter} from "@/api/basic/sicker/skPersonApi"; import dialogInvProduct from "@/views/inout/DialogSelectInvProduct"; -import {listPage} from "@/api/basic/sysWorkplaceManage"; +import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage"; import {printSplitLabel} from "@/api/collect/splitCreateOrder"; import { findInvRemind } from "@/api/inout/splitCode"; diff --git a/src/views/collect/IoCreateOrderBlank.vue b/src/views/collect/IoCreateOrderBlank.vue index 761ccaca..b15b2763 100644 --- a/src/views/collect/IoCreateOrderBlank.vue +++ b/src/views/collect/IoCreateOrderBlank.vue @@ -283,7 +283,7 @@ import DialogSelectSpace from "@/views/inout/DialogSelectSpace"; import {isBlank} from "@/utils/strUtil"; import {filterNoPage, remoteFilter} from "@/api/basic/sicker/skPersonApi"; import dialogInvProduct from "@/views/inout/DialogSelectInvProduct"; -import {listPage} from "@/api/basic/sysWorkplaceManage"; +import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage"; import {printSplitLabel} from "@/api/collect/splitCreateOrder"; import { findInvRemind } from "@/api/inout/splitCode"; diff --git a/src/views/collect/IoSplitFifoCodePanel.vue b/src/views/collect/IoSplitFifoCodePanel.vue index 90e870cd..3f027d36 100644 --- a/src/views/collect/IoSplitFifoCodePanel.vue +++ b/src/views/collect/IoSplitFifoCodePanel.vue @@ -427,6 +427,8 @@ import {executeFuc, getHead} from "@/utils/customConfig"; import {convertDate} from "@/utils/date"; import {materialCodePage, materialPrescribePage, splitFifoDetail, splitFifoPage} from "@/api/inout/splitCode"; import {getInvListByUserOptimize} from "@/api/system/invWarehouse"; +import { getBasicUnitMaintainsOptimize } from '@/api/basic/basicUnitMaintain' +import { listPage } from '@/api/basic/workPlace/sysWorkplaceManage' export default { name: "IoSplitFifoCodePanel", @@ -456,6 +458,7 @@ export default { getInvList: [], getDeptList: [], getBusType: [], + findWorkPlace: [], }, showSearch: true, @@ -586,9 +589,33 @@ export default { enterKey(_this, event) { _this.onSubmit(); }, + findWorkPlace(_this, query){ + let cQuery = { + key: query, + page: 1, + limit: 10, + }; + listPage(cQuery).then(res => { + if (res.code == 20000){ + let workPlaces = res.data.list || []; + // _this.options.getWorkPlace = res.data.list || []; + let getWorkPlace = workPlaces.map(workplace => { + return { + code: workplace.workplaceId, + label: workplace.workplaceName + }; + }); + _this.options.findWorkPlace = getWorkPlace + console.log("djdjdjdjd",_this.options.findWorkPlace) + } + }).catch(() => { + _this.options.findWorkPlace = []; + }); + }, + }, created() { - + this.findWorkPlace(this,"") console.log(this.panelType) getHead("ioSplitFifoCode", "1").then((re) => { // 处理返回的数据 diff --git a/src/views/collect/PanelCreateCodeDetail.vue b/src/views/collect/PanelCreateCodeDetail.vue index b999a74b..105e0b2a 100644 --- a/src/views/collect/PanelCreateCodeDetail.vue +++ b/src/views/collect/PanelCreateCodeDetail.vue @@ -11,7 +11,7 @@ show-overflow-tooltip > - +