lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改按钮颜色与页面上的日期框

Browse Source
This commit is contained in:
猫猫guowen
2025-07-05 09:18:17 +08:00
parent 6be43c4267
commit 451ec80549
20 changed files with 169 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/application.yml
View File

@@ -72,7 +72,7 @@ spring:
# 端口，默认为6379
port: 6379
# 数据库索引
database: 0
database: 2
# 密码
password: 123456
# 连接超时时间

4
ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
View File

@@ -77,8 +77,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="priority != null "> and mj.priority = #{priority}</if>
<if test="executionPhase != null and executionPhase != ''"> and mj.execution_phase = #{executionPhase}</if>
<if test="inOrOut != null and inOrOut != ''"> and mj.in_or_out = #{inOrOut}</if>
<if test="startTime != null and startTime != ''"> and mj.start_time = #{startTime}</if>
<if test="finishTime != null and finishTime != ''"> and mj.finish_time = #{finishTime}</if>
<if test="startTime != null and startTime != ''"> and mj.start_time like concat('%', #{startTime}, '%')</if>
<if test="finishTime != null and finishTime != ''"> and mj.finish_time like concat('%', #{finishTime}, '%')</if>
<if test="entranceId != null and entranceId != ''"> and mj.entrance_id = #{entranceId}</if>
<if test="exitId != null and exitId != ''"> and mj.exit_id = #{exitId}</if>
<if test="classId != null and classId != ''"> and mj.class_id = #{classId}</if>

2
ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
View File

@@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="stockStatus != null and stockStatus != ''"> and bs.stock_status = #{stockStatus}</if>
<if test="productStatus != null and productStatus != ''"> and bs.product_status = #{productStatus}</if>
<if test="lotNo != null and lotNo != ''"> and bs.lot_no = #{lotNo}</if>
<if test="inDate != null and inDate != ''"> and bs.in_date = #{inDate}</if>
<if test="inDate != null and inDate != ''"> and bs.in_date like concat('%', #{inDate}, '%')</if>
<if test="backDate != null and backDate != ''"> and bs.back_date = #{backDate}</if>
<if test="productGuid != null and productGuid != ''"> and bs.product_guid = #{productGuid}</if>
<if test="productName != null and productName != ''"> and bp.product_name = #{productName}</if>

6
ruoyi-ui/src/assets/styles/element-variables.scss
View File

@@ -4,9 +4,9 @@
**/
/* theme color */
$--color-primary: #1890ff;
$--color-success: #13ce66;
$--color-warning: #ffba00;
$--color-primary: #2a7fff;
$--color-success: #5ec468;
$--color-warning: #f97e19;
$--color-danger: #ff4949;
// $--color-info: #1E1E1E;

1
ruoyi-ui/src/lang/en.js
View File

@@ -334,6 +334,7 @@ export default {
selectStartTime: 'Please select start time',
finishTime: 'End Time',
selectFinishTime: 'Please select end time',
createTime:'Create Time',
// Location Information
warehouse: 'Warehouse',

1
ruoyi-ui/src/lang/zh.js
View File

@@ -304,6 +304,7 @@ export default {
selectStartTime: '请选择开始时间',
finishTime: '结束时间',
selectFinishTime: '请选择结束时间',
createTime:'创建时间',
// 位置信息
warehouse: '仓库',

15
ruoyi-ui/src/views/check/flat/index.vue
View File

@@ -47,13 +47,14 @@
/>
</el-select>
</el-form-item>-->
<el-form-item :label="$t('stockManagement.inDate')" prop="inDate"><!-- 入库时间 -->
<el-input
v-model="queryParams.inDate"
:placeholder="$t('stockManagement.inputInDate')"
clearable
@keyup.enter.native="handleQuery"
/>
<el-form-item :label="$t('stockManagement.inDate')" prop="startDate">
<el-date-picker clearable
v-model="queryParams.inDate"
type="date"
value-format="yyyy-MM-dd"
:placeholder="$t('stockManagement.inputInDate')">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="回流时间" prop="backDate">
<el-input

11
ruoyi-ui/src/views/out/addOutStockout.vue
View File

@@ -292,4 +292,13 @@ export default {
}
};
</script>
<style scoped>
.el-table >>> .current-row {
background-color: #f0f9eb;
}
.el-form-item >>> .el-form-item__label {
white-space: nowrap;
width: auto;
min-width: fit-content;
}
</style>

8
ruoyi-ui/src/views/out/outStockoutManage.vue
View File

@@ -57,16 +57,16 @@
<el-form-item :label="$t('outStockoutManage.startDate')" prop="startDate">
<el-date-picker clearable
v-model="queryParams.startDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
type="date"
value-format="yyyy-MM-dd"
:placeholder="$t('outStockoutManage.selectStartDate')">
</el-date-picker>
</el-form-item>
<el-form-item :label="$t('outStockoutManage.finishDate')" prop="finishDate">
<el-date-picker clearable
v-model="queryParams.finishDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
type="date"
value-format="yyyy-MM-dd"
:placeholder="$t('outStockoutManage.selectFinishDate')">
</el-date-picker>
</el-form-item>

10
ruoyi-ui/src/views/search/StockSummary/index.vue
View File

@@ -249,3 +249,13 @@ export default {
}
};
</script>
<style scoped>
.el-table >>> .current-row {
background-color: #f0f9eb;
}
.el-form-item >>> .el-form-item__label {
white-space: nowrap;
width: auto;
min-width: fit-content;
}
</style>

10
ruoyi-ui/src/views/search/ViewFlatWarehouseInFlow/index.vue
View File

@@ -477,3 +477,13 @@ export default {
}
}
</script>
<style scoped>
.el-table >>> .current-row {
background-color: #f0f9eb;
}
.el-form-item >>> .el-form-item__label {
white-space: nowrap;
width: auto;
min-width: fit-content;
}
</style>

10
ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue
View File

@@ -504,3 +504,13 @@ export default {
}
}
</script>
<style scoped>
.el-table >>> .current-row {
background-color: #f0f9eb;
}
.el-form-item >>> .el-form-item__label {
white-space: nowrap;
width: auto;
min-width: fit-content;
}
</style>

18
ruoyi-ui/src/views/search/ViewInJobFlow/index.vue
View File

@@ -221,16 +221,16 @@
<el-form-item :label="$t('searchViewInJobFlow.startTime')" prop="startTime"> <!-- 开始时间 -->
<el-date-picker clearable
v-model="queryParams.startTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
type="date"
value-format="yyyy-MM-dd"
:placeholder="$t('searchViewInJobFlow.selectStartTime')">
</el-date-picker>
</el-form-item>
<el-form-item :label="$t('searchViewInJobFlow.finishTime')" prop="finishTime"> <!-- 结束时间 -->
<el-date-picker clearable
v-model="queryParams.finishTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
type="date"
value-format="yyyy-MM-dd"
:placeholder="$t('searchViewInJobFlow.selectFinishTime')">
</el-date-picker>
</el-form-item>
@@ -745,3 +745,13 @@ export default {
}
}
</script>
<style scoped>
.el-table >>> .current-row {
background-color: #f0f9eb;
}
.el-form-item >>> .el-form-item__label {
white-space: nowrap;
width: auto;
min-width: fit-content;
}
</style>

