From 64005f076c10294f71324de45d36c5004e6a6e47 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 31 八月 2023 15:06:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/task.vue | 71 ++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/task.vue b/Source/UBCS-WEB/src/views/docking/task.vue
index da87c29..591ea4e 100644
--- a/Source/UBCS-WEB/src/views/docking/task.vue
+++ b/Source/UBCS-WEB/src/views/docking/task.vue
@@ -67,61 +67,53 @@
},
{
label: "鍥惧彿",
- prop: "uniquecode",
+ prop: "uniqueCode",
search: true,
+ hide:true,
sortable:true,
width:150
},
{
- label: '鍒嗙被id',
- prop: 'classifyid',
+ label: '鍒嗙被浠ｅ彿',
+ prop: 'classifyId',
search: true,
sortable:true,
width: 250
},
{
label: '鍒嗙被鍚嶇О',
- prop: 'classifyname',
+ prop: 'classifyName',
search: true,
- sortable:true
+ sortable:true,
+ width: 200
},
{
- label: '绯荤粺缂栧彿',
- prop: 'systemcode',
+ label: '闆嗘垚绯荤粺缂栧彿',
+ prop: 'systemCode',
search: true,
sortable:true,
width: 150
},
{
- label: '绯荤粺鍚嶇О',
- prop: 'systemname',
+ label: '闆嗘垚绯荤粺鍚嶇О',
+ prop: 'systemName',
search: true,
sortable:true,
width: 150
},
{
label: '鏁版嵁鎯呭喌',
- prop: 'sendtype',
+ prop: 'sendType',
sortable:true,
- width: 100
- },
- {
- label: '鏄惁鎺ㄩ�佹垚鍔�',
- prop: 'sendflag',
- search: true,
- sortable:true,
- width: 120,
- html:true,
- align:'center',
- type:'select',
- searchLabelWidth:130,
- dicData: [{key:'true',value:'鏄�'},{key:'false',value:'鍚�'}],
- props: {
- label: "value",
- value: "key"
- },
- formatter : function (row, column) {
- return row.sendflag == 'true' || row.sendflag == '1' ? '<i class="el-icon-check"></i>' : '<i class="el-icon-close"></i>'
+ width: 100,
+ formatter: function (row, column) {
+ if (row.sendType === 'Released') {
+ return '鍙戝竷';
+ } else if (row.sendType === 'TakeBack') {
+ return '鍥炴敹';
+ } else if (row.sendType === 'Disabled') {
+ return '鍋滅敤';
+ }
}
},
{
@@ -135,7 +127,26 @@
prop: 'lastModifyTime',
sortable:true,
width: 150
- }
+ },
+ {
+ label: '鏄惁鎺ㄩ�佹垚鍔�',
+ prop: 'sendFlag',
+ search: true,
+ sortable:true,
+ width: 120,
+ html:true,
+ align:'center',
+ type:'select',
+ searchLabelWidth:130,
+ dicData: [{key:'true',value:'鏄�'},{key:'false',value:'鍚�'}],
+ props: {
+ label: "value",
+ value: "key"
+ },
+ formatter : function (row, column) {
+ return row.sendFlag == 'true' || row.sendFlag == '1' ? '<i class="el-icon-check" style="color: limegreen"></i>' : '<i class="el-icon-close" style="color: red"></i>'
+ }
+ },
]
}
}
--
Gitblit v1.9.3