diff --git a/src/data/stepMockData.js b/src/data/stepMockData.js index 80b1cad..ba4a2ae 100644 --- a/src/data/stepMockData.js +++ b/src/data/stepMockData.js @@ -65,4 +65,7 @@ export const partInfoMap = { 7: { id: 7, name: "右轴端装置", spec: "端装置", desc: "右端保护" }, }; -export const defaultPaymentTerms = "货物出厂验收合格前,买方需将所提货物全额货款支付给卖方。"; \ No newline at end of file +export const defaultPaymentTerms = "货物出厂验收合格前,买方需将所提货物全额货款支付给卖方。"; +export const defaultObjectionTerms = "买方提出对产品质量异议的时间为收到货物起5个工作日内,卖方应在收到异议书次日起3个工作日内与买方沟通,通过技术指导方式解决问题,如不能解决,买方可以要求卖方前往修理,如修理后仍不能使用,买方可以提出更换请求。如买方在收到货物后5日内未提出异议,则视为同意卖方处理意见。"; +export const defaultForceTerms = "如因不可抗力的原因,致使卖方推迟或不能交货,卖方不需为此承担责任。但卖方需在上述事件发生次日起七天内,以传真等书面方式通知买方,同时,卖方应采取一切必要措施及早交货。"; +export const defaultDisputeTerms = "合同双方因履行本合同发生争议时,应本着友好合作的精神共同协商解决。如协商后双方仍然无法达成一致则向买方所在地法院申请裁决。"; diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 1c61428..4afbdf8 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -117,7 +117,7 @@ function logout() { }) .then(() => { userStore.logOut().then(() => { - location.href = "/index"; + location.href = "/"; }); }) .catch(() => {}); diff --git a/src/views/order/intention/Step3.vue b/src/views/order/intention/Step3.vue index b69f0ef..3c0ebdd 100644 --- a/src/views/order/intention/Step3.vue +++ b/src/views/order/intention/Step3.vue @@ -1,63 +1,87 @@ @@ -67,11 +91,45 @@ const form = reactive({ background: #fff; padding: 24px; border-radius: 8px; + height: calc(100vh - 200px); + display: flex; + flex-direction: column; } + +.content-wrapper { + flex: 1; + overflow: hidden; +} + +.left-tabs { + height: 100%; + + :deep(.el-tabs__content) { + height: 100%; + padding: 20px; + } + + :deep(.el-tabs__nav-wrap) { + padding-right: 20px; + } +} + +.editor-container { + height: 100%; + padding: 0 20px; + + :deep(.el-textarea__inner) { + height: 100%; + min-height: 400px; + } +} + .btn-row { display: flex; justify-content: flex-end; gap: 16px; margin-top: 20px; + padding-top: 20px; + border-top: 1px solid #eee; } \ No newline at end of file