diff --git a/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue b/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue index 32a43f44..08448889 100644 --- a/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue @@ -581,7 +581,7 @@ }, }, { - title: '放箱单号', + title: '合同号', width: 120, data: 'ctnReleaseNo', }, diff --git a/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue b/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue index eb546839..18f0bc8d 100644 --- a/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue @@ -602,7 +602,7 @@ }, }, { - title: '放箱单号', + title: '合同号', width: 120, data: 'ctnReleaseNo', }, diff --git a/src/views/ContainerManagement/CtnScrap/columns.tsx b/src/views/ContainerManagement/CtnScrap/columns.tsx index 91965453..016478a1 100644 --- a/src/views/ContainerManagement/CtnScrap/columns.tsx +++ b/src/views/ContainerManagement/CtnScrap/columns.tsx @@ -202,7 +202,7 @@ export const formSearchBoxSchema: FormSchema[] = [ }, { field: 'ctnreleaseno', - label: '放箱单号', + label: '合同号', component: 'Input', colProps: { span: 6 }, }, diff --git a/src/views/ContainerManagement/CurrentState/columns.tsx b/src/views/ContainerManagement/CurrentState/columns.tsx index 3d8e0c64..fe093ee2 100644 --- a/src/views/ContainerManagement/CurrentState/columns.tsx +++ b/src/views/ContainerManagement/CurrentState/columns.tsx @@ -73,7 +73,7 @@ export const columns: BasicColumn[] = [ width: 200, }, { - title: '关联放箱单号', + title: '关联合同号', dataIndex: 'ctnReleaseNo', sorter: true, width: 200, @@ -312,7 +312,7 @@ export const searchFormSchema: FormSchema[] = [ }, { field: 'ctnReleaseNo', - label: '关联放箱单号', + label: '关联合同号', component: 'Input', colProps: { span: 4 }, }, @@ -498,7 +498,7 @@ export const formSchema: FormSchema[] = [ }, { field: 'ctnReleaseNo', - label: '关联放箱单号', + label: '关联合同号', component: 'Input', colProps: { span: 6 }, // required: true, diff --git a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue index 74288824..8c5ea509 100644 --- a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue @@ -781,7 +781,7 @@ data: 'rentType', }, { - title: '放箱单号', + title: '合同号', width: 120, data: 'ctnReleaseNo', }, diff --git a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue index 186b28fe..bcce9ffe 100644 --- a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue @@ -623,7 +623,7 @@ // data: 'billState', // }, { - title: '关联放箱单号', + title: '关联合同号', width: 120, data: 'ctnReleaseNo', }, @@ -734,7 +734,7 @@ data: 'vesselVoyno', }, { - title: '放箱单号', + title: '合同号', width: 120, data: 'ctnreleaseno', }, @@ -930,7 +930,7 @@ // data: 'billState', // }, { - title: '关联放箱单号', + title: '关联合同号', width: 120, data: 'ctnReleaseNo', }, diff --git a/src/views/ContainerManagement/RentIn/columns.tsx b/src/views/ContainerManagement/RentIn/columns.tsx index bcfcf5c4..674af413 100644 --- a/src/views/ContainerManagement/RentIn/columns.tsx +++ b/src/views/ContainerManagement/RentIn/columns.tsx @@ -547,7 +547,7 @@ export const formSearchBoxSchema: FormSchema[] = [ }, { field: 'ctnreleaseno', - label: '放箱单号', + label: '合同号', component: 'Input', colProps: { span: 6 }, }, diff --git a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue index 54b09815..a35ffebc 100644 --- a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue @@ -641,7 +641,7 @@ }, }, { - title: '放箱单号', + title: '合同号', width: 120, data: 'ctnReleaseNo', }, diff --git a/src/views/ContainerManagement/RentOneWay/columns.tsx b/src/views/ContainerManagement/RentOneWay/columns.tsx index 419a96ca..2e02628d 100644 --- a/src/views/ContainerManagement/RentOneWay/columns.tsx +++ b/src/views/ContainerManagement/RentOneWay/columns.tsx @@ -544,7 +544,7 @@ export const formSearchBoxSchema: FormSchema[] = [ }, { field: 'ctnreleaseno', - label: '放箱单号', + label: '合同号', component: 'Input', colProps: { span: 6 }, }, diff --git a/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue index b305ff38..5e3312e1 100644 --- a/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue @@ -589,7 +589,7 @@ }, }, { - title: '放箱单号', + title: '合同号', width: 120, data: 'ctnReleaseNo', }, diff --git a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue index 693a561b..eeb64f34 100644 --- a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue @@ -643,7 +643,7 @@ // data: 'billState', // }, { - title: '放箱单号', + title: '合同号', width: 120, data: 'ctnReleaseNo', }, @@ -975,7 +975,7 @@ // data: 'billState', // }, { - title: '放箱单号', + title: '合同号', width: 120, data: 'ctnReleaseNo', }, @@ -1374,7 +1374,7 @@ data: 'stateTime', }, { - title: '放箱单号', + title: '合同号', width: 120, data: 'ctnReleaseNo', }, @@ -1552,7 +1552,7 @@ data: 'vesselVoyno', }, { - title: '放箱单号', + title: '合同号', width: 120, data: 'ctnReleaseNo', }, diff --git a/src/views/ContainerManagement/RentOut/columns.tsx b/src/views/ContainerManagement/RentOut/columns.tsx index 15cd9cfa..d5089a5f 100644 --- a/src/views/ContainerManagement/RentOut/columns.tsx +++ b/src/views/ContainerManagement/RentOut/columns.tsx @@ -574,7 +574,7 @@ export const formSearchBoxSchema: FormSchema[] = [ }, { field: 'ctnreleaseno', - label: '放箱单号', + label: '合同号', component: 'Input', colProps: { span: 6 }, }, diff --git a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue index 447a40b3..a4058a48 100644 --- a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue @@ -682,7 +682,7 @@ // }, // }, { - title: '放箱单号', + title: '合同号', width: 120, data: 'ctnReleaseNo', }, diff --git a/src/views/ContainerManagement/SellCtn/columns.tsx b/src/views/ContainerManagement/SellCtn/columns.tsx index 6f45997e..9ca334ed 100644 --- a/src/views/ContainerManagement/SellCtn/columns.tsx +++ b/src/views/ContainerManagement/SellCtn/columns.tsx @@ -290,7 +290,7 @@ export const formSearchBoxSchema: FormSchema[] = [ }, { field: 'ctnreleaseno', - label: '放箱单号', + label: '合同号', component: 'Input', colProps: { span: 6 }, }, diff --git a/src/views/ContainerManagement/StateChange/columns.tsx b/src/views/ContainerManagement/StateChange/columns.tsx index 5fe5c82f..1ef08af3 100644 --- a/src/views/ContainerManagement/StateChange/columns.tsx +++ b/src/views/ContainerManagement/StateChange/columns.tsx @@ -365,7 +365,7 @@ export const formSchema: FormSchema[] = [ }, { field: 'ctnReleaseNo', - label: '关联放箱单号', + label: '关联合同号', component: 'Input', colProps: { span: 6 }, // required: true, diff --git a/src/views/ContainerManagement/dsxxcl/columns.tsx b/src/views/ContainerManagement/dsxxcl/columns.tsx index 2c214e73..5c265406 100644 --- a/src/views/ContainerManagement/dsxxcl/columns.tsx +++ b/src/views/ContainerManagement/dsxxcl/columns.tsx @@ -52,7 +52,7 @@ export const columns: BasicColumn[] = [ width: 200, }, { - title: '关联放箱单号', + title: '关联合同号', dataIndex: 'ctnReleaseNo', sorter: true, width: 200, diff --git a/src/views/ContainerManagement/qbxdtbdrz/columns.tsx b/src/views/ContainerManagement/qbxdtbdrz/columns.tsx index 62d47e76..495952e0 100644 --- a/src/views/ContainerManagement/qbxdtbdrz/columns.tsx +++ b/src/views/ContainerManagement/qbxdtbdrz/columns.tsx @@ -312,7 +312,7 @@ export const formSchema: FormSchema[] = [ }, { field: 'ctnReleaseNo', - label: '关联放箱单号', + label: '关联合同号', component: 'Input', colProps: { span: 6 }, // required: true, diff --git a/src/views/baseinfo/TaskMail/TenantAuditStepModal.vue b/src/views/baseinfo/TaskMail/TenantAuditStepModal.vue index 39d5f663..933b8008 100644 --- a/src/views/baseinfo/TaskMail/TenantAuditStepModal.vue +++ b/src/views/baseinfo/TaskMail/TenantAuditStepModal.vue @@ -73,7 +73,7 @@ }) const DiyFieldIdS = ref([]) function linkageForm(data) { - console.log(data) + console.log(data, 11111111) // 清楚所有添加的Schema if (DiyFieldIdS.value.length) { @@ -251,12 +251,8 @@ sortConditions: [], }, }) - console.log(DiyFieldIdS.value) - arrRes.data.forEach((item) => { values.attachments.forEach((e) => { - console.log(item.id, e) - if (item.id == e) { attachments.push({ taskMailId: values.id, diff --git a/src/views/baseinfo/TaskMail/api.ts b/src/views/baseinfo/TaskMail/api.ts index 1f64cf5e..fab96a16 100644 --- a/src/views/baseinfo/TaskMail/api.ts +++ b/src/views/baseinfo/TaskMail/api.ts @@ -6,6 +6,7 @@ enum Api { edit = '/opApi/TaskMail/Edit', info = '/opApi/TaskMail/Edit', del = '/opApi/TaskMail/Delete', + delfile = '/opApi/TaskMail/DeleteAttachments', PrintTemplateList = '/mainApi/Print/GetOpenPrintTemplateList', } @@ -41,6 +42,14 @@ export function ApiDel(data: PageRequest) { data, }) } +// 删除附件 (Auth) +export function ApiDelFile(data: PageRequest) { + return request({ + url: Api.delfile, + method: 'post', + data, + }) +} // 印模块列表 (Auth) export function GetPrintTemplateList(data: PageRequest) { return request({ @@ -48,4 +57,4 @@ export function GetPrintTemplateList(data: PageRequest) { method: 'post', data, }) -} \ No newline at end of file +} diff --git a/src/views/baseinfo/TaskMail/columns.tsx b/src/views/baseinfo/TaskMail/columns.tsx index a247167b..112243c3 100644 --- a/src/views/baseinfo/TaskMail/columns.tsx +++ b/src/views/baseinfo/TaskMail/columns.tsx @@ -1,8 +1,9 @@ import { BasicColumn, FormSchema } from '/@/components/Table' // 字典 import { getDictOption } from '/@/utils/dictUtil' -import { GetPrintTemplateList } from './api.ts' +import { GetPrintTemplateList, ApiDelFile } from './api.ts' let documentTypeList = [] +let attachmentsData = [] export const columns: BasicColumn[] = [ { title: '名称', @@ -29,6 +30,10 @@ export const columns: BasicColumn[] = [ return RText }, }, + { + title: '备注', + dataIndex: 'note', + }, ] export const searchFormSchema: FormSchema[] = [ @@ -141,12 +146,44 @@ export const formSchema: FormSchema[] = [ unCheckedChildren: '否', }, }, + // { + // label: '附件', + // field: 'attachmentsO', + // component: 'ApiSelect', + // show: false, + // componentProps: ({ formActionType }) => { + // return { + // api: () => { + // return new Promise((resolve) => { + // GetPrintTemplateList({ + // queryCondition: `[]`, + // pageCondition: { + // pageIndex: 1, + // pageSize: 999, + // sortConditions: [], + // }, + // }).then((res) => { + // attachmentsData = res.data + // resolve(res) + // }) + // }) + // }, + // labelField: 'templateName', + // valueField: 'id', + // resultField: 'data', + // allowClear: true, + // immediate: true, + // mode: 'multiple', + // class: 'NoLimitHeight', + // } + // }, + // }, { label: '附件', field: 'attachments', component: 'ApiSelect', colProps: { span: 12 }, - componentProps: ({ formActionType }) => { + componentProps: ({ formActionType, formModel }) => { return { api: () => { return new Promise((resolve) => { @@ -158,6 +195,7 @@ export const formSchema: FormSchema[] = [ sortConditions: [], }, }).then((res) => { + attachmentsData = res.data resolve(res) }) }) @@ -170,11 +208,55 @@ export const formSchema: FormSchema[] = [ mode: 'multiple', class: 'NoLimitHeight', onChange: (e, obj) => { + if (formModel && formModel.id) { + console.log(formModel.id) + + let DelData: any = [] + if (formModel.attachments.length) { + formModel.attachments.forEach((item) => { + let type = false + obj.forEach((item2) => {}) + if (!type) { + DelData.push(item) + } + }) + } + let ApiData: any = [] + attachmentsData.forEach((item: any) => { + console.log(item) + DelData.forEach((item2) => { + if (item.id == item2) { + ApiData.push({ + taskMailId: formModel.id, + templateId: item.id, + fileName: formModel[item.id] ? formModel[item.id] : item.templateName, + fileType: formModel[`${item.id}-fileType`], + }) + } + }) + }) + if (ApiData.length) { + ApiDelFile(ApiData).then((res) => { + console.log(res, 11111) + }) + } + console.log(formModel) + } + formActionType ? formActionType.linkageForm(obj) : null }, } }, }, + { + field: 'note', + label: '备注', + component: 'InputTextArea', + colProps: { span: 24 }, + componentProps: { + rows: 2, + }, + }, { field: 'title', label: '主题模板', diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx b/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx index 1fa0dec3..cab2d1c1 100644 --- a/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx +++ b/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx @@ -31,7 +31,7 @@ export const columns: BasicColumn[] = [ width: 120, }, { - title: '结算对象', + title: '费用对象', dataIndex: 'customerName', width: 200, }, @@ -223,7 +223,7 @@ export const formSchema: FormSchema[] = [ // }, { field: 'customerId', - label: '结算对象', + label: '费用对象', defaultValue: '', component: 'Input', show: false, @@ -231,12 +231,44 @@ export const formSchema: FormSchema[] = [ }, { field: 'customerName', - label: '结算对象', + label: '费用对象', component: 'Input', defaultValue: '', dynamicDisabled: true, colProps: { span: 6 }, }, + { + field: 'customerType', + label: '费用对象类别', + defaultValue: '', + component: 'ApiSelect', + colProps: { span: 6 }, + componentProps: ({ formModel }) => { + return { + api: () => { + return new Promise((resolve) => { + getDictOption('djy_cust_prop').then((res) => { + resolve(res) + }) + }) + }, + labelField: 'label', + valueField: 'value', + resultField: 'data', + filterOption: (input: string, option: any) => { + return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + }, + } + }, + dynamicRules: ({ values }) => { + return [ + { + required: values.customerId ? false : true, + message: '未选择费用对象时,此项必填!', + }, + ] + }, + }, // { // label: '', // field: 'customerId', diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue b/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue index 71b82fae..d1d35d57 100644 --- a/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue +++ b/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue @@ -1,7 +1,7 @@