From 30f352da6a049bfcfc0b148924ea973f36b68709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com> Date: Mon, 23 Oct 2023 14:33:08 +0800 Subject: [PATCH] 10/23 --- public/index.html | 15 ++-- src/Views/Booking/AddBooking.vue | 6 +- src/Views/Booking/index.vue | 2 +- src/Views/BookingOrder/index.vue | 50 +++++++----- src/Views/Login/index.vue | 134 +++++++++++++++++++++++++++++-- src/Views/Userinfo/index.vue | 44 +++++++++- src/api/Index.js | 25 ++++++ src/components/TableBox.vue | 9 +++ 8 files changed, 250 insertions(+), 35 deletions(-) diff --git a/public/index.html b/public/index.html index 3e5a139..76d460d 100644 --- a/public/index.html +++ b/public/index.html @@ -1,15 +1,18 @@ - - - - - <%= htmlWebpackPlugin.options.title %> + + + + + 济舱海工作平台
diff --git a/src/Views/Booking/AddBooking.vue b/src/Views/Booking/AddBooking.vue index 154dc4f..57352b4 100644 --- a/src/Views/Booking/AddBooking.vue +++ b/src/Views/Booking/AddBooking.vue @@ -237,7 +237,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -273,7 +273,7 @@ - + diff --git a/src/Views/Booking/index.vue b/src/Views/Booking/index.vue index 8c60302..45b07dd 100644 --- a/src/Views/Booking/index.vue +++ b/src/Views/Booking/index.vue @@ -126,7 +126,7 @@ export default { multipleData: ["vessel", "voyageNo"], }, { label: "订舱日期", prop: "createTime", width: "100" }, - { label: "操作人", prop: "createByName" }, + // { label: "操作人", prop: "createByName" }, { label: "操作", prop: "operate", diff --git a/src/Views/BookingOrder/index.vue b/src/Views/BookingOrder/index.vue index f88e194..c2abbc1 100644 --- a/src/Views/BookingOrder/index.vue +++ b/src/Views/BookingOrder/index.vue @@ -42,9 +42,9 @@

基本信息

 - + @@ -95,8 +95,8 @@ - - + + @@ -374,9 +374,7 @@ /> -

- ———————————————————————————————————————————————————————————————— -

+

-

- ———————————————————————————————————————————————————————————————— -

+

- {{ item.value }} + {{ item.serviceName }} @@ -1211,7 +1208,20 @@ export default { console.log(e); bookingOrderInfo({ id: e.id }).then((res) => { dialogFormVisible.value = true; + // store.state.Data.cobServiceItemTenantList + // + DialogForm.value = { ...e, ...res.data }; + let Arr = []; + store.state.Data.cobServiceItemTenantList.forEach((item) => { + DialogForm.value.serviceItemList.forEach((item2) => { + if (item2.code == item.serviceCode) { + item.show = true; + } + }); + Arr.push(item); + }); + DialogForm.value.WebserviceItemList = Arr; }); // e.type.split("[").forEach((a) => { @@ -1228,7 +1238,7 @@ export default { }; const TableData = reactive([ { label: "船公司代号", prop: "carrierCode" }, - { label: "订单编号", prop: "billNo" }, + { label: "订单编号", prop: "billNo", StyleActive: true }, { label: "主提单号", prop: "mblNo" }, { label: "船名/航次", @@ -1236,12 +1246,10 @@ export default { multiple: true, multipleData: ["vessel", "voyageNo"], }, - { label: "开船日期", prop: "etdBegin" }, + { label: "开船日期", prop: "etd" }, { label: "箱型/箱量", - prop: "vessel", - multiple: true, - multipleData: ["vessel", "voyageNo"], + prop: "containerTotalInfo", }, { label: "业务状态", @@ -1424,6 +1432,7 @@ export default { } }; return { + store, bizStatusData, DialogForm, dialogFormVisible, @@ -1541,4 +1550,9 @@ export default { .el-form-item--default { margin-bottom: 12px; } +.Csbian { + width: 100%; + height: 1px; + background: #606266; +} diff --git a/src/Views/Login/index.vue b/src/Views/Login/index.vue index 53787f6..8dd44af 100644 --- a/src/Views/Login/index.vue +++ b/src/Views/Login/index.vue @@ -32,11 +32,16 @@ > 登录 - - 注册用户 - +
+ + 忘记密码 + + + 注册用户 + +
-
+
+
+ + + + + +
+ + + {{ btnText }} + +
+ + + + + + + + + + 修改密码 + + + 返回 + +
@@ -131,6 +191,7 @@ import { UserReg, UserGetLoginUser, genRegisterCheckCode, + userForgetPasswordForm, } from "@/api/Index"; import { ref, reactive } from "vue"; import { useRouter } from "vue-router"; @@ -147,9 +208,11 @@ export default { password: "", }); const RegData = ref({}); + const PasData = ref({}); console.log(msg); const name = ref("Login"); const ruleFormRef = ref(); + const rulePasFormRef = ref(); const FnClick = () => { console.log(name.value); }; @@ -177,6 +240,10 @@ export default { const FnReg = () => { Type.value = "reg"; }; + const FnPas = () => { + Type.value = "pas"; + }; + const FnLogin = () => { Type.value = "login"; RegData.value = {}; @@ -201,6 +268,18 @@ export default { } }); }; + const Pas = () => { + userForgetPasswordForm(PasData.value).then((res) => { + console.log(res); + if (res.code == 200) { + ElMessage({ + message: "注册成功！", + type: "success", + }); + FnLogin(); + } + }); + }; const validatePass = (rule, value, callback) => { if (value == "") { callback(new Error("请再次确认密码")); @@ -289,20 +368,58 @@ export default { } }); }; + const bindforgetSendPasCode = () => { + rulePasFormRef.value.validateField("phone", (errorMessage) => { + if (errorMessage) { + console.log(); + // captchaSms({ phonenumber: RegData.value.phone }).then((res) => { + // console.log(res); + // }); + disabled.value = true; + btnText.value = "请稍候..."; + genRegisterCheckCode({ phone: RegData.value.phone }).then((res) => { + console.log(res); + let i = 0; + + let time = () => { + if (i < 60) { + setTimeout(() => { + ++i; + btnText.value = `${60 - i}s`; + time(); + }, 1000); + } else { + disabled.value = false; + btnText.value = "获取验证码"; + } + }; + time(); + }); + } else { + console.log(errorMessage); + return false; + } + }); + }; return { Type, name, ruleFormRef, + rulePasFormRef, FnClick, // ----------------- LoginData, RegData, + PasData, Login, Reg, + Pas, FnReg, + FnPas, FnLogin, rules, bindforgetSendCode, + bindforgetSendPasCode, disabled, btnText, }; @@ -376,9 +493,14 @@ export default { width: 100%; margin-bottom: 21px; } - .CsSignB { - margin-left: 180px; + .ButtonBox { + width: 100%; + display: flex; + justify-content: space-between; } + // .CsSignB { + // margin-left: 180px; + // } .CsSignB2 { margin-left: 210px; } diff --git a/src/Views/Userinfo/index.vue b/src/Views/Userinfo/index.vue index 7c20197..552a438 100644 --- a/src/Views/Userinfo/index.vue +++ b/src/Views/Userinfo/index.vue @@ -53,6 +53,31 @@ + +
+ + + + + + + + + + + + + 更改 + + + +
+ @@ -61,13 +86,18 @@