diff --git a/src/components/CostEntry/actionBar.vue b/src/components/CostEntry/actionBar.vue index 3a40a391..4e816aec 100644 --- a/src/components/CostEntry/actionBar.vue +++ b/src/components/CostEntry/actionBar.vue @@ -630,16 +630,16 @@ const revokeSubmit = () => { let flag = false const ids = [] - props.data.forEach(item => { - if (item?.selected) { - if (item.feeStatus != 2) { + for (let i = 0; i < props.data.length; i++) { + if (props.data[i]?.selected) { + flag = true + if (props.data[i].feeStatus != 2) { return createMessage.warning('只能撤销状态为提交审核的费用!') } else { - ids.push(item?.id) + ids.push(props.data[i]?.id) } - flag = true } - }) + } if (!flag) return createMessage.warning('请勾选要撤销提交的费用!') emits('revoke', ids) } diff --git a/src/components/CostEntry/feeTable.vue b/src/components/CostEntry/feeTable.vue index 27c8b304..9d3520fe 100644 --- a/src/components/CostEntry/feeTable.vue +++ b/src/components/CostEntry/feeTable.vue @@ -728,6 +728,7 @@ return changes[0][3].includes(item.name) }) if (item) dict = item[0] + console.log(dict) list.value[changes[0][0]]['unit'] = dict?.value if (changes[0][3].indexOf('-') > -1) { changes[0][3] = changes[0][3].split('-')[0] diff --git a/src/components/HColSet/index.vue b/src/components/HColSet/index.vue index 316afc34..133941c3 100644 --- a/src/components/HColSet/index.vue +++ b/src/components/HColSet/index.vue @@ -125,7 +125,6 @@ id: props.columns?.id || 0 }).then(res => { createMessage.success(res.message) - if (res.data) vid.value = res.data emits('updateCol', TableColDragRef.value.getColList()) if (!b) visible.value = false }) @@ -142,9 +141,11 @@ showNumCol: checked.value }) } + if (vid.value) Apidata.id = vid.value editColumnSet(Object.assign(Apidata, permissionsInfo())).then((res) => { loading.value = false createMessage.success(res.message) + if (res.data) vid.value = res.data emits('updateCol', TableColDragRef.value.colData) if (!b) visible.value = false }).catch(() => { diff --git a/src/views/baseinfo/accountMaintenance/columns.tsx b/src/views/baseinfo/accountMaintenance/columns.tsx index 15c52d12..b1849d19 100644 --- a/src/views/baseinfo/accountMaintenance/columns.tsx +++ b/src/views/baseinfo/accountMaintenance/columns.tsx @@ -247,6 +247,19 @@ export const formSchema: FormSchema[] = [ defaultValue: '', colProps: { span: 12 }, }, + { + field: 'isCompany', + label: '是否公司', + component: 'Switch', + defaultValue: false, + colProps: { span: 12 }, + componentProps: { + checkedChildren: '是', + checkedValue: true, + unCheckedChildren: '否', + unCheckedValue: false, + } + }, { field: 'note', label: '备注', diff --git a/src/views/operation/seaexport/detail/modules/basicInfo.vue b/src/views/operation/seaexport/detail/modules/basicInfo.vue index 3912cd97..7a18c7c0 100644 --- a/src/views/operation/seaexport/detail/modules/basicInfo.vue +++ b/src/views/operation/seaexport/detail/modules/basicInfo.vue @@ -295,6 +295,12 @@ import { mode } from 'crypto-js' formData.shippingSpaceType = v.shippingSpaceType formData.bookingType = v.bookingType formData.issuingWay = v.issuingWay + if (props.details.contractNo && !props.details.contractId) { + updateSchema([ + { field: 'contractId', show: false }, + { field: 'contractNo', show: true } + ]) + } }, ) onMounted(() => {