fix(物料管理): 修正出入库记录表单日期选择器类型及选项绑定
- 将日期选择器从datetime类型改为date类型,统一使用YYYY-MM-DD格式 - 修正入库记录表单中入库类型选项的绑定字段 - 添加出库记录查询表单的创建日期筛选条件 - 更新注释说明为"获取出入库类型列表"
This commit is contained in:
@@ -587,7 +587,7 @@ function getMaterialCodeList() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取入库类型列表
|
// 获取出入库类型列表
|
||||||
function getTypeOfWarehousingList() {
|
function getTypeOfWarehousingList() {
|
||||||
try {
|
try {
|
||||||
getTransactionOption('typeOfWarehousing').then((res) => {
|
getTransactionOption('typeOfWarehousing').then((res) => {
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
<el-input v-model="queryParams.operator" placeholder="请输入操作员" />
|
<el-input v-model="queryParams.operator" placeholder="请输入操作员" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="创建日期" prop="createdTime">
|
<el-form-item label="创建日期" prop="createdTime">
|
||||||
<el-date-picker v-model="queryParams.createdTime" type="datetime" placeholder="选择日期时间"> </el-date-picker>
|
<el-date-picker v-model="queryParams.createdTime" type="date" placeholder="选择日期" value-format="YYYY-MM-DD"> </el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
|
<el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
|
||||||
@@ -93,8 +93,7 @@
|
|||||||
|
|
||||||
<el-col :lg="12">
|
<el-col :lg="12">
|
||||||
<el-form-item label="创建时间" prop="createdTime">
|
<el-form-item label="创建时间" prop="createdTime">
|
||||||
<el-date-picker v-model="form.createdTime" type="datetime" placeholder="选择日期时间" value-format="YYYY-MM-DD HH:mm:ss">
|
<el-date-picker v-model="form.createdTime" type="date" placeholder="选择日期时间" value-format="YYYY-MM-DD"> </el-date-picker>
|
||||||
</el-date-picker>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
||||||
@@ -124,15 +123,13 @@
|
|||||||
|
|
||||||
<el-col :lg="12">
|
<el-col :lg="12">
|
||||||
<el-form-item label="有效期至" prop="expiryDate">
|
<el-form-item label="有效期至" prop="expiryDate">
|
||||||
<el-date-picker v-model="form.expiryDate" type="datetime" placeholder="选择日期时间" value-format="YYYY-MM-DD HH:mm:ss">
|
<el-date-picker v-model="form.expiryDate" type="date" placeholder="选择日期时间" value-format="YYYY-MM-DD"> </el-date-picker>
|
||||||
</el-date-picker>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
||||||
<el-col :lg="12">
|
<el-col :lg="12">
|
||||||
<el-form-item label="生产日期" prop="productionDate">
|
<el-form-item label="生产日期" prop="productionDate">
|
||||||
<el-date-picker v-model="form.productionDate" type="datetime" placeholder="选择日期时间" value-format="YYYY-MM-DD HH:mm:ss">
|
<el-date-picker v-model="form.productionDate" type="date" placeholder="选择日期时间" value-format="YYYY-MM-DD"> </el-date-picker>
|
||||||
</el-date-picker>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
||||||
@@ -147,9 +144,9 @@
|
|||||||
<el-select v-model="form.transactionType" placeholder="请选择入库类型">
|
<el-select v-model="form.transactionType" placeholder="请选择入库类型">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in options.transactionTypeOptions"
|
v-for="item in options.transactionTypeOptions"
|
||||||
:key="item.dictValue"
|
:key="item.value"
|
||||||
:label="item.dictLabel"
|
:label="item.label"
|
||||||
:value="item.dictValue"></el-option>
|
:value="item.value"></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
@@ -225,6 +222,7 @@ import {
|
|||||||
updateMmRecordInbound,
|
updateMmRecordInbound,
|
||||||
getMmRecordInbound
|
getMmRecordInbound
|
||||||
} from '@/api/materialManagement/productionMaterial/mmrecordinbound.js'
|
} from '@/api/materialManagement/productionMaterial/mmrecordinbound.js'
|
||||||
|
import { getTransactionOption } from '@/api/materialManagement/productionMaterial/mminventory.js'
|
||||||
const { proxy } = getCurrentInstance()
|
const { proxy } = getCurrentInstance()
|
||||||
const ids = ref([])
|
const ids = ref([])
|
||||||
const loading = ref(false)
|
const loading = ref(false)
|
||||||
@@ -236,7 +234,7 @@ const queryParams = reactive({
|
|||||||
sortType: 'asc',
|
sortType: 'asc',
|
||||||
supplierCode: null,
|
supplierCode: null,
|
||||||
operator: null,
|
operator: null,
|
||||||
createdTime: null,
|
createdTime: null
|
||||||
})
|
})
|
||||||
const columns = ref([
|
const columns = ref([
|
||||||
{ visible: true, align: 'center', type: '', prop: 'unit', label: '计量单位', showOverflowTooltip: true },
|
{ visible: true, align: 'center', type: '', prop: 'unit', label: '计量单位', showOverflowTooltip: true },
|
||||||
@@ -367,6 +365,7 @@ function handleAdd() {
|
|||||||
open.value = true
|
open.value = true
|
||||||
title.value = '添加入库记录表'
|
title.value = '添加入库记录表'
|
||||||
opertype.value = 1
|
opertype.value = 1
|
||||||
|
getTypeOfWarehousingList()
|
||||||
}
|
}
|
||||||
// 修改按钮操作
|
// 修改按钮操作
|
||||||
function handleUpdate(row) {
|
function handleUpdate(row) {
|
||||||
@@ -426,5 +425,19 @@ function handleDelete(row) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 获取出入库类型列表
|
||||||
|
function getTypeOfWarehousingList() {
|
||||||
|
try {
|
||||||
|
getTransactionOption('typeOfWarehousing').then((res) => {
|
||||||
|
const { code, data } = res
|
||||||
|
if (code == 200) {
|
||||||
|
state.options.transactionTypeOptions = data
|
||||||
|
}
|
||||||
|
})
|
||||||
|
} catch (error) {
|
||||||
|
proxy.$modal.msgError(error.message)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
handleQuery()
|
handleQuery()
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -12,6 +12,9 @@
|
|||||||
<el-form-item label="物料编码" prop="materialCode">
|
<el-form-item label="物料编码" prop="materialCode">
|
||||||
<el-input v-model="queryParams.materialCode" placeholder="请输入物料编码" />
|
<el-input v-model="queryParams.materialCode" placeholder="请输入物料编码" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="创建日期" prop="createdTime">
|
||||||
|
<el-date-picker v-model="queryParams.createdTime" type="date" placeholder="选择日期"value-format="YYYY-MM-DD"> </el-date-picker>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
|
<el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
|
||||||
<el-button icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
|
<el-button icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
|
||||||
@@ -177,7 +180,7 @@
|
|||||||
|
|
||||||
<el-col :lg="12">
|
<el-col :lg="12">
|
||||||
<el-form-item label="创建时间" prop="createdTime">
|
<el-form-item label="创建时间" prop="createdTime">
|
||||||
<el-date-picker v-model="form.createdTime" type="datetime" placeholder="选择日期时间" value-format="YYYY-MM-DD HH:mm:ss">
|
<el-date-picker v-model="form.createdTime" type="date" placeholder="选择日期时间" value-format="YYYY-MM-DD">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|||||||
Reference in New Issue
Block a user