From a07f90d6106971923e8f761f253a9b4d30a60752 Mon Sep 17 00:00:00 2001 From: CD配唱片 <CD配唱片> Date: 星期二, 06 五月 2025 15:37:30 +0800 Subject: [PATCH] Merge branch 'feature-i18n' into dev --- src/views/mainPlan/platePlanList/index.vue | 240 +++++++++++++++++++++++++++++++----------------------------- 1 files changed, 124 insertions(+), 116 deletions(-) diff --git a/src/views/mainPlan/platePlanList/index.vue b/src/views/mainPlan/platePlanList/index.vue index 4297ece..0d95149 100644 --- a/src/views/mainPlan/platePlanList/index.vue +++ b/src/views/mainPlan/platePlanList/index.vue @@ -40,17 +40,18 @@ icon="Download" @click="handleExport" v-hasPermi="['plateProcessShopStat:export']" - >瀵煎嚭</el-button + >{{ $t(`common.common.export`) }}</el-button > </el-col> <el-col :span="1.5"> <el-button type="success" plain - icon="Edit" + icon="Refresh" @click="handleUpdate" + :disabled="loading" v-hasPermi="['plateProcessShopStat:update']" - >鏇存柊</el-button + >{{ $t(`common.common.update`) }}</el-button > </el-col> @@ -68,7 +69,7 @@ > </HxlhTable> <!-- 娣诲姞鎴栦慨鏀归挘閲戠粺璁″璇濇 --> - <el-dialog :title="title" v-model="open" width="500px" append-to-body> + <!-- <el-dialog :title="title" v-model="open" width="500px" append-to-body> <el-form ref="aps_plate_process_statRef" :model="form" @@ -103,7 +104,7 @@ <el-button @click="cancel">鍙� 娑�</el-button> </div> </template> - </el-dialog> + </el-dialog> --> </div> </template> @@ -116,8 +117,12 @@ import { getToken } from "@/utils/auth"; import { nextTick, onMounted, ref } from "vue"; import { ElMessage } from "element-plus"; +import { useI18n } from "vue-i18n"; //瑕佸湪js涓娇鐢ㄥ浗闄呭寲 +// import i18n from "@/utils/i18n"; +// const t = i18n.global.t +const { t, locale } = useI18n(); const { proxy } = getCurrentInstance(); - +// console.log(proxy.$i18n.locale, "indexPlanList"); const aps_plate_process_statList = ref([]); const dynamicList = ref([]); const generateColumnList = ref([]); @@ -150,114 +155,117 @@ // }, // rules: {}, }); +const columns = ref([]); const xGrid = ref(); const { queryParams, form, rules } = toRefs(data); - -// 琛ㄦ牸閰嶇疆 -const columns = ref([ - /* { type: 'seq', title: '搴忓彿', width: 60 },*/ - { - title: "涓讳欢鏂欏彿", - field: "mainPartNumber", - width: 150, - fixed: "left", - }, - { - title: "涓氬姟绫诲瀷", - field: "businessType", - width: 120, - fixed: "left", - }, - { - title: "鍗曟嵁鍙�", - field: "documentNumber", - width: 160, - fixed: "left", - }, - { - title: "闇�姹傚垎绫�", - field: "requirementType", - width: 100, - fixed: "left", - }, - { - title: "鍗曟嵁鐘舵��", - field: "documentStatus", - width: 100, - fixed: "left", - }, - { - title: "瀹℃牳鏃堕棿", - field: "updateBy", - width: 100, - }, - { - title: "褰撳墠宸ュ簭", - field: "workCenter", - width: 200, - }, - { - title: "褰撳墠宸ュ簭璐熻矗浜�", - field: "department", - width: 200, - }, - { - title: "褰撳墠宸ュ簭鐘舵��", - field: "opStatus", - width: 200, - }, - { - title: "涓嬩竴宸ュ簭", - field: "nextOpName", - width: 100, - }, - { - title: "涓嬩竴宸ュ簭璐熻矗浜�", - field: "nextProcessDeparment", - width: 200, - }, - { - title: "鏂欏彿", - field: "itemNumber", - width: 150, - type: "html", - }, - { - title: "鍥惧彿", - field: "drawingNo", - width: 150, - // format: 'YYYY-MM-DD' - }, - { - title: "鐗堟湰鍙�", - field: "versionNumber", - width: 100, - type: "html", - }, - { - title: "浣庨樁鐮�", - field: "updateBy", - width: 100, - }, - { - title: "鐢熶骇鏁伴噺", - field: "productionQuantity", - width: 100, - type: "html", - }, - { - title: "宸ュ崟璁″垝涓嬪彂鏃堕棿", - field: "updateBy", - width: 200, - }, - { - title: "绯荤粺瀹屽伐鏃堕棿", - field: "planEndDay", - width: 150, - format: "YYYY-MM-DD hh:mm:ss", - }, -]); - +watch(locale, (newLocale) => { + // 閲嶆柊鑾峰彇缈昏瘧鏂囨湰 + // 琛ㄦ牸閰嶇疆 + columns.value = [ + /* { type: 'seq', title: '搴忓彿', width: 60 },*/ + { + title: t("plan.table.mainPartNumber"), + field: "mainPartNumber", + width: 150, + fixed: "left", + }, + { + title: t("plan.table.businessType"), + field: "businessType", + width: 120, + fixed: "left", + }, + { + title: t("plan.table.documentNumber"), + field: "documentNumber", + width: 160, + fixed: "left", + }, + { + title: t("plan.table.requirementType"), + field: "requirementType", + width: 100, + fixed: "left", + }, + { + title: t("plan.table.documentStatus"), + field: "documentStatus", + width: 100, + fixed: "left", + }, + { + title: t("plan.table.updateBy"), + field: "updateBy", + width: 100, + }, + { + title: t("plan.table.workCenter"), + field: "workCenter", + width: 200, + }, + { + title: t("plan.table.department"), + field: "department", + width: 200, + }, + { + title: t("plan.table.opStatus"), + field: "opStatus", + width: 200, + }, + { + title: t("plan.table.nextOpName"), + field: "nextOpName", + width: 100, + }, + { + title: t("plan.table.nextProcessDeparment"), + field: "nextProcessDeparment", + width: 200, + }, + { + title: t("plan.table.itemNumber"), + field: "itemNumber", + width: 150, + type: "html", + }, + { + title: t("plan.table.drawingNo"), + field: "drawingNo", + width: 150, + // format: 'YYYY-MM-DD' + }, + { + title: t("plan.table.versionNumber"), + field: "versionNumber", + width: 100, + type: "html", + }, + { + title: t("plan.table.cheaperCode"), + field: "cheaperCode", + width: 100, + }, + { + title: t("plan.table.productionQuantity"), + field: "productionQuantity", + width: 100, + type: "html", + }, + { + title: t("plan.table.planworkOrderTime"), + field: "planworkOrderTime", + width: 200, + }, + { + title: t("plan.table.planEndDay"), + field: "planEndDay", + width: 150, + format: "YYYY-MM-DD hh:mm:ss", + }, + ] + getList(); +},{immediate:true, deep:true}); /** 鏌ヨ閽i噾缁熻鍒楄〃 */ async function getList() { loading.value = true; @@ -279,7 +287,6 @@ }; } ); - console.log(aps_plate_process_statList.value, "resDataresDataresData"); let newArray = []; newArray = dynamicList.value.flatMap((item, index) => [ { @@ -404,7 +411,7 @@ listApsPlateProcessShopStatUpdate().then((response) => { // form.value = response.data; ElMessage({ - message: "鏁版嵁鏇存柊鎴愬姛", + message: t("plan.message.update"), type: "success", }); loading.value = false; @@ -419,9 +426,10 @@ `aps_plate_plan_list_${new Date().getTime()}.xlsx` ); } -getList(); +// getList(); // onMounted(async () => { -// +// await nextTick(); + // }); </script> <style lang="scss" scoped> -- Gitblit v1.9.3