yunxi
/
mes-majoys
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

字段 搜索条件 新增及优化

Browse Source
dev
qiuhongwu 3 months ago
parent 34e2c94d79
commit 79e366c4d6
6 changed files with 124 additions and 30 deletions
Show Stats Download Patch File Download Diff File

5
mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageForm.vue
Unescape View File

@ -36,9 +36,9 @@
<el-select <el-select
v-model="formData.stockInType" v-model="formData.stockInType"
clearable clearable
disabled
style="width: 100%" style="width: 100%"
@change="handleStockType" @change="handleStockType"
v-bind:disabled="ctrView || ctrSave || enableHeadNo || activetype !== 'create'"
> >
<el-option <el-option
v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_STORAGE_IN_TYPE)" v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_STORAGE_IN_TYPE)"
@ -55,11 +55,10 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="单据日期" prop="createTime"> <el-form-item label="单据日期" prop="createTime">
<!-- {{ formatDate(formData.createTime, 'YYYY-MM-DD HH:mm:ss') }} -->
<el-date-picker <el-date-picker
v-model="formData.createTime" v-model="formData.createTime"
value-format="x" value-format="x"
placeholder="单据日期" placeholder="系统自动生成"
disabled disabled
class="!w-400px" class="!w-400px"
/> />

49
mes-ui/mes-ui-admin-vue3/src/views/biz/storage/index.vue
Unescape View File

