提交
This commit is contained in:
1 parent
ba21c40058
commit
0e8f244bc3
16 files changed
+405027
-2098
No files matched your search
@@ -1927,20 +1927,20 @@
|
||||
return true
|
||||
}
|
||||
|
||||
/** 安排运输前:非内部客户(山峡/云栋)的装/送货段必须至少选一份合同 */
|
||||
function validateContractsForArrange() {
|
||||
/** 非内部客户(山峡/云栋)的装/送货段必须至少选一份合同(保存与安排均校验) */
|
||||
function validateStopContractsRequired() {
|
||||
if (
|
||||
!isPlInternalCustomerName(loadForm.value.customerName) &&
|
||||
!stopHasSelectedContract(loadForm.value.contracts)
|
||||
) {
|
||||
ElMessage.warning('安排运输前请为装货客户选择合同')
|
||||
ElMessage.warning('请为装货客户选择合同')
|
||||
return false
|
||||
}
|
||||
for (let i = 0; i < deliveryForms.value.length; i += 1) {
|
||||
const row = deliveryForms.value[i]
|
||||
if (isPlInternalCustomerName(row.customerName)) continue
|
||||
if (!stopHasSelectedContract(row.contracts)) {
|
||||
ElMessage.warning(`安排运输前请为送货段#${i + 1}选择合同`)
|
||||
ElMessage.warning(`请为送货段#${i + 1}选择合同`)
|
||||
return false
|
||||
}
|
||||
}
|
||||
@@ -1984,6 +1984,7 @@
|
||||
const valid = await basicFormRef.value?.validate().catch(() => false)
|
||||
if (!valid || !validateBusinessRules()) return
|
||||
if (!validateSingleContractPerStop()) return
|
||||
if (!validateStopContractsRequired()) return
|
||||
|
||||
if (mode === 'saveAndArrange' || mode === 'rearrange') {
|
||||
const missing = getArrangePrerequisiteGaps()
|
||||
@@ -1995,7 +1996,6 @@
|
||||
ElMessage.warning('安排运输前请选择车辆')
|
||||
return
|
||||
}
|
||||
if (!validateContractsForArrange()) return
|
||||
if (!validateStopProductsForArrange()) return
|
||||
}
|
||||
|
||||
|
||||
@@ -64,7 +64,8 @@
|
||||
const { pageTransition, containerWidth, refresh, showWorkTab } = storeToRefs(useSettingStore())
|
||||
const { keepAliveExclude } = storeToRefs(useWorktabStore())
|
||||
|
||||
const keepAliveMax = computed(() => (showWorkTab.value ? 10 : 1))
|
||||
// 多 Tab 常开场景下缓存过多会占满内存导致整机卡顿;上限压到 5
|
||||
const keepAliveMax = computed(() => (showWorkTab.value ? 5 : 1))
|
||||
|
||||
const isRefresh = shallowRef(true)
|
||||
const isOpenRouteInfo = import.meta.env.VITE_OPEN_ROUTE_INFO
|
||||
|
||||
Reference in new issue
Block a user