Browse Source

Merge branch 'refs/heads/dev-2.19.0' into dev

Lita-Tako 5 months ago
parent
commit
457056153f

+ 4 - 4
src/views/storageJob/fumigation.vue

@@ -7,10 +7,10 @@
7
 			title: '序号',
7
 			title: '序号',
8
 			customRender: ({ text, record, index }) => `${index + 1}`
8
 			customRender: ({ text, record, index }) => `${index + 1}`
9
 		},
9
 		},
10
-		{
11
-			title: '企业名称',
12
-			dataIndex: 'someField'
13
-		},
10
+		// {
11
+		// 	title: '企业名称',
12
+		// 	dataIndex: 'someField'
13
+		// },
14
 		{
14
 		{
15
 			title: '库区名称',
15
 			title: '库区名称',
16
 			dataIndex: 'orgName'
16
 			dataIndex: 'orgName'

+ 9 - 9
src/views/storageJob/internalCirculation.vue

@@ -13,27 +13,27 @@
13
 		},
13
 		},
14
 		{
14
 		{
15
 			title: '库区名称',
15
 			title: '库区名称',
16
-			dataIndex: 'someField'
16
+			dataIndex: 'orgName'
17
 		},
17
 		},
18
 		{
18
 		{
19
 			title: '仓房名称',
19
 			title: '仓房名称',
20
-			dataIndex: 'someField'
20
+			dataIndex: 'cfmc'
21
 		},
21
 		},
22
 		{
22
 		{
23
 			title: '环流风机型号',
23
 			title: '环流风机型号',
24
-			dataIndex: 'someField'
24
+			dataIndex: 'vdevcode'
25
 		},
25
 		},
26
 		{
26
 		{
27
 			title: '磷化氢浓度',
27
 			title: '磷化氢浓度',
28
-			dataIndex: 'someField'
29
-		},
30
-		{
31
-			title: '状态',
32
-			dataIndex: 'someField'
28
+			dataIndex: 'lhqnd'
33
 		},
29
 		},
30
+		// {
31
+		// 	title: '状态',
32
+		// 	dataIndex: 'someField'
33
+		// },
34
 		{
34
 		{
35
 			title: '操作时间',
35
 			title: '操作时间',
36
-			dataIndex: 'someField'
36
+			dataIndex: 'xzsj'
37
 		},
37
 		},
38
 		...(hasPerm(['fumigationFilingApprovalView', 'doFumigationFilingApproval'])
38
 		...(hasPerm(['fumigationFilingApprovalView', 'doFumigationFilingApproval'])
39
 			? [
39
 			? [

+ 4 - 4
src/views/storageJob/ventilation.vue

@@ -7,10 +7,10 @@
7
 			title: '序号',
7
 			title: '序号',
8
 			customRender: ({ text, record, index }) => `${index + 1}`
8
 			customRender: ({ text, record, index }) => `${index + 1}`
9
 		},
9
 		},
10
-		{
11
-			title: '企业名称',
12
-			dataIndex: 'someField'
13
-		},
10
+		// {
11
+		// 	title: '企业名称',
12
+		// 	dataIndex: 'someField'
13
+		// },
14
 		{
14
 		{
15
 			title: '库区名称',
15
 			title: '库区名称',
16
 			dataIndex: 'orgName'
16
 			dataIndex: 'orgName'