18
ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
View File

@@ -205,16 +205,16 @@
<el-form-item :label="$t('searchViewOutJobFlow.startTime')" prop="startTime"> <!-- 开始时间 -->
<el-date-picker clearable
v-model="queryParams.startTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
type="date"
value-format="yyyy-MM-dd"
:placeholder="$t('searchViewOutJobFlow.selectStartTime')">
</el-date-picker>
</el-form-item>
<el-form-item :label="$t('searchViewOutJobFlow.finishTime')" prop="finishTime"> <!-- 结束时间 -->
<el-date-picker clearable
v-model="queryParams.finishTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
type="date"
value-format="yyyy-MM-dd"
:placeholder="$t('searchViewOutJobFlow.selectFinishTime')">
</el-date-picker>
</el-form-item>
@@ -775,3 +775,13 @@ export default {
}
}
</script>
<style scoped>
.el-table >>> .current-row {
background-color: #f0f9eb;
}
.el-form-item >>> .el-form-item__label {
white-space: nowrap;
width: auto;
min-width: fit-content;
}
</style>

18
ruoyi-ui/src/views/search/ViewStockDetail/index.vue
View File

@@ -76,12 +76,14 @@
/>
</el-form-item>
<el-form-item :label="$t('searchViewStockDetail.inDate')" prop="inDate"> <!-- 入库时间 -->
<el-input
<el-date-picker
v-model="queryParams.inDate"
:placeholder="$t('searchViewStockDetail.inputInDate')"
clearable
@keyup.enter.native="handleQuery"
/>
type="date"
value-format="yyyy-MM-dd"
@keyup.enter.native="handleQuery">
</el-date-picker>
</el-form-item>
<!-- <el-form-item :label="$t('searchViewStockDetail.warehouseId')" prop="warehouseId"> &lt;!&ndash; 仓库 &ndash;&gt;-->
<!-- <el-input-->
@@ -571,3 +573,13 @@ export default {
}
}
</script>
<style scoped>
.el-table >>> .current-row {
background-color: #f0f9eb;
}
.el-form-item >>> .el-form-item__label {
white-space: nowrap;
width: auto;
min-width: fit-content;
}
</style>

