From 119b55b59e4d6af0e8881fae671eaa3a1c9fd6ac Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 10 一月 2024 10:26:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/integration/applicationForm.vue | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/integration/applicationForm.vue b/Source/UBCS-WEB/src/views/integration/applicationForm.vue
index 4c11990..242709c 100644
--- a/Source/UBCS-WEB/src/views/integration/applicationForm.vue
+++ b/Source/UBCS-WEB/src/views/integration/applicationForm.vue
@@ -57,26 +57,26 @@
{
label: '鐢宠鍗曞彿',
prop: 'id',
- width: 300,
+ width: 200,
fixed: true,
search: true,
}, {
label: '闆嗗洟鐮�',
- width: 200,
+ width: 150,
prop: 'groupCode',
search: true,
}, {
label: '鎿嶄綔绫诲瀷',
- width: 200,
+ width: 120,
prop: 'operationType',
type: 'select',
search: true,
dicData: [{
label: '鐢宠',
- value: 1
+ value: '1'
}, {
label: '鏇存敼',
- value: 2
+ value: '2'
}]
}, {
label: '鐢宠鍗曟暟鎹俊鎭�',
@@ -85,30 +85,33 @@
},
{
label: '鍒涘缓鏃堕棿',
- width: 200,
prop: 'createTime',
type: 'datetime',
search: true,
},
{
label: '鏇存敼鏃堕棿',
- width: 200,
prop: 'lastModifyTime',
type: 'datetime',
search: true,
}, {
label: '杩斿洖鏍囪瘑',
- width: 100,
- prop: 'code'
+ width: 120,
+ prop: 'code',
+ html: true,
+ align:'center',
+ formatter : function (row) {
+ return row.code == '1' ? '<i class="el-icon-check" style="color: #32cd32;font-size: 20px;font-weight: 800"></i>' : '<i class="el-icon-close" style="color: #ff0000;font-size: 20px;font-weight: 800"></i>'
+ }
},
{
label: '杩斿洖淇℃伅',
- width: 300,
- prop: 'content'
+ prop: 'content',
+ hide: true
},
{
label: '娑堟伅淇℃伅',
- width: 300,
+ width: 150,
prop: 'msg'
}
]
@@ -124,10 +127,10 @@
message: "璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!"
})
} else {
- console.log(this.stateParam)
+ // console.log(this.stateParam)
const response = await queryApplyStat(this.stateParam)
if (response.status === 200) {
- console.log(response)
+ // console.log(response)
}
}
},
@@ -135,15 +138,15 @@
this.loading = true
const { pageSize, currentPage, total } = this.page
let param = { size: pageSize, current: currentPage }
- console.log(this.searchParam)
+ // console.log(this.searchParam)
this.searchParam = Object.keys(this.searchParam)
.filter((key) => this.searchParam[key] !== null && this.searchParam[key] !== undefined && this.searchParam[key] !== "")
.reduce((acc, key) => ({ ...acc, [key]: this.searchParam[key] }), {});
- console.log(this.searchParam)
+ // console.log(this.searchParam)
const response = await getList({ ...param, ...this.searchParam })
if (response.status === 200) {
this.loading = false
- console.log(response)
+ // console.log(response)
const data = response.data.data
this.data = data.records
this.page.total = data.total
@@ -160,7 +163,7 @@
this.getDataList()
},
handleSearch(form, done) {
- console.log(form)
+ // console.log(form)
const { id, groupCode, operationType } = form
let dataTime = { id, groupCode, operationType }
if (form.hasOwnProperty('createTime')) {
@@ -175,13 +178,13 @@
done()
},
selectionChange(list) {
- console.log(list)
+ // console.log(list)
let newData = list.map(item => {
const { dataOid } = item
return dataOid
})
this.stateParam = { oids: newData.toString() }
- console.log(newData)
+ // console.log(newData)
},
handleRowClick(row) {
this.$refs.crud.toggleRowSelection(row, true)
--
Gitblit v1.9.3