diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/car-icon.png b/sub-operation-service/src/assets/images/warehouseLogistics/car-icon.png new file mode 100644 index 0000000..11ba0f4 Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/car-icon.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/company-vehicles1.png b/sub-operation-service/src/assets/images/warehouseLogistics/company-vehicles1.png new file mode 100644 index 0000000..033b809 Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/company-vehicles1.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/company-vehicles2.png b/sub-operation-service/src/assets/images/warehouseLogistics/company-vehicles2.png new file mode 100644 index 0000000..08a7e1e Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/company-vehicles2.png differ diff --git a/sub-operation-service/src/assets/images/warehouseLogistics/company-vehicles3.png b/sub-operation-service/src/assets/images/warehouseLogistics/company-vehicles3.png new file mode 100644 index 0000000..ab72510 Binary files /dev/null and b/sub-operation-service/src/assets/images/warehouseLogistics/company-vehicles3.png differ diff --git a/sub-operation-service/src/views/shoppingCarts/components/leftMenu.vue b/sub-operation-service/src/views/shoppingCarts/components/leftMenu.vue index 3e655c1..cab4b07 100644 --- a/sub-operation-service/src/views/shoppingCarts/components/leftMenu.vue +++ b/sub-operation-service/src/views/shoppingCarts/components/leftMenu.vue @@ -2,7 +2,7 @@
- +
- +
@@ -120,74 +100,48 @@ import Common from '../components/common.vue'; import { useGetCommonData } from '@/store/modules/common.js'; import { storeToRefs } from 'pinia'; import { ElMessage } from 'element-plus'; +import { getRegion } from '@/apis/common'; const store = useGetCommonData(); const { data } = storeToRefs(store); - const route = useRoute(); const router = useRouter(); -const tab0 = reactive(['物流服务', '物流需求']); -const tab1 = reactive(['全部', '物流公司', '个人']); -const tab2 = reactive(['全部', '11米7', '13米', '13米7', '15米']); -const tab3 = reactive(['全部', '厢式', '平板', '高栏', '飞翼', '开顶']); +const tab0 = reactive(['选择位置']); const currentTab0 = ref(0); -const currentTab1 = ref(0); -const currentTab2 = ref(0); -const currentTab3 = ref(0); +const formSize = 'large'; + +import img1 from './images/xiangshi.png'; +import img2 from './images/gaolan.png'; const state = reactive({ menus: warehouseLogisticsRoutes[0].children, query: { current: {}, + selectedAddress: [], + detailAddress: '', }, data: [ { - imageUrl: '/storage1.jpg', - title: '果蔬保鲜仓储', - description: '绿鲜蔬选果蔬仓储中心 ', - location: '临沧市-耿马县', - price: '600.0', - rank: '1', + imageUrl: img1, + title: '长途大车', + licensePlate: '云AL6AB7', + conductor: '15m', + vehicleNature: '物流公司', + vehicleModel: '厢式', + maximumPayload: '1000吨', + freeTime: '2025.05.05', + price: '￥20元/吨/公里', }, { - imageUrl: '/storage2.jpg', - title: '果蔬保鲜仓储', - description: '绿鲜蔬选果蔬仓储中心', - location: '临沧市-耿马县', - price: '600.0', - rank: '2', - }, - { - imageUrl: '/storage3.jpg', - title: '果蔬保鲜仓储', - description: '绿鲜蔬选果蔬仓储中心 ', - location: '临沧市-耿马县', - price: '600.0', - rank: '3', - }, - { - imageUrl: '/storage3.jpg', - title: '果蔬保鲜仓储', - description: '绿鲜蔬选果蔬仓储中心 ', - location: '临沧市-耿马县', - price: '600.0', - rank: '', - }, - { - imageUrl: '/storage3.jpg', - title: '果蔬保鲜仓储', - description: '绿鲜蔬选果蔬仓储中心 ', - location: '临沧市-耿马县', - price: '600.0', - rank: '', - }, - { - imageUrl: '/storage3.jpg', - title: '果蔬保鲜仓储', - description: '绿鲜蔬选果蔬仓储中心 ', - location: '临沧市-耿马县', - price: '600.0', - rank: '', + imageUrl: img2, + title: '长途大车', + licensePlate: '云AL5B15', + conductor: '13m', + vehicleNature: '个人', + vehicleModel: '高栏', + maximumPayload: '800吨', + freeTime: '2025.05.08', + price: '￥20元/吨/公里', }, ], }); @@ -200,13 +154,7 @@ const paginations = reactive({ const dialogFormVisible = ref(false); const formLabelWidth = ref('120px'); - -onMounted(() => { - getWarehouseList('1'); -}); - const currentTab = ref(0); - const currentChange = (current) => { paginations.page = current; getWarehouseList(currentTab.value + 1); @@ -279,6 +227,30 @@ const priceConfirm = () => { } }); }; + +// 级联选择器配置 +const cascaderProps = ref({ + label: 'areaName', // 选项标签字段名 + value: 'areaCode', // 选项值字段名 + children: 'areaChildVOS', // 子选项字段名 + emitPath: true, + expandTrigger: 'hover', +}); +// 省市区数据（示例） +const addressOptions = ref([]); +const getArea = async () => { + const res = await getRegion(); + if (res.code === 200) { + addressOptions.value = res.data; + } else { + ElMessage.error(res.message); + } +}; + +onMounted(() => { + // getWarehouseList('1'); + getArea(); +}); diff --git a/sub-operation-service/src/views/warehouseLogistics/warehouse/application.vue b/sub-operation-service/src/views/warehouseLogistics/warehouse/application.vue index 123db85..948d0fb 100644 --- a/sub-operation-service/src/views/warehouseLogistics/warehouse/application.vue +++ b/sub-operation-service/src/views/warehouseLogistics/warehouse/application.vue @@ -120,6 +120,119 @@ :style="{ width: unifiedWidth }" > + +
分拣包装需要
+ + + 需要 + 不需要 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
附加服务
+ + + + + + + + + + + + +
企业信息
+ + + + + + + + + + + +
提交 @@ -146,7 +259,6 @@ const state = reactive({ data: {}, }); -const dialogVisible = ref(false); const unifiedWidth = '300px'; const formSize = 'large'; const formRef = ref(null); @@ -164,6 +276,22 @@ const formInline = reactive({ goodsWeight: '', //货物重量 temperature: '', //温度要求 detailedDescription: '', //详情描述 + + sortingService: 2, //分拣包装服务 + sortingType: '', //分拣类型 + sortingStandards: '', //分拣标准 + packagingType: '', //包装类型 + packagingSpecifications: '', //包装规格 + dailySortingVolume: '', //日分拣量 + otherRequirements: '', //其他需求 + + additionalServicesList: [], //附加服务 + otherServices: '', //其他服务 + + enterpriseName: '', //企业名称 + contacts: '', //联系人 + contactNumber: '', //联系电话 + email: '', //电子邮箱 }); const resetForm = ref({ ...formInline }); const dialogRules = reactive({ @@ -251,6 +379,117 @@ const dialogRules = reactive({ { pattern: /^\d+(\.\d{1,2})?$/, message: '请输入有效数字（最多两位小数）', trigger: 'blur' }, ], detailedDescription: [{ required: true, message: '请输入详情描述', trigger: 'blur' }], + sortingType: [ + { + required: true, + validator: (rule, value, callback) => { + if (formInline.sortingService === 1 && !value) { + callback(new Error('请选择分拣类型')); + } else { + callback(); + } + }, + trigger: 'change', + }, + ], + + sortingStandards: [ + { + required: true, + validator: (rule, value, callback) => { + if (formInline.sortingService === 1 && !value) { + callback(new Error('请选择分拣标准')); + } else { + callback(); + } + }, + trigger: 'change', + }, + ], + + packagingType: [ + { + required: true, + validator: (rule, value, callback) => { + if (formInline.sortingService === 1 && !value) { + callback(new Error('请选择包装类型')); + } else { + callback(); + } + }, + trigger: 'change', + }, + ], + + packagingSpecifications: [ + { + required: true, + validator: (rule, value, callback) => { + if (formInline.sortingService === 1 && !value) { + callback(new Error('请输入包装规格')); + } else if (formInline.sortingService === 1 && !/^\d+(\.\d{1,2})?$/.test(value)) { + callback(new Error('请输入有效数字（最多两位小数）')); + } else { + callback(); + } + }, + trigger: 'blur', + }, + ], + + dailySortingVolume: [ + { + required: true, + validator: (rule, value, callback) => { + if (formInline.sortingService === 1 && !value) { + callback(new Error('请输入日分拣量')); + } else if (formInline.sortingService === 1 && !/^\d+(\.\d{1,2})?$/.test(value)) { + callback(new Error('请输入有效数字（最多两位小数）')); + } else { + callback(); + } + }, + trigger: 'blur', + }, + ], + // 其他需求 + otherRequirements: [ + { + required: true, + validator: (rule, value, callback) => { + if (formInline.sortingService === 1 && !value) { + callback(new Error('请输入其他需求')); + } else { + callback(); + } + }, + trigger: 'blur', + }, + ], + + // 附加服务部分 + otherServices: [{ required: false, message: '请输入其他服务', trigger: 'blur' }], + + // 联系信息部分 + enterpriseName: [ + { required: true, message: '请输入企业名称', trigger: 'blur' }, + { min: 2, max: 50, message: '长度在2到50个字符', trigger: 'blur' }, + ], + + contacts: [ + { required: true, message: '请输入联系人', trigger: 'blur' }, + { min: 2, max: 20, message: '长度在2到20个字符', trigger: 'blur' }, + ], + + contactNumber: [ + { required: true, message: '请输入联系电话', trigger: 'blur' }, + { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }, + ], + + email: [ + { required: true, message: '请输入电子邮箱', trigger: 'blur' }, + { type: 'email', message: '请输入有效的邮箱地址', trigger: ['blur', 'change'] }, + ], }); // 禁用开始日期的逻辑（不能晚于已选的结束日期） const disableStartDate = (time) => { @@ -323,6 +562,28 @@ const goodsList = ref([ name: '冷藏货物', }, ]); +const sortingTypeList = ref([ + { id: 1, name: '分拣类型一' }, + { id: 2, name: '分拣类型二' }, +]); +const sortingStandardList = ref([ + { id: 1, name: '分拣标准一' }, + { id: 2, name: '分拣标准二' }, +]); +const packagingTypesList = ref([ + { id: 1, name: '包装类型一' }, + { id: 2, name: '包装类型二' }, +]); +const sortingServiceChange = (val) => { + if (val === 2) { + formInline.sortingType = ''; + formInline.sortingStandards = ''; + formInline.packagingType = ''; + formInline.packagingSpecifications = ''; + formInline.dailySortingVolume = ''; + formInline.otherRequirements = ''; + } +}; // 级联选择器配置 const cascaderProps = ref({ @@ -342,22 +603,28 @@ const getArea = async () => { ElMessage.error(res.message); } }; -const reservation = () => { - dialogVisible.value = true; - Object.assign(formInline, resetForm.value); -}; -const onSubmit = async () => { - await formRef.value.validate(); - ElMessage.success('提交成功'); - console.log(formInline); - dialogVisible.value = false; -}; const toBack = (level) => { router.go(level); }; -const application = () => { +const application = async () => { + // await formRef.value.validate(); + // ElMessage.success('提交成功'); + // console.log(formInline); + // if (formInline.sortingService === 2) { + // formInline.sortingType = ''; + // formInline.sortingStandards = ''; + // formInline.packagingType = ''; + // formInline.packagingSpecifications = ''; + // formInline.dailySortingVolume = ''; + // formInline.otherRequirements = ''; + // } + // 发起请求 + + // 请求返回成功后重置表单 + Object.assign(formInline, resetForm.value); + // 请求返回成功后跳转（资源分配）页面 router.push({ name: 'warehouse-allocation', });