From 4d0093d34b0928c810582d745279c77e15502e56 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 09 十一月 2023 10:08:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/equipment/metering/index.vue | 145 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 110 insertions(+), 35 deletions(-)
diff --git a/src/views/equipment/metering/index.vue b/src/views/equipment/metering/index.vue
index bbc96a2..bbd003d 100644
--- a/src/views/equipment/metering/index.vue
+++ b/src/views/equipment/metering/index.vue
@@ -37,7 +37,7 @@
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
isShow: true,
- url: '/mes/equipment/upload'
+ url: '/mes/equipmentDevice/upload'
},
prelang: 'workstation',
options: {
@@ -94,41 +94,23 @@
// 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: '30',
+ // prop: 'type',
+ // label: '璁惧绫诲瀷',
+ // // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // // searchInfoType: 'select',
+ // formatter: this.workShopFormatter,
+ // // optList: () => {
+ // // return this.workshopList
+ // // }
+ // },
// 鍨嬪彿瑙勬牸
- {
- minWidth: '30',
- prop: 'supplier',
- label: '鍘傚',
- sort: true,
- isTrue: true,
- isSearch: false,
- searchInfoType: 'text'
- },
- // 鐘舵��
- {
- minWidth: '30',
- prop: 'status',
- label: '鐘舵��',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
- // 鍒堕�犳棩鏈�
- {
+
+ // 鍒堕�犳棩鏈�
+ {
minWidth: '150',
width: '250',
prop: 'createTime',
@@ -151,6 +133,99 @@
isSearch: true,
searchInfoType: 'datetime'
},
+ {
+ minWidth: '30',
+ prop: 'createUser',
+ label: '璐熻矗浜�',
+ sort: true,
+ isTrue: true,
+ isSearch: false,
+ searchInfoType: 'text'
+ },
+
+ {
+ minWidth: '30',
+ prop: 'supplier',
+ label: '鍘傚',
+ sort: true,
+ isTrue: true,
+ isSearch: false,
+ searchInfoType: 'text'
+ },
+ // 鐘舵��
+ {
+ minWidth: '30',
+ prop: 'status',
+ label: '鐘舵��',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ // 鐘舵��
+ {
+ minWidth: '30',
+ prop: 'responsibleDepartment',
+ label: '璐熻矗閮ㄩ棬',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
+ minWidth: '30',
+ prop: 'InspectionUnit',
+ label: '妫�楠屽崟浣�',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ 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