将报表中查询‘全部’工序的中文替换成对应语言，并需改对应传入的参数

chenlu

2025-10-20 a93d59d255da1d3d410c2706e44b3069af8503e9

将报表中查询‘全部’工序的中文替换成对应语言，并需改对应传入的参数

 north-glass-erp/northglass-erp/src/lang/ar.js

@@ -1105,6 +1105,7 @@
            finishedProductReport :'تقرير المنتجات النهائية',
            orderWorkReportForm :'订单报工报表',
        },
        allProcess:'全部',
        teamsGroupsName:'上工序报工',
        WorkInProgressCombination:'在制品汇总报表',
        processCompleted:'工序待完成汇总报表',

 north-glass-erp/northglass-erp/src/lang/en.js

@@ -1105,6 +1105,7 @@
            finishedProductReport :'Finished product report',
            orderWorkReportForm :'订单报工报表',
        },
        allProcess:'全部',
        teamsGroupsName:'上工序报工',
        WorkInProgressCombination:'在制品汇总报表',
        processCompleted:'工序待完成汇总报表',

 north-glass-erp/northglass-erp/src/lang/kr.js

@@ -1105,6 +1105,7 @@
            finishedProductReport :'완제품 보고서',
            orderWorkReportForm :'订单报工报表',
        },
        allProcess:'全部',
        teamsGroupsName:'上工序报工',
        WorkInProgressCombination:'在制品汇总报表',
        processCompleted:'工序待完成汇总报表',

 north-glass-erp/northglass-erp/src/lang/ru.js

@@ -1105,6 +1105,7 @@
            finishedProductReport :'Отчет о готовой продукции',
            orderWorkReportForm :'订单报工报表',
        },
        allProcess:'全部',
        teamsGroupsName:'上工序报工',
        WorkInProgressCombination:'在制品汇总报表',
        processCompleted:'工序待完成汇总报表',

 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -1105,6 +1105,7 @@
            finishedProductReport :'成品报表',
            orderWorkReportForm :'订单报工报表',
        },
        allProcess:'全部',
        teamsGroupsName:'上工序报工',
        productionReport:'生产报表',
        workInProgressReport:'在制品明细报表',

 north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue

@@ -52,12 +52,7 @@
let pageNum = ref(1)
let pageState = null

let newItem= ref({
  basic_name: '全部',
  basic_type: 'product',
  basic_category: 'process',
  id: "001"
    })


//获取七天前到当前时间
function getNowTime() {
@@ -117,7 +112,6 @@
    pageTotal.value = res.data.total
    produceList = produceList.value.concat(deepClone(res.data.data))
    titleSelectJson.value.processType = res.data.process
    titleSelectJson.value.processType.unshift(newItem.value)
    produceList.forEach(item => {
      item.mmTotal = sumMmValues(item.workProcessName);
    });
@@ -463,6 +457,10 @@
          
        <el-select v-model="procseeValue" clearable default-value="default_city" style="width: 120px">
          <el-option
              :label="t('report.allProcess')"
              :value="'all'"
          />
          <el-option
              v-for="item in titleSelectJson['processType']"
              :key="item.id"
              :label="item.basic_name"

 north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue

@@ -93,12 +93,7 @@
  dataTotal: 0,
  pageSize: 100
})
let newItem= ref({
  basic_name: '全部',
  basic_type: 'product',
  basic_category: 'process',
  id: "001"
})

//定义接收加载表头下拉数据
const titleSelectJson = ref({
  processType: [],
@@ -118,7 +113,6 @@
    produceList = produceList.value.concat(deepClone(res.data.data))
    titleSelectJson.value.processType = res.data.process
    titleSelectJson.value.processType.splice(0,1)
    titleSelectJson.value.processType.unshift(newItem.value)
    //xGrid.value.reloadData(produceList)
    gridOptions.loading = false
  } else {
@@ -493,6 +487,10 @@
       {{$t('report.workingProcedure')}}：
        <el-select v-model="valueProcess" clearable :placeholder="$t('reportingWorks.selectProcess')" default-value="default_city" style="width: 120px">
          <el-option
              :label="t('report.allProcess')"
              :value="'all'"
          />
          <el-option
              v-for="item in titleSelectJson['processType']"
              :key="item.id"
              :label="item.basic_name"

 north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgressCombination.vue

@@ -96,12 +96,7 @@
  dataTotal: 0,
  pageSize: 100
})
let newItem= ref({
  basic_name: '全部',
  basic_type: 'product',
  basic_category: 'process',
  id: "001"
})

//定义接收加载表头下拉数据
const titleSelectJson = ref({
  processType: [],
@@ -121,7 +116,6 @@
    // produceList = produceList.value.concat(deepClone(res.data.data))
    titleSelectJson.value.processType = res.data.process
    titleSelectJson.value.processType.splice(0,1)
    titleSelectJson.value.processType.unshift(newItem.value)
    xGrid.value.reloadData(produceList)
    gridOptions.loading = false
  } else {
@@ -368,6 +362,10 @@
      {{$t('report.workingProcedure')}}：
        <el-select v-model="value" clearable :placeholder="$t('reportingWorks.selectProcess')" default-value="default_city" style="width: 120px">
          <el-option
              :label="t('report.allProcess')"
              :value="'all'"
          />
          <el-option
              v-for="item in titleSelectJson['processType']"
              :key="item.id"
              :label="item.basic_name"

 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java

@@ -336,7 +336,7 @@
        if ("null".equals(optionVal)) {
            optionVal = ("");
        }
        if (selectProcesses.equals("全部")){
        if (selectProcesses.equals("all")){
            selectProcesses="";
        }
        String laminating = reportMapper.getLaminating(selectProcesses);
@@ -618,7 +618,7 @@

    public List exportWorkInProgressSv(Map<String, Object> dates) {
        String process= (String) dates.get("processes");
        if (process.equals("全部")){
        if (process.equals("all")){
            process="";
        }
        String inputVal= (String) dates.get("inputVal");
@@ -655,7 +655,7 @@
    }

    public Map<String, Object> teamOutputSv(Integer pageNum, Integer pageSize, String selectTime1, String selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO) {
        if (selectProcesses.equals("全部")){
        if (selectProcesses.equals("all")){
            selectProcesses="";
        }
        Integer offset = (pageNum - 1) * pageSize;
@@ -687,7 +687,7 @@
    public List exportTeamOutputSv(Map<String, Object> dates) {
        List<LocalDate> date= (List<LocalDate>) dates.get("date");
        String process= (String) dates.get("processes");
        if (process.equals("全部")){
        if (process.equals("all")){
            process="";
        }
        String laminating = reportMapper.getLaminating(process);
@@ -728,7 +728,7 @@
        if ("null".equals(optionVal)) {
            optionVal = "";
        }
        if ("全部".equals(selectProcesses)) {
        if ("all".equals(selectProcesses)) {
            selectProcesses = "";
        }

@@ -806,7 +806,7 @@

    public List exportWorkInProgressCombinationSv(Map<String, Object> dates) {
        String process= (String) dates.get("processes");
        if (process.equals("全部")){
        if (process.equals("all")){
            process="";
        }
        String inputVal= (String) dates.get("inputVal");