feat: 新增现场日历并将四类日历的起止地改为选填,以支持现场派车记录。
This commit is contained in:
1 parent
0453e90000
commit
cd99b040aa
15 files changed
+172
-31
No files matched your search
@@ -1,6 +1,6 @@
|
||||
import request, { pickBxData } from '@/utils/http/bx'
|
||||
|
||||
export type DispatchCalendarKind = 'acid' | 'alkali' | 'other'
|
||||
export type DispatchCalendarKind = 'acid' | 'alkali' | 'other' | 'site'
|
||||
|
||||
export interface DispatchCalendarBody {
|
||||
dispatchDate: string
|
||||
|
||||
@@ -128,14 +128,12 @@
|
||||
<van-field
|
||||
v-model="draft.origin"
|
||||
label="始发地"
|
||||
required
|
||||
maxlength="255"
|
||||
placeholder="请输入始发地"
|
||||
/>
|
||||
<van-field
|
||||
v-model="draft.destination"
|
||||
label="目的地"
|
||||
required
|
||||
maxlength="255"
|
||||
placeholder="请输入目的地"
|
||||
/>
|
||||
|
||||
@@ -179,10 +179,10 @@
|
||||
><template #append>吨</template></el-input
|
||||
></el-form-item
|
||||
>
|
||||
<el-form-item label="始发地" required
|
||||
<el-form-item label="始发地"
|
||||
><el-input v-model="draft.origin" maxlength="255" placeholder="请输入始发地"
|
||||
/></el-form-item>
|
||||
<el-form-item label="目的地" required
|
||||
<el-form-item label="目的地"
|
||||
><el-input v-model="draft.destination" maxlength="255" placeholder="请输入目的地"
|
||||
/></el-form-item>
|
||||
<el-form-item label="备注" class="form-col-span-2"
|
||||
|
||||
@@ -3,18 +3,21 @@
|
||||
<div
|
||||
class="dispatch-calendar-tabs"
|
||||
:class="{
|
||||
'manual-calendar-theme': active === 'acid' || active === 'alkali' || active === 'other'
|
||||
'manual-calendar-theme':
|
||||
active === 'acid' || active === 'alkali' || active === 'other' || active === 'site'
|
||||
}"
|
||||
>
|
||||
<el-tabs v-model="active">
|
||||
<el-tab-pane label="酸派车日历" name="acid" />
|
||||
<el-tab-pane label="碱派车日历" name="alkali" />
|
||||
<el-tab-pane label="其他日历" name="other" />
|
||||
<el-tab-pane label="现场日历" name="site" />
|
||||
<el-tab-pane label="实际派车信息" name="actual" />
|
||||
</el-tabs>
|
||||
<ManualCalendar v-if="active === 'acid'" calendar-kind="acid" title="酸派车日历" />
|
||||
<ManualCalendar v-else-if="active === 'alkali'" calendar-kind="alkali" title="碱派车日历" />
|
||||
<ManualCalendar v-else-if="active === 'other'" calendar-kind="other" title="其他日历" />
|
||||
<ManualCalendar v-else-if="active === 'site'" calendar-kind="site" title="现场日历" />
|
||||
<ActualCalendar v-else />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -118,8 +118,6 @@ export function validateManualDraft(body: DispatchCalendarBody): string {
|
||||
return '请选择有效的派车日期'
|
||||
if (!body.vehicleId) return '请选择车辆'
|
||||
if (!body.productId) return '请选择产品'
|
||||
if (!body.origin.trim()) return '请填写始发地'
|
||||
if (!body.destination.trim()) return '请填写目的地'
|
||||
if (body.origin.trim().length > 255 || body.destination.trim().length > 255)
|
||||
return '始发地和目的地最多255个字符'
|
||||
if (manualQuantityText(body.quantity) && !QUANTITY_TEXT.test(manualQuantityText(body.quantity)))
|
||||
|
||||
Reference in new issue
Block a user