From e50fa16b6dbc4e7c50d5fbdbc04d2a556ca01c4e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:36 +0800
Subject: [PATCH] 补片流程卡调整
---
north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue | 73 ++++++++++++++----------------------
1 files changed, 29 insertions(+), 44 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue b/north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue
index 2ef6277..95d8acc 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue
@@ -19,23 +19,6 @@
basic_name: '',
d_basic_name: '',
})
-const getTableRow = (row,type) =>{
- switch (type) {
- case 'edit' :{
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/reportingWorks/ReportingWorkDetail', query: { id: row.id }})
- break
- }
- case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
- break
- }
- case 'setType':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍙嶅鐘舵��')
- break
- }
- }
-}
//琛ㄥ熬姹傚拰
const sumNum = (list, field) => {
@@ -70,7 +53,7 @@
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
id: 'CustomerList',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
@@ -95,17 +78,17 @@
},//琛ㄥご鍙傛暟
columns:[
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
- {field: 'deviceId', width: 120, title: '璁惧缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged },
- {field: 'deviceName', width: 130,title: '璁惧鍚嶇О' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
- {field: 'type',width: 100, title: '浣跨敤鐘舵��',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged },
- {field: 'faultCount',width: 120, title: '缁翠慨娆℃暟' ,showOverflow:"ellipsis"},
- {field: 'maintenanceCount', width: 120,title: '淇濆吇娆℃暟', },
- {field: 'faultLastTime',width: 120, title: '鏈�鍚庣淮淇椂闂�', },
- {field: 'maintenanceLastTime',width: 120, title: '鏈�鍚庝繚鍏绘椂闂�', },
- {field: 'faultCost',width: 120, title: '缁翠慨璐圭敤', },
- {field: 'maintenanceCost',width: 120, title: '淇濆吇璐圭敤', },
- {field: 'process',width: 120, title: '鎵�鍦ㄥ伐鑹�',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged }
+ { type: 'seq',fixed:"left", title: t('basicData.Number'), width: 50 },
+ {field: 'deviceId', width: 120, title: t('machine.basicId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged },
+ {field: 'deviceName', width: 130,title: t('machine.basicName') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
+ {field: 'type',width: 100, title: t('machine.type'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged },
+ {field: 'faultCount',width: 120, title: t('machine.faultCount') ,showOverflow:"ellipsis"},
+ {field: 'maintenanceCount', width: 120,title: t('machine.maintenanceCount'), },
+ {field: 'faultLastTime',width: 120, title: t('machine.faultLastTime'), },
+ {field: 'maintenanceLastTime',width: 120, title: t('machine.maintenanceLastTime'), },
+ {field: 'faultCost',width: 120, title: t('machine.faultCost'), },
+ {field: 'maintenanceCost',width: 120, title: t('machine.maintenanceCost'), },
+ {field: 'process',width: 120, title: t('machine.basicCategory'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged }
],
//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -126,7 +109,7 @@
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ return t('basicData.total')
}
if (footList.includes(column.field)) {
return sumNum(data, column.field)
@@ -172,7 +155,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="text" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="text" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
@@ -180,15 +165,15 @@
</vxe-grid>
- <el-dialog v-model="dialogFormVisible" title="璁惧缂栬緫">
+ <el-dialog v-model="dialogFormVisible" :title="$t('machine.deviceEditing')">
<el-form :model="form">
- <el-form-item label="鏍囧噯鍚嶇О" :label-width="formLabelWidth">
+ <el-form-item :label="$t('machine.standardName')" :label-width="formLabelWidth">
<el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
</el-form-item>
- <el-form-item label="璁惧鍚嶇О" :label-width="formLabelWidth">
+ <el-form-item :label="$t('machine.basicName')" :label-width="formLabelWidth">
<el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
</el-form-item>
- <el-form-item label="璐拱鏃堕棿" :label-width="formLabelWidth">
+ <el-form-item :label="$t('machine.purchaseTime')" :label-width="formLabelWidth">
<el-date-picker
v-model="value1"
type="date"
@@ -196,7 +181,7 @@
:size="size"
/>
</el-form-item>
- <el-form-item label="瀹夎鏃堕棿" :label-width="formLabelWidth">
+ <el-form-item :label="$t('machine.installationTime')" :label-width="formLabelWidth">
<el-date-picker
v-model="value1"
type="date"
@@ -204,22 +189,22 @@
:size="size"
/>
</el-form-item>
- <el-form-item label="淇濆吇鍛ㄦ湡" :label-width="formLabelWidth">
+ <el-form-item :label="$t('machine.maintenanceCycle')" :label-width="formLabelWidth">
<el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
</el-form-item>
- <el-form-item label="鎵�鍦ㄥ伐鑹�" :label-width="formLabelWidth">
- <el-select v-model="form.region" placeholder="閽㈠寲" style="width: 220px">
- <el-option label="鍒囧壊" value="shanghai" />
- <el-option label="纾ㄨ竟" value="mobian" />
- <el-option label="閽㈠寲" value="ganghua" />
+ <el-form-item :label="$t('machine.standardName')" :label-width="formLabelWidth">
+ <el-select v-model="form.region" :placeholder="$t('machine.tempering')" style="width: 220px">
+ <el-option :label="$t('machine.cutting')" value="shanghai" />
+ <el-option :label="$t('machine.edgeGrinding')" value="mobian" />
+ <el-option :label="$t('machine.tempering')" value="ganghua" />
</el-select>
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
- <el-button @click="dialogFormVisible = false">鍙栨秷</el-button>
+ <el-button @click="dialogFormVisible = false">{{$t('basicData.cancelButtonText')}}</el-button>
<el-button type="primary" @click="dialogFormVisible = false">
- 纭
+ {{$t('basicData.confirmButtonText')}}
</el-button>
</span>
</template>
--
Gitblit v1.8.0