diff --git a/src/views/archives/packages/index.vue b/src/views/archives/packages/index.vue index 357193f4..f3328b34 100644 --- a/src/views/archives/packages/index.vue +++ b/src/views/archives/packages/index.vue @@ -166,7 +166,6 @@ - - - - - - + + + { - this.userOptions = response.data.list; - }); - }, - handleSelectUser(val) { - this.form.manegeName = val.username; - }, /** 查询列表 */ getList() { this.loading = true; @@ -566,6 +551,17 @@ export default { this.form.flowId = obj.flowId; } }, + // 人员选择弹窗 + handleSelectUser() { + this.$refs.UserSelect.showFlag = true; + }, + // 负责人选择 + onUserSelected(obj) { + console.log(obj); + if (obj != undefined && obj != null) { + this.form.manegeName = obj.username; + } + }, }, }; diff --git a/src/views/archives/turnOver/index.vue b/src/views/archives/turnOver/index.vue index 7c3707d0..6d0a4c1d 100644 --- a/src/views/archives/turnOver/index.vue +++ b/src/views/archives/turnOver/index.vue @@ -253,40 +253,44 @@ - - - - + + + - - - - + + + @@ -361,15 +365,14 @@ import { getTurnOverPage, exportTurnOverExcel, } from "@/api/archives/turnOver"; -import { getOrganizationPage } from "@/api/setting/organization"; -import { listUser } from "@/api/system/user"; import { createWS } from "@/api/archives/record"; import { getSiteTree } from "@/api/setting/organization"; import FileSelect from "@/components/FileSelect/single.vue"; +import UserSelect from "@/components/UserSelect/single.vue"; export default { name: "TurnOver", - components: { FileSelect }, + components: { FileSelect, UserSelect }, data() { return { propName: { @@ -464,20 +467,6 @@ export default { this.form.applyNo = response.data; }); }, - //获取用户 - getUserList() { - listUser().then((response) => { - this.userOptions = response.data.list; - }); - }, - handleSelectUser1(val) { - this.form.outputNameId = val.id; - this.form.outputName = val.username; - }, - handleSelectUser2(val) { - this.form.inputNameId = val.id; - this.form.inputName = val.username; - }, //获取归档位置 getSiteList() { getSiteTree().then((response) => { @@ -657,6 +646,28 @@ export default { this.createWS(obj.id); } }, + // 人员选择弹窗 + handleSelectUser1() { + this.$refs.UserSelect1.showFlag = true; + }, + // 移交人选择 + onUserSelected1(obj) { + console.log(obj); + if (obj != undefined && obj != null) { + this.form.outputName = obj.username; + } + }, + // 人员选择弹窗 + handleSelectUser2() { + this.$refs.UserSelect2.showFlag = true; + }, + // 签收人选择 + onUserSelected2(obj) { + console.log(obj); + if (obj != undefined && obj != null) { + this.form.inputName = obj.username; + } + }, }, }; diff --git a/src/views/borrow/apply/index.vue b/src/views/borrow/apply/index.vue index 26476b08..4e7300b4 100644 --- a/src/views/borrow/apply/index.vue +++ b/src/views/borrow/apply/index.vue @@ -104,7 +104,6 @@ - - - - - + + + @@ -300,13 +303,6 @@ -