diff --git a/src/views/operation/seaexport/detail/modules/baseInfo.tsx b/src/views/operation/seaexport/detail/modules/baseInfo.tsx index 7227a850..f2a98078 100644 --- a/src/views/operation/seaexport/detail/modules/baseInfo.tsx +++ b/src/views/operation/seaexport/detail/modules/baseInfo.tsx @@ -1839,12 +1839,6 @@ export const cargoInfoFormSchema1: FormSchema[] = [ }, ] export const cargoInfoFormSchema2: FormSchema[] = [ - { - label: '', - field: 'goodsId', - component: 'Input', - show: false, - }, { label: '', field: 'isPreOrder', @@ -1873,6 +1867,7 @@ export const cargoInfoFormSchema2: FormSchema[] = [ mode: 'SECRET_COMBOBOX_MODE_DO_NOT_USE', resultField: 'data', onChange: (v, obj) => { + console.log(obj) if (v && obj) { formModel.goodsId = obj.id if (obj.hsCode) { @@ -1883,7 +1878,7 @@ export const cargoInfoFormSchema2: FormSchema[] = [ formModel.goodsId = null formModel.hsCode = null } - }, + } } }, }, diff --git a/src/views/system/user/UserModal.vue b/src/views/system/user/UserModal.vue index 2a4c7331..6181cc1c 100644 --- a/src/views/system/user/UserModal.vue +++ b/src/views/system/user/UserModal.vue @@ -158,10 +158,12 @@ import { v } from 'vxe-table' const { data } = res const userAttr = [] Object.keys(data).forEach((item) => { - if (item.includes('is') && item != 'isUseSystem' && data[item]) { + if (item.includes('is') && (item != 'isUseSystem' && item != 'permissionIdentity') && data[item]) { + console.log(item) userAttr.push(item) } }) + console.log(userAttr) setFieldsValue({ userAttr, ...data diff --git a/src/views/system/user/columns.tsx b/src/views/system/user/columns.tsx index d38ef9d4..f2581b3a 100644 --- a/src/views/system/user/columns.tsx +++ b/src/views/system/user/columns.tsx @@ -349,7 +349,6 @@ export const formSchema: FormSchema[] = [ { label: '员工代码', field: 'userNumber', - dynamicDisabled: true, component: 'Input', colProps: { span: 6 }, },