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

Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-majoys into dev

Browse Source
dev
siontion 4 months ago
parent b1f50e3d0e d00578306d
commit 0d4b227eca
7 changed files with 67 additions and 20 deletions
Show Stats Download Patch File Download Diff File

2
mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/unqualifiednotification/UnqualifiedNotificationMapper.java
Unescape View File

@ -107,7 +107,7 @@ public interface UnqualifiedNotificationMapper extends BaseMapperX<UnqualifiedNo
.leftJoin(MaterialDO.class, "f", MaterialDO::getId, ProjectOrderSubDO::getMaterialId)
.leftJoin(WorkshopDO.class, "i", WorkshopDO::getId, UnqualifiedNotificationDO::getWorkshopId)
.disableSubLogicDel()
.groupBy("t.project_id", "t.project_sub_id", "t.workshop_id", "t.type", "t.audit_opinion")
.groupBy("t.project_id", "t.project_sub_id", "t.workshop_id", "t.type", "t.audit_opinion","t.product_amount,t.check_amount,t.solution_content,t.punishment_opinion,t.remark")
.orderByDesc(ProjectOrderDO::getId);
query.eqIfPresent(UnqualifiedNotificationDO::getWorkshopId, reqVO.getWorkshopId())

2
mes-ui/mes-ui-admin-vue3/src/views/biz/hlvuestyle/workshopSelect.vue
Unescape View File

@ -32,7 +32,7 @@ const queryParams = {
pageSize: 10,
code: undefined,
brief: undefined,
status: undefined
status: 1
}
const status1 = ref(false)
const getlist = async () => {

6
mes-ui/mes-ui-admin-vue3/src/views/biz/plan/detail.vue
Unescape View File

@ -156,14 +156,14 @@
<el-table-column label="序号" align="center" type="index" width="80" fixed />
<el-table-column prop="projectSubCode" label="产品编码" min-width="160" align="center" />
<el-table-column prop="projectSubName" label="产品名称" min-width="140" align="center" />
<el-table-column prop="mouldId" label="规格/型号" align="center" min-width="120" />
<el-table-column prop="spec" label="规格/型号" align="center" min-width="120" />
<el-table-column prop="amount" label="数量" min-width="100" align="center" />
<el-table-column prop="unit" label="单位" min-width="100" align="center">
<template #default="scope">
<dict-tag :type="DICT_TYPE.BIZ_MATERIAL_UNIT" :value="scope.row.unit" />
</template>
</el-table-column>
<el-table-column min-width="160" align="center">
<!-- <el-table-column min-width="160" align="center">
<template #header>2D负责人</template>
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.twoDimOwner`" class="mb-0px!">
@ -194,7 +194,7 @@
<el-date-picker disabled class="!w-265px" v-model="row.threeDimDate" type="date" value-format="x" placeholder="3D结束日期" />
</el-form-item>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
</el-form>
</el-card>

6
mes-ui/mes-ui-admin-vue3/src/views/biz/plan/edit.vue
Unescape View File

@ -275,7 +275,7 @@
align="center"
/>
<el-table-column
prop="mouldId"
prop="spec"
label="规格/型号"
align="center"
min-width="120"
@ -286,7 +286,7 @@
<dict-tag :type="DICT_TYPE.BIZ_MATERIAL_UNIT" :value="scope.row.unit" />
</template>
</el-table-column>
<el-table-column min-width="160" align="center">
<!-- <el-table-column min-width="160" align="center">
<template #header>2D负责人</template>
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.twoDimOwner`" class="mb-0px!">
@ -337,7 +337,7 @@
/>
</el-form-item>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
</el-form>
</el-card>

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

@ -208,7 +208,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="创建人" prop="creatorName">
<el-input disabled class="!w-260px" v-model="formData.creatorName" placeholder="" />
<el-input disabled class="!w-260px" v-model="formData.creatorName" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -239,7 +239,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="审核人" prop="auditorName">
<el-input disabled class="!w-260px" v-model="formData.auditorName" placeholder="" />
<el-input disabled class="!w-260px" v-model="formData.auditorName" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -270,7 +270,12 @@
</el-card>
<el-dialog v-model="activeOpinionDialogVisible" title="" width="30%" center>
<el-form-item label="审核意见" prop="auditOpinion">
<el-select clearable v-model="formData.auditOpinion" placeholder="请选择审核意见">
<el-select
clearable
v-model="formData.auditOpinion"
placeholder="请选择审核意见"
class="!w-240px"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.BIZ_UNQUALIFIED_NOTIFICATION_OPINION)"
:key="dict.value"
@ -279,6 +284,20 @@
/>
</el-select>
</el-form-item>
<el-form-item label="解决方案描述" prop="">
<el-input
v-model="formData.solutionContent"
placeholder="请输入解决方案描述"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="处罚意见" prop="">
<el-input
v-model="formData.punishmentOpinion"
placeholder="请输入处罚意见"
class="!w-240px"
/>
</el-form-item>
<template #footer>
<span class="dialog-footer">
<el-button @click="activeOpinionDialogVisible = false">取 消</el-button>
@ -350,7 +369,9 @@ const formData = ref({
auditOpinion: undefined,
status: undefined,
workshopId: undefined,
attachments: []
attachments: [],
solutionContent: undefined,
punishmentOpinion: undefined
})
const formRef = ref() // 表单 Ref
@ -386,7 +407,9 @@ const resetForm = () => {
auditOpinion: undefined,
status: undefined,
workshopId: undefined,
attachments: []
attachments: [],
solutionContent: undefined,
punishmentOpinion: undefined
}
formRef.value?.resetFields()
}
@ -409,7 +432,6 @@ const queryData = async (id?: number) => {
businessType: businessType.value
}
formData.value.attachments = (await getFilePage(attParams)).list
} finally {
formLoading.value = false
}

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

