licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

生产计划添加查看工作弹窗

Browse Source
This commit is contained in:
z 2025-10-11 18:55:30 +08:00
parent cb45e5b246
commit 224c4aeb9e
8 changed files with 205 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/plansub/vo/PlanSubPageReqVO.java
View File

@ -87,4 +87,5 @@ public class PlanSubPageReqVO extends PageParam {
private LocalDateTime[] createTime;
private String projectCode;
private String projectSubName;
private String customerBrief;
}

3
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plansub/PlanSubMapper.java
View File

@ -65,7 +65,8 @@ public interface PlanSubMapper extends BaseMapperX<PlanSubDO> {
.orderByDesc(PlanSubDO::getId)
;
query.like(ObjectUtil.isNotEmpty(reqVO.getProjectCode()), PlanDO::getCode, reqVO.getProjectCode())
.like(ObjectUtil.isNotEmpty(reqVO.getProjectSubName()), PlanSubDetailDO::getName, reqVO.getProjectSubName());
.like(ObjectUtil.isNotEmpty(reqVO.getProjectSubName()), PlanSubDetailDO::getName, reqVO.getProjectSubName())
.like(ObjectUtil.isNotEmpty(reqVO.getCustomerBrief()), CustomerDO::getBrief, reqVO.getCustomerBrief());
return selectPage(reqVO, query);
}

4
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java
View File

@ -267,6 +267,7 @@ public class MaterialPlanServiceImpl implements MaterialPlanService {
lambdaUpdateWrapper.set(TaskDispatchDetailDO::getPlanStatus,0);
lambdaUpdateWrapper.set(TaskDispatchDetailDO::getProjectMaterialPlanDetailId,null);
lambdaUpdateWrapper.set(TaskDispatchDetailDO::getMatPlanProcess,"N");
lambdaUpdateWrapper.set(TaskDispatchDetailDO::getReportStatus,0);
taskDispatchDetailMapper.update(lambdaUpdateWrapper);
}
materialPlanBoomMapper.delete(queryWrapper1);
@ -428,6 +429,8 @@ public class MaterialPlanServiceImpl implements MaterialPlanService {
lambdaUpdateWrapper.set(TaskDispatchDetailDO::getProjectMaterialPlanNo, null);
lambdaUpdateWrapper.set(TaskDispatchDetailDO::getPlanStatus,0);
lambdaUpdateWrapper.set(TaskDispatchDetailDO::getProjectMaterialPlanDetailId,null);
lambdaUpdateWrapper.set(TaskDispatchDetailDO::getProcedureStatus, 0);
lambdaUpdateWrapper.set(TaskDispatchDetailDO::getMatPlanProcess, "N");
taskDispatchDetailMapper.update(lambdaUpdateWrapper);
return CommonResult.success(true);
}
@ -573,6 +576,7 @@ public class MaterialPlanServiceImpl implements MaterialPlanService {
lambdaUpdateWrapper.set(TaskDispatchDetailDO::getPlanStatus,0);
lambdaUpdateWrapper.set(TaskDispatchDetailDO::getProjectMaterialPlanDetailId,null);
lambdaUpdateWrapper.set(TaskDispatchDetailDO::getMatPlanProcess,"N");
lambdaUpdateWrapper.set(TaskDispatchDetailDO::getReportStatus,0);
taskDispatchDetailMapper.update(lambdaUpdateWrapper);
return CommonResult.success( true);
}

1
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plansubdetail/PlanSubDetailServiceImpl.java
View File

