diff --git a/src/components/File/api.ts b/src/components/File/api.ts index f13e09a2..ac3d35fa 100644 --- a/src/components/File/api.ts +++ b/src/components/File/api.ts @@ -37,6 +37,7 @@ export function BatchDelFiles(data: PageRequest) { export function DownloadOpFile(params) { return request({ url: Api.DownloadOpFile, + responseType: 'arraybuffer', method: 'get', params }) diff --git a/src/components/File/list.vue b/src/components/File/list.vue index 7bda6fba..a550c6a3 100644 --- a/src/components/File/list.vue +++ b/src/components/File/list.vue @@ -18,7 +18,7 @@ - + { - DownloadOpFile({ id }).then(res => { - + const downFile = (item) => { + DownloadOpFile({ id: item.id }).then(res => { + const pdfUrl = window.URL.createObjectURL(new Blob([res], { type: 'application/txt;charset=utf-8' })) + const fname = item.fileName // 下载文件的名字 + const link = document.createElement('a') + link.href = pdfUrl + link.setAttribute('download', fname) + document.body.appendChild(link) + link.click() }) } // 确定删除附件 diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue index 2eb3432f..c1c7369a 100644 --- a/src/components/Table/src/BasicTable.vue +++ b/src/components/Table/src/BasicTable.vue @@ -2,6 +2,7 @@
, default: DEFAULT_SIZE, }, + showSearchForm: { + type: Boolean, + default: true + } } diff --git a/src/design/public.less b/src/design/public.less index 4c98a53b..b65fd3a1 100644 --- a/src/design/public.less +++ b/src/design/public.less @@ -89,4 +89,59 @@ .ant-tabs-tab { padding: 5px 15px!important; } -} \ No newline at end of file +} + +.ant-table-thead { + th { + background-color: #f7f9fb!important; + font-weight: 600!important; + color: #262626!important; + } +} +.ant-table-tbody { + td { + font-family: Helvetica Neue,Helvetica,PingFang SC,Hiragino Sans GB,Microsoft YaHei,Arial,sans-serif!important; + font-weight: 400!important; + color: #262626!important; + } +} + + +.ds-approve-mian-action-bar { + .ant-btn-link, .ant-checkbox-wrapper { + font-size: 12px; + } + .ant-btn-link:hover { + color: #007aff; + } + .ant-checkbox-inner { + width: 14px; + height: 14px; + } +} + +// basetbale form +.vben-basic-form { + .ant-select-selector, .ant-form-item-control-input, .ant-input-affix-wrapper, .ant-form-item-control-input { + height: 28px!important; + min-height: 28px!important; + } + .ant-select-selection-search-input { + height: 26px!important; + } + .ant-select-selection-item, .ant-select-selection-placeholder { + line-height: 26px!important; + } + .ant-select-selection-placeholder { + line-height: 26px; + } + .ant-select-selection-search-input { + height: 26px; + } + .ant-picker { + height: 28px; + } + .ant-btn { + height: 30px; + } +} diff --git a/src/design/var/index.less b/src/design/var/index.less index ad1d8442..bb9682af 100644 --- a/src/design/var/index.less +++ b/src/design/var/index.less @@ -4,6 +4,8 @@ @namespace: vben; +@mini-height: 28px; + // font-size @content-size: 12px; diff --git a/src/styles/common.scss b/src/styles/common.scss index 04a00c4b..b25f9d68 100644 --- a/src/styles/common.scss +++ b/src/styles/common.scss @@ -126,6 +126,10 @@ h5 { margin-top: 2px!important; } +.mt5 { + margin-top: 5px!important; +} + .mt10 { margin-top: 10px!important; } @@ -179,3 +183,33 @@ h5 { .ds-purple-tag { background-color: #531dab; } + +// 表格状态使用(定义2) +.ds-green-status, .ds-blue-status, .ds-orange-status, .ds-red-status, .ds-purple-status, .ds-grey-status { + font-family: Arial, Helvetica, sans-serif; + font-weight: 600; +} + +.ds-green-status { + color: #419638; +} + +.ds-blue-status { + color: #096dd9; +} + +.ds-orange-status { + color: #E1A200; +} + +.ds-red-status { + color: #F5222D; +} + +.ds-purple-status { + color: #531dab; +} + +.ds-grey-status { + color: #8C8C8C; +} diff --git a/src/views/approve/fee/api.ts b/src/views/approve/fee/api.ts index 70f6e081..f121aa03 100644 --- a/src/views/approve/fee/api.ts +++ b/src/views/approve/fee/api.ts @@ -2,7 +2,8 @@ import { request } from '/@/utils/request' import { DataResult, PageRequest } from '/@/api/model/baseModel' enum Api { - GetList = '/feeApi/FeeAudit/GetList' + GetList = '/feeApi/FeeAudit/GetList', + AuditByBiz = '/feeApi/FeeAudit/AuditByBiz' } // 业务列表 @@ -13,6 +14,15 @@ export function GetList(data: PageRequest) { data }) } + +// 批量审批 +export function AuditByBiz(data: PageRequest) { + return request({ + url: Api.AuditByBiz, + method: 'post', + data + }) +} // export function getThermometryWarningCount() { // return request({ // url: Api.getThermometryWarningCount, diff --git a/src/views/approve/fee/columns.tsx b/src/views/approve/fee/columns.tsx index 40f622fd..e6d16a48 100644 --- a/src/views/approve/fee/columns.tsx +++ b/src/views/approve/fee/columns.tsx @@ -144,56 +144,67 @@ export const columns: BasicColumn[] = [ { dataIndex: 'businessTypeText', title: '业务类型', + align: 'left', width: 120 }, { dataIndex: 'arFeeStatusText', title: '应收费用', + align: 'left', width: 120 }, { dataIndex: 'apFeeStatusText', title: '应付费用', + align: 'left', width: 120 }, { dataIndex: 'changeOrder', title: '更改单', + align: 'left', width: 120 }, { dataIndex: 'customerName', title: '委托单位', + align: 'left', width: 120 }, { dataIndex: 'mblno', title: '主提单号', + align: 'left', width: 120 }, { dataIndex: 'etd', title: '开船日期', + align: 'left', width: 120 }, { dataIndex: 'businessStatus', title: '业务状态', + align: 'left', width: 120 }, { dataIndex: 'hblno', title: '分提单号', + align: 'left', width: 120 }, { dataIndex: 'isBusinessLocking', title: '业务锁定', + align: 'left', width: 120 }, { dataIndex: 'isFeeLocking', title: '费用锁定', + align: 'left', width: 120 }, ] \ No newline at end of file diff --git a/src/views/approve/fee/components/feeActionBar.vue b/src/views/approve/fee/components/feeActionBar.vue new file mode 100644 index 00000000..80f89a73 --- /dev/null +++ b/src/views/approve/fee/components/feeActionBar.vue @@ -0,0 +1,40 @@ + + + + + diff --git a/src/views/approve/fee/components/feeTable.vue b/src/views/approve/fee/components/feeTable.vue new file mode 100644 index 00000000..80016ad1 --- /dev/null +++ b/src/views/approve/fee/components/feeTable.vue @@ -0,0 +1,227 @@ + + + + + diff --git a/src/views/approve/fee/components/mainActionBar.vue b/src/views/approve/fee/components/mainActionBar.vue new file mode 100644 index 00000000..7c7d61c3 --- /dev/null +++ b/src/views/approve/fee/components/mainActionBar.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/approve/fee/index.vue b/src/views/approve/fee/index.vue index 5c3a4b5e..244c5b46 100644 --- a/src/views/approve/fee/index.vue +++ b/src/views/approve/fee/index.vue @@ -4,42 +4,78 @@ * @Date: 2024-06-13 17:08:08 -->