From 99a1ad1d015d6f76c5dd28ccf328e4ceba5aee80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?=
<14166000+zhangtonghai@user.noreply.gitee.com>
Date: Wed, 30 Oct 2024 17:40:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?10/30=20=E9=83=A8=E5=88=86=E7=A6=85?=
=?UTF-8?q?=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../FeeCustTemplate/TenantAuditStepModal.vue | 21 +-
.../infoclient/FeeCustTemplate/api.ts | 15 +-
.../infoclient/FeeCustTemplate/columns.tsx | 102 +-
.../infoclient/FeeCustTemplate/index.vue | 21 +
.../infoclient/TenantAuditStepModal.vue | 4 +-
.../FeeCustTemplate/TenantAuditStepModal.vue | 48 +-
src/views/fee/FeeCustTemplate/api.ts | 25 +-
src/views/fee/FeeCustTemplate/columns.tsx | 400 ++-
src/views/fee/FeeCustTemplate/feeField.vue | 61 +-
src/views/fee/FeeCustTemplate/index.vue | 21 +
src/views/taskmanage/api.ts | 209 +-
src/views/taskmanage/index.vue | 3171 +++++++++--------
.../taskmanage/taskList/BLConfirmation.vue | 75 +
13 files changed, 2525 insertions(+), 1648 deletions(-)
create mode 100644 src/views/taskmanage/taskList/BLConfirmation.vue
diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/FeeCustTemplate/TenantAuditStepModal.vue
index de262619..7722b655 100644
--- a/src/views/baseinfo/infoclient/FeeCustTemplate/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/infoclient/FeeCustTemplate/TenantAuditStepModal.vue
@@ -10,7 +10,7 @@
-
+
{
+ ApiData.push({ ...values, id: e })
+ })
+ res = await ApiBulkEdit(ApiData)
+ } else {
+ res = await ApiEdit(values)
+ }
loading.value = false
if (res.succeeded) {
createMessage.success(res.message)
diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/api.ts b/src/views/baseinfo/infoclient/FeeCustTemplate/api.ts
index a1b4eb65..bae5602e 100644
--- a/src/views/baseinfo/infoclient/FeeCustTemplate/api.ts
+++ b/src/views/baseinfo/infoclient/FeeCustTemplate/api.ts
@@ -4,6 +4,7 @@ import { DataResult, PageRequest } from '/@/api/model/baseModel'
enum Api {
list = '/feeApi/FeeCustTemplate/GetList',
edit = '/feeApi/FeeCustTemplate/Edit',
+ bulkEdit = '/feeApi/FeeCustTemplate/BulkEdit',
info = '/feeApi/FeeCustTemplate/Edit',
delete = '/feeApi/FeeCustTemplate/Delete',
GetColumns = '/mainApi/Common/GetColumnsByClient',
@@ -33,6 +34,14 @@ export function ApiEdit(data: PageRequest) {
data,
})
}
+// 批量编辑 (Auth)
+export function ApiBulkEdit(data: PageRequest) {
+ return request({
+ url: Api.bulkEdit,
+ method: 'post',
+ data,
+ })
+}
// 详情 (Auth)
export function ApiInfo(query) {
return request({
@@ -46,7 +55,7 @@ export function ApiDel(data: PageRequest) {
return request({
url: Api.delete,
method: 'post',
- data
+ data,
})
}
@@ -55,6 +64,6 @@ export function DeleteDetails(data: PageRequest) {
return request({
url: Api.DeleteDetails,
method: 'post',
- data
+ data,
})
-}
\ No newline at end of file
+}
diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx b/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx
index 9bfce6f2..10d01aa3 100644
--- a/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx
+++ b/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx
@@ -3,13 +3,15 @@ import { BasicColumn, FormSchema } from '/@/components/Table'
import { Tag } from 'ant-design-vue'
// 引入字典数据
import { getDictOption } from '/@/utils/dictUtil'
-
+import { useUserStore } from '/@/store/modules/user'
+const userStore: any = useUserStore()
import { getOrgList, GetClientPortSelectList, GetCarrierSelectList } from '/@/api/common'
import {
GetClientLanesSelectList,
GetAgentCnClientList,
GetClientFrtSelectList,
GetClientSourceSelectList,
+ GetClientSourceDetailSelectList,
} from '/@/views/operation/seaexport/api/BookingLedger'
// 往来单位下拉框数据
const companyDict = ref([])
@@ -39,6 +41,8 @@ const mblFrtCodeList = ref([])
GetClientFrtSelectList().then((res) => {
mblFrtCodeList.value = res.data
})
+// 业务来源明细数据
+const sourceDetailId = ref([])
export const columns: BasicColumn[] = [
{
title: '模板名称',
@@ -499,6 +503,13 @@ export const searchFormSchema: FormSchema[] = [
},
]
export const formSchema: FormSchema[] = [
+ {
+ label: '是否批量编辑',
+ field: 'isBulk',
+ component: 'Input',
+ defaultValue: false,
+ show: false,
+ },
{
label: '主键Id',
field: 'id',
@@ -512,6 +523,16 @@ export const formSchema: FormSchema[] = [
component: 'Input',
required: true,
colProps: { span: 6 },
+ show: ({ values }) => {
+ return !values.isBulk
+ },
+ dynamicRules: ({ values }) => {
+ return [
+ {
+ required: values.isBulk ? false : true,
+ },
+ ]
+ },
},
{
field: 'businessType',
@@ -519,6 +540,16 @@ export const formSchema: FormSchema[] = [
component: 'Select',
required: true,
colProps: { span: 6 },
+ show: ({ values }) => {
+ return !values.isBulk
+ },
+ dynamicRules: ({ values }) => {
+ return [
+ {
+ required: values.isBulk ? false : true,
+ },
+ ]
+ },
componentProps: () => {
return {
options: businessType,
@@ -552,6 +583,9 @@ export const formSchema: FormSchema[] = [
{ label: '付', value: 2 },
],
},
+ show: ({ values }) => {
+ return !values.isBulk
+ },
},
{
label: '费用类别名称',
@@ -662,12 +696,68 @@ export const formSchema: FormSchema[] = [
required: false,
dynamicDisabled: false,
colProps: { span: 6 },
- componentProps: ({ formModel }) => {
+ componentProps: ({ formActionType, formModel }) => {
return {
api: GetClientSourceSelectList,
labelField: 'sourceName',
valueField: 'id',
resultField: 'data',
+ filterOption: (input: string, option: any) => {
+ return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+ },
+ onChange: async (e) => {
+ if (e) {
+ const FnsourceDetailId: any = await GetClientSourceDetailSelectList({
+ id: e,
+ })
+ if (FnsourceDetailId.succeeded) {
+ sourceDetailId.value.splice(0)
+ FnsourceDetailId.data.forEach((e) => {
+ sourceDetailId.value.push({ label: e.detailName, value: e.id })
+ })
+ }
+ if (formActionType) {
+ formModel.sourceDetailId = ''
+ }
+ }
+ },
+ }
+ },
+ },
+ {
+ label: '来源明细',
+ field: 'sourceDetailId',
+ component: 'Select',
+ required: false,
+ dynamicDisabled: ({ values }) => {
+ return !values.sourceId
+ },
+ colProps: { span: 6 },
+ componentProps: {
+ allowClear: true,
+ options: sourceDetailId.value,
+ showSearch: true,
+ filterOption: (input: string, option: any) => {
+ return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+ },
+ },
+ },
+ {
+ field: 'deptOrgId',
+ label: '分公司',
+ component: 'ApiSelect',
+ colProps: { span: 6 },
+ defaultValue: userStore.getUserInfo.orgId,
+ componentProps: () => {
+ return {
+ api: getOrgList,
+ labelField: 'label',
+ valueField: 'id',
+ resultField: 'data',
+ allowClear: true,
+ filterOption: (input: string, option: any) => {
+ return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+ },
}
},
},
@@ -752,6 +842,7 @@ export const formSchema: FormSchema[] = [
componentProps: {
showTime: false,
style: 'width:100%',
+ getPopupContainer: () => document.body,
},
},
{
@@ -763,6 +854,7 @@ export const formSchema: FormSchema[] = [
componentProps: {
showTime: false,
style: 'width:100%',
+ getPopupContainer: () => document.body,
},
},
{
@@ -804,11 +896,17 @@ export const formSchema: FormSchema[] = [
label: '模板说明',
component: 'Input',
colProps: { span: 6 },
+ show: ({ values }) => {
+ return !values.isBulk
+ },
},
{
field: 'note',
label: '备注',
component: 'Input',
colProps: { span: 12 },
+ show: ({ values }) => {
+ return !values.isBulk
+ },
},
]
diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/index.vue b/src/views/baseinfo/infoclient/FeeCustTemplate/index.vue
index e6249945..21f4dc7d 100644
--- a/src/views/baseinfo/infoclient/FeeCustTemplate/index.vue
+++ b/src/views/baseinfo/infoclient/FeeCustTemplate/index.vue
@@ -7,6 +7,10 @@
添加
+
+
+ 批量编辑
+
{
+ ids.push(e.id)
+ })
+ openModal(true, {
+ ids,
+ isUpdate: false,
+ isBulk: true,
+ })
+ }
+ }
function handleAudit(record: Recordable) {
openModal(true, {
record,
diff --git a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
index 7398b234..ca28f9e6 100644
--- a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
@@ -288,7 +288,7 @@
diff --git a/src/views/taskmanage/taskList/BLConfirmation.vue b/src/views/taskmanage/taskList/BLConfirmation.vue
new file mode 100644
index 00000000..6e631499
--- /dev/null
+++ b/src/views/taskmanage/taskList/BLConfirmation.vue
@@ -0,0 +1,75 @@
+
+
+
+
+
+
主
+
AGB14654614
+
待确认
+
+
+ col-8
+
+
+
+
+ 客户已确认
+
+
+
+ 国外代理确认中
+
+
+
+ 操作确认
+
+
+ 发起截单
+
+
+
+
+
+
+
From 9c926e62292291d1976849c461b9038f6664d38c Mon Sep 17 00:00:00 2001
From: sunzehua
Date: Wed, 30 Oct 2024 18:18:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/print/columns.tsx | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/views/system/print/columns.tsx b/src/views/system/print/columns.tsx
index 7d0c8ca7..afae4c66 100644
--- a/src/views/system/print/columns.tsx
+++ b/src/views/system/print/columns.tsx
@@ -211,6 +211,12 @@ export const temFormSchema: FormSchema[] = [
}
},
},
+ {
+ field: 'namingRule',
+ label: '打印文件名称',
+ component: 'Input',
+ colProps: { span: 24 },
+ },
{
field: 'templateName',
label: '',