From 931e45f5f78494c7af4cab75053da49b57f22fbe Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 13 十月 2025 14:31:43 +0800
Subject: [PATCH] 定时自动叫号 与 WMS获取车辆是否在园接口开发
---
admin/src/components/common/QueryForm/queryForm.vue | 52 +++++++++++++++++++++++++++-------------------------
1 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/admin/src/components/common/QueryForm/queryForm.vue b/admin/src/components/common/QueryForm/queryForm.vue
index bb962f5..092d6b6 100644
--- a/admin/src/components/common/QueryForm/queryForm.vue
+++ b/admin/src/components/common/QueryForm/queryForm.vue
@@ -2,15 +2,13 @@
<div class="doumee-filter">
<el-form inline label-suffix="锛�" @submit.native.prevent>
<template v-for="(item, index) in queryFormConfig.formItems">
- <el-form-item v-if="item.type === 'input' && (showZk || index < listLength)" :key="item.filed"
- :label="item.label">
+ <el-form-item v-if="item.type === 'input' && (showZk || index < listLength)" :key="item.filed">
<el-input v-model="searchForm[item.filed]"
:clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
- :placeholder="item.placeholder ? item.placeholder : '璇疯緭鍏�' + item.label" class="w200"
- @change="changeForm(item.filed)" @keyup.enter.native="handlekeyup(item.keyup || false)" />
+ :placeholder="item.label" class="w200" @change="changeForm(item.filed)"
+ @keyup.enter.native="handlekeyup(item.keyup || false)" />
</el-form-item>
- <el-form-item v-if="item.type === 'moneySelect' && (showZk || index < listLength)" :key="item.label"
- :label="item.label">
+ <el-form-item v-if="item.type === 'moneySelect' && (showZk || index < listLength)" :key="item.label">
<el-input v-model="searchForm[item.filedStrt]"
:clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
:placeholder="item.start" style="width: 150px" />
@@ -19,48 +17,52 @@
:clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
:placeholder="item.end" style="width: 150px" />
</el-form-item>
- <el-form-item v-if="item.type === 'select' && (showZk || index < listLength)" :key="item.filed"
- :label="item.label">
+ <el-form-item v-if="item.type === 'select' && (showZk || index < listLength)" :key="item.filed">
<el-select v-model="searchForm[item.filed]" :filterable="item.filterable || true"
:clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
- :placeholder="item.placeholder ? item.placeholder : '璇烽�夋嫨' + item.label" class="w200"
- @change="changeForm(item.filed)">
+ :placeholder="item.label" class="w200" @change="changeForm(item.filed)">
<el-option v-for="opt, i in item.options" :key="i" :value="item.valueCode ? opt[item.valueCode] : opt.value"
:label="item.labelCode ? opt[item.labelCode] : opt.label" />
</el-select>
</el-form-item>
- <el-form-item v-if="item.type === 'date' && (showZk || index < listLength)" :key="item.filed"
- :label="item.label || '鏃ユ湡'">
+ <el-form-item v-if="item.type === 'date' && (showZk || index < listLength)" :key="item.filed">
<el-date-picker v-model="searchForm[item.filed]" type="date" value-format="yyyy-MM-dd" class="w200"
:clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
- :placeholder="item.placeholder || '璇烽�夋嫨鏃ユ湡'" :picker-options="item.pickerOptions || {}"
- @change="changeForm(item.filed)" />
+ :placeholder="item.label" :picker-options="item.pickerOptions || {}" @change="changeForm(item.filed)" />
</el-form-item>
- <el-form-item v-if="item.type === 'daterange' && (showZk || index < listLength)" :key="item.filed"
- :label="item.label || ''">
+ <el-form-item :label="item.label ? item.label : '璧锋鏃堕棿'"
+ v-if="item.type === 'datetime' && (showZk || index < listLength)" :key="item.filed1">
+ <el-date-picker v-model="searchForm[item.filed1]" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+ class="w200"
+ :clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
+ placeholder="寮�濮嬫椂闂�" @change="changeForm(item.filed)" />
+ <el-date-picker v-model="searchForm[item.filed2]" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+ class="w200"
+ :clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
+ placeholder="缁撴潫鏃堕棿" @change="changeForm(item.filed)" />
+ </el-form-item>
+ <el-form-item v-if="item.type === 'daterange' && (showZk || index < listLength)" :key="item.filed">
<el-date-picker v-model="searchForm[item.filed]" value-format="yyyy-MM-dd" type="daterange"
range-separator="鑷�"
:clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
:start-placeholder="item.start || ''" :end-placeholder="item.end || ''"
:picker-options="item.pickerOptions || {}" class="w400" @change="changeForm(item.filed)" />
</el-form-item>
- <el-form-item v-if="item.type === 'timePicker' && (showZk || index < listLength)" :key="item.filed"
- :label="item.label || '閫夋嫨鏃堕棿'">
+ <el-form-item v-if="item.type === 'timePicker' && (showZk || index < listLength)" :key="item.filed">
<el-time-picker v-model="searchForm[item.filed]" is-range range-separator="鑷�" format="HH:mm"
value-format="HH:mm" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿" placeholder="閫夋嫨鏃堕棿鑼冨洿" class="w400"
@change="changeForm(item.filed)" />
</el-form-item>
- <el-form-item v-if="item.type === 'datetimerange' && (showZk || index < listLength)" :key="item.filed"
- :label="item.label || '閫夋嫨鏃ユ湡'">
+ <el-form-item v-if="item.type === 'datetimerange' && (showZk || index < listLength)" :key="item.filed">
<el-date-picker v-model="searchForm[item.filed]" format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange"
+ value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" :default-time="['00:00:00', '23:59:59']"
:picker-options="item.pickerOptions || pickerOptions" range-separator="鑷�"
:clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
:start-placeholder="item.start || '寮�濮嬫椂闂�'" :end-placeholder="item.end || '缁撴潫鏃堕棿'" class="w400"
@change="changeForm(item.filed)" />
</el-form-item>
- <el-form-item v-if="item.type === 'slot' && (showZk || index < listLength)" :key="item.filed"
- :label="item.label">
+ <el-form-item :label="item.label ? item.label : ''"
+ v-if="item.type === 'slot' && (showZk || index < listLength)" :key="item.filed">
<slot :name="item.filed" />
</el-form-item>
</template>
@@ -190,8 +192,8 @@
align-items: center;
background-color: #fff;
border-bottom: 10px solid #f7f8f9;
- margin: 0 -30px;
- padding: 0 0 0 30px;
+ margin: 0 -20px;
+ padding: 0 0 0 20px;
.el-input,
.el-select {
--
Gitblit v1.9.3