From 5a5e59f8aaa2a030511ef245886bf6d1db9bf774 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 15 三月 2024 14:40:14 +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 | 299 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 218 insertions(+), 81 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..c3fe5c1 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()
@@ -15,6 +18,7 @@
const user=userInfo()
//瀹氫箟琛ㄥご鏁版嵁
const titleUploadData = ref({
+ reportingWorkId: null,
//娴佺▼鍗″彿
processId: 'NG24030804A02/1',
//閿�鍞崟鍙�
@@ -76,22 +80,32 @@
})
-
+let inputDisabled = ref(false)
onMounted(() =>{
if(route.query.processId !== undefined && route.query.processId!=='' && route.query.processId!=null ){
titleUploadData.value.processId = route.query.processId
}
+ //route.query.reportingWorkId = 'BG2403150004'
//鍒ゆ柇鏄惁浼犲叆鎶ュ伐缂栧彿
- if(route.query.reportingWorkId!== undefined && route.query.reportingWorkId!=='' && route.query.reportingWorkId!=null){
+ if(route.query.reportingWorkId !== '' && route.query.reportingWorkId!=null){
request.post(`reportingWork/selectUpdateReportingWork/${route.query.reportingWorkId}`).then(res=>{
if(res.code === '200'){
titleUploadData.value = res.data.reportingWork
- console.log(res.data)
+ titleSelectJson.value = res.data.basic
xGrid.value.reloadData(res.data.reportingWorkDetails)
+ let button = {
+ code: 'update',
+ name: '淇敼',
+ status: 'primary',
+ }
+ gridOptions.toolbarConfig.buttons.push(button)
}
+ inputDisabled.value = true
})
}
})
+
+const data = [{id:1,num:2},{id:1,num:3},{id:2,num:2},{id:1,num:2}];
//琛ㄥ熬姹傚拰
@@ -153,14 +167,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 +182,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 +204,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 +234,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'),},
],
//琛ㄥ崟楠岃瘉
@@ -239,6 +253,9 @@
}else if((row.completedQuantity*1+brokenNum*1)>row.quantity*1){
return new Error((`${row.completedQuantity}+${brokenNum}>${row.quantity}`))
}
+ if(titleUploadData.value.reportingWorkId!=null && row.completedQuantity<row.minQuantity){
+ return new Error(`璇疯緭鍏ュぇ浜庣瓑浜�${row.minQuantity}鐨勬暟瀛梎)
+ }
}
}
@@ -251,8 +268,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 +283,7 @@
return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ return t('basicData.total')
}
return ''
})
@@ -275,7 +292,12 @@
})
-let brokenRow = ref()
+let brokenRow = ref({
+ glass_child:'',
+ order_number:'',
+ technology_number:''
+
+})
const gridEvents = {
async toolbarButtonClick({code}) {
const $grid = xGrid.value
@@ -287,7 +309,7 @@
ElMessage.error(`鏍￠獙涓嶉�氳繃锛乣)
return
}
- saveReportingWork(0)
+ saveReportingWork(0,'save')
break
}
case 'saveReportingWorkReview': {
@@ -296,7 +318,16 @@
ElMessage.error(`鏍￠獙涓嶉�氳繃锛乣)
return
}
- saveReportingWork(1)
+ saveReportingWork(1,'save')
+ break
+ }
+ case 'update': {
+ const errMap = await $grid.validate(true)
+ if (errMap) {
+ ElMessage.error(`鏍￠獙涓嶉�氳繃锛乣)
+ return
+ }
+ saveReportingWork(0,'update')
break
}
}
@@ -311,7 +342,6 @@
//brokenGrid.value.reloadData(brokenRow.damageDetail)
//鏀瑰彉brokenVisible鐨勫�艰Е鍙憃penedBrokenTable锛堬級鏂规硶
brokenVisible.value = true
- //console.log(brokenGrid.value)
}
}
@@ -347,7 +377,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 +385,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 +472,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,
@@ -476,7 +506,6 @@
addListener(brokenGrid.value,brokenGridOptions)
let damage =ref(brokenRow.value.damageDetails)
brokenGrid.value.reloadData(damage.value)
- //console.log(brokenRow.value)
}
@@ -497,16 +526,29 @@
})
let reportingWorkNum = isNaN(brokenRow.value.completedQuantity*1)?0:brokenRow.value.completedQuantity*1
- if((breakageQuantityCount+reportingWorkNum>brokenRow.value.quantity*1) ){
+ if((breakageQuantityCount>brokenRow.value.quantity*1) ){
ElMessage.warning(`鎹熻�楁暟:'${breakageQuantityCount}'
- 瀹屽伐鏁�:'${reportingWorkNum}'涔嬪拰${breakageQuantityCount+reportingWorkNum}
涓嶈兘澶т簬${brokenRow.value.quantity*1}`)
return false
}
-
+ brokenRow.value.completedQuantity = brokenRow.value.quantity-breakageQuantityCount
breakageQuantityCount = breakageQuantityCount === 0 ? null : breakageQuantityCount
brokenRow.value.breakageQuantity = breakageQuantityCount
brokenRow.value.damageDetails=brokenGrid.value.getTableData().fullData
+ // xGrid.value.getTableData().fullData.forEach(
+ //
+ // )
+ const equalByOrderNum = xGrid.value.getTableData().fullData.filter((row) =>{
+ return row.order_number === brokenRow.value.order_number
+ })
+ const maxQuantity = Math.max(...equalByOrderNum.map(item =>item.breakageQuantity || 0))
+ equalByOrderNum.forEach((row) =>{
+ row.completedQuantity= brokenRow.value.quantity*1-maxQuantity
+ })
+
+
+ getQuantity()
+
done()
}
@@ -521,11 +563,38 @@
}
})
-const saveReportingWork = (type) => {
+function checkSameNumForId(data, targetId) {
+ // 鍒濆鍖栦竴涓璞℃潵瀛樺偍閬囧埌鐨刬d鍙婂叾瀵瑰簲鐨刵um鍊�
+ const idNums = {};
+ let firstNum = null;
+
+ for (const item of data) {
+ if (item.order_number === targetId) {
+ // 濡傛灉鎵惧埌浜嗙洰鏍噄d锛屾鏌um鏄惁涓庣涓�涓亣鍒扮殑num鐩稿悓
+ if (firstNum === null) {
+ // 濡傛灉鏄涓�涓亣鍒扮殑锛岃褰昻um鍊�
+ firstNum = item.completedQuantity;
+ } else if (item.completedQuantity !== firstNum) {
+ // 濡傛灉num鍊间笌绗竴涓亣鍒扮殑num涓嶅悓锛岃繑鍥瀎alse
+ return false;
+ }
+ }
+ }
+
+ // 濡傛灉閬嶅巻瀹屾暟缁勫悗娌℃湁杩斿洖false锛岄偅涔堟墍鏈夊叿鏈夌洰鏍噄d鐨勫璞￠兘鍏锋湁鐩稿悓鐨刵um鍊�
+ return true;
+}
+
+
+
+
+
+
+const saveReportingWork = (state,saveType) => {
if(xGrid.value.getTableData().fullData.length===0){
ElMessage.warning(`璇烽�夋嫨娴佺▼鍗℃暟鎹甡)
- return false
+ return
}
const device = titleUploadData.value.deviceName
if(device === null || device === undefined || device === ''){
@@ -537,6 +606,28 @@
ElMessage.error('璇烽�夋嫨鎶ュ伐璁惧锛�')
return
}
+
+ const seenIds = {}
+ const uniqueByOrderNum = xGrid.value.getTableData().fullData.filter(item => {
+ // 妫�鏌tem鐨刬d鏄惁宸茬粡鍦╯eenIds涓�
+ if (!seenIds[item.order_number]) {
+ // 濡傛灉涓嶅湪锛屾坊鍔犲畠骞惰繑鍥瀟rue浠ヤ繚鐣欒繖涓璞�
+ seenIds[item.order_number] = true;
+ return true;
+ }
+ // 濡傛灉宸茬粡鍦╯eenIds涓紝杩斿洖false浠ヨ繃婊ゆ帀杩欎釜瀵硅薄
+ return false;
+ });
+ const notFinishList = xGrid.value.getTableData().fullData.filter(item =>{
+ return item.saveFlag === false
+ })
+ for(let item of uniqueByOrderNum){
+ if(!checkSameNumForId(notFinishList,item.order_number)){
+ ElMessage.error(`璇锋鏌ヨ鍗曞簭鍙�: ${item.order_number} 鎶ュ伐鏁伴噺鏄惁鐩稿悓锛乣)
+ return false
+ }
+ }
+
titleUploadData.value.creator = user.user.userName
titleUploadData.value.creatorId = user.user.userId
@@ -553,10 +644,19 @@
const requestData = {
title:titleUploadData.value,
detail:xGrid.value.getTableData().fullData,
- type:type//瀹℃牳鐘舵��
+ type:state//瀹℃牳鐘舵��
}
gridOptions.toolbarConfig.buttons[0].disabled=true
gridOptions.toolbarConfig.buttons[1].disabled=true
+ if(saveType==='save'){
+ saveReportingWorkRequest(requestData)
+ }else{
+ updateReportingWorkRequest(requestData)
+ }
+
+}
+
+const saveReportingWorkRequest = (requestData) =>{
request.post(`/reportingWork/saveReportingWork`,requestData).then(res =>{
if (res.code == 200){
ElMessage.success("鎶ュ伐鎴愬姛")
@@ -564,18 +664,33 @@
}else{
const errorObj = JSON.parse(res.msg)
const msg = "搴忓彿锛�"+errorObj.orderNumber+'\n'
- +'灏忕墖椤哄簭锛�'+errorObj.technologyNumber+'\n'
- +"瀹為檯鍙姤宸ユ暟閲忥細"+errorObj.processNum+'<'+
- "鎶ュ伐鏁伴噺锛�"+errorObj.sumNum+'\n'
- +"璇峰埛鏂扮晫闈㈤噸鏂版姤宸�"
+ +'灏忕墖椤哄簭锛�'+errorObj.technologyNumber+'\n'
+ +"瀹為檯鍙姤宸ユ暟閲忥細"+errorObj.processNum+'<'+
+ "鎶ュ伐鏁伴噺锛�"+errorObj.sumNum+'\n'
+ +"璇峰埛鏂扮晫闈㈤噸鏂版姤宸�"
ElMessage.error(msg)
}
}).catch(err =>{
ElMessage.error(err.message)
}).finally(()=>{
+
gridOptions.toolbarConfig.buttons[0].disabled=false
gridOptions.toolbarConfig.buttons[1].disabled=false
+ })
+}
+
+//鏇存柊鎶ュ伐鏁版嵁
+const updateReportingWorkRequest = (requestData) =>{
+ request.post(`/reportingWork/updateReportingWork`,requestData).then(res =>{
+ if (res.code == 200){
+ ElMessage.success("鎶ュ伐淇敼鎴愬姛")
+ router.push({path:'/main/reportingWorks/AddReportingWork',
+ query:{
+ processId:titleUploadData.value.processId,
+ random:Math.random()}
+ })
+ }
})
}
@@ -656,17 +771,17 @@
const getWork = () => {
let processId = titleUploadData.value.processId
- if (processId.indexOf("/") < 0) {
-
- ElMessage.warning("璇疯緭鍏ユ纭牸寮忔祦绋嬪崱")
- return
- }
- let indexOfChar = processId.indexOf("/")
- let leftString = processId.slice(0, indexOfChar)
- if (leftString.length != 13) {
- ElMessage.warning("璇疯緭鍏ユ纭綅鏁扮殑娴佺▼鍗�")
- return
- }
+ // if (processId.indexOf("/") < 0) {
+ //
+ // ElMessage.warning("璇疯緭鍏ユ纭牸寮忔祦绋嬪崱")
+ // return
+ // }
+ // let indexOfChar = processId.indexOf("/")
+ // let leftString = processId.slice(0, indexOfChar)
+ // if (leftString.length != 13) {
+ // ElMessage.warning("璇疯緭鍏ユ纭綅鏁扮殑娴佺▼鍗�")
+ // return
+ // }
//宸ュ簭
let process = titleUploadData.value.thisProcess
if (process == "" || process == null) {
@@ -719,7 +834,7 @@
}
//鍒ゆ柇鏃╂櫄鐝�
- titleUploadData.value.classes='鏃╃彮'
+ titleUploadData.value.classes=t('reportingWorks.early')
titleUploadData.value.reportingWorkTime = formatCurrentTime()
//缁戝畾涓嬫柟琛ㄦ牸
detail.value = res.data.Detail
@@ -781,7 +896,26 @@
item.completedQuantity=row.completedQuantity
}
})
+ getQuantity()
}
+}
+const getQuantity = () => {
+ const arr = xGrid.value.getTableData().fullData
+ const returnArr = arr.filter((obj, index, self) =>
+ self.findIndex((t) => t.order_number === obj.order_number) === index
+ )
+
+
+ let sumBreak = 0
+ let sumQuantity = 0
+ returnArr.forEach((item)=>{
+ sumQuantity+=Number(item.completedQuantity*1)
+ })
+ arr.forEach((item)=>{
+ sumBreak+=Number(item.breakageQuantity) || 0
+ })
+ titleUploadData.value.thisCompletedQuantity = sumQuantity
+ titleUploadData.value.thisWornQuantity = sumBreak
}
</script>
@@ -789,9 +923,10 @@
<template>
<div style="height: 100%;width: 100%">
<div id="head" style="height: 5%;width: 100%;margin-bottom: 5px">
- <el-input v-model="titleUploadData.processId" placeholder="娴佺▼鍗″彿" style="width: 200px" @keyup.enter.native="getWork"/>
+ <el-input :disabled="inputDisabled" v-if="titleUploadData.reportingWorkId" v-model="titleUploadData.reportingWorkId" placeholder="鎶ュ伐缂栧彿" style="width: 200px" />
+ <el-input :disabled="inputDisabled" v-model="titleUploadData.processId" placeholder="娴佺▼鍗″彿" style="width: 200px" @keyup.enter.native="getWork"/>
- <el-select v-model="titleUploadData.thisProcess" clearable placeholder="璇烽�夋嫨宸ュ簭" style="width: 120px"
+ <el-select :disabled="inputDisabled" v-model="titleUploadData.thisProcess" clearable placeholder="璇烽�夋嫨宸ュ簭" style="width: 120px"
@change="getWork">
<el-option
v-for="item in titleSelectJson['processType']"
@@ -801,39 +936,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 +978,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 +991,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 +1020,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 +1033,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 +1046,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 +1066,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 +1104,8 @@
v-model="brokenVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
- title="鐮存崯鍒楄〃"
+ :title="$t('reportingWorks.damageList')+':'
+ +brokenRow.glass_child+'.'+brokenRow.order_number+'.'+brokenRow.technology_number"
style="width: 80%;height:75% ">
<vxe-grid
--
Gitblit v1.8.0