@ -51,6 +51,10 @@
<el-option v-for="dict in getStrDictOptions(DICT_TYPE.BIZ_UNQUALIFIED_NOTIFICATION_OPINION)" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<!-- 新增规格型号 -->
<el-form-item label="规格/型号" prop="code">
<el-input v-model="queryParams.spec" placeholder="请输入规格/型号" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item style="margin-left:40px">
<el-button @click="handleQuery" type="primary">
<Icon icon="ep:search" class="mr-5px" /> 查询

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

@ -47,31 +47,46 @@
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
<el-table-column fixed type="index" width="100" label="序号" align="center" />
<!-- 生产订单号 -->
<el-table-column fixed label="生产订单号" align="center" prop="projectCode" min-width="220" />
<el-table-column label="客户名称" align="center" prop="customerName" min-width="160" />
<!-- 产品编码 -->
<el-table-column label="产品编码" align="center" prop="projectSubCode" min-width="260" />
<!-- 产品名称 -->
<el-table-column label="产品名称" align="center" prop="projectSubName" min-width="180" />
<!-- 新增生产车间 -->
<el-table-column label="生产车间" align="center" prop="materialName" min-width="160" />
<el-table-column fixed="right" label="质检类型" align="center" prop="type" min-width="140">
<template #default="scope">
<dict-tag :type="DICT_TYPE.BIZ_INSPECTION_TYPE" :value="scope.row.type" />
</template>
</el-table-column>
<!--7/3 增加字段：：规格型号、生产总数、检验数量、不合格详细描述、解决方案、处罚意见 -->
<el-table-column label="规格型号" align="center" prop="spec" 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="remark" 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 fixed="right" label="异常数量" align="center" prop="statisticAmount" min-width="140" />
<el-table-column fixed="right" label="审核意见" align="center" prop="auditOpinion" min-width="120">
<template #default="scope">
<dict-tag :type="DICT_TYPE.BIZ_UNQUALIFIED_NOTIFICATION_OPINION" :value="scope.row.auditOpinion" />
</template>
</el-table-column>
<!-- <el-table-column fixed="right" label="操作" align="center" min-width="120">
<template #default="scope">
<el-button link type="primary" @click="openDetail('updata', scope.row.id)">
编辑
</el-button>
<el-button link type="primary" @click="openDetail('detail', scope.row.id)">
查看详情
</el-button>
</template>
</el-table-column> -->
</el-table>
<!-- 分页 -->
<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize" @pagination="getList" />
</ContentWrap>
</el-card>
<!-- <StatisticDialog ref="Statisticref" @success="getList" /> -->
</template>
<script setup lang="ts">
@ -80,6 +95,7 @@ import * as UnqualifiedNotificationApi from '@/api/biz/unqualifiednotification'
import { useCommonStore } from '@/store/modules/common'
import { getUnqualifiedNotificationStatisticPage } from '@/api/biz/unqualifiednotification'
import WorkshopSelect from '@/views/biz/hlvuestyle/workshopSelect.vue'
// import StatisticDialog from './statisticDialog.vue'
defineOptions({ name: 'UnqualifiedNotificationStatistic' })
@ -149,4 +165,9 @@ onMounted(() => {
const handleSelectedWorkshop = (newValue: any) => {
queryParams.workshopId = newValue?.id
}
const Statisticref = ref()
const openDetail = (type: string, id: number) => {
Statisticref.value.open(type, id)
}
</script>

Write Preview
Loading…
Cancel
Save