提交
This commit is contained in:
1 parent
299609706c
commit
e46c0480d4
87 files changed
+11975
-15543
No files matched your search
@@ -357,7 +357,7 @@
|
||||
scroll-to-error
|
||||
>
|
||||
<el-form-item label="车牌号" prop="vehicleNo">
|
||||
<DbVehicleSelect ref="vehicleSelectRef" v-model="formData.vehicleNo" />
|
||||
<PlVehicleSelect v-model="formData.vehicleNo" />
|
||||
</el-form-item>
|
||||
<el-form-item label="产品" prop="productId">
|
||||
<DbCrmProductSelect
|
||||
@@ -504,7 +504,7 @@
|
||||
import DbCrmProductSelect from '@/components/business/db/DbCrmProductSelect.vue'
|
||||
import DbRelatedViewDialog from '@/components/business/db/DbRelatedViewDialog.vue'
|
||||
import { buildWeighingRelatedSections } from '@/components/business/db/db-related-view'
|
||||
import DbVehicleSelect from '@/components/business/db/DbVehicleSelect.vue'
|
||||
import PlVehicleSelect from '@/components/business/pl/PlVehicleSelect.vue'
|
||||
import { useDbInstantSearch } from '@/composables/useDbInstantSearch'
|
||||
import { $modal } from '@/utils/modal'
|
||||
import { inventoryApi } from '@/api/db/inventory'
|
||||
@@ -552,7 +552,6 @@
|
||||
const timeRange = ref<[string, string] | null>([formatYmd(new Date()), formatYmd(new Date())])
|
||||
|
||||
const modalOpen = ref(false)
|
||||
const vehicleSelectRef = ref<InstanceType<typeof DbVehicleSelect> | null>(null)
|
||||
const editingRecord = ref<WeighingRecord | null>(null)
|
||||
const relatedModalOpen = ref(false)
|
||||
const loadingRelated = ref(false)
|
||||
@@ -592,7 +591,7 @@
|
||||
})
|
||||
|
||||
const formRules = {
|
||||
vehicleNo: [{ required: true, message: '请输入车牌号', trigger: 'blur' }],
|
||||
vehicleNo: [{ required: true, message: '请选择车牌号', trigger: 'change' }],
|
||||
productId: [{ required: true, message: '请选择 CRM 产品', trigger: 'change' }],
|
||||
supplier: [{ required: true, message: '请输入供货单位', trigger: 'blur' }],
|
||||
consignee: [{ required: true, message: '请输入收货单位', trigger: 'blur' }]
|
||||
@@ -903,9 +902,6 @@
|
||||
if (!valid) return
|
||||
saving.value = true
|
||||
try {
|
||||
if (formData.vehicleNo?.trim()) {
|
||||
await vehicleSelectRef.value?.ensureVehicleExists()
|
||||
}
|
||||
const hasGrossWeight = formData.grossWeight && formData.grossWeight > 0
|
||||
const hasTareWeight = formData.tareWeight && formData.tareWeight > 0
|
||||
if (hasGrossWeight && hasTareWeight) {
|
||||
|
||||
Reference in new issue
Block a user