@ -13,19 +13,20 @@
<el-form-item label="退料单号" prop="stockNo"> <el-form-item label="退料单号" prop="stockNo">
<el-input <el-input
v-model="queryParams.stockNo" v-model="queryParams.stockNo"
placeholder="入库单号" placeholder="退料单号"
clearable clearable
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="单据日期" prop="stockNo"> <el-form-item label="单据日期" prop="createTime">
<el-input <el-date-picker
v-model="queryParams.stockNo" v-model="getDateRangevalue"
type="date"
placeholder="单据日期" placeholder="单据日期"
clearable :size="size"
@keyup.enter="handleQuery"
class="!w-240px" class="!w-240px"
@change="getDateRange"
/> />
</el-form-item> </el-form-item>
<el-form-item label="物料编码" prop="matNo"> <el-form-item label="物料编码" prop="matNo">
@ -169,16 +170,14 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="right" min-width="180" fixed="right"> <el-table-column label="操作" align="right" min-width="180" fixed="right">
<template #header> <template #header>
<span style="margin-right:35%"> <span style="margin-right: 35%"> 操作 </span>
操作
</span>
</template> </template>
<template #default="scope"> <template #default="scope">
<el-button <el-button
link link
type="primary" type="primary"
@click="openDetail('update', scope.row.id)" @click="openDetail('update', scope.row.id)"
v-if="scope.row.status != 4&&scope.row.status != 2" v-if="scope.row.status != 4 && scope.row.status != 2"
> >
编辑 编辑
</el-button> </el-button>
@ -247,7 +246,9 @@ const queryParams = reactive({
cancel: undefined, cancel: undefined,
cancelTime: [], cancelTime: [],
matNo: undefined, matNo: undefined,
matName: undefined matName: undefined,
minCreateTime: undefined,
maxCreateTime: undefined
}) })
const queryFormRef = ref() // 搜索的表单 const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中 const exportLoading = ref(false) // 导出的加载中
@ -278,6 +279,32 @@ const resetQuery = () => {
handleQuery() handleQuery()
} }
const getDateRangevalue = ref() // 日期范围
//处理日期
const getDateRange = (getDateRangevalue) => {
if (getDateRangevalue == null) {
queryParams.minCreateTime = undefined
queryParams.maxCreateTime = undefined
} else {
queryParams.minCreateTime =
getDateRangevalue.toLocaleDateString('en-CA', {
year: 'numeric',
month: '2-digit',
day: '2-digit'
}) +
' ' +
'00:00:00'
queryParams.maxCreateTime =
getDateRangevalue.toLocaleDateString('en-CA', {
year: 'numeric',
month: '2-digit',
day: '2-digit'
}) +
' ' +
'23:59:59'
}
}
/** 添加/修改操作 */ /** 添加/修改操作 */
const formRef = ref() const formRef = ref()
const openForm = (type: string, id?: number) => { const openForm = (type: string, id?: number) => {

56
mes-ui/mes-ui-admin-vue3/src/views/biz/storage/indexAudit.vue
Unescape View File

@ -1,6 +1,6 @@
<template> <template>
<el-card class="hl-card"> <el-card class="hl-card">
<template #header> <span>退料申请</span></template> <template #header> <span>退料审核</span></template>
<ContentWrap class="borderxx"> <ContentWrap class="borderxx">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form <el-form
@ -13,19 +13,20 @@
<el-form-item label="退料单号" prop="stockNo"> <el-form-item label="退料单号" prop="stockNo">
<el-input <el-input
v-model="queryParams.stockNo" v-model="queryParams.stockNo"
placeholder="入库单号" placeholder="退料单号"
clearable clearable
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="单据日期" prop="stockNo"> <el-form-item label="单据日期" prop="createTime">
<el-input <el-date-picker
v-model="queryParams.stockNo" v-model="getDateRangevalue"
type="date"
placeholder="单据日期" placeholder="单据日期"
clearable :size="size"
@keyup.enter="handleQuery"
class="!w-240px" class="!w-240px"
@change="getDateRange"
/> />
</el-form-item> </el-form-item>
<el-form-item label="物料编码" prop="matNo"> <el-form-item label="物料编码" prop="matNo">
@ -169,12 +170,15 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="right" min-width="180" fixed="right"> <el-table-column label="操作" align="right" min-width="180" fixed="right">
<template #header> <template #header>
<span style="margin-right:35%"> <span style="margin-right: 35%"> 操作 </span>
操作
</span>
</template> </template>
<template #default="scope"> <template #default="scope">
<el-button link type="primary" @click="openDetail('Check', scope.row.id)" v-if="scope.row.status ==2"> <el-button
link
type="primary"
@click="openDetail('Check', scope.row.id)"
v-if="scope.row.status == 2"
>
审核 审核
</el-button> </el-button>
<el-button link type="primary" @click="openDetail('review', scope.row.id)"> <el-button link type="primary" @click="openDetail('review', scope.row.id)">
@ -242,7 +246,9 @@ const queryParams = reactive({
cancel: undefined, cancel: undefined,
cancelTime: [], cancelTime: [],
matNo: undefined, matNo: undefined,
matName: undefined matName: undefined,
minCreateTime: undefined,
maxCreateTime: undefined,
}) })
const queryFormRef = ref() // 搜索的表单 const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中 const exportLoading = ref(false) // 导出的加载中
@ -273,6 +279,32 @@ const resetQuery = () => {
handleQuery() handleQuery()
} }
const getDateRangevalue = ref() // 日期范围
//处理日期
const getDateRange = (getDateRangevalue) => {
if (getDateRangevalue == null) {
queryParams.minCreateTime = undefined
queryParams.maxCreateTime = undefined
} else {
queryParams.minCreateTime =
getDateRangevalue.toLocaleDateString('en-CA', {
year: 'numeric',
month: '2-digit',
day: '2-digit'
}) +
' ' +
'00:00:00'
queryParams.maxCreateTime =
getDateRangevalue.toLocaleDateString('en-CA', {
year: 'numeric',
month: '2-digit',
day: '2-digit'
}) +
' ' +
'23:59:59'
}
}
/** 添加/修改操作 */ /** 添加/修改操作 */
const formRef = ref() const formRef = ref()
const openForm = (type: string, id?: number) => { const openForm = (type: string, id?: number) => {

30
mes-ui/mes-ui-admin-vue3/src/views/biz/unqualifiednotification/detail.vue
Unescape View File

@ -47,6 +47,16 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item label="检验数量" prop="checkAmount">
<el-input
disabled
class="!w-260px"
v-model="formData.checkAmount"
placeholder="请输入检验数量"
/>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -266,6 +276,26 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item label="解决方案描述" prop="solutionContent">
<el-input
disabled
class="!w-260px"
v-model="formData.solutionContent"
placeholder="解决方案描述"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="处罚意见" prop="punishmentOpinion">
<el-input
disabled
class="!w-260px"
v-model="formData.punishmentOpinion"
placeholder="处罚意见"
/>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-card> </el-card>
<el-dialog v-model="activeOpinionDialogVisible" title="" width="30%" center> <el-dialog v-model="activeOpinionDialogVisible" title="" width="30%" center>

10
mes-ui/mes-ui-admin-vue3/src/views/biz/unqualifiednotification/index.vue
Unescape View File

@ -195,9 +195,15 @@
<!-- 新增生产车间 --> <!-- 新增生产车间 -->
<el-table-column label="生产车间" align="center" prop="workshopName" min-width="160" /> <el-table-column label="生产车间" align="center" prop="workshopName" min-width="160" />
<el-table-column label="责任工序" align="center" prop="procedureName" min-width="160" /> <el-table-column label="责任工序" align="center" prop="procedureName" min-width="160" />
<el-table-column label="检验数量" align="center" prop="checkAmount" min-width="140" />
<el-table-column label="异常数量" align="center" prop="amount" min-width="140" /> <el-table-column label="异常数量" align="center" prop="amount" min-width="140" />
<el-table-column label="责任人" align="center" prop="ownerName" min-width="160" /> <el-table-column label="责任人" align="center" prop="ownerName" min-width="160" />
<el-table-column label="情况描述" align="center" prop="remark" min-width="160" /> <el-table-column label="情况描述" align="center" prop="remark" min-width="160" />
<el-table-column label="解决方案描述" align="center" prop="solutionContent" min-width="160" />
<el-table-column label="处罚意见" align="center" prop="punishmentOpinion" min-width="160" />
<el-table-column <el-table-column
label="创建时间" label="创建时间"
align="center" align="center"
@ -346,7 +352,7 @@ const getDateRange = (getDateRangevalue) => {
month: '2-digit', month: '2-digit',
day: '2-digit' day: '2-digit'
}) + }) +
'' + ' ' +
'00:00:00' '00:00:00'
queryParams.maxCreateTime = queryParams.maxCreateTime =
getDateRangevalue.toLocaleDateString('en-CA', { getDateRangevalue.toLocaleDateString('en-CA', {
@ -354,7 +360,7 @@ const getDateRange = (getDateRangevalue) => {
month: '2-digit', month: '2-digit',
day: '2-digit' day: '2-digit'
}) + }) +
'' + ' ' +
'23:59:59' '23:59:59'
} }
} }

