diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/processdesign/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/processdesign/index.ts index 7a67aff..000d0fe 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/processdesign/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/processdesign/index.ts @@ -20,7 +20,9 @@ export const getProcessDesignPage = async (params) => { export const getProcessDesign = async (id: number) => { return await request.get({ url: `/heli/process-design/get?id=` + id }) } - +export const over = async (id: number) => { + return await request.get({ url: `/heli/process-design/over?id=` + id }) +} // 新增工艺设计 export const createProcessDesign = async (data: ProcessDesignVO) => { return await request.post({ url: `/heli/process-design/create`, data }) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/3d.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/3d.vue index e6bfac3..9238ba1 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/3d.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/3d.vue @@ -123,7 +123,7 @@ @@ -235,53 +235,29 @@ const openDetail = (type: string, id?: number) => { }) } const getDetailMsg = (row) =>{ - if(row.isDelay == true){ - // - if(row.threeDimDate != null ){ - // - if(row.lastDate != null){ - if(row.lastDate > row.threeDimDate){ - const start = new Date(row.threeDimDate).getTime(); - const end = new Date(row.lastDate).getTime(); - const diffTime = Math.abs(end - start); - var day = Math.floor(diffTime / (1000 * 60 * 60 * 24)); - return '延期' + day +'天'; + if(row.isOverProcess){ + //完结的，按计划完成了还是没按计划完成 + if(row.threeDimDate != null && row.lastDate != null ){ + const start = new Date(row.threeDimDate).getTime(); + const end = new Date(row.lastDate).getTime(); + const diffTime = Math.abs(end - start); + var day = Math.floor(diffTime / (1000 * 60 * 60 * 24)); + if(row.lastDate > row.threeDimDate){ + return '延后' + day +'天'; + }else if (row.lastDate < row.threeDimDate){ + return '提前' + day +'天'; }else{ - return '延期' + return '按时完成' } - - - }else{ - return '延期'; - } - }else{ - return '已延期'; - } - }else{ - if(row.threeDimDate != null){ - if(row.lastDate != null){ - const start = new Date(row.threeDimDate).getTime(); - const end = new Date(row.lastDate).getTime(); - if(row.threeDimDate > row.lastDate){ - const diffTime = Math.abs(start - end); - var day = Math.floor(diffTime / (1000 * 60 * 60 * 24)); - return '提前'+day +'天完成'; - } else if ( Math.floor((start) / (1000 * 60 * 60 * 24)) == Math.floor(end / (1000 * 60 * 60 * 24))){ - return '按计划时间完成' - }else{ - const diffTime = Math.abs(end - start); - var day = Math.floor(diffTime / (1000 * 60 * 60 * 24)); - return '滞后'+day +'完成'; - } - }else{ - return '按计划实施中'; - } - }else{ - return '按计划实施中'; + return '实施中'; } + + } + } + /** 删除按钮操作 */ const handleDelete = async (id: number) => { try { diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/bomDetail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/bomDetail.vue index f913040..8454226 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/bomDetail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/bomDetail.vue @@ -435,7 +435,7 @@ const subFormRef = ref() //20250601新增 const importFormRef = ref() const handleImport = () => { - importFormRef.value.open(formData.value.bomCode) + importFormRef.value.open(formData.value.id) } //上传附件 @@ -790,7 +790,9 @@ const fetchStorageOkQty = async (row)=>{ console.error('获取库存出错:', error); } } - +const getList = () => { + queryData(currentId.value) +} onMounted(() => { dialogTitle.value = t('action.' + active.value) if ('detail' == active.value) { diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/bomImportForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/bomImportForm.vue index 02349eb..1495ff6 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/bomImportForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/bomImportForm.vue @@ -43,6 +43,7 @@ const importUrl = const uploadHeaders = ref() // 上传 Header 头 const fileList = ref([]) // 文件列表 const bomCode = ref('') + /** 打开弹窗 */ const open = (bomcode :string) => { bomCode.value = bomcode; diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/detail.vue index 243512d..e149f60 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/detail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/detail.vue @@ -199,8 +199,8 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict - 延期 - + 延期 + {{ overbuttonName }} @@ -245,8 +245,8 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict - 开始 - 推送 + 开始 + 推送 @@ -261,7 +261,7 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict @@ -269,7 +269,7 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict @@ -296,7 +296,7 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict @@ -335,7 +335,7 @@ import { inject } from 'vue' import {useUserStore} from "@/store/modules/user"; import {useCommonStore} from "@/store/modules/common"; import {verify} from "node:crypto"; -import { delay, now } from 'lodash-es'; +import { delay, fromPairs, now } from 'lodash-es'; import { FolderOpened } from '@element-plus/icons-vue/dist/types'; defineOptions({ name: 'ProcessDesignDetail' }) @@ -369,7 +369,7 @@ const formData = ref({ const formRef = ref() // 表单 Ref const processDesignProgressFormRef = ref() - +const overbuttonName = ref('') /** 重置表单 */ const resetForm = () => { formData.value = { @@ -419,6 +419,20 @@ const getWorkTime = (type) =>{ }else{return '' } } +const endTimeChange = (e , row) =>{ + if(e == null ){ + row.workTime = null + row.maxTime = row.workTime; + }else{ + var endTime = new Date(e); + var timeDiff = endTime.getTime() -row.beginTime; + + // 将毫秒转换为小时 + row.workTime = timeDiff / (1000 * 60 * 60); + row.maxTime = row.workTime; + } + +} const delaySubmit = async() =>{ if(formData.value.delayReason == null || formData.value.delayReason.replaceAll(' ','') == ''){ message.error("延期原因不得为空,请确认!") @@ -481,7 +495,7 @@ const openDelay = () =>{ } const overRow = async( row :any) =>{ - if(row.endTime == null || row.endTime == ''){ + if(row.endTime == null ){ row.endTime = new Date().getTime() var timeDiff = row.endTime -row.beginTime; @@ -490,11 +504,11 @@ const overRow = async( row :any) =>{ row.maxTime = row.workTime; // row.workTime = row.endTime - row. } - if(row.endTime == null || row.endTime == ''){ + if(row.endTime == null ){ message.error("结束时间不能为空!请确认!") return } - if(row.workTime == null || row.workTime == '' + if(row.workTime == null ){ message.error("已做时间不能为空!请确认") return @@ -503,6 +517,37 @@ const overRow = async( row :any) =>{ await submitForm('SAVE'); //更新一下这条数据的状态 } +const overProcess = () =>{ + if(formData.value.processDesignProgressList != null && formData.value.processDesignProgressList.length > 0){ + for (let index = 0; index < formData.value.processDesignProgressList.length; index++) { + var item = formData.value.processDesignProgressList[index]; + if(!item.hasNext){ + if(item.endTime == null ){ + message.error("结束时间不能为空!请确认!") + return + } + if(item.workTime == null){ + message.error("已做时间不能为空!请确认") + return + } + } + item.isOver = 1; + } + }else{ + message.error("至少进行一次进度汇报！") + return + } + ElMessageBox.confirm('是否结束该项目?') + .then( async () => { + await submitForm('SAVE'); + await ProcessDesignApi.over(formData.value.id) + await queryData(formData.value.id) + message.success("修改成功！") + + }) + .catch(() => { + }) +} const sendItem = async() =>{ //推送最新的一条,如果备注为空提示备注为空不能推送 if(formData.value.processDesignProgressList != null && formData.value.processDesignProgressList.length > 0){ @@ -518,11 +563,11 @@ const sendItem = async() =>{ var item = formData.value.processDesignProgressList[index]; if(!item.hasNext){ senIndex = index; - if(item.endTime == null || item.endTime == ''){ + if(item.endTime == null){ message.error("结束时间不能为空!请确认!") return } - if(item.workTime == null || item.workTime == ''){ + if(item.workTime == null){ message.error("已做时间不能为空!请确认") return } @@ -530,7 +575,8 @@ const sendItem = async() =>{ message.error("推送备注不能为空!请确认") return } - } + } + item.isOver = 1 } //先保存 await submitForm('SAVE'); @@ -626,6 +672,7 @@ const submitForm = async (operate) => { /** 新增按钮操作 */ const onAddItem = async() => { + //条件修改：没有时间就不填 var date = new Date(); if(processDesignType.value == 'BLUEPRINT_WORKBLANK'){ if(formData.value.blankDate != null ){ @@ -636,8 +683,8 @@ const onAddItem = async() => { } } }else{ - message.error("毛坯结束时间为空!请确认!") - return + // message.error("毛坯结束时间为空!请确认!") + // return } } if(processDesignType.value == 'BLUEPRINT_2D'){ @@ -650,8 +697,8 @@ const onAddItem = async() => { } }else{ - message.error("2D结束时间为空!请确认!") - return + // message.error("2D结束时间为空!请确认!") + // return } } if(processDesignType.value == 'BLUEPRINT_3D'){ @@ -663,8 +710,8 @@ const onAddItem = async() => { } } }else{ - message.error("3D结束时间为空!请确认!") - return + // message.error("3D结束时间为空!请确认!") + // return } } if(processDesignType.value == 'BLUEPRINT_FOUNDRY_TECHNOLOGY'){ @@ -679,24 +726,28 @@ const onAddItem = async() => { } } }else{ - message.error("工艺结束时间为空!请确认!") - return + // message.error("工艺结束时间为空!请确认!") + // return } } - if (formData.value.processDesignProgressList.length>0){ + if (formData.value.processDesignProgressList != null && formData.value.processDesignProgressList.length>0){ for ( var i = 0 ; i < formData.value.processDesignProgressList.length ; i++){ var item = formData.value.processDesignProgressList[i]; - if(item.endTime == null || item.endTime == ''){ - message.error("结束时间不能为空!请确认!") - return - } - if(item.workTime == null || item.workTime == '' - ){ - message.error("已做时间不能为空!请确认") - return - } + if(item.isOver == 0){ + message.error("上一项进度未结束汇报!请确认!") + return; + } + // if(item.endTime == null ){ + // message.error("结束时间不能为空!请确认!") + // return + // } + // if(item.workTime == null + // ){ + // message.error("已做时间不能为空!请确认") + // return + // } } } @@ -710,7 +761,7 @@ const onAddItem = async() => { remark: '', createTime: date.getTime(), beginTime:date.getTime(), - endTime:'', + endTime:undefined, isOver:0, workTime:undefined, creatorName: userStore.getUser.nickname, @@ -732,6 +783,18 @@ onMounted(() => { } queryData(currentId.value) + if(processDesignType.value == 'BLUEPRINT_WORKBLANK'){ + overbuttonName.value = '毛坯项目完结' + } + if(processDesignType.value == 'BLUEPRINT_2D'){ + overbuttonName.value = '2D项目完结' + } + if(processDesignType.value == 'BLUEPRINT_3D'){ + overbuttonName.value = '3D项目完结' + } + if(processDesignType.value == 'BLUEPRINT_FOUNDRY_TECHNOLOGY'){ + overbuttonName.value='铸造项目完结' + } }) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/index.vue index ef13c4d..91d0452 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/index.vue @@ -117,7 +117,7 @@ @@ -203,54 +203,29 @@ const handleQuery = () => { getList() } const getDetailMsg = (row) =>{ - if(row.isDelay == true){ - // - if(row.craftEndDate != null ){ - // - if(row.lastDate != null){ - if(row.lastDate > row.craftEndDate){ - const start = new Date(row.craftEndDate).getTime(); - const end = new Date(row.lastDate).getTime(); - const diffTime = Math.abs(end - start); - var day = Math.floor(diffTime / (1000 * 60 * 60 * 24)); - return '延期' + day +'天'; + if(row.isOverProcess){ + //完结的，按计划完成了还是没按计划完成 + if(row.craftEndDate != null && row.lastDate != null ){ + const start = new Date(row.craftEndDate).getTime(); + const end = new Date(row.lastDate).getTime(); + const diffTime = Math.abs(end - start); + var day = Math.floor(diffTime / (1000 * 60 * 60 * 24)); + if(row.lastDate > row.craftEndDate){ + return '延后' + day +'天'; + }else if (row.lastDate < row.craftEndDate){ + return '提前' + day +'天'; }else{ - return '延期' + return '按时完成' } - - - }else{ - console.log('ss') - return '延期'; - } - }else{ - return '已延期'; - } - }else{ - if(row.craftEndDate != null){ - if(row.lastDate != null){ - const start = new Date(row.craftEndDate).getTime(); - const end = new Date(row.lastDate).getTime(); - if(row.craftEndDate > row.lastDate){ - const diffTime = Math.abs(start - end); - var day = Math.floor(diffTime / (1000 * 60 * 60 * 24)); - return '提前'+day +'天完成'; - } else if ( Math.floor((start) / (1000 * 60 * 60 * 24)) == Math.floor(end / (1000 * 60 * 60 * 24))){ - return '按计划时间完成' - }else{ - const diffTime = Math.abs(end - start); - var day = Math.floor(diffTime / (1000 * 60 * 60 * 24)); - return '滞后'+day +'完成'; - } - }else{ - return '按计划实施中'; - } - }else{ - return '按计划实施中'; + // return '已完成'; } + + } + } + /** 重置按钮操作 */ const resetQuery = () => { queryFormRef.value.resetFields() diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/workblank.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/workblank.vue index 4f9bdb5..2099bb8 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/workblank.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/workblank.vue @@ -85,7 +85,7 @@ @@ -184,53 +184,27 @@ const openDetail = (type: string, id?: number) => { }) } const getDetailMsg = (row) =>{ - if(row.isDelay == true){ - // - if(row.blankDate != null ){ - // - if(row.lastDate != null){ - if(row.lastDate > row.blankDate){ - const start = new Date(row.blankDate).getTime(); - const end = new Date(row.lastDate).getTime(); - const diffTime = Math.abs(end - start); - var day = Math.floor(diffTime / (1000 * 60 * 60 * 24)); - return '延期' + day +'天'; + if(row.isOverProcess){ + //完结的，按计划完成了还是没按计划完成 + if(row.blankDate != null && row.lastDate != null ){ + const start = new Date(row.blankDate).getTime(); + const end = new Date(row.lastDate).getTime(); + const diffTime = Math.abs(end - start); + var day = Math.floor(diffTime / (1000 * 60 * 60 * 24)); + if(row.lastDate > row.blankDate){ + return '延后' + day +'天'; + }else if (row.lastDate < row.blankDate){ + return '提前' + day +'天'; }else{ - return '延期' + return '按时完成' } - - - }else{ - return '延期'; - } - }else{ - return '已延期'; - } - }else{ - if(row.blankDate != null){ - if(row.lastDate != null){ - const start = new Date(row.blankDate).getTime(); - const end = new Date(row.lastDate).getTime(); - if(row.blankDate > row.lastDate){ - const diffTime = Math.abs(start - end); - var day = Math.floor(diffTime / (1000 * 60 * 60 * 24)); - return '提前'+day +'天完成'; - } else if ( Math.floor((start) / (1000 * 60 * 60 * 24)) == Math.floor(end / (1000 * 60 * 60 * 24))){ - return '按计划时间完成' - }else{ - const diffTime = Math.abs(end - start); - var day = Math.floor(diffTime / (1000 * 60 * 60 * 24)); - return '滞后'+day +'完成'; - } - }else{ - return '按计划实施中'; - } - }else{ - return '按计划实施中'; + return '实施中'; } } + } + /** 删除按钮操作 */ const handleDelete = async (id: number) => { try { diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue index 3a6c6d7..14a7910 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue @@ -181,6 +181,7 @@ class="!w-260px" v-model="formData.createTime" type="date" value-format="x" + @@ -778,7 +779,12 @@ const dispatchTypeHasChange = (row) =>{ row.postId ='' } else{ row.owner = '' - row.postId = ownerList2.value[0].id; + if(row.isOutsourcing == true){ + row.postId = '2' + }else{ +row.postId = ownerList2.value[0].id; + } + } } watch( @@ -1247,7 +1253,11 @@ const queryData = async (id?: number) => { postList.value = await TaskDispatchApi.getOwnerList(formData.value.ownerId,2); ownerList1.value = await getOwnerListThis (); //20250601改 固定为2 ownerList2.value = await getOwnerPostListThis (); - ownerList2 .value.push({index:1,id:'2',label:'2'}) + ownerList2.value = await getOwnerPostListThis (); + const exists = ownerList2.value.some(item => item.id === '2'); + if (!exists) { + ownerList2.value.push({ index: 1, id: '2', label: '2' }); + } } formData.value.bomCode = 'BOM-' + formData.value.projectSubCode diff --git a/mes-ui/mini-app/src/pages/moJuSheJiReport/components/dataItem.vue b/mes-ui/mini-app/src/pages/moJuSheJiReport/components/dataItem.vue index ec6d919..227e33d 100644 --- a/mes-ui/mini-app/src/pages/moJuSheJiReport/components/dataItem.vue +++ b/mes-ui/mini-app/src/pages/moJuSheJiReport/components/dataItem.vue @@ -232,22 +232,22 @@ const processDesignType = ref('') const updateItem = ref() const handleDetail = async (item) => { - updateItem.value = item; - processDesignType.value = item.processDesignType; - if (props.orderState == 0) { - progress.value = 0; - imageLink.value = item.blueprintLink; - remark.value = item.remark; - await queryData(updateItem.value.id) - await nextTick(); // 等待数据更新和DOM渲染 - // showPopup.value = true; + // updateItem.value = item; + // processDesignType.value = item.processDesignType; + // if (props.orderState == 0) { + // progress.value = 0; + // imageLink.value = item.blueprintLink; + // remark.value = item.remark; + // await queryData(updateItem.value.id) + // await nextTick(); // 等待数据更新和DOM渲染 + // // showPopup.value = true; - popup.value?.open() - selectedId.value = item.id; - } else { + // popup.value?.open() + // selectedId.value = item.id; + // } else { const url = `/pages/moJuSheJiReport/moJuSheJiReport-detail?id=${item.id}&jd=${item.progress}` uni.navigateTo({ url }) - } + // } // 为 selectedId 赋值 /* */ } @@ -352,7 +352,7 @@ } - if (dataListAdd.value.length > 0) { + if (dataListAdd.value != null && dataList.value.length > 0) { var indexs = -1; for (var i = 0; i < dataListAdd.value.length; i++) { @@ -403,7 +403,7 @@ } const overRow = async () => { var indexs = -1; - if (dataListAdd.value.length > 0) { + if (dataListAdd.value != null && dataListAdd.value.length > 0) { for (var i = 0; i < dataListAdd.value.length; i++) { var item = dataListAdd.value[i]; if (item.isOver == 0) { diff --git a/mes-ui/mini-app/src/pages/moJuSheJiReport/moJuSheJiReport-detail.vue b/mes-ui/mini-app/src/pages/moJuSheJiReport/moJuSheJiReport-detail.vue index 9c0823c..9ee70cf 100644 --- a/mes-ui/mini-app/src/pages/moJuSheJiReport/moJuSheJiReport-detail.vue +++ b/mes-ui/mini-app/src/pages/moJuSheJiReport/moJuSheJiReport-detail.vue @@ -1,218 +1,526 @@ + + + + 开始 + 结束 + + + 加载中.. + + + 填写信息 + + + + + 开始时间 + + + + *结束时间 + + + + *已做时间(小时) + + + + 小时 + + + 备注 + + + + + 确定 + + + .ok { + font-size: 32rpx; + margin: 20rpx auto 80rpx; + text-align: center; + width: 200rpx; + border-radius: 10rpx; + padding: 8rpx 0; + background-color: #3C8AF7; + color: #fff; + } + } + } + \ No newline at end of file diff --git a/mes-ui/mini-app/src/pages/pgMaster/components/dataItem.vue b/mes-ui/mini-app/src/pages/pgMaster/components/dataItem.vue index add94e5..23fd53d 100644 --- a/mes-ui/mini-app/src/pages/pgMaster/components/dataItem.vue +++ b/mes-ui/mini-app/src/pages/pgMaster/components/dataItem.vue @@ -146,15 +146,15 @@ const onRefresherrefresh = async () => { 项目名称：{{ item.projectName }} 子项目：{{ item.projectSubCode || '' }} {{' ' + item.projectSubName }} 零件名称：{{ item.materialName }} - 图号：{{ item.blueprintNo }} - + - 模型名称: {{ item.mouldName }} + 图号：{{ item.blueprintNo }} 派工工序: {{ item.procedureName }} - --> + 派工数量 diff --git a/mes-ui/mini-app/src/pages/productionReport/components/dataItem.vue b/mes-ui/mini-app/src/pages/productionReport/components/dataItem.vue index 32903c7..07d5825 100644 --- a/mes-ui/mini-app/src/pages/productionReport/components/dataItem.vue +++ b/mes-ui/mini-app/src/pages/productionReport/components/dataItem.vue @@ -18,6 +18,7 @@ }>() const noticeMsg = ref('') const isOverBeforeProcedure = async (id : number) => { + //console.log(props.orderState) const params = { id, } @@ -27,9 +28,6 @@ //如果上一道工序没结束 noticeMsg.value = '上一道工序尚未完成报工！'; return true; - }else if(data.testYn != 'Y'){ - noticeMsg.value = '上道工序过程检没有完成，请确认！'; - return true; }else { return false; } @@ -185,7 +183,7 @@ {{ item.totalWorkTime }} - 预计生产日期：{{ item.startTime }} ～ {{ item.endTime }} + 预计生产日期：{{ item.startTime }} ～ {{ item.endTime }} {{ statusText }} diff --git a/mes-ui/mini-app/src/pages/productionReport/productionReport-detail.vue b/mes-ui/mini-app/src/pages/productionReport/productionReport-detail.vue index 0eb4c6f..e915ba4 100644 --- a/mes-ui/mini-app/src/pages/productionReport/productionReport-detail.vue +++ b/mes-ui/mini-app/src/pages/productionReport/productionReport-detail.vue @@ -96,8 +96,6 @@ } else { isShowEnd.value = false } - console.log(isShowEnd.value); - console.log(isShowStart.value) if (historyList.value != null && historyList.value.length > 0) { var totalAmount = detailInfo.value.amount; var beforeAmount = detailInfo.value.totalReportAmount