wangfei
2025-11-03 3c4b851a7b5f199c745a4796e6560466aabcc2c2
点击确认上片后弹出自定义弹窗,并设置定时关闭功能
6个文件已修改
44 ■■■■ 已修改文件
UI-Project/src/lang/en.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/lang/kr.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/lang/py.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/lang/zh.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/views/Returns/upreturns.vue 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/views/Returns/upreturns2.vue 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/lang/en.js
@@ -36,6 +36,7 @@
    basicData: {
        untask: 'No task',
        tonumber: 'Total number of films uploaded',
        sectionUpperSuccessful:'Upper section operation successful!',
        finishnumber: 'Completed quantity',
        rackreset: 'Rack reset',
        prackreset: 'Is the rack reset?',
UI-Project/src/lang/kr.js
@@ -36,6 +36,7 @@
      basicData:{
          untask:'작업 없음',
          tonumber:'총 영화 수',
          sectionUpperSuccessful:'상부 조작 성공!',
          finishnumber:'완료된 수량',
          rackreset:'쉘프 재설정',
          prackreset:'쉘프가 재설정되는지 여부?',
UI-Project/src/lang/py.js
@@ -36,6 +36,7 @@
    basicData: {
        untask:'无任务',
        tonumber:'上片总数量',
        sectionUpperSuccessful:'上片操作成功!',
        finishnumber:'已完成数量',
        rackreset:'架子复位',
        prackreset:'是否架子复位?',
UI-Project/src/lang/zh.js
@@ -36,6 +36,7 @@
      basicData:{
          untask:'无任务',
          tonumber:'上片总数量',
          sectionUpperSuccessful:'上片操作成功!',
          finishnumber:'已完成数量',
          rackreset:'架子复位',
          prackreset:'是否架子复位?',
UI-Project/src/views/Returns/upreturns.vue
@@ -185,7 +185,22 @@
        state: 1,
      })
      if (response.code == 200) {
        ElMessage.success(response.message);
        let timeoutId = setTimeout(() => {
          // 模拟按下确认按钮
          const confirmBtn = document.querySelector('.el-message-box__btns .el-button--primary');
          if (confirmBtn) {
            confirmBtn.click();
          }
        }, 5000)
        await ElMessageBox.alert(' ', t('basicData.sectionUpperSuccessful'), {
          confirmButtonText: t('searchOrder.sure'),
          type: 'success',
          center: true,
          customClass: 'center-message-box',
        });
        // 清除定时器
        clearTimeout(timeoutId);
        // 执行确认后的逻辑
        canSelectProjecta.value = false;
        canSelectProjectb.value = false;
        canSelectProjectc.value = true;
UI-Project/src/views/Returns/upreturns2.vue
@@ -248,17 +248,32 @@
// 开始上片
const handleon = async () => {
  let filmRemove = window.localStorage.getItem('filmRemove')
  let engineeringIda = window.localStorage.getItem('engineeringIda')
  let engineeringId = window.localStorage.getItem('engineeringIda')
  if (markingMachineStatus.value === 'green' && cuttingMachineStatus.value === 'green') {
    try {
      const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
        stationCell: 6,
        stationCell: 5,
        filmRemove: filmRemove,
        engineerId: engineeringIda,
        engineerId: engineeringId,
        state: 1,
      })
      if (response.code == 200) {
        ElMessage.success(response.message);
        let timeoutId = setTimeout(() => {
          // 模拟按下确认按钮
          const confirmBtn = document.querySelector('.el-message-box__btns .el-button--primary');
          if (confirmBtn) {
            confirmBtn.click();
          }
        }, 5000)
        await ElMessageBox.alert(' ', t('basicData.sectionUpperSuccessful'), {
          confirmButtonText: t('searchOrder.sure'),
          type: 'success',
          center: true,
          customClass: 'center-message-box',
        });
        // 清除定时器
        clearTimeout(timeoutId);
        // 执行确认后的逻辑
        canSelectProjecta.value = false;
        canSelectProjectb.value = false;
        canSelectProjectc.value = true;