4
mes-ui/mes-ui-admin-vue3/src/views/biz/unqualifiednotification/statistic.vue
Unescape View File

@ -62,8 +62,8 @@
<el-table-column label="生产总数" align="center" prop="productAmount" min-width="140" /> <el-table-column label="生产总数" align="center" prop="productAmount" min-width="140" />
<el-table-column label="检验数量" align="center" prop="checkAmount" min-width="140" /> <el-table-column label="检验数量" align="center" prop="checkAmount" min-width="140" />
<el-table-column label="不合格详细描述" align="center" prop="remark" min-width="140" /> <el-table-column label="不合格详细描述" align="center" prop="remark" min-width="140" />
<el-table-column label="解决方案" align="center" prop="solutioncontent" min-width="140" /> <el-table-column label="解决方案" align="center" prop="solutionContent" min-width="140" />
<el-table-column label="处罚意见" align="center" prop="punishmentopinion" min-width="140" /> <el-table-column label="处罚意见" align="center" prop="punishmentOpinion" min-width="140" />
<el-table-column fixed="right" label="异常数量" align="center" prop="statisticAmount" min-width="140" /> <el-table-column fixed="right" label="异常数量" align="center" prop="statisticAmount" min-width="140" />
<el-table-column fixed="right" label="审核意见" align="center" prop="auditOpinion" min-width="120"> <el-table-column fixed="right" label="审核意见" align="center" prop="auditOpinion" min-width="120">
<template #default="scope"> <template #default="scope">

Write Preview
Loading…
Cancel
Save