diff --git a/src/views/basic/workplace/addCollectWorkplace.vue b/src/views/basic/workplace/addCollectWorkplace.vue index 52b07622..803acd5f 100644 --- a/src/views/basic/workplace/addCollectWorkplace.vue +++ b/src/views/basic/workplace/addCollectWorkplace.vue @@ -86,6 +86,7 @@ import { filterListByWorkplace, getWorkBindBusTypes } from '@/api/basic/workPlace/sysWorkplaceDocuments' import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage' import { bindCollect } from '@/api/basic/collectPoint/cargowWorkplaceManage' +import { isBlank } from '@/utils/strUtil' export default { props: { @@ -100,7 +101,11 @@ export default { collectWorks: { type: Array, required: true - } + }, + deptCode: { + type: Object, + required: true + }, }, components: {}, data() { @@ -112,7 +117,9 @@ export default { documentTypeCode: null, workPlaceClass: 1, page: 1, - limit: 10 + limit: 10, + deptCode: null + }, DeptList: [], list: [], @@ -177,6 +184,9 @@ export default { this.rowList = row }, getList() { + if (!isBlank(this.deptCode)){ + this.query.deptCode = this.deptCode + } filterListByWorkplace(this.query).then(res => { if (res.code == 20000) { this.list = res.data.list @@ -192,7 +202,8 @@ export default { workPlaceClass: 1, key: val, page: 1, - limit: 10 + limit: 10, + deptCode : this.deptCode } filterWorkOptimize(query) .then((response) => { @@ -257,6 +268,7 @@ export default { } }, created() { + console.log("GYgY",this.deptCode) this.getList() this.findWorkPlace('') this.getWorkBindBusTypes('') diff --git a/src/views/basic/workplace/cargowWorkplaceManage.vue b/src/views/basic/workplace/cargowWorkplaceManage.vue index d38b3bcb..9173ec45 100644 --- a/src/views/basic/workplace/cargowWorkplaceManage.vue +++ b/src/views/basic/workplace/cargowWorkplaceManage.vue @@ -278,6 +278,7 @@ @close="" > item.collectAndTypeCodes) this.chooseCollectDialogVisible = true