diff --git a/public/images/3D.png b/public/images/3D.png new file mode 100644 index 0000000..c798248 Binary files /dev/null and b/public/images/3D.png differ diff --git a/public/images/cars/CR400AF.jpg b/public/images/cars/CR400AF.jpg new file mode 100644 index 0000000..a2fe03b Binary files /dev/null and b/public/images/cars/CR400AF.jpg differ diff --git a/public/images/cars/CR400BF.jpg b/public/images/cars/CR400BF.jpg new file mode 100644 index 0000000..0ecfebf Binary files /dev/null and b/public/images/cars/CR400BF.jpg differ diff --git a/public/images/cars/CRH3A.jpg b/public/images/cars/CRH3A.jpg new file mode 100644 index 0000000..cbefcb9 Binary files /dev/null and b/public/images/cars/CRH3A.jpg differ diff --git a/src/data/stepMockData.js b/src/data/stepMockData.js index 6fc18bd..8ac46f3 100644 --- a/src/data/stepMockData.js +++ b/src/data/stepMockData.js @@ -32,7 +32,7 @@ export const carTypeOptions = [ "定员": "556人", "轴重": "≤17t" }, - image: "/src/assets/images/cars/CR400AF.jpg" + image: "/images/cars/CR400AF.jpg" } ] }, @@ -49,7 +49,7 @@ export const carTypeOptions = [ "定员": "556人", "轴重": "≤17t" }, - image: "/src/assets/images/cars/CR400AF.jpg" + image: "/images/cars/CR400AF.jpg" }, { value: "CR400BF", @@ -61,7 +61,7 @@ export const carTypeOptions = [ "定员": "556人", "轴重": "≤17t" }, - image: "/src/assets/images/cars/CR400BF.jpg" + image: "/images/cars/CR400BF.jpg" } ] }, @@ -78,7 +78,7 @@ export const carTypeOptions = [ "定员": "613人", "轴重": "≤16t" }, - image: "/src/assets/images/cars/CRH3A.jpg" + image: "/images/cars/CRH3A.jpg" } ] }, diff --git a/src/views/order/intention/Step2.vue b/src/views/order/intention/Step2.vue index 9a7edb2..d1d2dac 100644 --- a/src/views/order/intention/Step2.vue +++ b/src/views/order/intention/Step2.vue @@ -115,7 +115,7 @@
3D结构图 diff --git a/src/views/order/intention/Step3.vue b/src/views/order/intention/Step3.vue index 3c0ebdd..9e605bc 100644 --- a/src/views/order/intention/Step3.vue +++ b/src/views/order/intention/Step3.vue @@ -75,7 +75,7 @@ import { defaultDisputeTerms, } from "@/data/stepMockData"; -const activeTab = ref('pay'); +const activeTab = ref("pay"); const form = reactive({ pay: defaultPaymentTerms, @@ -91,7 +91,7 @@ const form = reactive({ background: #fff; padding: 24px; border-radius: 8px; - height: calc(100vh - 200px); + height: calc(100vh - 320px); display: flex; flex-direction: column; } @@ -103,12 +103,12 @@ const form = reactive({ .left-tabs { height: 100%; - + :deep(.el-tabs__content) { height: 100%; padding: 20px; } - + :deep(.el-tabs__nav-wrap) { padding-right: 20px; } @@ -117,10 +117,10 @@ const form = reactive({ .editor-container { height: 100%; padding: 0 20px; - + :deep(.el-textarea__inner) { height: 100%; - min-height: 400px; + min-height: 300px; } } @@ -128,8 +128,8 @@ const form = reactive({ display: flex; justify-content: flex-end; gap: 16px; - margin-top: 20px; - padding-top: 20px; + margin-top: 16px; + padding-top: 16px; border-top: 1px solid #eee; } \ No newline at end of file diff --git a/src/views/order/intention/index.vue b/src/views/order/intention/index.vue index 29fc6c5..c6936c3 100644 --- a/src/views/order/intention/index.vue +++ b/src/views/order/intention/index.vue @@ -56,18 +56,18 @@ icon="Plus" @click="handleAdd" v-hasPermi="['order:intention:add']" - >新增新增订单/意向单 修改查看 @@ -78,7 +78,7 @@ :disabled="multiple" @click="handleDelete" v-hasPermi="['order:intention:remove']" - >删除取消 - {{ index + 1 }}、{{ item.date }}: - {{ item.description }} + {{ index + 1 }}、{{ item.date }}: + + + {{ item.description }} +
@@ -142,17 +154,17 @@ @@ -166,7 +178,7 @@ @pagination="getList" /> - + item.id === id) // if (intention) { // form.value = { ...intention } // open.value = true - // title.value = "修改意向订单" + // title.value = "查看意向订单" // } router.push({ path: "/order/create", query: { id: id } }); } @@ -340,7 +352,7 @@ function handleUpdate(row) { // const index = mockData.value.findIndex(item => item.id === form.value.id); // if (index !== -1) { // mockData.value[index] = { ...form.value }; -// ElMessage.success("修改成功"); +// ElMessage.success("查看成功"); // } // } else { // // Add operation @@ -355,11 +367,11 @@ function handleUpdate(row) { // }); // } -/** 删除按钮操作 */ +/** 取消按钮操作 */ function handleDelete(row) { const intentionIds = row.id ? [row.id] : ids.value; ElMessageBox.confirm( - '是否确认删除意向订单编号为"' + intentionIds + '"的数据项?', + '是否确认取消意向订单编号为"' + intentionIds + '"的数据项?', "警告", { confirmButtonText: "确定", @@ -368,14 +380,14 @@ function handleDelete(row) { } ) .then(() => { - // 模拟删除 + // 模拟取消 mockData.value = mockData.value.filter( (item) => !intentionIds.includes(item.id) ); ids.value = []; // Clear selection after deletion single.value = true; multiple.value = true; - ElMessage.success("删除成功"); + ElMessage.success("取消成功"); getList(); }) .catch(() => {}); // Catch cancel to avoid console error @@ -394,6 +406,15 @@ function handleDelete(row) { // } // } +// Add isPastDate function +function isPastDate(dateStr) { + const today = new Date(); + today.setHours(0, 0, 0, 0); + const itemDate = new Date(dateStr); + itemDate.setHours(0, 0, 0, 0); + return itemDate <= today; +} + onMounted(() => { getList(); });