24
ruoyi-ui/src/views/search/ViewStockSecure/index.vue
View File

@@ -55,13 +55,13 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('searchViewStockSecure.inDate')" prop="inDate"> <!-- 入库时间 -->
<el-input
v-model="queryParams.inDate"
:placeholder="$t('searchViewStockSecure.inputInDate')"
clearable
@keyup.enter.native="handleQuery"
/>
<el-form-item :label="$t('searchViewStockSecure.inDate')" prop="inDate"><!-- 入库时间 -->
<el-date-picker clearable
v-model="queryParams.inDate"
type="date"
value-format="yyyy-MM-dd"
:placeholder="$t('searchViewStockSecure.inputInDate')">
</el-date-picker>
</el-form-item>
<el-form-item :label="$t('searchViewStockSecure.backDate')" prop="backDate"> <!-- 回流时间 -->
<el-input
@@ -557,3 +557,13 @@ export default {
}
}
</script>
<style scoped>
.el-table >>> .current-row {
background-color: #f0f9eb;
}
.el-form-item >>> .el-form-item__label {
white-space: nowrap;
width: auto;
min-width: fit-content;
}
</style>

20
ruoyi-ui/src/views/search/ViewStockWarning/index.vue
View File

@@ -56,13 +56,17 @@
/>
</el-form-item>-->
<el-form-item :label="$t('searchViewStockWarning.inDate')" prop="inDate"> <!-- 入库时间 -->
<el-input
<el-date-picker
v-model="queryParams.inDate"
:placeholder="$t('searchViewStockWarning.inputInDate')"
clearable
@keyup.enter.native="handleQuery"
/>
type="date"
value-format="yyyy-MM-dd"
@keyup.enter.native="handleQuery">
</el-date-picker>
</el-form-item>
<!-- <el-form-item :label="$t('searchViewStockWarning.backDate')" prop="backDate"> &lt;!&ndash; 回流时间 &ndash;&gt;
<el-input
v-model="queryParams.backDate"
@@ -546,3 +550,13 @@ export default {
}
}
</script>
<style scoped>
.el-table >>> .current-row {
background-color: #f0f9eb;
}
.el-form-item >>> .el-form-item__label {
white-space: nowrap;
width: auto;
min-width: fit-content;
}
</style>

18
ruoyi-ui/src/views/search/ViewStockinHistory/index.vue
View File

@@ -40,18 +40,18 @@
<el-form-item :label="$t('searchViewStockinHistory.createDate')" prop="createDate"> <!-- 创建时间 -->
<el-date-picker
v-model="queryParams.createDate"
type="datetime"
type="date"
:placeholder="$t('searchViewStockinHistory.selectCreateDate')"
value-format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd"
clearable
/>
</el-form-item>
<el-form-item :label="$t('searchViewStockinHistory.finishDate')" prop="finishDate"> <!-- 完成时间 -->
<el-date-picker
v-model="queryParams.finishDate"
type="datetime"
type="date"
:placeholder="$t('searchViewStockinHistory.selectFinishDate')"
value-format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd"
clearable
/>
</el-form-item>
@@ -747,3 +747,13 @@ export default {
}
}
</script>
<style scoped>
.el-table >>> .current-row {
background-color: #f0f9eb;
}
.el-form-item >>> .el-form-item__label {
white-space: nowrap;
width: auto;
min-width: fit-content;
}
</style>

10
ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue
View File

@@ -579,3 +579,13 @@ export default {
}
}
</script>
<style scoped>
.el-table >>> .current-row {
background-color: #f0f9eb;
}
.el-form-item >>> .el-form-item__label {
white-space: nowrap;
width: auto;
min-width: fit-content;
}
</style>

14
ruoyi-ui/src/views/stock/management/index.vue
View File

@@ -47,13 +47,13 @@
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('stockManagement.inDate')" prop="inDate"><!-- 入库时间 -->
<el-input
v-model="queryParams.inDate"
:placeholder="$t('stockManagement.inputInDate')"
clearable
@keyup.enter.native="handleQuery"
/>
<el-form-item :label="$t('stockManagement.inDate')" prop="startDate"><!-- 入库时间 -->
<el-date-picker clearable
v-model="queryParams.inDate"
type="date"
value-format="yyyy-MM-dd"
:placeholder="$t('stockManagement.inputInDate')">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="回流时间" prop="backDate">
<el-input