From b5adb9da270b7f8b856ac4d7ee74f4cc29e04712 Mon Sep 17 00:00:00 2001 From: sunzehua Date: Fri, 9 Aug 2024 18:21:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8F=91=E7=A5=A8=E7=94=B3?= =?UTF-8?q?=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bookingcabin/generation/index.vue | 49 +++--- src/views/operation/invoiceApply/api.js | 32 ++++ src/views/operation/invoiceApply/columns.tsx | 20 ++- .../invoiceApply/detail/InvoiceDetails.vue | 17 +- .../invoiceApply/detail/feeTable.vue | 7 +- .../operation/invoiceApply/detail/index.vue | 165 ++++++++++++++++-- src/views/taskmanage/taskList/cutModify.vue | 37 +++- src/views/taskmanage/taskList/taskCustom.vue | 5 + 8 files changed, 266 insertions(+), 66 deletions(-) diff --git a/src/views/bookingcabin/generation/index.vue b/src/views/bookingcabin/generation/index.vue index 7f6df1e3..1361b09a 100644 --- a/src/views/bookingcabin/generation/index.vue +++ b/src/views/bookingcabin/generation/index.vue @@ -14,14 +14,16 @@
-
服务项目
-
-
{{ - item.name }}
-
+ +
服务项目
+
+
{{ + item.name }}
+
+
-
+
选择箱型
@@ -51,7 +53,7 @@ import { ref, watch, onMounted } from 'vue' import { BasicModal, useModalInner } from '/@/components/Modal' import { BasicForm, useForm } from '/@/components/Form/index' -import { getAvailableCtnsBySlot, CreateBookingOrder, GetEnableProjectDictTreeList,CreateBookingAndSlot } from './api' +import { getAvailableCtnsBySlot, CreateBookingOrder, GetEnableProjectDictTreeList, CreateBookingAndSlot } from './api' import { useMessage } from '/@/hooks/web/useMessage' import { getOptions } from '/@/hooks/dict' const { createMessage } = useMessage() @@ -91,12 +93,12 @@ const formSchema: FormSchema[] = [ }, componentProps: ({ formModel }) => { return { - options:[ - {label: '更新订舱', value: 'UPD_BOOKING' }, - {label: '直接生成舱位和订舱', value: 'GEN_BOOKING_SLOT' }, - {label: '只生成订舱', value: 'GEN_BOOKING' }, - {label: '只生成舱位', value: 'GEN_SLOT' }, - {label: '匹配已有订舱', value: 'GEN_EXIST_BOOKING' } + options: [ + { label: '更新订舱', value: 'UPD_BOOKING' }, + { label: '直接生成舱位和订舱', value: 'GEN_BOOKING_SLOT' }, + { label: '只生成订舱', value: 'GEN_BOOKING' }, + { label: '只生成舱位', value: 'GEN_SLOT' }, + { label: '匹配已有订舱', value: 'GEN_EXIST_BOOKING' } ] } }, @@ -112,8 +114,8 @@ const formSchema: FormSchema[] = [ }, componentProps: ({ formModel }) => { return { - options:[ - {label: '是否直接发送邮件给订舱联系人', value: 'isDirectSend' }, + options: [ + { label: '是否直接发送邮件给订舱联系人', value: 'isDirectSend' }, ] } }, @@ -438,6 +440,7 @@ const [registerForm, { resetFields, setFieldsValue, getFieldsValue }] = useForm( schemas: formSchema, showActionButtonGroup: false, }) +const serverLoad = ref(false) const generationType = ref('') const taskId = ref('') const [registerModal, { setModalProps, closeModal }] = useModalInner((data) => { @@ -451,9 +454,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner((data) => { taskInit() taskId.value = data.taskId } -}) -const projectList = ref([]) as any -onMounted(() => { + serverLoad.value = true GetEnableProjectDictTreeList({ isAvoidCache: false }).then(res => { if (res.success) { if (res.data) { @@ -465,7 +466,12 @@ onMounted(() => { } else { createMessage.error(res.message) } + serverLoad.value = false }) +}) +const projectList = ref([]) as any +onMounted(() => { + }) function handleClickPro(index) { projectList.value[index].active = !projectList.value[index].active @@ -530,7 +536,7 @@ function cabinInit(row) { } // 任务生成初始化 function taskInit() { - setFieldsValue({generateMethod:'GEN_BOOKING'}) + setFieldsValue({ generateMethod: 'GEN_BOOKING' }) } function handleSave() { if (generationType.value === 'cabin') { @@ -581,7 +587,7 @@ function handleSaveCabin() { }) } // 任务生成保存 -function handleSaveTask(){ +function handleSaveTask() { const projectArr = [] as any projectList.value.forEach(item => { if (item.active) { @@ -658,6 +664,7 @@ function handleSaveTask(){ .project-list { display: flex; flex-wrap: wrap; + .project-item { background-color: rgb(255, 255, 255); color: rgb(37, 122, 250); diff --git a/src/views/operation/invoiceApply/api.js b/src/views/operation/invoiceApply/api.js index a4dd2df4..aad8c6eb 100644 --- a/src/views/operation/invoiceApply/api.js +++ b/src/views/operation/invoiceApply/api.js @@ -31,6 +31,14 @@ export function GetInvoiceCodeList() { }) } +export function InvoiceApplicationGet(parameter) { + return request({ + url: '/feeApi/InvoiceApplication/Get', + method: 'get', + params:parameter + }) +} + export function InvoiceApplicationSave(parameter) { return request({ url: '/feeApi/InvoiceApplication/Save', @@ -54,4 +62,28 @@ export function InvoiceApplicationGetFees(parameter) { method: 'post', data: parameter, }) +} + +export function GetTemplateFields(parameter) { + return request({ + url: '/feeApi/InvoiceApplication/GetTemplateFields', + method: 'get', + params:parameter + }) +} + +export function SaveTemplate(parameter) { + return request({ + url: '/feeApi/InvoiceApplication/SaveTemplate', + method: 'post', + data: parameter, + }) +} + +export function GetTemplateList(parameter) { + return request({ + url: '/feeApi/InvoiceApplication/GetTemplateList', + method: 'get', + params:parameter + }) } \ No newline at end of file diff --git a/src/views/operation/invoiceApply/columns.tsx b/src/views/operation/invoiceApply/columns.tsx index b4ebfc49..2606491e 100644 --- a/src/views/operation/invoiceApply/columns.tsx +++ b/src/views/operation/invoiceApply/columns.tsx @@ -275,6 +275,12 @@ export const columns: BasicColumn[] = [ ] export const detailForm: FormSchema[] = [ + { + field: 'id', + label: 'id', + component: 'Input', + show: false, + }, { field: 'applicationNO', label: '申请单号', @@ -388,7 +394,7 @@ export const detailForm: FormSchema[] = [ }, }, { - field: 'Category', + field: 'category', label: '申请类型', component: 'Select', colProps: { span: 4 }, @@ -428,8 +434,8 @@ export const detailForm: FormSchema[] = [ { label: '委托单位', field: 'customerId', + required: true, component: 'ApiSelect', - required: false, dynamicDisabled: false, colProps: { span: 4 }, componentProps: ({ formModel }) => { @@ -550,17 +556,13 @@ export const detailForm: FormSchema[] = [ }, { field: 'note', - label: '备注', + label: '', component: 'InputTextArea', colProps: { span: 12 }, - componentProps: () => { - return { - autoSize: { minRows: 4, maxRows: 7 } - } - }, + slot: 'note', }, { - field: 'note', + field: 'invoiceRemark', label: '开票要求', component: 'InputTextArea', colProps: { span: 12 }, diff --git a/src/views/operation/invoiceApply/detail/InvoiceDetails.vue b/src/views/operation/invoiceApply/detail/InvoiceDetails.vue index 41991298..e2c62014 100644 --- a/src/views/operation/invoiceApply/detail/InvoiceDetails.vue +++ b/src/views/operation/invoiceApply/detail/InvoiceDetails.vue @@ -42,7 +42,7 @@ 添加
-