@ -199,6 +199,7 @@ public class PlanSubDetailServiceImpl implements PlanSubDetailService {
subPageReqVO.setPageSize(pageReqVO.getPageSize());
subPageReqVO.setProjectCode(pageReqVO.getProjectCode() == null ? "" : pageReqVO.getProjectCode());
subPageReqVO.setProjectSubName(pageReqVO.getProjectSubName() == null ?null:pageReqVO.getProjectSubName());
subPageReqVO.setCustomerBrief(pageReqVO.getCustomerBrief() == null ? "" : pageReqVO.getCustomerBrief());
PageResult<PlanSubDO> planPage = planSubMapper.getPlanList(subPageReqVO);
for (PlanSubDO planSubDO : planPage.getList()) {
PlanSubDetailDO planSubDetailDO = new PlanSubDetailDO();

13
mes-ui/mes-ui-admin-vue3/src/views/heli/interrupt/index.vue
View File

@ -325,6 +325,9 @@
<el-form-item label="子项目名称">
<el-input v-model="addQueryParams.projectSubName" placeholder="请输入子项目名称" />
</el-form-item>
<el-form-item label="客户简称">
<el-input v-model="addQueryParams.customerBrief" placeholder="请输入客户简称" />
</el-form-item>
<el-button type="primary" @click="handleAddQuery">查询</el-button>
</el-form>
@ -422,7 +425,8 @@ const addQueryParams = reactive({
pageNo: 1,
pageSize: 10,
projectCode: '',
projectSubName: ''
projectSubName: '',
customerBrief:''
})
const selectedAddRow = ref([])
const rowClickHandle = (row) => {
@ -483,7 +487,8 @@ const getAddList = async () => {
loading3.value = true
const params = {
projectCode: addQueryParams.projectCode,
projectSubName: addQueryParams.projectSubName
projectSubName: addQueryParams.projectSubName,
customerBrief:addQueryParams.customerBrief
}
const res = await PlansubdetailApi.pageAddList(params)
console.log(res)
@ -661,7 +666,7 @@ const addItemRow = (row) => {
item.isOverProcess = 0
}
if (!item.id) {
var type =
'BLUEPRINT_WORKBLANK' == item.subType
? '毛坯'
@ -699,7 +704,7 @@ const addItemRow = (row) => {
}else{
list.value.unshift(newRow)
}
//message.success('新增行成功')
} else {

14
mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue
View File

@ -540,6 +540,9 @@
<el-button style="margin-left: 3%" type="warning" size="large" @click="printfClick"
>打印</el-button
>
<el-button style="margin-left: 3%" type="primary" size="large" @click="openUp"
>查看工作</el-button
>
</template>
<el-row>
<el-col>
@ -1139,11 +1142,10 @@
</el-row>
</el-card>
</el-form>
<!-- <div class="hl-footer text-center">-->
<!-- -->
<!-- </div>-->
</el-card>
<ProjectOrderDialog ref="projectOrderDialog" @success="handleSelectedProjectOrder" />
<insert ref="insert" />
<ProjectSubDialog
:title="dialogTitle"
width="80%"
@ -1186,6 +1188,7 @@ import * as shopCalendarApi from '@/api/heli/shopCalendar'
import * as TaskDispatchApi from '@/api/heli/taskdispatch'
import * as planSubDetailApi from '@/api/heli/plansubdetail'
import { verification } from '@/api/heli/plan'
import Insert from "@/views/heli/plan/insert.vue";
const printref = ref()
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
@ -1261,6 +1264,7 @@ const subFormRules = reactive({
projectSubShortName: [{ required: true, message: '子项目简称不能为空', trigger: 'blur' }]
})
const projectOrderDialog = ref()
const insert= ref()
const openProjectOrderDialog = () => {
projectOrderDialog.value?.open()
}
@ -1432,7 +1436,9 @@ const clouse = () => {
dialogVisible.value = false
dataListShuju.value = []
}
const openUp=()=>{
insert.value?.open()
}
const queryParams = reactive({
pageNo: 1,
pageSize: 10,

177
mes-ui/mes-ui-admin-vue3/src/views/heli/plan/insert.vue Normal file
View File

@ -0,0 +1,177 @@
<template>
<Dialog :title="dialogTitle" width="80%" v-model="dialogVisible" center>
<ContentWrap class="borderxx">
<!-- 搜索工作栏 -->
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="108px">
<el-form-item label="负责人" prop="twoDimOwner">
<el-select class="!w-265px" v-model="queryParams.twoDimOwner" clearable filterable>
<el-option
v-for="dict in userInit"
:key="dict.id"
:label="dict.nickname"
:value="dict.id"
/>
</el-select>
</el-form-item>
<el-form-item label="开始日期" prop="beginTime">
<el-date-picker
v-model="queryParams.beginTime"
value-format="YYYY-MM-DD"
type="date"
clearable
@change="changeBeginDate()"
start-placeholder="开始日期"
end-placeholder="结束日期"
class="!w-280px"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery" type="primary">
<Icon icon="ep:search" class="mr-5px" /> 搜索
</el-button>
<el-button @click="resetQuery">
<Icon icon="ep:refresh" class="mr-5px" /> 重置
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<el-card class="hl-card">
<!-- 列表 -->
<ContentWrap>
<el-table ref="multipleTable" v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"
class="hl-table" @selection-change="handleSelectionChange" @row-click="clickRow" selection>
<el-table-column fixed label="序号" type="index" width="70" align="center" />
<el-table-column fixed label="项目编码" align="center" prop="code" min-width="130" />
<el-table-column fixed label="子项目名称" align="center" prop="name" min-width="180" />
<el-table-column label="设计类型" align="center" prop="type" width="100px">
<template #default="scope">
{{ scope.row.subType=='BLUEPRINT_WORKBLANK'?"毛坯":scope.row.subType=='BLUEPRINT_2D'?"2D":"3D" }}
</template>
</el-table-column>
<el-table-column label="负责人" align="center" prop="creator" min-width="120" >
<template #default="scope">
{{ userInit.find((user) => user.id == scope.row.twoDimOwner)?.nickname }}
</template>
</el-table-column>
<el-table-column label="开始日期" align="center" prop="startTwoDimDate" min-width="100" :formatter="dateFormatter2"/>
<el-table-column label="结束日期" align="center" prop="twoDimDate" min-width="100" :formatter="dateFormatter2"/>
<el-table-column label="设计天数" align="center" prop="designNum" min-width="100" />
<el-table-column label="时间段顺序" align="center" prop="seqNo" min-width="130" />
</el-table>
<!-- 分页 -->
<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
@pagination="getList" />
</ContentWrap>
</el-card>
<template #footer>
<el-button @click="dialogVisible = false" size="large">取 消</el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { getIntDictOptions, getStrDictOptions, DICT_TYPE } from '@/utils/dict'
import {
dateFormatter,
dateFormatter2,
dateFormatter3,
formatDate,
formatDate1
} from '@/utils/formatTime'
import * as ProjectOrderApi from '@/api/heli/projectorder'
import { ref } from "vue";
import { ElTable } from 'element-plus'
import { ProjectOrderVO } from "@/api/heli/projectorder";
import * as UserApi from "@/api/system/user";
import * as PlansubdetailApi from "@/api/heli/plansubdetail";
const userInit = ref()
const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化
const router = useRouter()
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
const loading = ref(false) // 列表的加载中
const list = ref([]) // 列表的数据
const total = ref(0) // 列表的总页数
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
twoDimOwner: undefined,
beginTime: undefined,
})
const queryFormRef = ref() // 搜索的表单
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
if (queryParams.beginTime) {
queryParams.startTime = queryParams.beginTime + ' 00:00:00'
}
const data = await PlansubdetailApi.getPlanSubDetailPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
if (!queryParams.twoDimOwner) {
// 使用 setTimeout 避免渲染过程中直接调用 message.error
setTimeout(() => {
message.error('负责人为空,请确认')
}, 100)
return // 添加 return 防止继续执行
}
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
const multipleTable:any = ref<InstanceType<typeof ElTable>>()
const multipleSelection:any = ref([])
const handleSelectionChange = (val: ProjectOrderVO[]) => {
if (val.length > 1) {
multipleTable.value.clearSelection()
multipleTable.value.toggleRowSelection(val.pop())
} else {
multipleSelection.value = val.pop()
}
}
const clickRow = (row: any) => {
if(row){
multipleTable.value!.toggleRowSelection(row, undefined)
}else{
multipleTable.value!.clearSelection()
}
}
/** 提交表单 */
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
/** 打开弹窗 */
const open = async () => {
dialogVisible.value = true
userInit.value = await UserApi.getDeptName('设计部')
// handleQuery()
queryFormRef.value.resetFields()
list.value=[]
total.value=0
}
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
</script>

2
mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue
View File

@ -1605,7 +1605,7 @@ const onAddItem = () => {
postId: 2,
reportProcess:0,
matPlanProcess:"N",
startTime:new Date()
startTime:new Date().getTime()
}
// 遍历对象的键
// Object.keys(procedureList.value).forEach((key) => {