From d5868d38cd7d46c52da971d7d0388d229495d729 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 08 一月 2024 14:08:03 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue | 131 +++++++++++++++++++++----------------------
1 files changed, 64 insertions(+), 67 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 d289b45..8583b81 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
@@ -62,25 +62,25 @@
},//琛ㄥご鍙傛暟
columns:[
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
{title: '鎿嶄綔', width: 140, slots: { default: 'button_slot' },fixed:"left"},
- {field: 'equipmentNumber', width: 120, title: '璁惧缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
- {field: 'standardName',width: 120, title: '鏍囧噯鍚嶇О', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'deviceName', width: 130,title: '璁惧鍚嶇О', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'buyingTime',width: 120, title: '璐拱鏃堕棿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'installationTime', width: 100,title: '瀹夎鏃堕棿', sortable: true,showOverflow:"ellipsis"},
- {field: 'usageCycle', width: 100,title: '浣跨敤鍛ㄦ湡(骞�)', sortable: true},
- {field: 'onState',width: 100, title: '浣跨敤鐘舵��', sortable: true},
- {field: 'maintenanceFrequency',width: 120, title: '缁翠慨娆℃暟', sortable: true,showOverflow:"ellipsis"},
- {field: 'MaintenancesFrequency', width: 120,title: '淇濆吇娆℃暟', sortable: true},
- {field: 'finalRepairTime',width: 120, title: '鏈�鍚庣淮淇椂闂�', sortable: true},
- {field: 'finalMaintenanceTime',width: 120, title: '鏈�鍚庝繚鍏绘椂闂�', sortable: true},
- {field: 'maintenanceCosts',width: 120, title: '缁翠慨璐圭敤', sortable: true},
- {field: 'maintenancesCosts',width: 120, title: '淇濆吇璐圭敤', sortable: true},
- {field: 'process',width: 120, title: '鎵�鍦ㄥ伐鑹�', sortable: true},
- {field: 'cancel',width: 120, title: '浣滃簾鐘舵��', sortable: true},
- ],//琛ㄥご鎸夐挳
-
+ { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
+ {field: '璁惧缂栧彿', width: 120, title: '璁惧缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
+ {field: '鏍囧噯鍚嶇О',width: 120, title: '鏍囧噯鍚嶇О', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: '璁惧鍚嶇О', width: 130,title: '璁惧鍚嶇О', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: '璐拱鏃堕棿',width: 120, title: '璐拱鏃堕棿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '瀹夎鏃堕棿', width: 100,title: '瀹夎鏃堕棿', sortable: true,showOverflow:"ellipsis"},
+ {field: '浣跨敤鍛ㄦ湡', width: 100,title: '浣跨敤鍛ㄦ湡(骞�)', sortable: true},
+ {field: '浣跨敤鐘舵��',width: 100, title: '浣跨敤鐘舵��', sortable: true},
+ {field: '缁翠慨娆℃暟',width: 120, title: '缁翠慨娆℃暟', sortable: true,showOverflow:"ellipsis"},
+ {field: '淇濆吇娆℃暟', width: 120,title: '淇濆吇娆℃暟', sortable: true},
+ {field: '鏈�鍚庣淮淇椂闂�',width: 120, title: '鏈�鍚庣淮淇椂闂�', sortable: true},
+ {field: '鏈�鍚庝繚鍏绘椂闂�',width: 120, title: '鏈�鍚庝繚鍏绘椂闂�', sortable: true},
+ {field: '缁翠慨璐圭敤',width: 120, title: '缁翠慨璐圭敤', sortable: true},
+ {field: '淇濆吇璐圭敤',width: 120, title: '淇濆吇璐圭敤', sortable: true},
+ {field: '鎵�鍦ㄥ伐鑹�',width: 120, title: '鎵�鍦ㄥ伐鑹�', sortable: true},
+ {field: '浣滃簾鐘舵��',width: 120, title: '浣滃簾鐘舵��', sortable: true},
+ ],
+ //琛ㄥご鎸夐挳
toolbarConfig: {
// buttons: [{
//
@@ -93,63 +93,60 @@
},
data: [
{
- equipmentNumber: 'SB2209211',
- standardName: '閽㈠寲鐐�(22E)',
- deviceName: '閽㈠寲鐐�(22E)',
- buyingTime: '2022-03-16',
- installationTime:'2022-03-16',
- usageCycle:'313',
- onState:'浣跨敤涓�',
- maintenanceFrequency:'0',
- MaintenancesFrequency:'0',
- finalRepairTime:'',
- finalMaintenanceTime:'',
- maintenanceCosts:'',
- maintenancesCosts:'',
- process:'閽㈠寲',
- cancel:'姝ｅ父',
-
+ "璁惧缂栧彿": 'SB2209211',
+ '鏍囧噯鍚嶇О': '閽㈠寲鐐�(22E)',
+ '璁惧鍚嶇О': '閽㈠寲鐐�(22E)',
+ '璐拱鏃堕棿': '2022-03-16',
+ '瀹夎鏃堕棿':'2022-03-16',
+ '浣跨敤鍛ㄦ湡':'313',
+ '浣跨敤鐘舵��':'浣跨敤涓�',
+ '缁翠慨娆℃暟':'0',
+ '淇濆吇娆℃暟':'0',
+ '鏈�鍚庣淮淇椂闂�':'',
+ '鏈�鍚庝繚鍏绘椂闂�':'',
+ '缁翠慨璐圭敤':'',
+ '淇濆吇璐圭敤':'',
+ '鎵�鍦ㄥ伐鑹�':'閽㈠寲',
+ '浣滃簾鐘舵��':'姝ｅ父',
},
{
- equipmentNumber: 'SB2209211',
- standardName: '閽㈠寲鐐�(22E)',
- deviceName: '閽㈠寲鐐�(22E)',
- buyingTime: '2022-03-16',
- installationTime:'2022-03-16',
- usageCycle:'313',
- onState:'浣跨敤涓�',
- maintenanceFrequency:'0',
- MaintenancesFrequency:'0',
- finalRepairTime:'',
- finalMaintenanceTime:'',
- maintenanceCosts:'',
- maintenancesCosts:'',
- process:'閽㈠寲',
- cancel:'姝ｅ父',
-
+ "璁惧缂栧彿": 'SB2209211',
+ '鏍囧噯鍚嶇О': '閽㈠寲鐐�(22E)',
+ '璁惧鍚嶇О': '閽㈠寲鐐�(22E)',
+ '璐拱鏃堕棿': '2022-03-16',
+ '瀹夎鏃堕棿':'2022-03-16',
+ '浣跨敤鍛ㄦ湡':'313',
+ '浣跨敤鐘舵��':'浣跨敤涓�',
+ '缁翠慨娆℃暟':'0',
+ '淇濆吇娆℃暟':'0',
+ '鏈�鍚庣淮淇椂闂�':'',
+ '鏈�鍚庝繚鍏绘椂闂�':'',
+ '缁翠慨璐圭敤':'',
+ '淇濆吇璐圭敤':'',
+ '鎵�鍦ㄥ伐鑹�':'閽㈠寲',
+ '浣滃簾鐘舵��':'姝ｅ父',
},
{
- equipmentNumber: 'SB2209211',
- standardName: '閽㈠寲鐐�(22E)',
- deviceName: '閽㈠寲鐐�(22E)',
- buyingTime: '2022-03-16',
- installationTime:'2022-03-16',
- usageCycle:'313',
- onState:'浣跨敤涓�',
- maintenanceFrequency:'0',
- MaintenancesFrequency:'0',
- finalRepairTime:'',
- finalMaintenanceTime:'',
- maintenanceCosts:'',
- maintenancesCosts:'',
- process:'閽㈠寲',
- cancel:'姝ｅ父',
-
+ "璁惧缂栧彿": 'SB2209211',
+ '鏍囧噯鍚嶇О': '閽㈠寲鐐�(22E)',
+ '璁惧鍚嶇О': '閽㈠寲鐐�(22E)',
+ '璐拱鏃堕棿': '2022-03-16',
+ '瀹夎鏃堕棿':'2022-03-16',
+ '浣跨敤鍛ㄦ湡':'313',
+ '浣跨敤鐘舵��':'浣跨敤涓�',
+ '缁翠慨娆℃暟':'0',
+ '淇濆吇娆℃暟':'0',
+ '鏈�鍚庣淮淇椂闂�':'',
+ '鏈�鍚庝繚鍏绘椂闂�':'',
+ '缁翠慨璐圭敤':'',
+ '淇濆吇璐圭敤':'',
+ '鎵�鍦ㄥ伐鑹�':'閽㈠寲',
+ '浣滃簾鐘舵��':'姝ｅ父',
},
],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['maintenanceFrequency','MaintenancesFrequency']
+ let footList=['缁翠慨娆℃暟','淇濆吇娆℃暟','缁翠慨璐圭敤','淇濆吇璐圭敤']
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
--
Gitblit v1.8.0