diff --git a/src/Views/ApplyJoin/ForJ.vue b/src/Views/ApplyJoin/ForJ.vue index fbdd657..187e102 100644 --- a/src/Views/ApplyJoin/ForJ.vue +++ b/src/Views/ApplyJoin/ForJ.vue @@ -2,7 +2,7 @@

创建/加入企业

- 如果您所在企业已经在海管家创建了企业，您可以申请加入企业；如果还没，那就创建新企业 + 如果您所在企业已经在济舱海创建了企业，您可以申请加入企业；如果还没，那就创建新企业

diff --git a/src/Views/ApplyJoin/index.vue b/src/Views/ApplyJoin/index.vue index 58fb479..5e5c380 100644 --- a/src/Views/ApplyJoin/index.vue +++ b/src/Views/ApplyJoin/index.vue @@ -21,8 +21,8 @@

- 创建人 - {{ UserTenantList.CreatedUserName }} + 管理员 + {{ UserTenantList.AdminName }}

@@ -57,7 +57,9 @@
-
+
+ 退出公司 +
@@ -66,6 +68,7 @@ import { useRouter } from "vue-router"; // import SearchBox from "@/components/SearchBox.vue"; // import TableBox from "@/components/TableBox.vue"; import { Plus } from "@element-plus/icons-vue"; +import { ElMessage } from "element-plus"; import { tenantUserTenantList, applyJoinList, @@ -74,6 +77,7 @@ import { tenantDownFile, bookingTemplateDelete, TenantCancelApplyJoin, + TenantDepart, } from "@/api/Index"; import { ref, reactive } from "vue"; export default { @@ -306,6 +310,17 @@ export default { init(); }); }; + const FnQuit = () => { + TenantDepart().then((res) => { + console.log(res); + if (res.code == 200) { + ElMessage({ + message: res.message, + type: "success", + }); + } + }); + }; return { JoinType, UserTenantList, @@ -328,6 +343,7 @@ export default { handlePreview, GoForj, WithdrawalApplication, + FnQuit, }; }, }; @@ -383,6 +399,13 @@ export default { } } } + .ButtonBox { + border-top: 1px solid #e5e7eb; + padding: 10px; + margin: 0; + display: flex; + justify-content: end; + } } } diff --git a/src/Views/Booking/AddBooking.vue b/src/Views/Booking/AddBooking.vue index 606bda9..154dc4f 100644 --- a/src/Views/Booking/AddBooking.vue +++ b/src/Views/Booking/AddBooking.vue @@ -11,7 +11,18 @@ > 返回 - 保存 + + 保存 + - + 删除 发送订舱 @@ -60,50 +81,54 @@ - - - + @input=" + (e) => { + form.portLoading = ''; + form.portLoadingCode = e; + } + " + /> - - - + @input=" + (e) => { + form.portDischargeCode = ''; + form.portDischarge = e; + } + " + /> @@ -127,7 +152,7 @@ - + @@ -215,6 +240,9 @@ + + 保存模板 + @@ -230,6 +258,9 @@ + + 保存模板 + @@ -245,6 +276,9 @@ + + 保存模板 + @@ -266,11 +300,7 @@ --> - - - - - + @@ -530,10 +560,29 @@ + + + + + + + + + + + diff --git a/src/Views/Booking/index.vue b/src/Views/Booking/index.vue index 66bd5d3..8c60302 100644 --- a/src/Views/Booking/index.vue +++ b/src/Views/Booking/index.vue @@ -19,6 +19,7 @@ @ClickSend="ClickSend" @ClickCancelSend="ClickCancelSend" /> + + diff --git a/src/Views/WebC/index.vue b/src/Views/WebC/index.vue index 6b1432a..df61c94 100644 --- a/src/Views/WebC/index.vue +++ b/src/Views/WebC/index.vue @@ -15,10 +15,24 @@ }} - - - 退出登录 - + + + + + + + 个人信息 + + + + + + + + 退出登录 + + + @@ -97,10 +111,15 @@ export default { }); router.push("/login"); }; + const GoUserinfo = () => { + router.push("/Userinfo"); + }; + return { handleOpen, handleClose, LogOut, + GoUserinfo, }; }, }; diff --git a/src/Views/workmate/index.vue b/src/Views/workmate/index.vue index bf086f2..a785bdc 100644 --- a/src/Views/workmate/index.vue +++ b/src/Views/workmate/index.vue @@ -54,6 +54,8 @@ import { tenantWaitAdminApplyJoinList, TenantAdminAgreeApplyJoin, TenantAdminRejectApplyJoin, + tenantUserTenantList, + TenantAdminChangeAdmin, } from "@/api/Index"; import { ref, reactive } from "vue"; export default { @@ -62,6 +64,9 @@ export default { TableBox, }, setup() { + tenantUserTenantList().then((res) => { + console.log(res); + }); const dialogFormVisible = ref(false); const DialogForm = ref({}); const TypeData = [ @@ -93,10 +98,18 @@ export default { operateData: [ { name: "移出", + ShowType: false, Fn: (e) => { ClickDelete(e); }, }, + { + name: "转让管理", + ShowType: false, + Fn: (e) => { + ClickTransfer(e); + }, + }, ], }, ]); @@ -157,6 +170,17 @@ export default { } }); }; + const ClickTransfer = (e) => { + TenantAdminChangeAdmin({ id: e.id }).then((res) => { + if (res.code == 200) { + ElMessage({ + message: res.message, + type: "success", + }); + } + }); + console.log(e); + }; const FnAgreeApply = (e) => { TenantAdminAgreeApplyJoin({ id: e.id }).then((res) => { console.log(res); @@ -185,6 +209,7 @@ export default { FnApplyList, tableData, ClickDelete, + ClickTransfer, FnAgreeApply, FnRejectApply, }; diff --git a/src/api/Index.js b/src/api/Index.js index a5fbfb2..860c413 100644 --- a/src/api/Index.js +++ b/src/api/Index.js @@ -21,6 +21,17 @@ const UserReg = (data) => { }, }); }; +// 用户更新手机号(2023-10增加) +const UserChangPhone = (data) => { + return request({ + data: { + url: "/api/bookingAip/user/userChangPhone", + method: "post", + data, + // headers: { Authorization: localStorage.getItem("token") }, + }, + }); +}; // 获取用户注册验证码 const genRegisterCheckCode = (params) => { return request({ @@ -54,6 +65,18 @@ const bookingCustomList = (params) => { }, }); }; +// 查询状态日志列表 +const bookingCustomStatusLogList = (params) => { + return request({ + data: { + url: "/api/bookingAip/bookingCustom/statusLogList", + method: "get", + params, + // headers: { Authorization: localStorage.getItem("token") }, + }, + }); +}; + // 保存客户订单 const bookingCustomSave = (data) => { return request({ @@ -477,13 +500,37 @@ const TenantCancelApplyJoin = (data) => { }, }); }; +// 管理员变更企业新管理员(2023-10增加) +const TenantAdminChangeAdmin = (data) => { + return request({ + data: { + url: "/api/bookingAip/tenant/adminChangeAdmin", + method: "post", + data, + // headers: { Authorization: localStorage.getItem("token") }, + }, + }); +}; +// 退出企业（离职）(2023-10增加) +const TenantDepart = (data) => { + return request({ + data: { + url: "/api/bookingAip/tenant/depart", + method: "post", + data, + // headers: { Authorization: localStorage.getItem("token") }, + }, + }); +}; export { UserLogin, UserReg, + UserChangPhone, genRegisterCheckCode, UserGetLoginUser, bookingCustomList, + bookingCustomStatusLogList, bookingCustomSave, bookingCustomSubmit, bookingCustomCancelSubmit, @@ -521,4 +568,6 @@ export { TenantAdminRejectApplyJoin, TenantAdminRemoveUser, TenantCancelApplyJoin, + TenantAdminChangeAdmin, + TenantDepart, }; diff --git a/src/components/SearchBox.vue b/src/components/SearchBox.vue index d5b299c..efb4c03 100644 --- a/src/components/SearchBox.vue +++ b/src/components/SearchBox.vue @@ -82,7 +82,7 @@ export default { const search_data = reactive(props.SearchData); console.log(search_data); const Data = ref({}); - const OpenType = ref(false); + const OpenType = ref(true); const Open = () => { OpenType.value = !OpenType.value; ctx.emit("SearchOpen", OpenType.value); diff --git a/src/components/TableBox.vue b/src/components/TableBox.vue index 7f0ca2a..ba5b1f4 100644 --- a/src/components/TableBox.vue +++ b/src/components/TableBox.vue @@ -25,6 +25,7 @@ :height="height" v-loading="loading" ref="Table" + @row-dblclick="TableRowDblclick" >