diff --git a/index.html b/index.html
index bafa8d3f..7a977bbc 100644
--- a/index.html
+++ b/index.html
@@ -10,7 +10,7 @@
/>
<%= title %>
-
+
-
diff --git a/src/views/system/org/columns.tsx b/src/views/system/org/columns.tsx
index b5124cb0..3ccdb32d 100644
--- a/src/views/system/org/columns.tsx
+++ b/src/views/system/org/columns.tsx
@@ -491,8 +491,8 @@ export const BankColumns: BasicColumn[] = [
align: 'left',
},
{
- title: '银行名称2',
- dataIndex: 'bankName2',
+ title: '英文银行名称',
+ dataIndex: 'bankEnName',
width: 230,
align: 'left',
},
@@ -508,6 +508,12 @@ export const BankColumns: BasicColumn[] = [
width: 230,
align: 'left',
},
+ {
+ title: '英文银行地址',
+ dataIndex: 'bankEnAddress',
+ width: 230,
+ align: 'left',
+ },
{
title: 'ABA代码',
dataIndex: 'aba',
@@ -520,6 +526,12 @@ export const BankColumns: BasicColumn[] = [
width: 230,
align: 'left',
},
+ {
+ title: '英文户头名称',
+ dataIndex: 'accountEnName',
+ width: 230,
+ align: 'left',
+ },
{
title: '科目代码',
dataIndex: 'subjectCode',
@@ -629,6 +641,15 @@ export const BankformSchema: FormSchema[] = [
span: 12,
},
},
+ {
+ label: '英文银行名称',
+ field: 'bankEnName',
+ component: 'Input',
+ defaultValue: '',
+ colProps: {
+ span: 12,
+ },
+ },
{
label: '银行账户',
field: 'bankAccountNo',
@@ -638,6 +659,16 @@ export const BankformSchema: FormSchema[] = [
span: 12,
},
},
+
+ {
+ label: 'ABA代码',
+ field: 'aba',
+ component: 'Input',
+ defaultValue: '',
+ colProps: {
+ span: 12,
+ },
+ },
{
label: '银行地址',
field: 'bankAddress',
@@ -648,8 +679,8 @@ export const BankformSchema: FormSchema[] = [
},
},
{
- label: 'ABA代码',
- field: 'aba',
+ label: '英文银行地址',
+ field: 'bankEnAddress',
component: 'Input',
defaultValue: '',
colProps: {
@@ -665,6 +696,15 @@ export const BankformSchema: FormSchema[] = [
span: 12,
},
},
+ {
+ label: '英文户头名称',
+ field: 'accountEnName',
+ component: 'Input',
+ defaultValue: '',
+ colProps: {
+ span: 12,
+ },
+ },
{
label: '科目代码',
field: 'subjectCode',
diff --git a/src/views/taskmanage/index.vue b/src/views/taskmanage/index.vue
index c02f020a..844f3693 100644
--- a/src/views/taskmanage/index.vue
+++ b/src/views/taskmanage/index.vue
@@ -1593,7 +1593,7 @@ function laraRecordFun() {
function expandIcon(props) {
if (props.record.childTaskCount > 0) {
return h('div', { class: 'expDiv', onClick: (e) => props.onExpand(props.record, e) },
- [h('i', { class: 'iconfont icon-piliangxiaxian iconExp' }),
+ [h('i', { class: 'iconfont icon-zirenwu iconExp' }),
h('div', { class: 'expNum' }, props.record.childTaskCount)])
}
}
@@ -1636,8 +1636,21 @@ function handleClickTree(row, index) {
item.active = false
})
taskType.value = ''
- console.log(arr1)
- setColumns(arr1)
+ const arr = [] as any
+ columsAll.value.forEach((item) => {
+ if (item.taskTypeCode === 'BASIC') {
+ JSON.parse(item.content).forEach((item) => {
+ if (item.checked) {
+ arr.push(item)
+ }
+ })
+ }
+ })
+ if (arr.length == 0) {
+ setColumns(columns)
+ } else {
+ setColumns(arr)
+ }
}
reload()
@@ -1987,7 +2000,7 @@ function handleClickTree(row, index) {
width: 15px;
}
-:deep(.ant-table-tbody .ant-table-row td){
+:deep(.ant-table-tbody .ant-table-row td) {
border-right: 1px solid #f0f0f0 !important;
text-align: center;
}