From d8085c81987d5819d7f270bcf0bd68d879f28d2b Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 13 三月 2024 10:30:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 104 +++++++++++++++++++++++++++-------------------------
1 files changed, 54 insertions(+), 50 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
index 2a58df2..b223e8f 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -7,6 +7,9 @@
import {indexOf} from "xe-utils";
import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
import userInfo from "@/stores/userInfo"
+import { useI18n } from 'vue-i18n'
+//璇█鑾峰彇
+const { t } = useI18n()
let brokenVisible = ref(false)
const xGrid = ref()
const brokenGrid =ref()
@@ -153,14 +156,14 @@
// {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
{
field: 'order_number',
- title: '搴忓彿',
+ title: t('order.OrderNum'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
field: 'glass_child',
- title: '鍗曠墖鍚嶇О',
+ title: t('reportingWorks.glassChild'),
showOverflow: "ellipsis",
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
@@ -168,21 +171,21 @@
},
{
field: 'technology_number',
- title: '鏍囪',
+ title: t('processCard.technologyNumber'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
field: 'glass_address',
- title: '鐗囨爣璁�',
+ title: t('reportingWorks.glassAddress'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
field: 'quantity_card',
- title: '娴佺▼鍗℃暟閲�',
+ title: t('reportingWorks.numberProcessCards'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
showOverflow: "ellipsis",
@@ -190,29 +193,29 @@
},
{
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: 'shape',
- title: '褰㈢姸',
+ title: t('order.shape'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
showOverflow: "ellipsis",
filterMethod: filterChanged
},
- {field: 'quantity', title: '鍙姤鏁伴噺',},
+ {field: 'quantity', title: t('reportingWorks.reportableQuantityOk'),},
{
- field: 'completedQuantity', title: '瀹屽伐鏁伴噺',width: 120,
+ field: 'completedQuantity', title: t('reportingWorks.completedQuantity'),width: 120,
editRender: {
name: 'input',
attrs: {placeholder: ''}
@@ -220,10 +223,10 @@
},
{
- field: 'breakageQuantity', title: '娆＄牬鏁伴噺',
+ field: 'breakageQuantity', title: t('reportingWorks.quantityBroken'),
},
- {field: 'completed', width: 90, title: '宸插畬宸�',},
- {field: 'onceBroken', width: 90, title: '宸叉鐮�',},
+ {field: 'completed', width: 90, title:t('reportingWorks.completed'),},
+ {field: 'onceBroken', width: 90, title: t('reportingWorks.onceBroken'),},
],
//琛ㄥ崟楠岃瘉
@@ -251,8 +254,8 @@
// {code: 'sameDamage', name: '娆＄牬鐩稿悓'},
// {code: 'sameOneCompletion', name: '瀹屽伐涓�鍒楃浉鍚�'},
// {code: 'sameOneDamage', name: '娆＄牬涓�鍒楃浉鍚�'},
- {code: 'saveReportingWork', name: '淇濆瓨', status: 'primary', icon: 'vxe-icon-save',disabled:true},
- {code: 'saveReportingWorkReview', name: '淇濆瓨骞跺鏍�', status: 'primary', icon: 'vxe-icon-save',disabled:true},
+ {code: 'saveReportingWork', name: t('basicData.save'), status: 'primary', icon: 'vxe-icon-save',disabled:true},
+ {code: 'saveReportingWorkReview', name: t('reportingWorks.saveAndReview'), status: 'primary', icon: 'vxe-icon-save',disabled:true},
],
// import: false,
// export: true,
@@ -266,7 +269,7 @@
return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ return t('basicData.total')
}
return ''
})
@@ -347,7 +350,7 @@
showStatus: true
},//琛ㄥご鍙傛暟
columns: [
- {type: 'seq',fixed:"left", title: '鑷簭', width: 80 },
+ {type: 'seq',fixed:"left", title: t('basicData.Number'), width: 80 },
// {
// field: 'order_number',
// title: '搴忓彿'
@@ -355,48 +358,48 @@
{
field: 'breakageQuantity',
- title: '娆＄牬鏁伴噺',
+ title: t('reportingWorks.quantityBroken'),
editRender: {name: 'input', attrs: {placeholder: ''}}
},
{field: 'available',
- title: '鍙埄鐢�',
+ title: t('reportingWorks.available'),
slots: {default: 'available'}
},
- {field: 'returnProcess', title: '閫�鍥炲伐搴�',
+ {field: 'returnProcess', title: t('reportingWorks.returnProcess'),
editRender: {},
slots: {default: 'returnProcess_default', edit: 'returnProcess'}
},
{
- field: 'breakageType', title: '娆＄牬绫诲瀷',
+ field: 'breakageType', title: t('reportingWorks.breakageType'),
editRender: {},
slots: {default: 'breakageType_default', edit: 'breakageType'}
},
{
- field: 'breakageReason', title: '娆＄牬鍘熷洜',
+ field: 'breakageReason', title: t('reportingWorks.breakageReason'),
editRender: {},
slots: {default: 'breakageReason_default', edit: 'breakageReason'}
},
{
- field: 'responsibleProcess', title: '璐ｄ换宸ュ簭',
+ field: 'responsibleProcess', title: t('reportingWorks.responsibleProcess'),
editRender: {},
slots: {default: 'responsibleProcess_default', edit: 'responsibleProcess'}
},
{
field: 'responsibleEquipment',
- title: '璐ｄ换璁惧',
+ title: t('reportingWorks.responsibleEquipment'),
editRender: {},
slots: {default: 'reportingDeviceSort_default', edit: 'reportingDeviceSort'}
// editRender: {name: 'input', attrs: {placeholder: ''}}
},
{
- field: 'responsibleTeam', title: '璐ｄ换鐝粍',
+ field: 'responsibleTeam', title: t('reportingWorks.responsibleTeam'),
editRender: {},
slots: {default: 'responsibleTeam_default', edit: 'responsibleTeam'}
},
{
field: 'responsiblePersonnel',
- title: '璐ｄ换浜哄憳',
+ title: t('reportingWorks.responsiblePersonnel'),
editRender: {name: 'input', attrs: {placeholder: ''}}
},
@@ -442,8 +445,8 @@
},
toolbarConfig: {//琛ㄥご鎸夐挳
buttons: [
- {code: 'addRow', name: '娣诲姞', status: 'primary', icon: 'vxe-icon-square-plus'},
- {code: 'removeRow', name: '鍒犻櫎', status: 'primary', icon: 'vxe-icon-delete'},
+ {code: 'addRow', name: t('reportingWorks.increase'), status: 'primary', icon: 'vxe-icon-square-plus'},
+ {code: 'removeRow', name: t('basicData.delete'), status: 'primary', icon: 'vxe-icon-delete'},
],
// import: false,
// export: true,
@@ -719,7 +722,7 @@
}
//鍒ゆ柇鏃╂櫄鐝�
- titleUploadData.value.classes='鏃╃彮'
+ titleUploadData.value.classes=t('reportingWorks.early')
titleUploadData.value.reportingWorkTime = formatCurrentTime()
//缁戝畾涓嬫柟琛ㄦ牸
detail.value = res.data.Detail
@@ -801,39 +804,40 @@
/>
</el-select>
- <el-button :disabled="disabledFlag" :loading="loadingFlag" @click="reviewReportingWork" type="primary">瀹℃牳閫氳繃</el-button>
+ <el-button :disabled="disabledFlag" :loading="loadingFlag" @click="reviewReportingWork" type="primary">{{$t('reportingWorks.passAudit')}}
+ </el-button>
<!-- <el-button type="primary">瀹℃牳涓嶉�氳繃</el-button>-->
- <label>娴佺▼鍗￠潰绉細xxx骞虫柟绫�</label>
+ <label>{{$t('reportingWorks.processCardArea')}}锛�</label>
</div>
<div style="background-color: white;margin-bottom: 5px;height: 17%;width: 100%">
<el-row>
<el-col :span="2">
- <el-text>閿�鍞崟鍙凤細</el-text>
+ <el-text>{{$t('order.orderId')}}锛�</el-text>
</el-col>
<el-col :span="3">
<el-text>{{ titleUploadData.orderId }}</el-text>
</el-col>
<el-col :span="2">
- <el-text>鐢熶骇璁㈠崟鍙凤細</el-text>
+ <el-text>{{$t('workOrder.productionId')}}锛�</el-text>
</el-col>
<el-col :span="3">
<el-text>{{ titleUploadData.productionId }}</el-text>
</el-col>
<el-col :span="2">
- <el-text>瀹㈡埛缂栫爜锛�</el-text>
+ <el-text>{{$t('processCard.customerId')}}锛�</el-text>
</el-col>
<el-col :span="2">
<el-text>{{ titleUploadData.order.customerId }}</el-text>
</el-col>
<el-col :span="2">
- <el-text>瀹㈡埛鍚嶇О锛�</el-text>
+ <el-text>{{$t('processCard.customerName')}}锛�</el-text>
</el-col>
<el-col :span="3">
<el-text class="customClass"></el-text>
</el-col>
<el-col :span="2">
- <el-text>椤圭洰鍚嶇О锛�</el-text>
+ <el-text>{{$t('order.project')}}锛�</el-text>
</el-col>
<el-col :span="3">
<el-text wrap-text="false">{{ titleUploadData.order.project }}</el-text>
@@ -842,10 +846,10 @@
</el-row>
<el-row>
<el-col :span="2">
- <el-text>鎶ュ伐璁惧锛�</el-text>
+ <el-text>{{$t('reportingWorks.deviceType')}}锛�</el-text>
</el-col>
<el-col :span="3">
- <el-select v-model="titleUploadData.deviceName" clearable placeholder="璇烽�夋嫨璁惧">
+ <el-select v-model="titleUploadData.deviceName" clearable :placeholder="$t('reportingWorks.pleaseDevice')">
<el-option
v-for="item in titleSelectJson['deviceType']"
:key="item.id"
@@ -855,27 +859,27 @@
</el-select>
</el-col>
<el-col :span="2">
- <el-text>涓婂伐搴忥細</el-text>
+ <el-text>{{$t('reportingWorks.previousProcess')}}锛�</el-text>
</el-col>
<el-col :span="3">
<el-text>{{ titleUploadData.previousProcess }}</el-text>
</el-col>
<el-col :span="2">
- <el-text>鍙姤宸ユ暟閲忥細</el-text>
+ <el-text>{{$t('reportingWorks.numberReported')}}锛�</el-text>
</el-col>
<el-col :span="2">
<el-text>{{ titleUploadData.previousProcessQuantity }}</el-text>
</el-col>
<el-col :span="2">
- <el-text>鏈伐搴忓畬宸ワ細</el-text>
+ <el-text>{{$t('reportingWorks.thisCompletedQuantity')}}锛�</el-text>
</el-col>
<el-col :span="3">
<el-text>{{ titleUploadData.thisCompletedQuantity }}</el-text>
</el-col>
<el-col :span="2">
- <el-text>鏈伐搴忔鐮达細</el-text>
+ <el-text>{{$t('reportingWorks.thisWornQuantity')}}锛�</el-text>
</el-col>
<el-col :span="3">
<el-text>{{ titleUploadData.thisWornQuantity }}</el-text>
@@ -884,10 +888,10 @@
</el-row>
<el-row>
<el-col :span="2">
- <el-text>鎶ュ伐鐝粍锛�</el-text>
+ <el-text>{{$t('reportingWorks.teamsType')}}锛�</el-text>
</el-col>
<el-col :span="3">
- <el-select v-model="titleUploadData.teamsGroupsName" clearable placeholder="璇烽�夋嫨鐝粍">
+ <el-select v-model="titleUploadData.teamsGroupsName" clearable :placeholder="$t('reportingWorks.selectTeam')">
<el-option
v-for="item in titleSelectJson['teamsType']"
:key="item.id"
@@ -897,10 +901,10 @@
</el-select>
</el-col>
<el-col :span="2">
- <el-text>鐝锛�</el-text>
+ <el-text>{{$t('reportingWorks.classes')}}锛�</el-text>
</el-col>
<el-col :span="3">
- <el-select v-model="titleUploadData.classes" class="processesSt" placeholder="">
+ <el-select v-model="titleUploadData.classes" class="processesSt" :placeholder="$t('reportingWorks.selectClasses')">
<el-option
v-for="item in classesOption"
:key="item.value"
@@ -910,14 +914,14 @@
</el-select>
</el-col>
<el-col :span="2">
- <el-text>涓嬪伐搴忥細</el-text>
+ <el-text>{{$t('reportingWorks.nextProcess')}}锛�</el-text>
</el-col>
<el-col :span="2">
<el-text>{{ titleUploadData.nextProcess }}</el-text>
</el-col>
<el-col :span="2">
- <el-text>鎶ュ伐鏃ユ湡锛�</el-text>
+ <el-text>{{$t('reportingWorks.reportingWorkTime')}}锛�</el-text>
</el-col>
<el-col :span="3">
<el-date-picker
@@ -930,7 +934,7 @@
/>
</el-col>
<el-col :span="2">
- <el-text>澶囨敞锛�</el-text>
+ <el-text>{{$t('basicData.remarks')}}锛�</el-text>
</el-col>
<el-col :span="3">
<el-input v-model="titleUploadData.notes" placeholder="" />
@@ -968,7 +972,7 @@
v-model="brokenVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
- title="鐮存崯鍒楄〃"
+ :title="$t('reportingWorks.damageList')"
style="width: 80%;height:75% ">
<vxe-grid
--
Gitblit v1.8.0