diff --git a/src/hooks/web/common.ts b/src/hooks/web/common.ts index 96358581..c9b01f6f 100644 --- a/src/hooks/web/common.ts +++ b/src/hooks/web/common.ts @@ -148,7 +148,6 @@ export function formatParams(params = {}, equal: any = [], otherQuery: any = []) if (params[key] !== undefined) { let IsContinue = true if (otherQuery.length) { - postData.otherQueryCondition = {} otherQuery.forEach((item) => { if (key == item) { IsContinue = false @@ -238,6 +237,8 @@ export function formatParams(params = {}, equal: any = [], otherQuery: any = []) } else { postData.pageCondition.sortConditions = [] } + console.log(Object.keys(otherQueryCondition)); + if (Object.keys(otherQueryCondition).length) { postData.otherQueryCondition = otherQueryCondition } diff --git a/src/views/ContainerManagement/Templat/TenantAuditStepModal.vue b/src/views/ContainerManagement/Templat/TenantAuditStepModal.vue new file mode 100644 index 00000000..45a72684 --- /dev/null +++ b/src/views/ContainerManagement/Templat/TenantAuditStepModal.vue @@ -0,0 +1,317 @@ + + diff --git a/src/views/ContainerManagement/Templat/api.ts b/src/views/ContainerManagement/Templat/api.ts new file mode 100644 index 00000000..d6844dc0 --- /dev/null +++ b/src/views/ContainerManagement/Templat/api.ts @@ -0,0 +1,53 @@ +// @ts-ignore +import { request } from '/@/utils/request' +import { DataResult, PageRequest } from '/@/api/model/baseModel' +enum Api { + list = '/containerManagementApi/CM_State_Change_Templat/GetCM_State_Change_TemplatList', + edit = '/containerManagementApi/CM_State_Change_Templat/EditCM_State_Change_Templat', + info = '/containerManagementApi/CM_State_Change_Templat/GetCM_State_Change_Templat', + del = '/containerManagementApi/CM_State_Change_Templat/DeleteCM_State_Change_Templat', + +delDetail = '/containerManagementApi/CM_State_Change_Templat/DeleteCM_State_Change_TemplatDetail', + +} +// 列表 (Auth) +export function ApiList(data: PageRequest) { + return request({ + url: Api.list, + method: 'post', + data, + }) +} +// 编辑 (Auth) +export function ApiEdit(data: PageRequest) { + return request({ + url: Api.edit, + method: 'post', + data, + }) +} +// 详情 (Auth) +export function ApiInfo(query) { + return request({ + url: Api.info, + method: 'get', + params: query, + }) +} +// 批量删除 (Auth) +export function ApiDel(data: PageRequest) { + return request({ + url: Api.del, + method: 'post', + data, + }) +} + +// 删除明细 (Auth) +export function ApiDelDetail(data: PageRequest) { + return request({ + url: Api.delDetail, + method: 'post', + data, + }) +} \ No newline at end of file diff --git a/src/views/ContainerManagement/Templat/columns.tsx b/src/views/ContainerManagement/Templat/columns.tsx new file mode 100644 index 00000000..ecdd910d --- /dev/null +++ b/src/views/ContainerManagement/Templat/columns.tsx @@ -0,0 +1,153 @@ +import { ref } from 'vue' +import { BasicColumn, FormSchema } from '/@/components/Table' +import { Tag } from 'ant-design-vue' +import { GetCtnSelectList, GetClientListByCode } from '/@/api/common' + +import { GetDeptList } from '/@/views/operation/seaexport/api/BookingLedger' +import { useOptionsStore } from '/@/store/modules/options' +const optionsStore = useOptionsStore() +// 字典 +import { getDictOption } from '/@/utils/dictUtil' +// 新旧箱数据 +const usedStateList = [ + { + label: '', + value: '', + }, + { + label: 'USED', + value: 'USED', + }, + { + label: 'NEW', + value: 'NEW', + }, +] +export const columns: BasicColumn[] = [ + { + title: '模块名称', + dataIndex: 'formName', + sorter: true, + width: 150, + }, + { + title: '模板名称', + dataIndex: 'templetName', + sorter: true, + width: 150, + }, + { + title: '录入人', + dataIndex: 'createUserName', + sorter: true, + width: 200, + }, + { + title: '录入时间', + dataIndex: 'createTime', + sorter: true, + width: 200, + }, + { + title: '备注', + dataIndex: 'remark', + sorter: true, + width: 200, + }, +] + +export const searchFormSchema: FormSchema[] = [ + { + field: 'formName', + label: '模块名称', + component: 'Input', + colProps: { span: 4 }, + }, + { + field: 'templetName', + label: '模板名称', + component: 'Input', + colProps: { span: 4 }, + }, + { + field: 'remark', + label: '备注', + component: 'Input', + colProps: { span: 4 }, + }, +] +export const formSchema: FormSchema[] = [ + { + label: '', + field: 'id', + component: 'Input', + defaultValue: '', + show: false, + }, + { + label: '模块名称', + field: 'formName', + component: 'Input', + defaultValue: '', + colProps: { span: 6 }, + }, + { + label: '模板名称', + field: 'templetName', + component: 'Input', + defaultValue: '', + colProps: { span: 6 }, + }, + { + label: '录入人', + field: 'createUserName', + component: 'Input', + defaultValue: '', + // show: false, + }, + // { + // label: '录入人', + // field: 'createUser', + // component: 'ApiSelect', + // required: false, + // dynamicDisabled: false, + // colProps: { span: 6 }, + // componentProps: ({ formModel }) => { + // return { + // allowClear: true, + // showSearch: true, + // api: GetClientListByCode, + // params: { code: 'leasing' }, + // labelField: 'pinYinCode', + // showName: 'shortName', + // valueField: 'shortName', + // resultField: 'data', + // immediate: false, + // filterOption: (input: string, option: any) => { + // return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + // }, + // } + // }, + // }, + { + label: '录入时间', + field: 'createTime', + component: 'DatePicker', + colProps: { span: 6 }, + componentProps: { + showTime: false, + style: 'width:100%', + valueFormat: 'YYYY-MM-DD 00:00:00', + }, + }, + { + field: 'remark', + label: '备注', + component: 'InputTextArea', + // required: true, + colProps: { span: 12 }, + componentProps: { + rows: 3, + }, + }, +] diff --git a/src/views/ContainerManagement/Templat/index.vue b/src/views/ContainerManagement/Templat/index.vue new file mode 100644 index 00000000..beb358e4 --- /dev/null +++ b/src/views/ContainerManagement/Templat/index.vue @@ -0,0 +1,96 @@ + + diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx index 841dea8d..5e37e129 100644 --- a/src/views/baseinfo/infoclient/columns.tsx +++ b/src/views/baseinfo/infoclient/columns.tsx @@ -75,7 +75,6 @@ export const columns: BasicColumn[] = [ sorter: true, width: 150, customRender: ({ text, record }) => { - console.log(text, record) let RText = '' RText = text if (record.auditStatus == 2) { @@ -336,6 +335,7 @@ export const searchFormSchema: FormSchema[] = [ label: '是否合同超期', component: 'Switch', colProps: { span: 4 }, + defaultValue: false, componentProps: { checkedChildren: '是', checkedValue: true,