diff --git a/src/views/operation/autodui/TenantAuditStepModal.vue b/src/views/operation/autodui/TenantAuditStepModal.vue new file mode 100644 index 00000000..1e5ef4dd --- /dev/null +++ b/src/views/operation/autodui/TenantAuditStepModal.vue @@ -0,0 +1,184 @@ + + + + + + 添加 + + + + + 取消 + 仅保存 + 保存并关闭 + + + + + diff --git a/src/views/operation/autodui/api.ts b/src/views/operation/autodui/api.ts new file mode 100644 index 00000000..7288780d --- /dev/null +++ b/src/views/operation/autodui/api.ts @@ -0,0 +1,60 @@ +// @ts-ignore +import { request } from '/@/utils/request' +import { DataResult, PageRequest } from '/@/api/model/baseModel' +enum Api { + list = '/mainApi/CodeCtn/GetCodeCtnList', + edit = '/mainApi/CodeCtn/EditCodeCtn', + info = '/mainApi/CodeCtn/GetCodeCtnInfo', + + BasicsList = '/mainApi/CodeCtn/GetBasicsCodeCtnList', + ExistList = '/mainApi/CodeCtn/GetExistCodeCtnList', + Import = '/mainApi/CodeCtn/ImportCodeCtn', +} +// 列表 (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 ApiBasicsList(data: PageRequest) { + return request({ + url: Api.BasicsList, + method: 'post', + data, + }) +} +// 获取当前租户已有的商品类型 (Auth) +export function ApiExistList() { + return request({ + url: Api.ExistList, + method: 'get', + }) +} +// 导入商品类型列表-基础库 (Auth) +export function ApiImport(data: PageRequest) { + return request({ + url: Api.Import, + method: 'post', + data, + }) +} diff --git a/src/views/operation/autodui/columns.tsx b/src/views/operation/autodui/columns.tsx new file mode 100644 index 00000000..818d3ce0 --- /dev/null +++ b/src/views/operation/autodui/columns.tsx @@ -0,0 +1,247 @@ +import { BasicColumn, FormSchema } from '/@/components/Table' +import { Tag } from 'ant-design-vue' +export const columns: BasicColumn[] = [ + { + title: '对账记录号', + dataIndex: 'ctnSize0', + width: 150, + }, + { + title: '对账名称', + dataIndex: 'ctnSize1', + width: 150, + }, + { + title: '对账人', + dataIndex: 'ctnSize2', + width: 150, + }, + { + title: '对账备注', + dataIndex: 'ctnSize3', + width: 150, + }, + { + title: '对账日期', + dataIndex: 'ctnSize4', + width: 150, + }, + { + title: '对账客户', + dataIndex: 'ctnSize5', + width: 150, + }, +] + +export const searchFormSchema: FormSchema[] = [ + { + field: 'ctnSize0', + label: '对账记录号', + component: 'Input', + colProps: { span: 4 }, + }, +] +export const formSchema: FormSchema[] = [ + { + label: '', + field: 'id', + component: 'Input', + defaultValue: '', + show: false, + }, + { + field: 'AAA', + label: '对账记录号', + component: 'Input', + colProps: { span: 6 }, + }, + { + field: 'AAA', + label: '对账名称', + component: 'Input', + colProps: { span: 4 }, + }, + { + field: 'AAA', + label: '记录', + component: 'Input', + colProps: { span: 10 }, + }, + { + field: 'AAA', + label: '对账日期', + component: 'Input', + colProps: { span: 4 }, + }, +] +export const formcolumns: BasicColumn[] = [ + { + title: '对账编号', + dataIndex: 'ctnSize0', + width: 150, + }, + { + title: '客户简称', + dataIndex: 'ctnSize1', + width: 150, + }, + { + title: '客户全称', + dataIndex: 'ctnSize2', + width: 150, + }, + { + title: '揽货人', + dataIndex: 'ctnSize3', + width: 150, + }, + { + title: '应收开票', + dataIndex: 'ctnSize4', + width: 150, + }, + { + title: '应收RMB', + dataIndex: 'ctnSize5', + width: 150, + }, + { + title: '应收USD', + dataIndex: 'ctnSize5', + width: 150, + }, + { + title: '应付RMB', + dataIndex: 'ctnSize5', + width: 150, + }, + { + title: '应付USD', + dataIndex: 'ctnSize5', + width: 150, + }, + { + title: '对账联系人', + dataIndex: 'ctnSize5', + width: 150, + }, + { + title: '对账联系邮箱', + dataIndex: 'ctnSize5', + width: 150, + }, + { + title: '对账联系电话', + dataIndex: 'ctnSize5', + width: 150, + }, + { + title: '对账备注', + dataIndex: 'ctnSize5', + width: 150, + }, + { + title: '对账日期', + dataIndex: 'ctnSize5', + width: 150, + }, + { + title: '结费类型', + dataIndex: 'ctnSize5', + width: 150, + }, +] + +export const formsearchFormSchema: FormSchema[] = [ + { + field: 'ctnSize0', + label: '开船日期', + component: 'Input', + colProps: { span: 4 }, + }, + { + field: 'ctnSize0', + label: '对账客户', + component: 'Input', + colProps: { span: 4 }, + }, + { + field: 'ctnSize0', + label: '收付方向', + component: 'Input', + colProps: { span: 4 }, + }, + + { + field: 'ctnSize0', + label: '结算类型', + component: 'Input', + colProps: { span: 4 }, + }, + { + field: 'ctnSize0', + label: '装运方式', + component: 'Input', + colProps: { span: 4 }, + }, + { + field: 'ctnSize0', + label: '所属分布', + component: 'Input', + colProps: { span: 4 }, + }, + { + field: 'ctnSize0', + label: '仅超期', + component: 'Input', + colProps: { span: 4 }, + }, + { + field: 'ctnSize0', + label: '计算滞期', + component: 'Input', + colProps: { span: 4 }, + }, + { + field: 'ctnSize0', + label: '会计期间', + component: 'Input', + colProps: { span: 4 }, + }, + { + field: 'ctnSize0', + label: '费用状态', + component: 'Input', + colProps: { span: 4 }, + }, + { + field: 'ctnSize0', + label: '是否开票', + component: 'Input', + colProps: { span: 4 }, + }, + { + field: 'ctnSize0', + label: '币别', + component: 'Input', + colProps: { span: 4 }, + }, + { + field: 'ctnSize0', + label: '费用名称', + component: 'Input', + colProps: { span: 4 }, + }, + { + field: 'ctnSize0', + label: '所属公司', + component: 'Input', + colProps: { span: 4 }, + }, + { + field: 'ctnSize0', + label: '折算汇率', + component: 'Input', + colProps: { span: 4 }, + }, +] diff --git a/src/views/operation/autodui/index.vue b/src/views/operation/autodui/index.vue new file mode 100644 index 00000000..5b571d5e --- /dev/null +++ b/src/views/operation/autodui/index.vue @@ -0,0 +1,79 @@ + + + + + 添加 + + + + + + diff --git a/src/views/operation/seaexport/api/BookingLedger.js b/src/views/operation/seaexport/api/BookingLedger.js index 355ca414..fd6f1d36 100644 --- a/src/views/operation/seaexport/api/BookingLedger.js +++ b/src/views/operation/seaexport/api/BookingLedger.js @@ -633,6 +633,14 @@ export function GetFactorySelectList(parameter) { params: parameter, }) } +// 海运出口规则引擎校验 (Auth) +export function ExcuteRuleEngine(parameter) { + return request({ + url: '/opApi/SeaExport/ExcuteRuleEngine', + method: 'get', + params: parameter, + }) +} /** * 获取分页查询客户 * @params ShortName @@ -990,16 +998,6 @@ export function SampleBillPdf(parameter) { }) } -/** - * 校验 - */ -export function ExcuteRulesOceanBooking(parameter) { - return request({ - url: '/RulesEngineClient/ExcuteRulesOceanBooking?bookingId=' + parameter, - method: 'get', - }) -} - /** * 船代 * @params Name diff --git a/src/views/operation/seaexport/detail/index.vue b/src/views/operation/seaexport/detail/index.vue index 8d82ba1a..8727dc29 100644 --- a/src/views/operation/seaexport/detail/index.vue +++ b/src/views/operation/seaexport/detail/index.vue @@ -84,8 +84,8 @@ ref="RefrightContent" :id="id" :details="bookingDetails" - :excuteRules="excuteRules" - :excuteRulesType="excuteRulesType" + :PexcuteRules="excuteRules" + :PexcuteRulesType="excuteRulesType" @fileNewUpadte="fileNewUpadte" @changeAtd="changeAtd" @changeDetail="changeDetailFun" @@ -500,6 +500,7 @@ init() // 初始化 function init() { + console.log('init') if (route.query.id && !id.value) { id.value = route.query.id } @@ -1699,6 +1700,7 @@ const { rows, type } = data excuteRules.value = rows excuteRulesType.value = type + console.log(excuteRules.value, excuteRulesType.value) } // function changePageFun(type) { // const key = route.fullPath diff --git a/src/views/operation/seaexport/detail/modules/rightContent.vue b/src/views/operation/seaexport/detail/modules/rightContent.vue index 917f2a74..7811e123 100644 --- a/src/views/operation/seaexport/detail/modules/rightContent.vue +++ b/src/views/operation/seaexport/detail/modules/rightContent.vue @@ -10,12 +10,12 @@ title="重新校验" style="color: rgb(30, 144, 255); margin-left: 10px; cursor: pointer" /> --> - + /> --> - - + + --> - + 校验完成,无异常信息 - + 校验失败 再次校验 @@ -79,8 +79,8 @@ - + 船舶动态 刷新 @@ -613,7 +613,7 @@ import { AddRemark, AddFile, - ExcuteRulesOceanBooking, + ExcuteRuleEngine, BookingOrderDownload, BookingOrderDeleteRemark, SaveServiceItem, @@ -648,8 +648,8 @@ const props = defineProps({ id: { type: String, default: '' }, details: { type: Object, default: {} }, - excuteRules: { type: Array, default: [] }, - excuteRulesType: { type: String, default: '' }, + PexcuteRules: { type: Array, default: [] }, + PexcuteRulesType: { type: String, default: '' }, }) const emit = defineEmits([ 'rules', @@ -660,6 +660,7 @@ 'changeAtd', ]) let { ctx: that, proxy }: any = getCurrentInstance() + // const id = ref(route.query.id) // ---------------------------------------- const RemarkList: any = ref([]) const remarkSpinning = ref(false) @@ -1035,28 +1036,22 @@ } function checkFun() { notification.open({ message: '校验中...', duration: 3 }) - ExcuteRulesOceanBooking(props.id) - .then((res) => { - console.log(res) - if (res.succeeded) { - notification.destroy() - if (res.data.rows && res.data.rows.length > 0) { - notification.error({ message: res.data.msg, duration: 3 }) - } else { - notification.error({ message: '校验完成', duration: 3 }) - } - emit('rules', { - rows: res.data.rows, - type: res.data.succ ? 'success' : 'fail', - }) + ExcuteRuleEngine({ id: props.id }).then((res) => { + // res.data.rows + if (res.succeeded) { + if (res.data.extra.detailList && res.data.extra.detailList.length > 0) { + notification.error({ message: res.data.msg, duration: 3 }) } else { - notification.error({ message: res.message, duration: 3 }) + notification.error({ message: '校验完成', duration: 3 }) } - }) - .catch(() => { - notification.destroy() - notification.success({ message: '校验失败', duration: 3 }) - }) + emit('rules', { + rows: res.data.extra.detailList, + type: res.data.succ ? 'success' : 'fail', + }) + } else { + notification.error({ message: res.message, duration: 3 }) + } + }) } function stopTimer() {