From 2e2cc56d419ce972d37c8f24b72090c5183b67e7 Mon Sep 17 00:00:00 2001
From: 86134 <aa>
Date: 星期四, 09 十一月 2023 11:38:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/equipment/metering/index.vue | 130 ++++++++++++++++++++++++++++++++++---------
1 files changed, 103 insertions(+), 27 deletions(-)
diff --git a/src/views/equipment/metering/index.vue b/src/views/equipment/metering/index.vue
index bbc96a2..31f4ff7 100644
--- a/src/views/equipment/metering/index.vue
+++ b/src/views/equipment/metering/index.vue
@@ -36,8 +36,9 @@
multipleSelection: [],
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
- isShow: true,
- url: '/mes/equipment/upload'
+ Download:false,
+ isShow: true,
+ url: '/mes/equipmentDevice/upload'
},
prelang: 'workstation',
options: {
@@ -94,20 +95,55 @@
// isSearch: true,
// searchInfoType: 'text'
// },
+ // {
+ // minWidth: '30',
+ // prop: 'type',
+ // label: '璁惧绫诲瀷',
+ // // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // // searchInfoType: 'select',
+ // formatter: this.workShopFormatter,
+ // // optList: () => {
+ // // return this.workshopList
+ // // }
+ // },
+ // 鍨嬪彿瑙勬牸
+
+ // 鍒堕�犳棩鏈�
+ {
+ minWidth: '150',
+ width: '250',
+ prop: 'createTime',
+ label: '鏍″噯鏃堕棿',
+ sort: true,
+ isTrue: true,
+ formatter: this.formatReceiveTime,
+ isSearch: true,
+ searchInfoType: 'datetime'
+ },
+
+ {
+ minWidth: '150',
+ width: '250',
+ prop: 'updateTime',
+ label: '鏍″噯鍒版湡鏃堕棿',
+ sort: true,
+ isTrue: true,
+ formatter: this.formatReceiveTime,
+ isSearch: true,
+ searchInfoType: 'datetime'
+ },
{
minWidth: '30',
- prop: 'type',
- label: '璁惧绫诲瀷',
- // sort: true,
+ prop: 'createUser',
+ label: '璐熻矗浜�',
+ sort: true,
isTrue: true,
- isSearch: true,
- // searchInfoType: 'select',
- formatter: this.workShopFormatter,
- // optList: () => {
- // return this.workshopList
- // }
+ isSearch: false,
+ searchInfoType: 'text'
},
- // 鍨嬪彿瑙勬牸
+
{
minWidth: '30',
prop: 'supplier',
@@ -127,29 +163,69 @@
isSearch: true,
searchInfoType: 'text'
},
- // 鍒堕�犳棩鏈�
- {
- minWidth: '150',
- width: '250',
- prop: 'createTime',
- label: '鍒涘缓鏃堕棿',
+ // 鐘舵��
+ {
+ minWidth: '30',
+ prop: 'responsibleDepartment',
+ label: '璐熻矗閮ㄩ棬',
sort: true,
isTrue: true,
- formatter: this.formatReceiveTime,
isSearch: true,
- searchInfoType: 'datetime'
+ searchInfoType: 'text'
},
-
{
- minWidth: '150',
- width: '250',
- prop: 'updateTime',
- label: '淇敼鏃堕棿',
+ minWidth: '30',
+ prop: 'inspectionUnit',
+ label: '妫�楠屽崟浣�',
sort: true,
isTrue: true,
- formatter: this.formatReceiveTime,
isSearch: true,
- searchInfoType: 'datetime'
+ searchInfoType: 'text'
+ },
+ {
+ minWidth: '30',
+ prop: 'certificate',
+ label: '璇佷功缂栧彿',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
+ minWidth: '30',
+ prop: 'verification',
+ label: '妫�瀹�',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
+ minWidth: '30',
+ prop: 'classification',
+ label: '鍒嗙被',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
+ minWidth: '30',
+ prop: 'fixedPointPosition',
+ label: '瀹氱偣浣嶇疆',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
+ minWidth: '30',
+ prop: 'specifications',
+ label: '瑙勬牸',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
},
],
toolbar: [
--
Gitblit v1.9.3