From c048dbefde6c2275325758312bfe0766e5e8388d Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 25 六月 2024 09:36:36 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
index 5319bfb..2bc7dad 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
@@ -74,15 +74,15 @@
let pageState = null
//瀹ゅ唴瀹ゅ闈�
-const stateValue = ref('姝ら潰涓哄鍐呴潰')
+const stateValue = ref(t('processCard.thisIsTheIndoorSurface'))
const stateOptions = [
{
- value: '姝ら潰涓哄鍐呴潰',
- label: '姝ら潰涓哄鍐呴潰',
+ value: t('processCard.thisIsTheIndoorSurface'),
+ label: t('processCard.thisIsTheIndoorSurface'),
},
{
- value: '姝ら潰涓哄澶栭潰',
- label: '姝ら潰涓哄澶栭潰',
+ value: t('processCard.thisSideIsOutsideTheRoom'),
+ label: t('processCard.thisSideIsOutsideTheRoom'),
},
]
@@ -91,11 +91,11 @@
const lableTypeOptions = [
{
value: '1',
- label: '鎴愬搧鏍囩',
+ label: t('processCard.finishedProductLabel'),
},
{
value: '2',
- label: '鍗婂搧鏍囩',
+ label: t('processCard.halfProductLabel'),
},
]
@@ -175,7 +175,7 @@
},//琛ㄥご鍙傛暟
columns: [
{type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
- {title: '鎿嶄綔', width: 55, slots: { default: 'button_slot' },fixed:"left"},
+ {title: t('basicData.operate'), width: 55, slots: { default: 'button_slot' },fixed:"left"},
{type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
{
@@ -221,7 +221,7 @@
buttons: [
{code: 'print', name: t('processCard.print'), status: 'primary'},
{code: 'printLabel', name: t('processCard.printLabel'), status: 'primary'},
- {code: 'customLabel', name: '鑷畾涔夋爣绛炬墦鍗�', status: 'primary'},
+ {code: 'customLabel', name: t('processCard.customLabelPrinting'), status: 'primary'},
],
// import: false,
@@ -302,7 +302,7 @@
})
request.post("/processCard/printSort", flowCardData.value).then((res) => {
if (res.code == 200) {
- ElMessage.success("鎺掑簭鎴愬姛")
+ ElMessage.success(t('processCard.sortingSuccessful'))
//router.push('/main/processCard/SplittingDetails?orderId=${orderId}')
router.push({
path: '/main/processCard/PrintFlowCard',
@@ -322,7 +322,7 @@
return
}
if (type===null||type===''||type===undefined){
- ElMessage.warning('璇烽�夋嫨鑷畾涔夋墦鍗版爣绛炬牱寮�')
+ ElMessage.warning(t('processCard.pleaseSelectCustomPrintLabelStyle'))
return
}
@@ -390,60 +390,60 @@
field: 'sort',
width: 80,
editRender: {name: 'input', attrs: {placeholder: ''}},
- title: '鎺掑簭',
+ title: t('processCard.sorting'),
},
{
field: 'process_id',
- title: '娴佺▼鍗″彿',
+ title: t('processCard.processId'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
field: 'order_number',
- title: '搴忓彿',
+ title: t('order.OrderNum'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
field: 'technology_number',
- title: '灏忕墖椤哄簭',
+ title: t('processCard.technologyNumber'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
field: 'glass_address',
- title: '灏忕墖鏍囪',
+ title: t('processCard.glassAddress'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
field: 'quantity',
- title: '鏁伴噺',
+ title: t('order.quantity'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
field: 'child_width',
- title: '瀹�',
+ title: t('order.width'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
field: 'child_height',
- title: '楂�',
+ title: t('order.height'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
field: 'area',
- title: '闈㈢Н',
+ title: t('order.area'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
@@ -452,7 +452,7 @@
toolbarConfig: {
buttons: [
- {code: 'sort', name: '鎺掑簭', status: 'primary'},
+ {code: 'sort', name: t('processCard.sorting'), status: 'primary'},
],
// import: false,
// export: true,
@@ -488,8 +488,8 @@
<template>
<div class="main-div-customer">
- <label>鏍囩鏍峰紡锛�</label>
- <el-select v-model="printType" clearable default-value="default_city" style="width: 120px">
+ <label>{{$t('processCard.labelStyle')}}锛�</label>
+ <el-select v-model="printType" clearable default-value="default_city" :placeholder="$t('processCard.pleaseSelect')" style="width: 120px">
<el-option
v-for="item in titleSelectJson['dataType']"
:key="item.id"
@@ -498,7 +498,7 @@
/>
</el-select>
- <el-select v-model="lableType" class="m-2" placeholder="鎴愬搧鏍囩" style="width: 140px">
+ <el-select v-model="lableType" class="m-2" :placeholder="lableTypeOptions[0].label" style="width: 140px">
<el-option
v-for="item in lableTypeOptions"
:key="item.value"
@@ -507,7 +507,7 @@
/>
</el-select>
- <el-select v-model="stateValue" class="m-2" placeholder="瀹ゅ唴澶栭潰" style="width: 140px">
+ <el-select v-model="stateValue" class="m-2" :placeholder="stateOptions[0].label" style="width: 140px">
<el-option
v-for="item in stateOptions"
:key="item.value"
@@ -583,7 +583,7 @@
<el-dialog
v-model="dialogTableVisibleCustomLabel"
destroy-on-close
- title="鑷畾涔夋爣绛�"
+ :title="$t('processCard.labelStyle')"
style="width: 80%;height:75% ">
<PrintLabel :printList="selectRecords"
style="width: 100%;height: 100%" />
@@ -592,7 +592,7 @@
<el-dialog
@opened="openedTable"
v-model="printVisible"
- title="娴佺▼鍗℃槑缁�"
+ :title="$t('processCard.processCardDetails')"
:close-on-click-modal="false"
:close-on-press-escape="false"
style="width: 80%;height:75% ">
--
Gitblit v1.8.0